Do not squash PortNumber instances in test 19/74119/1
authorRobert Varga <robert.varga@pantheon.tech>
Tue, 17 Jul 2018 13:01:09 +0000 (15:01 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Tue, 17 Jul 2018 13:01:09 +0000 (15:01 +0200)
There is no need to squash all PortNumbers to one instance, hence
reduce the use of mockito.

Change-Id: I403f6a12f1ccc6227830f40e6ee81476ae4b1488
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommandTest.java

index f833966689e5d2e13b364ccd7a230ce963617788..cd75f7cf0cfce1cd3a7a3255bf8f94b47ce88ead 100644 (file)
@@ -49,7 +49,6 @@ 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.PortNumber;
 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;
@@ -460,10 +459,6 @@ public class OvsdbBridgeUpdateCommandTest {
         IpAddress bridgeControllerIpAddress = mock(IpAddress.class);
         PowerMockito.whenNew(IpAddress.class).withAnyArguments().thenReturn(bridgeControllerIpAddress);
 
-
-        PortNumber bridgeControllerPortNumber = mock(PortNumber.class);
-        PowerMockito.whenNew(PortNumber.class).withAnyArguments().thenReturn(bridgeControllerPortNumber);
-
         PowerMockito.mockStatic(NetworkInterface.class);
         Enumeration<NetworkInterface> networkInterfaces = mock(Enumeration.class);
         when(NetworkInterface.getNetworkInterfaces()).thenReturn(networkInterfaces);