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 <robert.varga@pantheon.tech>

diff --git a/southbound/southbound-impl/pom.xml b/southbound/southbound-impl/pom.xml
index 594041a1f278d51c5565048d449823298cbcff31..44a1d2b7a00246f28fd386f6ea57fb6d62c23ac4 100644 (file)
--- 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
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito</artifactId>
-      <version>1.6.4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.javassist</groupId>
-      <artifactId>javassist</artifactId>
-      <version>3.21.0-GA</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>1.10.19</version>
+      <artifactId>powermock-api-mockito2</artifactId>
+      <version>2.0.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>
-      <version>1.6.4</version>
+      <version>2.0.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-support</artifactId>
-      <version>1.6.4</version>
+      <version>2.0.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-reflect</artifactId>
-      <version>1.6.4</version>
+      <version>2.0.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-core</artifactId>
-      <version>1.6.4</version>
+      <version>2.0.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

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 9b07ba690612f720977db633cf80cdb6aa445239..e21410997e10261534a846da331fb4c56cfad541 100644 (file)
--- 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<Node> 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 <T extends DataObject> void deleteEntries(ReadWriteTransaction transaction,
+    @VisibleForTesting
+    <T extends DataObject> void deleteEntries(ReadWriteTransaction transaction,
             List<InstanceIdentifier<T>> entryIids) {
-        for (InstanceIdentifier<T> entryIid: entryIids) {
+        for (InstanceIdentifier<T> 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 37e9575136977b49b25d2e118b0faa57e416ef9d..8000c617739f0fe2ecd9910f8e097f690afc53c1 100644 (file)
--- 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<UUID, Controller> updatedControllerRows;
-    private Map<UUID, Bridge> updatedBridgeRows;
+    private final Map<UUID, Controller> updatedControllerRows;
+    private final Map<UUID, Bridge> 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<UUID, Controller> newUpdatedControllerRows) {
 
         Map<InstanceIdentifier<Node>, 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<ControllerEntry> getControllerEntryIid(
+    @VisibleForTesting
+    InstanceIdentifier<ControllerEntry> 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 1694f7085fbf93615a619b461840e00bb1d59977..b6824bc6ace2365710236c00a446edf2576f463f 100644 (file)
--- 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<UUID, Port> 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<TerminationPoint> tpPath,
             OvsdbTerminationPointAugmentationBuilder tpAugmentationBuilder,
             Node node, Entry<UUID, Port> 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<GenericTableSchema, String> 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<TerminationPoint> tpPath, final Entry<UUID, Port> 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<Long> 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<Long> 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<String> 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<TerminationPoint> tpPath, final Entry<UUID, Port> 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<Long> 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<Long> 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<String, String> 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<String, String> 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<String, String> 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<String, String> 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<String, String> interfaceOtherConfigMap = interf.getOtherConfigColumn().getData();
@@ -742,7 +757,8 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand {
     }
 
     @SuppressWarnings("unchecked")
-    private InstanceIdentifier<TerminationPoint> getInstanceIdentifier(InstanceIdentifier<Node> bridgeIid,Port port) {
+    @VisibleForTesting
+    InstanceIdentifier<TerminationPoint> getInstanceIdentifier(InstanceIdentifier<Node> 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 0c2eeb0a1b18ff0f9bbee0c638d4a17c0e6c73cf..a77cbb1b784a419791c609bc88dfbaa2315eae3d 100644 (file)
--- 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 afa65d5b513b24c7ad525132e900cf2e2153530d..0eaab99ab479a9757fe231333007b5914bfd5f77 100644 (file)
--- 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 9c8c3de504191d17226af3f5c0501c6e98a4f366..e92dbe510a406ecdf0026ecfc127f11aa395449a 100644 (file)
--- 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 5241b26b41b0b7397edb371731b441c7f62fd38e..c867eb780049186f2978c85610db08445bc08100 100644 (file)
--- 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 edcfb2840bec30febad55e9b0a05b1c85945218c..2534f152776a27187ad41c99a12541519982cab7 100644 (file)
--- 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 8eb6eaabade8654c7cc3ace201b0f09299ccb91f..f14d6b37a3d6f060db93583130b5957fc381b0f5 100644 (file)
--- 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 ee36f90de96dd9c10773e87fd6a4ad3af5cb9207..9c2c8d1d8f747a8ab4a155c63412f9cab4b18cd5 100644 (file)
--- 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 10010c07be485ef8047cb0dc655b61a3bfe4eed1..27332a01f8be8ed5d226ef306797d7e15942b24c 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
@@ -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<Node> 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<InstanceIdentifier<DataObject>> entryIids = new ArrayList<>();
         InstanceIdentifier<DataObject> 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<Node> 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 137bb06be0b193998eb12cbb14c0af21c2f4bf62..387bc8fd8855f367156c0ffed796ecd8c20c5c86 100644 (file)
--- 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<UUID, Bridge> updatedBridgeRows = new HashMap<>();
@@ -124,8 +124,8 @@ public class OvsdbControllerUpdateCommandTest {
         // suppress call to getControllerEntryIid()
         ReadWriteTransaction transaction = mock(ReadWriteTransaction.class);
         Map<UUID, Controller> 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 04f7a5d7c00ef34ff35edecfebbc01c629c82838..55d1107c3bbe3e449661e7b0cf8d4058e5c5f94b 100644 (file)
--- 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 939f06f5ef424e9a2929d39713b0fdf13427877c..63254eecc493aaddc079eeb4d468c618bf7a7f55 100644 (file)
--- 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 7308df52d35af9963f5b3cf2c0fe8f6f8cfed294..98dfd89bb19c8a2b450a3338ed25dc6ff6f61b0b 100644 (file)
--- 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<UUID, Port> 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<UUID, Bridge> 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<UUID, Bridge> 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<GenericTableSchema, Set<UUID>> 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<Node> 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 44ca15b04e4c3c412f5905369f79954d698bcef3..3ce8d6671773043e599402c6be7694eecf7350bb 100644 (file)
--- 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> 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<GenericTableSchema, Set<UUID>> column = mock(Column.class);
-        when(bridge.getPortsColumn()).thenReturn(column);
-        Set<UUID> 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<Node> nodeIid = mock(InstanceIdentifier.class);
-        PowerMockito.when(SouthboundMapper.createInstanceIdentifier(any(InstanceIdentifierCodec.class),
-                any(OvsdbConnectionInstance.class), any(Bridge.class))).thenReturn(nodeIid);
-
-        Optional<InstanceIdentifier<Node>> 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<GenericTableSchema, String> 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<UUID, Port> port = mock(Entry.class);
+        Entry<UUID, Port> 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));
     }