Reduce use of powermockito
[ovsdb.git] / southbound / southbound-impl / src / test / java / org / opendaylight / ovsdb / southbound / OvsdbConnectionInstanceTest.java
index 1088386ecc85df8494ec12eaa2479a5638837145..a286234e8cb8e3ece9c4d4874b24e537c4298bd6 100644 (file)
@@ -19,34 +19,34 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.powermock.reflect.Whitebox.getField;
 
+import com.google.common.util.concurrent.ListenableFuture;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.opendaylight.ovsdb.lib.EchoServiceCallbackFilters;
+import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.ovsdb.lib.LockAquisitionCallback;
 import org.opendaylight.ovsdb.lib.LockStolenCallback;
 import org.opendaylight.ovsdb.lib.MonitorCallBack;
 import org.opendaylight.ovsdb.lib.MonitorHandle;
 import org.opendaylight.ovsdb.lib.OvsdbClient;
 import org.opendaylight.ovsdb.lib.OvsdbConnectionInfo;
-import org.opendaylight.ovsdb.lib.message.MonitorRequest;
-import org.opendaylight.ovsdb.lib.message.MonitorRequestBuilder;
-import org.opendaylight.ovsdb.lib.message.MonitorSelect;
 import org.opendaylight.ovsdb.lib.message.TableUpdates;
 import org.opendaylight.ovsdb.lib.operations.OperationResult;
 import org.opendaylight.ovsdb.lib.operations.TransactionBuilder;
 import org.opendaylight.ovsdb.lib.schema.DatabaseSchema;
 import org.opendaylight.ovsdb.lib.schema.GenericTableSchema;
+import org.opendaylight.ovsdb.southbound.ovsdb.transact.BridgeOperationalState;
+import org.opendaylight.ovsdb.southbound.ovsdb.transact.DataChangeEvent;
 import org.opendaylight.ovsdb.southbound.ovsdb.transact.TransactCommand;
 import org.opendaylight.ovsdb.southbound.ovsdb.transact.TransactInvoker;
 import org.opendaylight.ovsdb.southbound.transactions.md.TransactionInvoker;
@@ -55,19 +55,11 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.api.support.membermodification.MemberMatcher;
-import org.powermock.api.support.membermodification.MemberModifier;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.Whitebox;
 
-import com.google.common.util.concurrent.ListenableFuture;
-
-@PrepareForTest({OvsdbConnectionInstance.class, MonitorRequestBuilder.class})
-@RunWith(PowerMockRunner.class)
-
+@RunWith(MockitoJUnitRunner.class)
 public class OvsdbConnectionInstanceTest {
+
     @Mock private OvsdbConnectionInstance ovsdbConnectionInstance;
     @Mock private OvsdbClient client;
     @Mock private ConnectionInfo connectionInfo;
@@ -79,42 +71,46 @@ public class OvsdbConnectionInstanceTest {
 
     @Before
     public void setUp() throws Exception {
-        ovsdbConnectionInstance = PowerMockito.mock(OvsdbConnectionInstance.class, Mockito.CALLS_REAL_METHODS);
-        MemberModifier.field(OvsdbConnectionInstance.class, "txInvoker").set(ovsdbConnectionInstance, txInvoker);
-        MemberModifier.field(OvsdbConnectionInstance.class, "connectionInfo").set(ovsdbConnectionInstance, key);
-        MemberModifier.field(OvsdbConnectionInstance.class, "instanceIdentifier").set(ovsdbConnectionInstance, instanceIdentifier);
-        MemberModifier.field(OvsdbConnectionInstance.class, "hasDeviceOwnership").set(ovsdbConnectionInstance, false);
+        ovsdbConnectionInstance = mock(OvsdbConnectionInstance.class, Mockito.CALLS_REAL_METHODS);
+        getField(OvsdbConnectionInstance.class, "txInvoker").set(ovsdbConnectionInstance, txInvoker);
+        getField(OvsdbConnectionInstance.class, "connectionInfo").set(ovsdbConnectionInstance, key);
+        getField(OvsdbConnectionInstance.class, "instanceIdentifier").set(ovsdbConnectionInstance, instanceIdentifier);
+        getField(OvsdbConnectionInstance.class, "hasDeviceOwnership").set(ovsdbConnectionInstance, false);
     }
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Test
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     public void testTransact() throws Exception {
-        TransactCommand command = mock(TransactCommand.class);
         transactInvokers = new HashMap();
 
-        //init instance variables
+        // init instance variables
         TransactInvoker transactInvoker1 = mock(TransactInvoker.class);
         TransactInvoker transactInvoker2 = mock(TransactInvoker.class);
         transactInvokers.put(mock(DatabaseSchema.class), transactInvoker1);
         transactInvokers.put(mock(DatabaseSchema.class), transactInvoker2);
-        MemberModifier.field(OvsdbConnectionInstance.class, "transactInvokers").set(ovsdbConnectionInstance , transactInvokers);
+        getField(OvsdbConnectionInstance.class, "transactInvokers").set(ovsdbConnectionInstance , transactInvokers);
 
-        ovsdbConnectionInstance.transact(command);
-        verify(transactInvoker1).invoke(any(TransactCommand.class));
-        verify(transactInvoker2).invoke(any(TransactCommand.class));
+        TransactCommand command = mock(TransactCommand.class);
+        ovsdbConnectionInstance.transact(command, mock(BridgeOperationalState.class), mock(DataChangeEvent.class),
+                mock(InstanceIdentifierCodec.class));
+        verify(transactInvoker1).invoke(any(TransactCommand.class), any(BridgeOperationalState.class),
+                any(DataChangeEvent.class), any(InstanceIdentifierCodec.class));
+        verify(transactInvoker2).invoke(any(TransactCommand.class), any(BridgeOperationalState.class),
+                any(DataChangeEvent.class), any(InstanceIdentifierCodec.class));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
+    @SuppressWarnings("unchecked")
     public void testRegisterCallbacks() throws Exception {
+        InstanceIdentifierCodec instanceIdentifierCodec = mock(InstanceIdentifierCodec.class);
 
-        //callback not null case
-        MemberModifier.field(OvsdbConnectionInstance.class, "callback").set(ovsdbConnectionInstance , callback);
-        ovsdbConnectionInstance.registerCallbacks();
+        // callback not null case
+        getField(OvsdbConnectionInstance.class, "callback").set(ovsdbConnectionInstance , callback);
+        ovsdbConnectionInstance.registerCallbacks(instanceIdentifierCodec);
         verify(ovsdbConnectionInstance, times(0)).getDatabases();
 
-        //callback null case
-        MemberModifier.field(OvsdbConnectionInstance.class, "callback").set(ovsdbConnectionInstance , null);
+        // callback null case
+        getField(OvsdbConnectionInstance.class, "callback").set(ovsdbConnectionInstance , null);
         ListenableFuture<List<String>> listenableFuture = mock(ListenableFuture.class);
         List<String> databases = new ArrayList<>();
         databases.add("Open_vSwitch");
@@ -123,53 +119,46 @@ public class OvsdbConnectionInstanceTest {
         when(listenableFuture.get()).thenReturn(databases);
 
         ListenableFuture<DatabaseSchema> listenableDbSchema = mock(ListenableFuture.class);
-        DatabaseSchema dbSchema= mock(DatabaseSchema.class);
+        DatabaseSchema dbSchema = mock(DatabaseSchema.class);
         doReturn(listenableDbSchema).when(ovsdbConnectionInstance).getSchema(anyString());
         when(listenableDbSchema.get()).thenReturn(dbSchema);
 
-        MemberModifier.suppress(MemberMatcher.method(OvsdbConnectionInstance.class, "monitorAllTables", String.class,DatabaseSchema.class));
-        ovsdbConnectionInstance.registerCallbacks();
-        PowerMockito.verifyPrivate(ovsdbConnectionInstance, times(1)).invoke("monitorAllTables", anyString(), any(DatabaseSchema.class));
+        doNothing().when(ovsdbConnectionInstance).monitorTables(anyString(), any(DatabaseSchema.class));
+        ovsdbConnectionInstance.registerCallbacks(instanceIdentifierCodec);
+        verify(ovsdbConnectionInstance, times(1)).monitorTables(anyString(), any(DatabaseSchema.class));
     }
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Test
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     public void testCreateTransactInvokers() throws Exception {
-        //transactInvokers not null case
+        // transactInvokers not null case
         transactInvokers = new HashMap();
-        MemberModifier.field(OvsdbConnectionInstance.class, "transactInvokers").set(ovsdbConnectionInstance , transactInvokers);
+        getField(OvsdbConnectionInstance.class, "transactInvokers").set(ovsdbConnectionInstance , transactInvokers);
         ovsdbConnectionInstance.createTransactInvokers();
-        verify(ovsdbConnectionInstance, times(0)).getDatabases();
+        verify(ovsdbConnectionInstance, times(0)).getSchema(anyString());
 
-        //transactInvokers null case
-        MemberModifier.field(OvsdbConnectionInstance.class, "transactInvokers").set(ovsdbConnectionInstance , null);
-        ListenableFuture<List<String>> listenableFuture = mock(ListenableFuture.class);
-        List<String> databases = new ArrayList<>();
-        databases.add("database1");
-        databases.add("database2");
-        doReturn(listenableFuture).when(ovsdbConnectionInstance).getDatabases();
-        when(listenableFuture.get()).thenReturn(databases);
+        // transactInvokers null case
+        getField(OvsdbConnectionInstance.class, "transactInvokers").set(ovsdbConnectionInstance , null);
 
         ListenableFuture<DatabaseSchema> listenableDbSchema = mock(ListenableFuture.class);
-        DatabaseSchema dbSchema= mock(DatabaseSchema.class);
-        DatabaseSchema dbSchema1= mock(DatabaseSchema.class);
+        DatabaseSchema dbSchema = mock(DatabaseSchema.class);
         doReturn(listenableDbSchema).when(ovsdbConnectionInstance).getSchema(anyString());
-        when(listenableDbSchema.get()).thenReturn(dbSchema).thenReturn(dbSchema1);
+        when(listenableDbSchema.get()).thenReturn(dbSchema);
 
         ovsdbConnectionInstance.createTransactInvokers();
-        verify(ovsdbConnectionInstance).getDatabases();
-        verify(ovsdbConnectionInstance, times(2)).getSchema(anyString());
+        verify(ovsdbConnectionInstance).getSchema(anyString());
 
-        Map<DatabaseSchema,TransactInvoker> testTransactInvokers = Whitebox.getInternalState(ovsdbConnectionInstance, "transactInvokers");
-        assertEquals("Error, size of the hashmap is incorrect", 2, testTransactInvokers.size());
+        Map<DatabaseSchema, TransactInvoker> testTransactInvokers = Whitebox.getInternalState(ovsdbConnectionInstance,
+                "transactInvokers");
+        assertEquals("Error, size of the hashmap is incorrect", 1, testTransactInvokers.size());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
+    @SuppressWarnings("unchecked")
     public void testMonitorAllTables() throws Exception {
         Set<String> tables = new HashSet<>();
-        tables.add("tableName1");
-        tables.add("tableName2");
+        tables.add("Open_vSwitch");
+        tables.add("Port");
         DatabaseSchema dbSchema = mock(DatabaseSchema.class);
         when(dbSchema.getName()).thenReturn(SouthboundConstants.OPEN_V_SWITCH);
         when(dbSchema.getTables()).thenReturn(tables);
@@ -179,144 +168,139 @@ public class OvsdbConnectionInstanceTest {
         Set<String> columns = new HashSet<>();
         columns.add("columnName1");
         columns.add("columnName2");
+        columns.add("_version");
+        columns.add("statistics");
         when(tableSchema.getColumns()).thenReturn(columns);
-        MonitorRequestBuilder<GenericTableSchema> monitorBuilder = mock(MonitorRequestBuilder.class);
-        PowerMockito.mockStatic(MonitorRequestBuilder.class);
-        when(MonitorRequestBuilder.builder(any(GenericTableSchema.class))).thenReturn(monitorBuilder);
-        when(monitorBuilder.addColumn(anyString())).thenReturn(monitorBuilder);
-        MonitorRequest monitorReq = mock(MonitorRequest.class);
-        when(monitorBuilder.with(any(MonitorSelect.class))).thenReturn(monitorBuilder);
-        when(monitorBuilder.build()).thenReturn(monitorReq);
-
-        MemberModifier.suppress(MemberMatcher.method(OvsdbConnectionInstance.class, "monitor", DatabaseSchema.class, List.class, MonitorCallBack.class));
+
         TableUpdates tableUpdates = mock(TableUpdates.class);
-        when(ovsdbConnectionInstance.monitor(any(DatabaseSchema.class), any(List.class), any(MonitorCallBack.class))).thenReturn(tableUpdates);
-        MemberModifier.field(OvsdbConnectionInstance.class, "callback").set(ovsdbConnectionInstance, callback);
+        doReturn(tableUpdates).when(ovsdbConnectionInstance).monitor(any(DatabaseSchema.class), any(List.class),
+            any(MonitorCallBack.class));
+        getField(OvsdbConnectionInstance.class, "callback").set(ovsdbConnectionInstance, callback);
         doNothing().when(callback).update(any(TableUpdates.class), any(DatabaseSchema.class));
 
-        Whitebox.invokeMethod(ovsdbConnectionInstance, "monitorAllTables", "database", dbSchema);
-        PowerMockito.verifyPrivate(ovsdbConnectionInstance, times(1)).invoke("monitorAllTables", anyString(), any(DatabaseSchema.class));
-
-        verify(monitorBuilder, times(4)).addColumn(anyString());
+        Whitebox.invokeMethod(ovsdbConnectionInstance, "monitorTables", "database", dbSchema);
+        verify(ovsdbConnectionInstance, times(1)).monitorTables(anyString(), any(DatabaseSchema.class));
     }
 
     @SuppressWarnings({ "unchecked" })
     @Test
     public void testOvsdbConnectionInstance() throws Exception {
-        MemberModifier.field(OvsdbConnectionInstance.class, "client").set(ovsdbConnectionInstance, client);
-        DatabaseSchema databaseSchema = mock(DatabaseSchema.class);
+        getField(OvsdbConnectionInstance.class, "client").set(ovsdbConnectionInstance, client);
 
-        //test getDatabases()
+        // test getDatabases()
         ListenableFuture<List<String>> listenableFuture = mock(ListenableFuture.class);
         when(client.getDatabases()).thenReturn(listenableFuture);
-        assertEquals("Error, did not return correct ListenableFuture<List<String>> object", listenableFuture, ovsdbConnectionInstance.getDatabases());
+        assertEquals("Error, did not return correct ListenableFuture<List<String>> object", listenableFuture,
+                ovsdbConnectionInstance.getDatabases());
         verify(client).getDatabases();
 
-        //test getSchema()
+        // test getSchema()
         ListenableFuture<DatabaseSchema> futureDatabaseSchema = mock(ListenableFuture.class);
         when(client.getSchema(anyString())).thenReturn(futureDatabaseSchema);
-        assertEquals("Error, did not return correct ListenableFuture<DatabaseSchema> object", futureDatabaseSchema, ovsdbConnectionInstance.getSchema(anyString()));
+        assertEquals("Error, did not return correct ListenableFuture<DatabaseSchema> object", futureDatabaseSchema,
+                ovsdbConnectionInstance.getSchema(anyString()));
         verify(client).getSchema(anyString());
 
-        //test transactBuilder()
+        // test transactBuilder()
         TransactionBuilder transactionBuilder = mock(TransactionBuilder.class);
         when(client.transactBuilder(any(DatabaseSchema.class))).thenReturn(transactionBuilder);
-        assertEquals("Error, did not return correct TransactionBuilder object", transactionBuilder, ovsdbConnectionInstance.transactBuilder(any(DatabaseSchema.class)));
+        assertEquals("Error, did not return correct TransactionBuilder object", transactionBuilder,
+                ovsdbConnectionInstance.transactBuilder(any(DatabaseSchema.class)));
         verify(client).transactBuilder(any(DatabaseSchema.class));
 
-        //test transact()
+        // test transact()
         ListenableFuture<List<OperationResult>> futureOperationResult = mock(ListenableFuture.class);
         when(client.transact(any(DatabaseSchema.class), any(List.class))).thenReturn(futureOperationResult);
-        assertEquals("Error, did not return correct ListenableFuture<List<OperationResult>> object", futureOperationResult, ovsdbConnectionInstance.transact(any(DatabaseSchema.class), any(List.class)));
+        assertEquals("Error, did not return correct ListenableFuture<List<OperationResult>> object",
+                futureOperationResult, ovsdbConnectionInstance.transact(any(DatabaseSchema.class), any(List.class)));
         verify(client).transact(any(DatabaseSchema.class), any(List.class));
 
-        //test monitor()
+        // test monitor()
         TableUpdates tableUpdates = mock(TableUpdates.class);
-        when(client.monitor(any(DatabaseSchema.class), any(List.class), any(MonitorCallBack.class))).thenReturn(tableUpdates);
-        assertEquals("Error, did not return correct TableUpdates object", tableUpdates, ovsdbConnectionInstance.monitor(any(DatabaseSchema.class), any(List.class), any(MonitorCallBack.class)));
+        when(client.monitor(any(DatabaseSchema.class), any(List.class), any(MonitorCallBack.class)))
+                .thenReturn(tableUpdates);
+        assertEquals("Error, did not return correct TableUpdates object", tableUpdates, ovsdbConnectionInstance
+                .monitor(any(DatabaseSchema.class), any(List.class), any(MonitorCallBack.class)));
         verify(client).monitor(any(DatabaseSchema.class), any(List.class), any(MonitorCallBack.class));
 
-        //test cancelMonitor()
+        // test cancelMonitor()
         doNothing().when(client).cancelMonitor(any(MonitorHandle.class));
         MonitorHandle monitorHandle = mock(MonitorHandle.class);
         ovsdbConnectionInstance.cancelMonitor(monitorHandle);
         verify(client).cancelMonitor(any(MonitorHandle.class));
 
-        //test lock()
+        // test lock()
         doNothing().when(client).lock(anyString(), any(LockAquisitionCallback.class), any(LockStolenCallback.class));
         LockAquisitionCallback lockAquisitionCallback = mock(LockAquisitionCallback.class);
         LockStolenCallback lockStolenCallback = mock(LockStolenCallback.class);
         ovsdbConnectionInstance.lock("lockId", lockAquisitionCallback, lockStolenCallback);
         verify(client).lock(anyString(), any(LockAquisitionCallback.class), any(LockStolenCallback.class));
 
-        //test steal()
+        // test steal()
         ListenableFuture<Boolean> futureBoolean = mock(ListenableFuture.class);
         when(client.steal(anyString())).thenReturn(futureBoolean);
-        assertEquals("Error, did not return correct ListenableFuture<Boolean> object", futureBoolean, ovsdbConnectionInstance.steal(anyString()));
+        assertEquals("Error, did not return correct ListenableFuture<Boolean> object", futureBoolean,
+                ovsdbConnectionInstance.steal(anyString()));
         verify(client).steal(anyString());
 
-        //test unLock()
+        // test unLock()
         when(client.unLock(anyString())).thenReturn(futureBoolean);
-        assertEquals("Error, did not return correct ListenableFuture<Boolean> object", futureBoolean, ovsdbConnectionInstance.unLock(anyString()));
+        assertEquals("Error, did not return correct ListenableFuture<Boolean> object", futureBoolean,
+                ovsdbConnectionInstance.unLock(anyString()));
         verify(client).unLock(anyString());
 
-        //test startEchoService()
-        EchoServiceCallbackFilters echoServiceCallbackFilters = mock(EchoServiceCallbackFilters.class);
-        doNothing().when(client).startEchoService(any(EchoServiceCallbackFilters.class));
-        ovsdbConnectionInstance.startEchoService(echoServiceCallbackFilters);
-        verify(client).startEchoService(any(EchoServiceCallbackFilters.class));
-
-        //test stopEchoService()
-        doNothing().when(client).stopEchoService();
-        ovsdbConnectionInstance.stopEchoService();
-        verify(client).stopEchoService();
-
-        //test isActive()
+        // test isActive()
         when(client.isActive()).thenReturn(true);
         assertEquals("Error, does not match isActive()", true, ovsdbConnectionInstance.isActive());
         verify(client).isActive();
 
-        //test disconnect()
+        // test disconnect()
         doNothing().when(client).disconnect();
         ovsdbConnectionInstance.disconnect();
         verify(client).disconnect();
 
-        //test getDatabaseSchema()
+        // test getDatabaseSchema()
+        DatabaseSchema databaseSchema = mock(DatabaseSchema.class);
         when(client.getDatabaseSchema(anyString())).thenReturn(databaseSchema);
-        assertEquals("Error, did not return correct DatabaseSchema object", databaseSchema, ovsdbConnectionInstance.getDatabaseSchema(anyString()));
+        assertEquals("Error, did not return correct DatabaseSchema object", databaseSchema,
+                ovsdbConnectionInstance.getDatabaseSchema(anyString()));
         verify(client).getDatabaseSchema(anyString());
 
-        //test getConnectionInfo()
+        // test getConnectionInfo()
         OvsdbConnectionInfo ovsdbConnectionInfo = mock(OvsdbConnectionInfo.class);
         when(client.getConnectionInfo()).thenReturn(ovsdbConnectionInfo);
-        assertEquals("Error, did not return correct OvsdbConnectionInfo object", ovsdbConnectionInfo, ovsdbConnectionInstance.getConnectionInfo());
+        assertEquals("Error, did not return correct OvsdbConnectionInfo object", ovsdbConnectionInfo,
+                ovsdbConnectionInstance.getConnectionInfo());
         verify(client).getConnectionInfo();
 
-        //test getMDConnectionInfo()
+        // test getMDConnectionInfo()
         assertEquals("Error, incorrect connectionInfo", key, ovsdbConnectionInstance.getMDConnectionInfo());
 
-        //test setMDConnectionInfo()
+        // test setMDConnectionInfo()
         ovsdbConnectionInstance.setMDConnectionInfo(key);
-        assertEquals("Error, incorrect ConnectionInfo", key, Whitebox.getInternalState(ovsdbConnectionInstance, "connectionInfo"));
+        assertEquals("Error, incorrect ConnectionInfo", key,
+                Whitebox.getInternalState(ovsdbConnectionInstance, "connectionInfo"));
 
-        //test getInstanceIdentifier()
-        assertEquals("Error, incorrect instanceIdentifier", instanceIdentifier, ovsdbConnectionInstance.getInstanceIdentifier());
+        // test getInstanceIdentifier()
+        assertEquals("Error, incorrect instanceIdentifier", instanceIdentifier,
+                ovsdbConnectionInstance.getInstanceIdentifier());
 
-        //test getNodeId()
-        NodeKey nodeKey = mock(NodeKey.class);
+        // test getNodeId()
         NodeId nodeId = mock(NodeId.class);
-        MemberModifier.suppress(MemberMatcher.method(OvsdbConnectionInstance.class, "getNodeKey"));
+        NodeKey nodeKey = new NodeKey(nodeId);
+        doReturn(nodeKey).when(ovsdbConnectionInstance).getNodeKey();
         when(ovsdbConnectionInstance.getNodeKey()).thenReturn(nodeKey);
-        when(nodeKey.getNodeId()).thenReturn(nodeId);
         assertEquals("Error, incorrect NodeId object", nodeId, ovsdbConnectionInstance.getNodeId());
 
-        //test setInstanceIdentifier()
+        // test setInstanceIdentifier()
         ovsdbConnectionInstance.setInstanceIdentifier(instanceIdentifier);
-        assertEquals("Error, incorrect instanceIdentifier", instanceIdentifier, Whitebox.getInternalState(ovsdbConnectionInstance, "instanceIdentifier"));
-
-        //test monitor()
-        MemberModifier.suppress(MemberMatcher.method(OvsdbConnectionInstance.class, "monitor", DatabaseSchema.class, List.class, MonitorHandle.class, MonitorCallBack.class));
-        when(ovsdbConnectionInstance.monitor(any(DatabaseSchema.class), any(List.class), any(MonitorHandle.class), any(MonitorCallBack.class))).thenReturn(null);
-        assertNull(ovsdbConnectionInstance.monitor(any(DatabaseSchema.class), any(List.class), any(MonitorHandle.class), any(MonitorCallBack.class)));
+        assertEquals("Error, incorrect instanceIdentifier", instanceIdentifier,
+                Whitebox.getInternalState(ovsdbConnectionInstance, "instanceIdentifier"));
+
+        // test monitor()
+        when(ovsdbConnectionInstance.monitor(any(DatabaseSchema.class), any(List.class), any(MonitorHandle.class),
+                any(MonitorCallBack.class))).thenReturn(null);
+        assertNull(ovsdbConnectionInstance.monitor(any(DatabaseSchema.class), any(List.class), any(MonitorHandle.class),
+                any(MonitorCallBack.class)));
     }
 }