Do not mock IpAddress

There really is no need, we can use the generated implementation.

Change-Id: Ibe2514588385f54e1cca2fe4f1631f3f87b63389
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 c51ee028b58a3c6e2abd28c42f71e6664ef380e9..10010c07be485ef8047cb0dc655b61a3bfe4eed1 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
@@ -47,8 +47,6 @@ import org.opendaylight.ovsdb.southbound.InstanceIdentifierCodec;
 import org.opendaylight.ovsdb.southbound.OvsdbConnectionInstance;
 import org.opendaylight.ovsdb.southbound.SouthboundMapper;
 import org.opendaylight.ovsdb.southbound.SouthboundUtil;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.DatapathId;
@@ -456,15 +454,10 @@ public class OvsdbBridgeUpdateCommandTest {
         when(controllerEntry.getTarget()).thenReturn(uri);
         when(uri.getValue()).thenReturn("tcp:192.168.12.56:6633");
 
-        Ipv4Address ipv4Address = new Ipv4Address("127.0.0.1");
-        IpAddress bridgeControllerIpAddress = mock(IpAddress.class);
-        when(bridgeControllerIpAddress.getIpv4Address()).thenReturn(ipv4Address);
-        PowerMockito.whenNew(IpAddress.class).withAnyArguments().thenReturn(bridgeControllerIpAddress);
-
         PowerMockito.mockStatic(NetworkInterface.class);
         NetworkInterface networkInterface = PowerMockito.mock(NetworkInterface.class);
         when(networkInterface.getInetAddresses()).thenReturn(Iterators.asEnumeration(
-            Iterators.singletonIterator(InetAddresses.forString("127.0.0.1"))));
+            Iterators.singletonIterator(InetAddresses.forString("192.168.12.56"))));
         when(NetworkInterface.getNetworkInterfaces()).thenReturn(Iterators.asEnumeration(
             Iterators.singletonIterator(networkInterface)));