From a696ec62d038944bd4cb943af83a24a8827a7aac Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 17 Jul 2018 15:01:09 +0200 Subject: [PATCH] Do not squash PortNumber instances in test 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 --- .../transactions/md/OvsdbBridgeUpdateCommandTest.java | 5 ----- 1 file changed, 5 deletions(-) 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 f83396668..cd75f7cf0 100644 --- 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 @@ -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 networkInterfaces = mock(Enumeration.class); when(NetworkInterface.getNetworkInterfaces()).thenReturn(networkInterfaces); -- 2.36.6