Migrate MockitoJUnitRunner

[ovsdb.git] / southbound / southbound-impl / src / test / java / org / opendaylight / ovsdb / southbound / OvsdbMonitorCallbackTest.java

diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbMonitorCallbackTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbMonitorCallbackTest.java
index 7a8f5714ccb144e379aa36a86fb7f0a4af3467d4..cc1bc38630a519310f731721bb79966f7213da5e 100644 (file)
--- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbMonitorCallbackTest.java
+++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbMonitorCallbackTest.java
@@ -11,14 +11,16 @@ package org.opendaylight.ovsdb.southbound;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.ovsdb.lib.message.TableUpdates;
+import org.opendaylight.ovsdb.lib.notation.Version;
 import org.opendaylight.ovsdb.lib.schema.DatabaseSchema;
 import org.opendaylight.ovsdb.southbound.transactions.md.OvsdbOperationalCommandAggregator;
 import org.opendaylight.ovsdb.southbound.transactions.md.TransactionInvoker;
@@ -26,13 +28,21 @@ import org.opendaylight.ovsdb.southbound.transactions.md.TransactionInvoker;
 @RunWith(MockitoJUnitRunner.class)
 
 public class OvsdbMonitorCallbackTest {
-    @InjectMocks private OvsdbMonitorCallback ovsdbMonitorCallback = mock(OvsdbMonitorCallback.class, Mockito.CALLS_REAL_METHODS);
-    @Mock private TransactionInvoker txInvoker;
-    @Mock private OvsdbConnectionInstance key;
+
+    @InjectMocks
+    OvsdbMonitorCallback ovsdbMonitorCallback = mock(OvsdbMonitorCallback.class, Mockito.CALLS_REAL_METHODS);
+
+    @Mock
+    private TransactionInvoker txInvoker;
+    @Mock
+    private OvsdbConnectionInstance key;
 
     @Test
     public void testUpdate() {
-        ovsdbMonitorCallback.update(mock(TableUpdates.class), mock(DatabaseSchema.class));
+        DatabaseSchema dbSchema = mock(DatabaseSchema.class);
+        when(dbSchema.getVersion())
+                .thenReturn(Version.fromString(SouthboundConstants.AUTOATTACH_SUPPORTED_OVS_SCHEMA_VERSION));
+        ovsdbMonitorCallback.update(mock(TableUpdates.class), dbSchema);
         verify(txInvoker).invoke(any(OvsdbOperationalCommandAggregator.class));
     }