Bump JMock to 2.12.0

[lispflowmapping.git] / commons / unittest_tools / src / main / java / org / opendaylight / lispflowmapping / tools / junit / BaseTestCase.java

diff --git a/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseTestCase.java b/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseTestCase.java
index e14463d3dd09fa758c3570d8707b167aef6440b0..e2777d75b4772ec270c20000ed3a7d2643aae22e 100644 (file)
--- a/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseTestCase.java
+++ b/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseTestCase.java
@@ -20,12 +20,17 @@ import org.hamcrest.Description;
 import org.jmock.api.Action;
 import org.jmock.api.Invocation;
 import org.junit.Assert;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class BaseTestCase extends BaseExpectations {
+    protected static final Logger LOG = LoggerFactory.getLogger(BaseTestCase.class);
+
     protected InetAddress asInet(int intValue) {
         try {
             return InetAddress.getByAddress(ByteBuffer.allocate(4).putInt(intValue).array());
         } catch (UnknownHostException e) {
+            LOG.debug("Unknown host {}", ByteBuffer.allocate(4).putInt(intValue).array(), e);
             fail("");
         }
         return null;
@@ -84,19 +89,6 @@ public abstract class BaseTestCase extends BaseExpectations {
         return inject(testedObject, new FieldData(field, member));
     }
 
-    protected Object injectStatic(Class<?> clazz, String memberName, Object member) throws Exception {
-        assertNotNull(clazz);
-        assertNotNull(memberName);
-        assertNotNull(member);
-
-        Field field = null;
-        for (Class<?> cls = clazz; (cls != null) && (field == null); cls = cls.getSuperclass()) {
-            field = cls.getDeclaredField(memberName);
-        }
-        assertNotNull("Couldn't find member '" + memberName + "' in " + clazz.getSimpleName(), field);
-        return inject(null, new FieldData(field, member));
-    }
-
     protected Object inject(Object testedObject, FieldData fieldData) {
         assertNotNull(fieldData.field);
         Field field = fieldData.field;
@@ -109,14 +101,28 @@ public abstract class BaseTestCase extends BaseExpectations {
                 field.set(testedObject, fieldData.value);
                 return fieldData.value;
             } catch (Exception e) {
+                LOG.debug("Caught generic exception", e);
                 fail(e.getMessage());
             }
         }
         return null;
     }
 
-    static protected final class FieldData {
-        final public Field field;
+    protected Object injectStatic(Class<?> clazz, String memberName, Object member) throws Exception {
+        assertNotNull(clazz);
+        assertNotNull(memberName);
+        assertNotNull(member);
+
+        Field field = null;
+        for (Class<?> cls = clazz; (cls != null) && (field == null); cls = cls.getSuperclass()) {
+            field = cls.getDeclaredField(memberName);
+        }
+        assertNotNull("Couldn't find member '" + memberName + "' in " + clazz.getSimpleName(), field);
+        return inject(null, new FieldData(field, member));
+    }
+
+    protected static final class FieldData {
+        public final Field field;
         public Object value;
 
         public FieldData(Field field, Object value) {