X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fimpl%2Fdevice%2FTransactionChainManagerTest.java;h=d6d77acab551f00a86a3fececfdff527b268a983;hb=777c94332871b8c34f56f7f2010de1536cb759ba;hp=1fdad07299016f268da18e50ad5edbe28af8c20d;hpb=2fdde79d3bc5b5e2e54992e3c4b8c52e9131a48f;p=openflowplugin.git

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/TransactionChainManagerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/TransactionChainManagerTest.java
index 1fdad07299..d6d77acab5 100644
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/TransactionChainManagerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/device/TransactionChainManagerTest.java
@@ -9,6 +9,7 @@ package org.opendaylight.openflowplugin.impl.device;
 
 import static org.mockito.ArgumentMatchers.any;
 
+import java.util.concurrent.ExecutionException;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -24,7 +25,6 @@ import org.opendaylight.mdsal.binding.api.TransactionChain;
 import org.opendaylight.mdsal.binding.api.TransactionChainListener;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.mdsal.common.api.TransactionCommitFailedException;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
 import org.opendaylight.openflowplugin.common.txchain.TransactionChainManager;
 import org.opendaylight.openflowplugin.impl.util.DeviceStateUtil;
@@ -84,7 +84,7 @@ public class TransactionChainManagerTest {
         txChainManager.writeToTransaction(LogicalDatastoreType.CONFIGURATION, path, data, false);
 
         Mockito.verify(txChain).newReadWriteTransaction();
-        Mockito.verify(writeTx).put(LogicalDatastoreType.CONFIGURATION, path, data, false);
+        Mockito.verify(writeTx).put(LogicalDatastoreType.CONFIGURATION, path, data);
     }
 
     /**
@@ -98,7 +98,7 @@ public class TransactionChainManagerTest {
         txChainManager.submitTransaction();
 
         Mockito.verify(txChain).newReadWriteTransaction();
-        Mockito.verify(writeTx).put(LogicalDatastoreType.CONFIGURATION, path, data, false);
+        Mockito.verify(writeTx).put(LogicalDatastoreType.CONFIGURATION, path, data);
         Mockito.verify(writeTx).commit();
     }
 
@@ -112,13 +112,13 @@ public class TransactionChainManagerTest {
         txChainManager.submitTransaction();
 
         Mockito.verify(txChain).newReadWriteTransaction();
-        Mockito.verify(writeTx).put(LogicalDatastoreType.CONFIGURATION, path, data, false);
+        Mockito.verify(writeTx).put(LogicalDatastoreType.CONFIGURATION, path, data);
         Mockito.verify(writeTx, Mockito.never()).commit();
     }
 
     @Test
     public void testSubmitTransactionFailed() {
-        Mockito.doReturn(FluentFutures.immediateFailedFluentFuture(new TransactionCommitFailedException("mock")))
+        Mockito.doReturn(FluentFutures.immediateFailedFluentFuture(new ExecutionException(new Throwable("mock"))))
             .when(writeTx).commit();
         final Node data = new NodeBuilder().setId(nodeId).build();
         txChainManager.initialSubmitWriteTransaction();
@@ -126,7 +126,7 @@ public class TransactionChainManagerTest {
         txChainManager.submitTransaction();
 
         Mockito.verify(txChain).newReadWriteTransaction();
-        Mockito.verify(writeTx).put(LogicalDatastoreType.CONFIGURATION, path, data, false);
+        Mockito.verify(writeTx).put(LogicalDatastoreType.CONFIGURATION, path, data);
         Mockito.verify(writeTx).commit();
     }
 
@@ -140,7 +140,7 @@ public class TransactionChainManagerTest {
         txChainManager.writeToTransaction(LogicalDatastoreType.CONFIGURATION, path, data, false);
 
         Mockito.verify(txChain).newReadWriteTransaction();
-        Mockito.verify(writeTx, Mockito.times(2)).put(LogicalDatastoreType.CONFIGURATION, path, data, false);
+        Mockito.verify(writeTx, Mockito.times(2)).put(LogicalDatastoreType.CONFIGURATION, path, data);
         Mockito.verify(writeTx, Mockito.never()).commit();
     }
 
@@ -156,7 +156,7 @@ public class TransactionChainManagerTest {
     public void testOnTransactionChainSuccessful() {
         txChainManager.onTransactionChainSuccessful(transactionChain);
         // NOOP
-        Mockito.verifyZeroInteractions(transactionChain);
+        Mockito.verifyNoInteractions(transactionChain);
     }
 
     @Test
@@ -182,7 +182,7 @@ public class TransactionChainManagerTest {
         txChainManager.deactivateTransactionManager();
 
         Mockito.verify(txChain).newReadWriteTransaction();
-        Mockito.verify(writeTx).put(LogicalDatastoreType.CONFIGURATION, path, data, false);
+        Mockito.verify(writeTx).put(LogicalDatastoreType.CONFIGURATION, path, data);
         Mockito.verify(writeTx, Mockito.never()).commit();
         Mockito.verify(writeTx).cancel();
         Mockito.verify(txChain).close();
@@ -196,7 +196,7 @@ public class TransactionChainManagerTest {
         txChainManager.shuttingDown();
 
         Mockito.verify(txChain).newReadWriteTransaction();
-        Mockito.verify(writeTx).put(LogicalDatastoreType.CONFIGURATION, path, data, false);
+        Mockito.verify(writeTx).put(LogicalDatastoreType.CONFIGURATION, path, data);
         Mockito.verify(writeTx).commit();
     }