MD-SAL API integration

[ovsdb.git] / southbound / southbound-impl / src / test / java / org / opendaylight / ovsdb / southbound / transactions / md / OvsdbControllerUpdateCommandTest.java

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 c0e7ceb235d2d58f8960341d57901b1de707fc3f..f7af37ed265b93ffe9e8e443404ce3960f205e65 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,23 +9,24 @@
 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;
 
-import com.google.common.base.Optional;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.mdsal.binding.api.ReadWriteTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.ovsdb.lib.message.TableUpdates;
 import org.opendaylight.ovsdb.lib.notation.Column;
 import org.opendaylight.ovsdb.lib.notation.UUID;
@@ -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,
@@ -165,7 +165,7 @@ public class OvsdbControllerUpdateCommandTest {
         Optional<Node> ovsdbNode = Optional.of(node);
         when(SouthboundUtil.readNode(transaction, connectionIId)).thenReturn(ovsdbNode);
         OvsdbNodeAugmentation ovsdbNodeAugmentation = mock(OvsdbNodeAugmentation.class);
-        when(node.getAugmentation(OvsdbNodeAugmentation.class)).thenReturn(ovsdbNodeAugmentation);
+        when(node.augmentation(OvsdbNodeAugmentation.class)).thenReturn(ovsdbNodeAugmentation);
 
         List<ManagedNodeEntry> managedNodeEntries = new ArrayList<>();
         ManagedNodeEntry managedNodeEntry = mock(ManagedNodeEntry.class);
@@ -201,9 +201,9 @@ public class OvsdbControllerUpdateCommandTest {
         PowerMockito.whenNew(NodeKey.class).withAnyArguments().thenReturn(nodeKey);
         PowerMockito.whenNew(TopologyKey.class).withAnyArguments().thenReturn(mock(TopologyKey.class));
         //PowerMockito.suppress(MemberMatcher.methodsDeclaredIn(InstanceIdentifier.class));
-        when(controllerEntry.getKey()).thenReturn(mock(ControllerEntryKey.class));
-        assertEquals(KeyedInstanceIdentifier.class, (Whitebox
+        when(controllerEntry.key()).thenReturn(mock(ControllerEntryKey.class));
+        assertEquals(KeyedInstanceIdentifier.class, Whitebox
                 .invokeMethod(ovsdbControllerUpdateCommand, "getControllerEntryIid", controllerEntry, BRIDGE_NAME)
-                .getClass()));
+                .getClass());
     }
 }