From f4bd246ff412d37c11868b4c9d86acf097cb8e3d Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 11 Mar 2019 15:18:49 +0100 Subject: [PATCH] Upgrade powermock to 2.0.0 This upgrades powermock to version 2.0.0, also updating tests to match nulls being returned through mocks. JIRA: OVSDB-476 Change-Id: I54beb2db411cff0e126c8e8208ff9ee1530437ab Signed-off-by: Robert Varga --- southbound/southbound-impl/pom.xml | 24 ++--- .../md/OvsdbBridgeUpdateCommand.java | 9 +- .../md/OvsdbControllerUpdateCommand.java | 12 ++- .../md/OvsdbPortUpdateCommand.java | 50 ++++++--- .../OvsdbConnectionInstanceTest.java | 6 +- .../OvsdbConnectionManagerTest.java | 4 +- .../ovsdb/southbound/SouthboundUtilTest.java | 4 +- .../transact/OvsdbNodeUpdateCommandTest.java | 6 +- .../ovsdb/transact/TransactUtilsTest.java | 6 +- .../BridgeConfigReconciliationTaskTest.java | 2 +- .../md/OpenVSwitchUpdateCommandTest.java | 6 +- .../md/OvsdbBridgeUpdateCommandTest.java | 28 ++--- .../md/OvsdbControllerUpdateCommandTest.java | 14 +-- .../md/OvsdbManagersRemovedCommandTest.java | 2 +- .../md/OvsdbNodeRemoveCommandTest.java | 2 +- .../md/OvsdbPortRemoveCommandTest.java | 36 ++++--- .../md/OvsdbPortUpdateCommandTest.java | 101 +++++++----------- 17 files changed, 146 insertions(+), 166 deletions(-) diff --git a/southbound/southbound-impl/pom.xml b/southbound/southbound-impl/pom.xml index 594041a1f..44a1d2b7a 100644 --- a/southbound/southbound-impl/pom.xml +++ b/southbound/southbound-impl/pom.xml @@ -115,44 +115,32 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.powermock - powermock-api-mockito - 1.6.4 - test - - - org.javassist - javassist - 3.21.0-GA - test - - - org.mockito - mockito-core - 1.10.19 + powermock-api-mockito2 + 2.0.0 test org.powermock powermock-module-junit4 - 1.6.4 + 2.0.0 test org.powermock powermock-api-support - 1.6.4 + 2.0.0 test org.powermock powermock-reflect - 1.6.4 + 2.0.0 test org.powermock powermock-core - 1.6.4 + 2.0.0 test diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommand.java index 9b07ba690..e21410997 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommand.java @@ -9,6 +9,7 @@ package org.opendaylight.ovsdb.southbound.transactions.md; import static org.opendaylight.ovsdb.southbound.SouthboundUtil.schemaMismatchLog; +import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.net.InetAddresses; @@ -100,7 +101,8 @@ public class OvsdbBridgeUpdateCommand extends AbstractTransactionCommand { } } - private void updateBridge(ReadWriteTransaction transaction, + @VisibleForTesting + void updateBridge(ReadWriteTransaction transaction, Bridge bridge, InstanceIdentifier connectionIId) { // Update the connection node to let it know it manages this bridge Node connectionNode = buildConnectionNode(bridge); @@ -116,9 +118,10 @@ public class OvsdbBridgeUpdateCommand extends AbstractTransactionCommand { deleteEntries(transaction, bridgeOtherConfigsToRemove(bridgeIid,bridge)); } - private static void deleteEntries(ReadWriteTransaction transaction, + @VisibleForTesting + void deleteEntries(ReadWriteTransaction transaction, List> entryIids) { - for (InstanceIdentifier entryIid: entryIids) { + for (InstanceIdentifier entryIid : entryIids) { transaction.delete(LogicalDatastoreType.OPERATIONAL, entryIid); } } diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerUpdateCommand.java index 37e957513..8000c6177 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerUpdateCommand.java @@ -7,6 +7,7 @@ */ package org.opendaylight.ovsdb.southbound.transactions.md; +import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; import java.util.HashMap; import java.util.List; @@ -41,8 +42,8 @@ import org.slf4j.LoggerFactory; public class OvsdbControllerUpdateCommand extends AbstractTransactionCommand { private static final Logger LOG = LoggerFactory.getLogger(OvsdbControllerUpdateCommand.class); - private Map updatedControllerRows; - private Map updatedBridgeRows; + private final Map updatedControllerRows; + private final Map updatedBridgeRows; public OvsdbControllerUpdateCommand(OvsdbConnectionInstance key, TableUpdates updates, DatabaseSchema dbSchema) { @@ -107,9 +108,9 @@ public class OvsdbControllerUpdateCommand extends AbstractTransactionCommand { * * @param transaction the {@link ReadWriteTransaction} * @param newUpdatedControllerRows updated {@link Controller} rows - */ - private void updateController(ReadWriteTransaction transaction, + @VisibleForTesting + void updateController(ReadWriteTransaction transaction, Map newUpdatedControllerRows) { Map, Node> bridgeNodes = getBridgeNodes(transaction); @@ -170,7 +171,8 @@ public class OvsdbControllerUpdateCommand extends AbstractTransactionCommand { * @param bridgeName the name of the bridge * @return the {@link InstanceIdentifier} */ - private InstanceIdentifier getControllerEntryIid( + @VisibleForTesting + InstanceIdentifier getControllerEntryIid( ControllerEntry controllerEntry, String bridgeName) { OvsdbConnectionInstance client = getOvsdbConnectionInstance(); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommand.java index 1694f7085..b6824bc6a 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommand.java @@ -10,6 +10,7 @@ package org.opendaylight.ovsdb.southbound.transactions.md; import static org.opendaylight.ovsdb.southbound.SouthboundUtil.schemaMismatchLog; +import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; import java.util.ArrayList; import java.util.Collection; @@ -124,7 +125,8 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { } } - private void updateTerminationPoints(ReadWriteTransaction transaction, Node node) { + @VisibleForTesting + void updateTerminationPoints(ReadWriteTransaction transaction, Node node) { for (Entry portUpdate : portUpdatedRows.entrySet()) { String portName = null; portName = portUpdate.getValue().getNameColumn().getData(); @@ -184,7 +186,8 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { } - private void buildTerminationPoint(ReadWriteTransaction transaction, + @VisibleForTesting + void buildTerminationPoint(ReadWriteTransaction transaction, InstanceIdentifier tpPath, OvsdbTerminationPointAugmentationBuilder tpAugmentationBuilder, Node node, Entry portUpdate) { @@ -249,7 +252,8 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { return Optional.absent(); } - private void updateInterfaces(Interface interfaceUpdate, + @VisibleForTesting + void updateInterfaces(Interface interfaceUpdate, final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) { Column typeColumn = interfaceUpdate.getTypeColumn(); @@ -257,7 +261,8 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { updateInterface(interfaceUpdate, type,ovsdbTerminationPointBuilder); } - private void updatePort(final ReadWriteTransaction transaction, final Node node, + @VisibleForTesting + void updatePort(final ReadWriteTransaction transaction, final Node node, final InstanceIdentifier tpPath, final Entry port, final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) { @@ -269,7 +274,8 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { updatePortOtherConfig(port.getValue(), ovsdbTerminationPointBuilder); } - private void updateInterface(final Interface interf, + @VisibleForTesting + void updateInterface(final Interface interf, final String type, final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) { @@ -291,7 +297,8 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { updateInterfacePolicing(interf, ovsdbTerminationPointBuilder); } - private void updateVlan(final Port port, + @VisibleForTesting + void updateVlan(final Port port, final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) { Collection vlanId = port.getTagColumn().getData(); @@ -303,7 +310,8 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { } } - private void updateVlanTrunks(final Port port, + @VisibleForTesting + void updateVlanTrunks(final Port port, final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) { Set portTrunks = port.getTrunksColumn().getData(); @@ -319,7 +327,8 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { ovsdbTerminationPointBuilder.setTrunks(modelTrunks); } - private void updateVlanMode(final Port port, + @VisibleForTesting + void updateVlanMode(final Port port, final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) { Collection vlanMode = port.getVlanModeColumn().getData(); @@ -344,7 +353,6 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { } } - @SuppressWarnings("unchecked") private void updateQos(final ReadWriteTransaction transaction, final Node node, InstanceIdentifier tpPath, final Entry port, final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) { @@ -480,7 +488,8 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { } } - private void updateOfPort(final Interface interf, + @VisibleForTesting + void updateOfPort(final Interface interf, final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) { Set ofPorts = interf.getOpenFlowPortColumn().getData(); @@ -497,7 +506,8 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { } } - private void updateOfPortRequest(final Interface interf, + @VisibleForTesting + void updateOfPortRequest(final Interface interf, final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) { Set ofPortRequests = null; @@ -519,7 +529,8 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { } } - private void updateInterfaceExternalIds(final Interface interf, + @VisibleForTesting + void updateInterfaceExternalIds(final Interface interf, final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) { Map interfaceExternalIds = @@ -539,7 +550,8 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { } } - private void updatePortExternalIds(final Port port, + @VisibleForTesting + void updatePortExternalIds(final Port port, final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) { Map portExternalIds = port.getExternalIdsColumn().getData(); @@ -558,7 +570,8 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { } } - private void updateOptions(final Interface interf, + @VisibleForTesting + void updateOptions(final Interface interf, final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) { Map optionsMap = interf.getOptionsColumn().getData(); @@ -578,7 +591,8 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { } } - private void updatePortOtherConfig(final Port port, + @VisibleForTesting + void updatePortOtherConfig(final Port port, final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) { Map portOtherConfigMap = port.getOtherConfigColumn().getData(); @@ -622,7 +636,8 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { } } - private void updateInterfaceOtherConfig(final Interface interf, + @VisibleForTesting + void updateInterfaceOtherConfig(final Interface interf, final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) { Map interfaceOtherConfigMap = interf.getOtherConfigColumn().getData(); @@ -742,7 +757,8 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { } @SuppressWarnings("unchecked") - private InstanceIdentifier getInstanceIdentifier(InstanceIdentifier bridgeIid,Port port) { + @VisibleForTesting + InstanceIdentifier getInstanceIdentifier(InstanceIdentifier bridgeIid,Port port) { if (port.getExternalIdsColumn() != null && port.getExternalIdsColumn().getData() != null && port.getExternalIdsColumn().getData().containsKey(SouthboundConstants.IID_EXTERNAL_ID_KEY)) { diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstanceTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstanceTest.java index 0c2eeb0a1..a77cbb1b7 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstanceTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstanceTest.java @@ -10,9 +10,9 @@ package org.opendaylight.ovsdb.southbound; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManagerTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManagerTest.java index afa65d5b5..0eaab99ab 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManagerTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManagerTest.java @@ -9,8 +9,8 @@ package org.opendaylight.ovsdb.southbound; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundUtilTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundUtilTest.java index 9c8c3de50..e92dbe510 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundUtilTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundUtilTest.java @@ -9,8 +9,8 @@ package org.opendaylight.ovsdb.southbound; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/OvsdbNodeUpdateCommandTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/OvsdbNodeUpdateCommandTest.java index 5241b26b4..c867eb780 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/OvsdbNodeUpdateCommandTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/OvsdbNodeUpdateCommandTest.java @@ -8,8 +8,8 @@ package org.opendaylight.ovsdb.southbound.ovsdb.transact; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -126,7 +126,7 @@ public class OvsdbNodeUpdateCommandTest { verify(externalId).getExternalIdKey(); verify(otherConfig).getOtherConfigKey(); verify(ovs, times(2)).getExternalIdsColumn(); - verify(transaction, times(2)).add(any(Operation.class)); + verify(transaction, times(2)).add(eq(null)); } static Operations setOpField() throws Exception { diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TransactUtilsTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TransactUtilsTest.java index edcfb2840..2534f1527 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TransactUtilsTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TransactUtilsTest.java @@ -9,9 +9,9 @@ package org.opendaylight.ovsdb.southbound.ovsdb.transact; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTaskTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTaskTest.java index 8eb6eaaba..f14d6b37a 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTaskTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTaskTest.java @@ -8,7 +8,7 @@ package org.opendaylight.ovsdb.southbound.reconciliation.configuration; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OpenVSwitchUpdateCommandTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OpenVSwitchUpdateCommandTest.java index ee36f90de..9c2c8d1d8 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OpenVSwitchUpdateCommandTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OpenVSwitchUpdateCommandTest.java @@ -9,9 +9,9 @@ package org.opendaylight.ovsdb.southbound.transactions.md; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; 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 10010c07b..27332a01f 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 @@ -9,9 +9,9 @@ package org.opendaylight.ovsdb.southbound.transactions.md; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -125,7 +125,7 @@ public class OvsdbBridgeUpdateCommandTest { MemberModifier.suppress(MemberMatcher.method(OvsdbBridgeUpdateCommand.class, "updateBridge", ReadWriteTransaction.class, Bridge.class, InstanceIdentifier.class)); ovsdbBridgeUpdateCommand.execute(transaction); - PowerMockito.verifyPrivate(ovsdbBridgeUpdateCommand).invoke("updateBridge", any(ReadWriteTransaction.class), + verify(ovsdbBridgeUpdateCommand).updateBridge(any(ReadWriteTransaction.class), any(Bridge.class), any(InstanceIdentifier.class)); } @@ -154,8 +154,7 @@ public class OvsdbBridgeUpdateCommandTest { Bridge bridge = mock(Bridge.class); InstanceIdentifier connectionIId = mock(InstanceIdentifier.class); Whitebox.invokeMethod(ovsdbBridgeUpdateCommand, "updateBridge", transaction, bridge, connectionIId); - PowerMockito.verifyPrivate(ovsdbBridgeUpdateCommand, times(3)).invoke("deleteEntries", - any(ReadWriteTransaction.class), any(Bridge.class)); + verify(ovsdbBridgeUpdateCommand, times(3)).deleteEntries(any(ReadWriteTransaction.class), eq(null)); } @SuppressWarnings("unchecked") @@ -165,9 +164,9 @@ public class OvsdbBridgeUpdateCommandTest { List> entryIids = new ArrayList<>(); InstanceIdentifier iid = mock(InstanceIdentifier.class); entryIids.add(iid); - doNothing().when(transaction).delete(any(LogicalDatastoreType.class), (InstanceIdentifier) any(List.class)); + doNothing().when(transaction).delete(any(LogicalDatastoreType.class), any(InstanceIdentifier.class)); Whitebox.invokeMethod(ovsdbBridgeUpdateCommand, "deleteEntries", transaction, entryIids); - verify(transaction).delete(any(LogicalDatastoreType.class), (InstanceIdentifier) any(List.class)); + verify(transaction).delete(any(LogicalDatastoreType.class), any(InstanceIdentifier.class)); } @SuppressWarnings("unchecked") @@ -473,17 +472,4 @@ public class OvsdbBridgeUpdateCommandTest { verify(controllerEntry, times(2)).isIsConnected(); verify(ovsdbBridgeAugmentationBuilder).setBridgeOpenflowNodeRef(any(InstanceIdentifier.class)); } - - @SuppressWarnings("unchecked") - @Test - public void testGetInstanceIdentifier() throws Exception { - PowerMockito.mockStatic(SouthboundMapper.class); - when(ovsdbBridgeUpdateCommand.getOvsdbConnectionInstance()).thenReturn(mock(OvsdbConnectionInstance.class)); - InstanceIdentifier iid = mock(InstanceIdentifier.class); - when(SouthboundMapper.createInstanceIdentifier(any(InstanceIdentifierCodec.class), - any(OvsdbConnectionInstance.class), any(Bridge.class))) - .thenReturn(iid); - - assertEquals(iid, Whitebox.invokeMethod(ovsdbBridgeUpdateCommand, "getInstanceIdentifier", mock(Bridge.class))); - } } diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerUpdateCommandTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerUpdateCommandTest.java index 137bb06be..387bc8fd8 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerUpdateCommandTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerUpdateCommandTest.java @@ -9,8 +9,9 @@ package org.opendaylight.ovsdb.southbound.transactions.md; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -96,8 +97,7 @@ public class OvsdbControllerUpdateCommandTest { // updatedBridgeRows null case ReadWriteTransaction transaction = mock(ReadWriteTransaction.class); ovsdbControllerUpdateCommand.execute(transaction); - PowerMockito.verifyPrivate(ovsdbControllerUpdateCommand).invoke("updateController", - any(ReadWriteTransaction.class), any(Map.class)); + verify(ovsdbControllerUpdateCommand).updateController(any(ReadWriteTransaction.class), any(Map.class)); // updatedBridgeRows not null case Map updatedBridgeRows = new HashMap<>(); @@ -124,8 +124,8 @@ public class OvsdbControllerUpdateCommandTest { // suppress call to getControllerEntryIid() ReadWriteTransaction transaction = mock(ReadWriteTransaction.class); Map updatedControllerRows = new HashMap<>(); - MemberModifier.suppress(MemberMatcher.method(OvsdbControllerUpdateCommand.class, "getControllerEntryIid", - ControllerEntry.class, String.class)); + doReturn(mock(InstanceIdentifier.class)).when(ovsdbControllerUpdateCommand).getControllerEntryIid( + any(ControllerEntry.class), any(String.class)); doNothing().when(transaction).merge(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(ControllerEntry.class)); Whitebox.invokeMethod(ovsdbControllerUpdateCommand, "updateController", transaction, updatedControllerRows, @@ -202,8 +202,8 @@ public class OvsdbControllerUpdateCommandTest { PowerMockito.whenNew(TopologyKey.class).withAnyArguments().thenReturn(mock(TopologyKey.class)); //PowerMockito.suppress(MemberMatcher.methodsDeclaredIn(InstanceIdentifier.class)); when(controllerEntry.key()).thenReturn(mock(ControllerEntryKey.class)); - assertEquals(KeyedInstanceIdentifier.class, (Whitebox + assertEquals(KeyedInstanceIdentifier.class, Whitebox .invokeMethod(ovsdbControllerUpdateCommand, "getControllerEntryIid", controllerEntry, BRIDGE_NAME) - .getClass())); + .getClass()); } } diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersRemovedCommandTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersRemovedCommandTest.java index 04f7a5d7c..55d1107c3 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersRemovedCommandTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersRemovedCommandTest.java @@ -9,7 +9,7 @@ package org.opendaylight.ovsdb.southbound.transactions.md; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommandTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommandTest.java index 939f06f5e..63254eecc 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommandTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommandTest.java @@ -9,7 +9,7 @@ package org.opendaylight.ovsdb.southbound.transactions.md; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortRemoveCommandTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortRemoveCommandTest.java index 7308df52d..98dfd89bb 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortRemoveCommandTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortRemoveCommandTest.java @@ -9,9 +9,10 @@ package org.opendaylight.ovsdb.southbound.transactions.md; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -74,23 +75,26 @@ public class OvsdbPortRemoveCommandTest { public void testExecute() throws Exception { when(ovsdbPortRemoveCommand.getUpdates()).thenReturn(mock(TableUpdates.class)); when(ovsdbPortRemoveCommand.getDbSchema()).thenReturn(mock(DatabaseSchema.class)); - PowerMockito.mockStatic(TyperUtils.class); UUID uuid = mock(UUID.class); Map portRemovedRows = new HashMap<>(); Port port = mock(Port.class); portRemovedRows.put(uuid, port); - when(TyperUtils.extractRowsRemoved(eq(Port.class), any(TableUpdates.class), any(DatabaseSchema.class))) - .thenReturn(portRemovedRows); + + PowerMockito.mockStatic(TyperUtils.class); + PowerMockito.doReturn(portRemovedRows).when(TyperUtils.class); + TyperUtils.extractRowsRemoved(eq(Port.class), any(TableUpdates.class), any(DatabaseSchema.class)); + Map bridgeUpdatedRows = new HashMap<>(); Bridge updatedBridgeData = mock(Bridge.class); bridgeUpdatedRows.put(uuid, updatedBridgeData); - when(TyperUtils.extractRowsUpdated(eq(Bridge.class), any(TableUpdates.class), any(DatabaseSchema.class))) - .thenReturn(bridgeUpdatedRows); + PowerMockito.doReturn(bridgeUpdatedRows).when(TyperUtils.class); + TyperUtils.extractRowsUpdated(eq(Bridge.class), any(TableUpdates.class), any(DatabaseSchema.class)); + Map bridgeUpdatedOldRows = new HashMap<>(); Bridge oldBridgeData = mock(Bridge.class); bridgeUpdatedOldRows.put(uuid, oldBridgeData); - when(TyperUtils.extractRowsOld(eq(Bridge.class), any(TableUpdates.class), any(DatabaseSchema.class))) - .thenReturn(bridgeUpdatedOldRows); + PowerMockito.doReturn(bridgeUpdatedOldRows).when(TyperUtils.class); + TyperUtils.extractRowsOld(eq(Bridge.class), any(TableUpdates.class), any(DatabaseSchema.class)); Column> column = mock(Column.class); when(oldBridgeData.getPortsColumn()).thenReturn(column); @@ -103,17 +107,19 @@ public class OvsdbPortRemoveCommandTest { when(uuidColumn.getData()).thenReturn(uuid); when(port.getName()).thenReturn(PORT_NAME); - PowerMockito.mockStatic(SouthboundMapper.class); InstanceIdentifier nodeIID = mock(InstanceIdentifier.class); - when(ovsdbPortRemoveCommand.getOvsdbConnectionInstance()).thenReturn(mock(OvsdbConnectionInstance.class)); - when(SouthboundMapper.createInstanceIdentifier(any(InstanceIdentifierCodec.class), - any(OvsdbConnectionInstance.class), any(Bridge.class))) - .thenReturn(nodeIID); + doReturn(mock(OvsdbConnectionInstance.class)).when(ovsdbPortRemoveCommand).getOvsdbConnectionInstance(); + + PowerMockito.mockStatic(SouthboundMapper.class); + PowerMockito.doReturn(nodeIID).when(SouthboundMapper.class); + SouthboundMapper.createInstanceIdentifier(eq(null), + any(OvsdbConnectionInstance.class), any(Bridge.class)); + MemberModifier.suppress(MemberModifier.methodsDeclaredIn(InstanceIdentifier.class)); ReadWriteTransaction transaction = mock(ReadWriteTransaction.class); doNothing().when(transaction).delete(any(LogicalDatastoreType.class), any(InstanceIdentifier.class)); ovsdbPortRemoveCommand.execute(transaction); - verify(transaction).delete(any(LogicalDatastoreType.class), any(InstanceIdentifier.class)); + verify(transaction).delete(any(LogicalDatastoreType.class), eq(null)); } } diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommandTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommandTest.java index 44ca15b04..3ce8d6671 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommandTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommandTest.java @@ -9,9 +9,9 @@ package org.opendaylight.ovsdb.southbound.transactions.md; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -23,6 +23,7 @@ import static org.powermock.api.support.membermodification.MemberModifier.suppre import com.google.common.base.Optional; import com.google.common.util.concurrent.CheckedFuture; +import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -156,13 +157,12 @@ public class OvsdbPortUpdateCommandTest { Optional node = Optional.of(mock(Node.class)); PowerMockito.doReturn(node).when(ovsdbPortUpdateCommand, "readNode", any(ReadWriteTransaction.class), any(InstanceIdentifier.class)); - PowerMockito.suppress(MemberMatcher.method(OvsdbPortUpdateCommand.class, "updateTerminationPoints", - ReadWriteTransaction.class, Node.class)); + doNothing().when(ovsdbPortUpdateCommand).updateTerminationPoints(any(ReadWriteTransaction.class), + any(Node.class)); ReadWriteTransaction transaction = mock(ReadWriteTransaction.class); ovsdbPortUpdateCommand.execute(transaction); verify(ovsdbConnectionInstance).getInstanceIdentifier(); - PowerMockito.verifyPrivate(ovsdbPortUpdateCommand).invoke("updateTerminationPoints", - any(ReadWriteTransaction.class), any(Node.class)); + verify(ovsdbPortUpdateCommand).updateTerminationPoints(any(ReadWriteTransaction.class), any(Node.class)); } @Test @@ -248,8 +248,8 @@ public class OvsdbPortUpdateCommandTest { Node node = mock(Node.class); Whitebox.invokeMethod(ovsdbPortUpdateCommand, "updateTerminationPoints", transaction, node); - PowerMockito.verifyPrivate(ovsdbPortUpdateCommand).invoke("getInstanceIdentifier", - any(OvsdbTerminationPointAugmentationBuilder.class), any(Port.class)); + verify(ovsdbPortUpdateCommand).getInstanceIdentifier(any(InstanceIdentifier.class), + any(Port.class)); verify(transaction, times(2)).merge(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(TerminationPoint.class)); } @@ -271,9 +271,9 @@ public class OvsdbPortUpdateCommandTest { when(tpAugmentationBuilder.setName(anyString())).thenReturn(tpAugmentationBuilder); when(tpAugmentationBuilder.setPortUuid(any(Uuid.class))).thenReturn(tpAugmentationBuilder); - MemberModifier.suppress( - MemberMatcher.method(OvsdbPortUpdateCommand.class, "updatePort", ReadWriteTransaction.class, Node.class, - InstanceIdentifier.class, Entry.class, OvsdbTerminationPointAugmentationBuilder.class)); + doNothing().when(ovsdbPortUpdateCommand).updatePort(any(ReadWriteTransaction.class), + any(Node.class), any(InstanceIdentifier.class), any(Entry.class), + any(OvsdbTerminationPointAugmentationBuilder.class)); Node node = mock(Node.class); ReadWriteTransaction transaction = mock(ReadWriteTransaction.class); @@ -283,7 +283,7 @@ public class OvsdbPortUpdateCommandTest { tpAugmentationBuilder, node, portEntry); verify(tpAugmentationBuilder).setName(anyString()); verify(tpAugmentationBuilder).setPortUuid(any(Uuid.class)); - PowerMockito.verifyPrivate(ovsdbPortUpdateCommand).invoke("updatePort", any(ReadWriteTransaction.class), + verify(ovsdbPortUpdateCommand).updatePort(any(ReadWriteTransaction.class), any(Node.class), any(InstanceIdentifier.class), any(Entry.class), any(OvsdbTerminationPointAugmentationBuilder.class)); } @@ -298,13 +298,14 @@ public class OvsdbPortUpdateCommandTest { OvsdbTerminationPointAugmentationBuilder.class); when(tpAugmentationBuilder.setName(anyString())).thenReturn(tpAugmentationBuilder); when(tpAugmentationBuilder.setInterfaceUuid(any(Uuid.class))).thenReturn(tpAugmentationBuilder); - MemberModifier.suppress(MemberMatcher.method(OvsdbPortUpdateCommand.class, "updateInterfaces", Interface.class, - OvsdbTerminationPointAugmentationBuilder.class)); + + doNothing().when(ovsdbPortUpdateCommand).updateInterfaces(any(Interface.class), + any(OvsdbTerminationPointAugmentationBuilder.class)); Whitebox.invokeMethod(ovsdbPortUpdateCommand, "buildTerminationPoint", tpAugmentationBuilder, interfaceUpdate); verify(tpAugmentationBuilder).setName(anyString()); verify(tpAugmentationBuilder).setInterfaceUuid(any(Uuid.class)); - PowerMockito.verifyPrivate(ovsdbPortUpdateCommand).invoke("updateInterfaces", any(Interface.class), + verify(ovsdbPortUpdateCommand).updateInterfaces(any(Interface.class), any(OvsdbTerminationPointAugmentationBuilder.class)); } @@ -321,32 +322,6 @@ public class OvsdbPortUpdateCommandTest { assertEquals(node, Whitebox.invokeMethod(ovsdbPortUpdateCommand, "readNode", transaction, nodePath)); } - @SuppressWarnings("unchecked") - @Test - public void testGetTerminationPointBridge() throws Exception { - bridgeUpdatedRows = new HashMap<>(); - Bridge bridge = mock(Bridge.class); - UUID bridgeUuid = mock(UUID.class); - bridgeUpdatedRows.put(bridgeUuid, bridge); - field(OvsdbPortUpdateCommand.class, "bridgeUpdatedRows").set(ovsdbPortUpdateCommand, bridgeUpdatedRows); - - Column> column = mock(Column.class); - when(bridge.getPortsColumn()).thenReturn(column); - Set set = new HashSet<>(); - UUID portUuid = mock(UUID.class); - set.add(portUuid); - when(column.getData()).thenReturn(set); - - PowerMockito.mockStatic(SouthboundMapper.class); - when(ovsdbPortUpdateCommand.getOvsdbConnectionInstance()).thenReturn(mock(OvsdbConnectionInstance.class)); - InstanceIdentifier nodeIid = mock(InstanceIdentifier.class); - PowerMockito.when(SouthboundMapper.createInstanceIdentifier(any(InstanceIdentifierCodec.class), - any(OvsdbConnectionInstance.class), any(Bridge.class))).thenReturn(nodeIid); - - Optional> testResult = Optional.of(nodeIid); - assertEquals(testResult, Whitebox.invokeMethod(ovsdbPortUpdateCommand, "getTerminationPointBridge", portUuid)); - } - @SuppressWarnings("unchecked") @Test public void testGetTerminationPointBridge1() throws Exception { @@ -399,14 +374,14 @@ public class OvsdbPortUpdateCommandTest { Column typeColumn = mock(Column.class); when(interfaceUpdate.getTypeColumn()).thenReturn(typeColumn); when(typeColumn.getData()).thenReturn(OVSDB_INTERFACE_TYPE); - MemberModifier.suppress(MemberMatcher.method(OvsdbPortUpdateCommand.class, "updateInterface", Interface.class, - String.class, OvsdbTerminationPointAugmentationBuilder.class)); + doNothing().when(ovsdbPortUpdateCommand).updateInterface(any(Interface.class), anyString(), + any(OvsdbTerminationPointAugmentationBuilder.class)); OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder = mock( OvsdbTerminationPointAugmentationBuilder.class); Whitebox.invokeMethod(ovsdbPortUpdateCommand, "updateInterfaces", interfaceUpdate, ovsdbTerminationPointBuilder); - PowerMockito.verifyPrivate(ovsdbPortUpdateCommand).invoke("updateInterface", any(Interface.class), anyString(), + verify(ovsdbPortUpdateCommand).updateInterface(any(Interface.class), anyString(), any(OvsdbTerminationPointAugmentationBuilder.class)); } @@ -446,15 +421,15 @@ public class OvsdbPortUpdateCommandTest { ovsdbTerminationPointBuilder); verify(ovsdbTerminationPointBuilder).setInterfaceUuid(any(Uuid.class)); verify(ovsdbTerminationPointBuilder).setInterfaceType(any(Class.class)); - PowerMockito.verifyPrivate(ovsdbPortUpdateCommand).invoke("updateOfPort", any(Interface.class), + verify(ovsdbPortUpdateCommand).updateOfPort(any(Interface.class), any(OvsdbTerminationPointAugmentationBuilder.class)); - PowerMockito.verifyPrivate(ovsdbPortUpdateCommand).invoke("updateOfPortRequest", any(Interface.class), + verify(ovsdbPortUpdateCommand).updateOfPortRequest(any(Interface.class), any(OvsdbTerminationPointAugmentationBuilder.class)); - PowerMockito.verifyPrivate(ovsdbPortUpdateCommand).invoke("updateInterfaceExternalIds", any(Interface.class), + verify(ovsdbPortUpdateCommand).updateInterfaceExternalIds(any(Interface.class), any(OvsdbTerminationPointAugmentationBuilder.class)); - PowerMockito.verifyPrivate(ovsdbPortUpdateCommand).invoke("updateOptions", any(Interface.class), + verify(ovsdbPortUpdateCommand).updateOptions(any(Interface.class), any(OvsdbTerminationPointAugmentationBuilder.class)); - PowerMockito.verifyPrivate(ovsdbPortUpdateCommand).invoke("updateInterfaceOtherConfig", any(Interface.class), + verify(ovsdbPortUpdateCommand).updateInterfaceOtherConfig(any(Interface.class), any(OvsdbTerminationPointAugmentationBuilder.class)); } @@ -462,18 +437,22 @@ public class OvsdbPortUpdateCommandTest { @SuppressWarnings("unchecked") public void testUpdatePort() throws Exception { suppress(method(OvsdbPortUpdateCommand.class, "updateVlan", Port.class, - OvsdbTerminationPointAugmentationBuilder.class)); + OvsdbTerminationPointAugmentationBuilder.class)); suppress(method(OvsdbPortUpdateCommand.class, "updateVlanTrunks", Port.class, - OvsdbTerminationPointAugmentationBuilder.class)); + OvsdbTerminationPointAugmentationBuilder.class)); suppress(method(OvsdbPortUpdateCommand.class, "updateVlanMode", Port.class, - OvsdbTerminationPointAugmentationBuilder.class)); + OvsdbTerminationPointAugmentationBuilder.class)); suppress(method(OvsdbPortUpdateCommand.class, "updatePortExternalIds", Port.class, - OvsdbTerminationPointAugmentationBuilder.class)); + OvsdbTerminationPointAugmentationBuilder.class)); suppress(method(OvsdbPortUpdateCommand.class, "updatePortOtherConfig", Port.class, - OvsdbTerminationPointAugmentationBuilder.class)); + OvsdbTerminationPointAugmentationBuilder.class)); + suppress(method(OvsdbPortUpdateCommand.class, "updatePortOtherConfig", Port.class, + OvsdbTerminationPointAugmentationBuilder.class)); + suppress(method(OvsdbPortUpdateCommand.class, "updateQos", ReadWriteTransaction.class, Node.class, + InstanceIdentifier.class, Entry.class, OvsdbTerminationPointAugmentationBuilder.class)); Node node = mock(Node.class); - Entry port = mock(Entry.class); + Entry port = new SimpleEntry<>(mock(UUID.class), mock(Port.class)); OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder = mock( OvsdbTerminationPointAugmentationBuilder.class); ReadWriteTransaction transaction = mock(ReadWriteTransaction.class); @@ -481,15 +460,15 @@ public class OvsdbPortUpdateCommandTest { Whitebox.invokeMethod(ovsdbPortUpdateCommand, "updatePort", transaction, node, tpPath, port, ovsdbTerminationPointBuilder); - PowerMockito.verifyPrivate(ovsdbPortUpdateCommand).invoke("updateVlan", any(Port.class), + verify(ovsdbPortUpdateCommand).updateVlan(any(Port.class), any(OvsdbTerminationPointAugmentationBuilder.class)); - PowerMockito.verifyPrivate(ovsdbPortUpdateCommand).invoke("updateVlanTrunks", any(Port.class), + verify(ovsdbPortUpdateCommand).updateVlanTrunks(any(Port.class), any(OvsdbTerminationPointAugmentationBuilder.class)); - PowerMockito.verifyPrivate(ovsdbPortUpdateCommand).invoke("updateVlanMode", any(Port.class), + verify(ovsdbPortUpdateCommand).updateVlanMode(any(Port.class), any(OvsdbTerminationPointAugmentationBuilder.class)); - PowerMockito.verifyPrivate(ovsdbPortUpdateCommand).invoke("updatePortExternalIds", any(Port.class), + verify(ovsdbPortUpdateCommand).updatePortExternalIds(any(Port.class), any(OvsdbTerminationPointAugmentationBuilder.class)); - PowerMockito.verifyPrivate(ovsdbPortUpdateCommand).invoke("updatePortOtherConfig", any(Port.class), + verify(ovsdbPortUpdateCommand).updatePortOtherConfig(any(Port.class), any(OvsdbTerminationPointAugmentationBuilder.class)); } -- 2.36.6