Remove OvsdbConfigurationService

[ovsdb.git] / openstack / net-virt / src / test / java / org / opendaylight / ovsdb / openstack / netvirt / impl / BridgeConfigurationManagerImplTest.java

diff --git a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImplTest.java b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImplTest.java
index 3cb6625ccf52c7a294ef8775c1ee99abb1810cec..dc218b0a24487ca747aeefcf8daeb3950edc069d 100644 (file)
--- a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImplTest.java
+++ b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImplTest.java
@@ -211,8 +211,8 @@ public class BridgeConfigurationManagerImplTest {
         verifyNoMoreInteractions(networkingProviderManager);
 
         when(configurationService.getIntegrationBridgeName()).thenReturn(bridgeMockName);
-        // getBridge() is private method - cannot be mocked with mockito
-        // when(bridgeConfigurationManagerImpl.getBridge(any(Node.class), anyString())).thenReturn(bridgeMock);
+        // readBridge() is private method - cannot be mocked with mockito
+        // when(bridgeConfigurationManagerImpl.readBridge(any(Node.class), anyString())).thenReturn(bridgeMock);
 
         // Negative testing only due to private method call
         assertEquals("Error, did not return correct boolean from isNodeTunnelReady", false,
@@ -235,7 +235,7 @@ public class BridgeConfigurationManagerImplTest {
         verifyNoMoreInteractions(configurationService);
         verifyNoMoreInteractions(networkingProviderManager);
 
-        // getBridge() is private method - cannot be mocked with mockito
+        // readBridge() is private method - cannot be mocked with mockito
         // Negative testing only due to private method call
         assertEquals("Error, did not return correct boolean from isNodeVlanReady", false,
                 bridgeConfigurationManagerImpl.isNodeVlanReady(nodeMock, neutronNetworkMock));
@@ -391,7 +391,7 @@ public class BridgeConfigurationManagerImplTest {
         verify(configurationService, times(1)).getProviderMappingsKey();
         verify(configurationService, times(0)).getDefaultProviderMapping();
     }
-
+    /* TODO SB_MIGRATION
     @Test
     public void testGetBridge() throws Exception {
         Row row = mock(Row.class);
@@ -400,7 +400,6 @@ public class BridgeConfigurationManagerImplTest {
         hashMap = new ConcurrentHashMap<>();
         hashMap.put("row1", row);
 
-        /* TODO SB_MIGRATION */
         //when(ovsdbConfigurationService.getRows(any(Node.class), anyString())).thenReturn(hashMap);
         //when(ovsdbConfigurationService.getTypedRow(any(Node.class), same(Bridge.class),
         //        any(Row.class))).thenReturn(bridge);
@@ -411,5 +410,5 @@ public class BridgeConfigurationManagerImplTest {
         //verify(ovsdbConfigurationService, times(1)).getRows(any(Node.class), anyString());
         //verify(ovsdbConfigurationService, times(1)).getTableName(any(Node.class), any(Class.class));
         //verify(ovsdbConfigurationService, times(1)).getTypedRow(any(Node.class), any(Class.class), any(Row.class));
-    }
+    }*/
 }
\ No newline at end of file