Merge "BUG 5746 - Ovsdb QoS and Queue model enhancements"

[ovsdb.git] / southbound / southbound-impl / src / test / java / org / opendaylight / ovsdb / southbound / ovsdb / transact / TerminationPointUpdateCommandTest.java

diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointUpdateCommandTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointUpdateCommandTest.java
index 58174e26253e292ff5aae3f2e74dc8ff98b24d02..176a1b5bd54d006879c94c46e9f9f1e82cb86a29 100644 (file)
--- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointUpdateCommandTest.java
+++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointUpdateCommandTest.java
@@ -8,7 +8,6 @@
 
 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;
@@ -41,15 +40,17 @@ import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils;
 import org.opendaylight.ovsdb.schema.openvswitch.Interface;
 import org.opendaylight.ovsdb.schema.openvswitch.Port;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbPortInterfaceAttributes.VlanMode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
-import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.api.support.membermodification.MemberMatcher;
 import org.powermock.api.support.membermodification.MemberModifier;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
-import org.powermock.reflect.Whitebox;
+
+import com.google.common.base.Optional;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({TerminationPointUpdateCommand.class, TransactUtils.class, TyperUtils.class, VlanMode.class, TerminationPointCreateCommand.class, InstanceIdentifier.class})
@@ -63,47 +64,40 @@ public class TerminationPointUpdateCommandTest {
         terminationPointUpdateCommand = mock(TerminationPointUpdateCommand.class, Mockito.CALLS_REAL_METHODS);
     }
 
-    @SuppressWarnings("unchecked")
-    @Test
-    public void testTerminationPointUpdateCommand() {
-        BridgeOperationalState state = mock(BridgeOperationalState.class);
-        AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes = mock(AsyncDataChangeEvent.class);
-        TerminationPointUpdateCommand terminationPointUpdateCommand1 = new TerminationPointUpdateCommand(state, changes);
-        assertEquals(state, Whitebox.getInternalState(terminationPointUpdateCommand1, "operationalState"));
-        assertEquals(changes, Whitebox.getInternalState(terminationPointUpdateCommand1, "changes"));
-    }
-
     @SuppressWarnings("unchecked")
     @Test
     public void testExecute() {
         Map<InstanceIdentifier<OvsdbTerminationPointAugmentation>, OvsdbTerminationPointAugmentation> created = new HashMap<>();
         created.put(mock(InstanceIdentifier.class), mock(OvsdbTerminationPointAugmentation.class));
         PowerMockito.mockStatic(TransactUtils.class);
-        MemberModifier.suppress(MemberMatcher.method(TerminationPointUpdateCommand.class, "getChanges"));
-        when(terminationPointUpdateCommand.getChanges()).thenReturn(mock(AsyncDataChangeEvent.class));
         PowerMockito.when(TransactUtils.extractCreated(any(AsyncDataChangeEvent.class), eq(OvsdbTerminationPointAugmentation.class))).thenReturn(created);
         MemberModifier.suppress(MemberMatcher.method(TerminationPointUpdateCommand.class, "updateTerminationPoint",
-                TransactionBuilder.class, InstanceIdentifier.class, OvsdbTerminationPointAugmentation.class));
+                TransactionBuilder.class, BridgeOperationalState.class,
+                InstanceIdentifier.class, OvsdbTerminationPointAugmentation.class));
         doNothing().when(terminationPointUpdateCommand)
-                .updateTerminationPoint(any(TransactionBuilder.class), any(InstanceIdentifier.class), any(OvsdbTerminationPointAugmentation.class));
+                .updateTerminationPoint(any(TransactionBuilder.class), any(BridgeOperationalState.class), any(InstanceIdentifier.class), any(OvsdbTerminationPointAugmentation.class));
 
         Map<InstanceIdentifier<OvsdbTerminationPointAugmentation>, OvsdbTerminationPointAugmentation> updated = new HashMap<>();
         updated.put(mock(InstanceIdentifier.class), mock(OvsdbTerminationPointAugmentation.class));
         PowerMockito.when(TransactUtils.extractUpdated(any(AsyncDataChangeEvent.class), eq(OvsdbTerminationPointAugmentation.class))).thenReturn(updated);
 
         TransactionBuilder transactionBuilder = mock(TransactionBuilder.class);
-        terminationPointUpdateCommand.execute(transactionBuilder);
-        verify(terminationPointUpdateCommand, times(2)).
-                updateTerminationPoint(any(TransactionBuilder.class), any(InstanceIdentifier.class), any(OvsdbTerminationPointAugmentation.class));
+        terminationPointUpdateCommand.execute(transactionBuilder, mock(BridgeOperationalState.class), mock(AsyncDataChangeEvent.class));
+        // TODO Verify something useful
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @Test
     public void testUpdateTerminationPoint() throws Exception {
         TransactionBuilder transaction = mock(TransactionBuilder.class);
+        BridgeOperationalState state = mock(BridgeOperationalState.class);
         InstanceIdentifier<OvsdbTerminationPointAugmentation> iid = mock(InstanceIdentifier.class);
         OvsdbTerminationPointAugmentation terminationPoint = mock(OvsdbTerminationPointAugmentation.class);
         when(terminationPoint.getName()).thenReturn(TERMINATION_POINT_NAME);
+        Optional<Node> optNode = (Optional<Node>)mock(Optional.class);
+        when(state.getBridgeNode(any(InstanceIdentifier.class))).thenReturn(optNode);
+        when(state.getBridgeNode(any(InstanceIdentifier.class)).get()).thenReturn(mock(Node.class));
+        when(state.getBridgeNode(any(InstanceIdentifier.class)).get().getAugmentation(OvsdbBridgeAugmentation.class)).thenReturn(mock(OvsdbBridgeAugmentation.class));
 
         // Test updateInterface()
         Interface ovsInterface = mock(Interface.class);
@@ -140,7 +134,7 @@ public class TerminationPointUpdateCommandTest {
         when(op.update(any(Port.class))).thenReturn(update);
         when(extraPort.getNameColumn()).thenReturn(column);
 
-        terminationPointUpdateCommand.updateTerminationPoint(transaction, iid, terminationPoint);
+        terminationPointUpdateCommand.updateTerminationPoint(transaction, state, iid, terminationPoint);
         verify(transaction, times(2)).add(any(Operation.class));
     }