Do not mock InetAddress

Rather than mocking it, create a known-good constant and rely on it.

Change-Id: I10fc205c122a77f94a7851a6fe38e9252bac73af
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommandTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommandTest.java
index cd75f7cf0cfce1cd3a7a3255bf8f94b47ce88ead..0da83ac03577d39c937aba2164b4a900b075c27a 100644 (file)
--- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommandTest.java
+++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommandTest.java
@@ -19,6 +19,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import com.google.common.base.Optional;
+import com.google.common.net.InetAddresses;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.util.ArrayList;
@@ -470,14 +471,13 @@ public class OvsdbBridgeUpdateCommandTest {
         Enumeration<InetAddress> networkInterfaceAddresses = mock(Enumeration.class);
         when(networkInterface.getInetAddresses()).thenReturn(networkInterfaceAddresses);
         when(networkInterfaceAddresses.hasMoreElements()).thenReturn(true, false);
-        InetAddress networkInterfaceAddress = PowerMockito.mock(InetAddress.class);
+
+        InetAddress networkInterfaceAddress = InetAddresses.forString("127.0.0.1");
         when(networkInterfaceAddresses.nextElement()).thenReturn(networkInterfaceAddress);
 
         Ipv4Address ipv4Address = mock(Ipv4Address.class);
         when(bridgeControllerIpAddress.getIpv4Address()).thenReturn(ipv4Address);
         when(ipv4Address.getValue()).thenReturn("127.0.0.1");
-        when(networkInterfaceAddress.getHostAddress()).thenReturn("127.0.0.1");
-        assertEquals(bridgeControllerIpAddress.getIpv4Address().getValue(), networkInterfaceAddress.getHostAddress());
         OvsdbConnectionInstance ovsdbConnectionInstance = mock(OvsdbConnectionInstance.class);
         when(ovsdbBridgeUpdateCommand.getOvsdbConnectionInstance()).thenReturn(ovsdbConnectionInstance);
         when(ovsdbConnectionInstance.getInstanceIdentifier()).thenReturn(mock(InstanceIdentifier.class));