manually cherry pick this patch https://git.opendaylight.org/gerrit/#/c/34579/

[unimgr.git] / impl / src / test / java / org / opendaylight / unimgr / command / EvcRemoveCommandTest.java

diff --git a/impl/src/test/java/org/opendaylight/unimgr/command/EvcDeleteCommandTest.java b/impl/src/test/java/org/opendaylight/unimgr/command/EvcRemoveCommandTest.java
similarity index 79%
rename from impl/src/test/java/org/opendaylight/unimgr/command/EvcDeleteCommandTest.java
rename to impl/src/test/java/org/opendaylight/unimgr/command/EvcRemoveCommandTest.java
index daabff7c0cfcf7ea1953dfe06b4e2932b1a75eea..98a86d86eecb0bc94882f6bf3b539c2eb6c0e5b4 100644 (file)
--- a/impl/src/test/java/org/opendaylight/unimgr/command/EvcDeleteCommandTest.java
+++ b/impl/src/test/java/org/opendaylight/unimgr/command/EvcRemoveCommandTest.java
@@ -13,15 +13,12 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
+import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.unimgr.impl.UnimgrMapper;
 import org.opendaylight.unimgr.utils.EvcUtils;
@@ -30,8 +27,8 @@ import org.opendaylight.unimgr.utils.OvsdbUtils;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev151012.EvcAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev151012.evc.UniDest;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev151012.evc.UniSource;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Link;
 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.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -41,10 +38,11 @@ import com.google.common.base.Optional;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({EvcUtils.class, MdsalUtils.class, OvsdbUtils.class, UnimgrMapper.class})
-public class EvcDeleteCommandTest {
+public class EvcRemoveCommandTest {
 
-    private EvcDeleteCommand evcDeleteCommand;
-    private AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes;
+    private EvcRemoveCommand evcRemoveCommand;
+    private DataTreeModification<Link> evcLink;
+    private Link link;
     private DataBroker dataBroker;
 
     @SuppressWarnings("unchecked")
@@ -54,19 +52,18 @@ public class EvcDeleteCommandTest {
         PowerMockito.mockStatic(EvcUtils.class);
         PowerMockito.mockStatic(OvsdbUtils.class);
         PowerMockito.mockStatic(UnimgrMapper.class);
-        changes = mock(AsyncDataChangeEvent.class);
         dataBroker = mock(DataBroker.class);
-        evcDeleteCommand = new EvcDeleteCommand(dataBroker, changes);
+        link = mock(Link.class);
+        evcLink = DataTreeModificationHelper.getEvcLink(link);
+        evcRemoveCommand = new EvcRemoveCommand(dataBroker, evcLink);
     }
     /**
-     * Test method for {@link org.opendaylight.unimgr.command.EvcDeleteCommand#EvcDeleteCommand(org.opendaylight.controller.md.sal.binding.api.DataBroker, org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent)}.
+     * Test method for {@link org.opendaylight.unimgr.command.EvcRemoveCommand#execute().
      * @throws Exception
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @Test
-    public void testEvcDeleteCommand() throws Exception {
-        final Set<InstanceIdentifier<EvcAugmentation>> removedEvcs =
-                new HashSet<InstanceIdentifier<EvcAugmentation>>();
+    public void testEvcRemoveCommand() throws Exception {
         final List<UniSource> unisSource = new ArrayList<UniSource>();
         final UniSource uniSource = mock(UniSource.class);
         final List<UniDest> unisDest = new ArrayList<UniDest>();
@@ -74,16 +71,14 @@ public class EvcDeleteCommandTest {
         final EvcAugmentation evcAugmentation = mock(EvcAugmentation.class);
         final Optional<Node> optionalNode = mock(Optional.class);
         final InstanceIdentifier instanceOfNode = mock(InstanceIdentifier.class);
-        removedEvcs.add(mock(InstanceIdentifier.class));
         unisSource.add(uniSource);
         unisDest.add(uniDest);
 
+        when(link.getAugmentation(EvcAugmentation.class)).thenReturn(evcAugmentation);
         when(evcAugmentation.getUniSource()).thenReturn(unisSource);
         when(evcAugmentation.getUniDest()).thenReturn(unisDest);
         when(uniSource.getUni()).thenReturn(instanceOfNode);
         when(uniDest.getUni()).thenReturn(instanceOfNode);
-        when(OvsdbUtils.extractRemoved(any(AsyncDataChangeEvent.class), any(Class.class)))
-                .thenReturn(removedEvcs);
         when(MdsalUtils.read(any(DataBroker.class), any(LogicalDatastoreType.class),
                 any(InstanceIdentifier.class))).thenReturn(evcAugmentation);
         when(MdsalUtils.readNode(any(DataBroker.class), any(LogicalDatastoreType.class),
@@ -93,7 +88,7 @@ public class EvcDeleteCommandTest {
         when(MdsalUtils.deleteNode(any(DataBroker.class), any(InstanceIdentifier.class),
                 any(LogicalDatastoreType.class))).thenReturn(true);
 
-        evcDeleteCommand.execute();
+        evcRemoveCommand.execute();
         PowerMockito.verifyStatic(times(2));
         EvcUtils.deleteEvcData(any(DataBroker.class), any(Optional.class));
         PowerMockito.verifyStatic(times(1));
@@ -101,4 +96,4 @@ public class EvcDeleteCommandTest {
                 any(LogicalDatastoreType.class));
     }
 
-}
+}
\ No newline at end of file