Merge dev/fluorine work across to master

[unimgr.git] / impl / src / test / java / org / opendaylight / unimgr / mef / nrp / impl / decomposer / BasicDecomposerMultipointTest.java

diff --git a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/decomposer/BasicDecomposerMultipointTest.java b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/decomposer/BasicDecomposerMultipointTest.java
index b2e2085ccc8e3b1f701b022ca69fd104b8ac7e4c..4486d85c1626d34588646c3e3da0b757079c70ab 100644 (file)
--- a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/decomposer/BasicDecomposerMultipointTest.java
+++ b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/decomposer/BasicDecomposerMultipointTest.java
@@ -8,6 +8,15 @@
 
 package org.opendaylight.unimgr.mef.nrp.impl.decomposer;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import org.hamcrest.CoreMatchers;
 import org.junit.Assert;
 import org.junit.Before;
@@ -19,19 +28,10 @@ import org.opendaylight.unimgr.mef.nrp.api.FailureResult;
 import org.opendaylight.unimgr.mef.nrp.api.Subrequrest;
 import org.opendaylight.unimgr.mef.nrp.impl.AbstractTestWithTopo;
 import org.opendaylight.unimgr.mef.nrp.impl.NrpInitializer;
-import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.tapi.common.rev171113.OperationalState;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev180307.OperationalState;
 import org.opendaylight.yangtools.yang.common.OperationFailedException;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-/**
- * @author bartosz.michalik@amartus.com
- */
 public class BasicDecomposerMultipointTest extends AbstractTestWithTopo {
     private BasicDecomposer decomposer;
 
@@ -47,20 +47,24 @@ public class BasicDecomposerMultipointTest extends AbstractTestWithTopo {
     public ExpectedException expected = ExpectedException.none();
 
     @Test
-    public void singleNodeTest() throws FailureResult, OperationFailedException {
+    public void singleNodeTest()
+            throws FailureResult, OperationFailedException, InterruptedException, ExecutionException {
         //having
         ReadWriteTransaction tx = dataBroker.newReadWriteTransaction();
         n(tx, "n1", "n1:1", "n1:2", "n1:3", "n1:4");
         n(tx, "n2", "n2:1", "n2:2", "n2:3", "n2:4");
-        tx.submit().checkedGet();
+        tx.commit().get();
         //when
         List<Subrequrest> decomposed = decomposer.decompose(Arrays.asList(ep("n1:1"), ep("n1:2"), ep("n1:4")), null);
 
         assertEquals(1, decomposed.size());
+        assertEquals(3, decomposed.stream()
+                .flatMap(s -> s.getEndpoints().stream()).filter(e -> e.getAttrs() != null).count());
     }
 
     @Test
-    public void twoConnectedNodesTest() throws FailureResult, OperationFailedException {
+    public void twoConnectedNodesTest()
+            throws FailureResult, OperationFailedException, InterruptedException, ExecutionException {
         //having
         ReadWriteTransaction tx = dataBroker.newReadWriteTransaction();
         n(tx, "n1", "n1:1", "n1:2", "n1:3","n1:4");
@@ -68,17 +72,20 @@ public class BasicDecomposerMultipointTest extends AbstractTestWithTopo {
         n(tx, "n3", "n3:1", "n3:2", "n3:3","n3:4");
         l(tx, "n1", "n1:1", "n2", "n2:1", OperationalState.ENABLED);
         l(tx, "n2", "n2:3", "n3", "n3:3", OperationalState.ENABLED);
-        tx.submit().checkedGet();
+        tx.commit().get();
         //when
         List<Subrequrest> decomposed = decomposer.decompose(Arrays.asList(ep("n1:2"), ep("n2:2"), ep("n2:3")), null);
         assertNotNull(decomposed);
         assertEquals(2, decomposed.size());
-        assertEquals(Stream.of(2,3).collect(Collectors.toSet()), decomposed.stream().map(s -> s.getEndpoints().size()).collect(Collectors.toSet()));
+        assertEquals(
+                Stream.of(2,3).collect(Collectors.toSet()),
+                decomposed.stream().map(s -> s.getEndpoints().size()).collect(Collectors.toSet()));
 
     }
 
     @Test
-    public void fourNodesTopology() throws FailureResult, OperationFailedException {
+    public void fourNodesTopology()
+            throws FailureResult, OperationFailedException, InterruptedException, ExecutionException {
         //having
         ReadWriteTransaction tx = dataBroker.newReadWriteTransaction();
         n(tx, "n1", "n1:1", "n1:2", "n1:3", "n1:4");
@@ -90,13 +97,17 @@ public class BasicDecomposerMultipointTest extends AbstractTestWithTopo {
         l(tx, "n4", "n4:1", "n3", "n3:1", OperationalState.ENABLED);
         l(tx, "n4", "n4:2", "n2", "n2:2", OperationalState.ENABLED);
 
-        tx.submit().checkedGet();
+        tx.commit().get();
         //when
         List<Subrequrest> decomposed = decomposer.decompose(Arrays.asList(ep("n1:3"), ep("n1:4"), ep("n2:3")), null);
         assertNotNull(decomposed);
         assertEquals(2, decomposed.size());
-        assertEquals(Stream.of(2,3).collect(Collectors.toSet()), decomposed.stream().map(s -> s.getEndpoints().size()).collect(Collectors.toSet()));
+        assertEquals(
+                Stream.of(2,3).collect(Collectors.toSet()),
+                decomposed.stream().map(s -> s.getEndpoints().size()).collect(Collectors.toSet()));
         List<String> uuids = decomposed.stream().map(s -> s.getNodeUuid().getValue()).collect(Collectors.toList());
         Assert.assertThat(uuids, CoreMatchers.not(CoreMatchers.hasItems("n3", "n4")));
+        assertEquals(3, decomposed.stream()
+                .flatMap(s -> s.getEndpoints().stream()).filter(e -> e.getAttrs() != null).count());
     }
 }