Migrate off deprecated APIs, to mdsal.binding.api.DataBroker

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

diff --git a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandlerTest.java b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandlerTest.java
index c3b719dcf932402d8bd551192008ec4f1ebca91e..c1c354bdda7b1aca27a866efdaf5d9a0d8da8de0 100644 (file)
--- a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandlerTest.java
+++ b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/AbstractNodeHandlerTest.java
@@ -26,10 +26,9 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
+import org.opendaylight.mdsal.binding.api.ReadWriteTransaction;
 import org.opendaylight.mdsal.common.api.CommitInfo;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.unimgr.mef.nrp.api.TapiConstants;
 import org.opendaylight.unimgr.mef.nrp.common.NrpDao;
 import org.opendaylight.unimgr.mef.nrp.common.TapiUtils;
@@ -66,7 +65,7 @@ public class AbstractNodeHandlerTest extends AbstractTestWithTopo {
     public void tearDown() throws Exception {
 
         abstractNodeHandler.close();
-        removeContext();
+        //removeContext();
 
     }
 
@@ -80,7 +79,7 @@ public class AbstractNodeHandlerTest extends AbstractTestWithTopo {
 
     @Test
     public void testNodeAddition()
-            throws TransactionCommitFailedException, InterruptedException, ExecutionException {
+            throws InterruptedException, ExecutionException {
         //when
         performNrpDaoAction(addNode,null).get();
 
@@ -98,7 +97,7 @@ public class AbstractNodeHandlerTest extends AbstractTestWithTopo {
 
     @Test
     public void testNepAddition()
-            throws TransactionCommitFailedException, InterruptedException, ExecutionException {
+            throws InterruptedException, ExecutionException {
         //given
         String newNepName = "newNep";
         performNrpDaoAction(addNode,null).get();
@@ -114,7 +113,7 @@ public class AbstractNodeHandlerTest extends AbstractTestWithTopo {
     }
 
     @Test
-    public void testNepUpdate() throws TransactionCommitFailedException, InterruptedException, ExecutionException {
+    public void testNepUpdate() throws InterruptedException, ExecutionException {
         //given
         performNrpDaoAction(addNode, null).get();
 
@@ -131,7 +130,7 @@ public class AbstractNodeHandlerTest extends AbstractTestWithTopo {
 
     @Test
     public void testNepUpdatedWithSipAddition()
-            throws ExecutionException, InterruptedException, TransactionCommitFailedException {
+            throws ExecutionException, InterruptedException {
 
         //given
         ReadWriteTransaction tx = dataBroker.newReadWriteTransaction();
@@ -162,7 +161,7 @@ public class AbstractNodeHandlerTest extends AbstractTestWithTopo {
 
     @Test
     public void testNepUpdatedWithSipRemoval()
-            throws ExecutionException, InterruptedException, TransactionCommitFailedException {
+            throws ExecutionException, InterruptedException {
         //given we have sips
         ReadWriteTransaction tx = dataBroker.newReadWriteTransaction();
         final Node n1 = n(tx, true, new Uuid("n1"), "d1", "n1:1", "n1:2");
@@ -185,7 +184,7 @@ public class AbstractNodeHandlerTest extends AbstractTestWithTopo {
     }
 
     @Test
-    public void testNodeRemoval() throws TransactionCommitFailedException, InterruptedException, ExecutionException {
+    public void testNodeRemoval() throws InterruptedException, ExecutionException {
         //given
         performNrpDaoAction(addNode,null).get();
 
@@ -193,12 +192,12 @@ public class AbstractNodeHandlerTest extends AbstractTestWithTopo {
         performNrpDaoAction(removeNode,null).get();
 
         //then
-        Node node = getAbstractNode(n -> n.getOwnedNodeEdgePoint() != null && n.getOwnedNodeEdgePoint().isEmpty());
-        assertTrue(node.getOwnedNodeEdgePoint().isEmpty());
+        Node node = getAbstractNode(n -> n.getOwnedNodeEdgePoint() == null || n.getOwnedNodeEdgePoint().isEmpty());
+        assertTrue(node.getOwnedNodeEdgePoint() == null || node.getOwnedNodeEdgePoint().isEmpty());
     }
 
     @Test
-    public void testNepRemoval() throws TransactionCommitFailedException, InterruptedException, ExecutionException {
+    public void testNepRemoval() throws InterruptedException, ExecutionException {
         //given
         performNrpDaoAction(addNode,null).get();
         String nepNameToRemove = TEST_NEP_NAME + "0";