X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fsal-netconf-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fsal%2Fconnect%2Fnetconf%2Fsal%2Ftx%2FTxChainTest.java;h=02fef9792b7fef1a000ccfb4e5b51d949243cb08;hb=de76f7996dc99d8580345e20ac4cd6e90330037f;hp=384d83d5f144ab83ec95d62546d52d0e22d00502;hpb=45cfee1861924b4a8086d38079ce8cbd320386d6;p=netconf.git diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxChainTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxChainTest.java index 384d83d5f1..02fef9792b 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxChainTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/TxChainTest.java @@ -8,7 +8,7 @@ package org.opendaylight.netconf.sal.connect.netconf.sal.tx; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -112,7 +112,7 @@ public class TxChainTest { public void testChainFail() throws Exception { final AbstractWriteTx writeTx = chain.newWriteOnlyTransaction(); verify(writeOnlyTx1).addListener(captor.capture()); - writeTx.submit(); + writeTx.commit(); final TransactionCommitFailedException cause = new TransactionCommitFailedException("fail"); captor.getValue().onTransactionFailed(writeOnlyTx1, cause); verify(registration1).close(); @@ -124,7 +124,7 @@ public class TxChainTest { final AbstractWriteTx writeTx = chain.newWriteOnlyTransaction(); chain.close(); verify(writeOnlyTx1).addListener(captor.capture()); - writeTx.submit(); + writeTx.commit(); captor.getValue().onTransactionSuccessful(writeOnlyTx1); verify(registration1).close(); verify(listener).onTransactionChainSuccessful(chain); @@ -146,7 +146,7 @@ public class TxChainTest { final ArgumentCaptor captor1 = ArgumentCaptor.forClass(TxListener.class); verify(writeOnlyTx1).addListener(captor1.capture()); //submit 1st tx - writeTx1.submit(); + writeTx1.commit(); captor1.getValue().onTransactionSubmitted(writeOnlyTx1); //create 2nd tx @@ -154,7 +154,7 @@ public class TxChainTest { final ArgumentCaptor captor2 = ArgumentCaptor.forClass(TxListener.class); verify(writeTx2).addListener(captor2.capture()); //submit 2nd tx - writeTx2.submit(); + writeTx2.commit(); captor2.getValue().onTransactionSubmitted(writeOnlyTx2); //create 3rd tx @@ -185,7 +185,7 @@ public class TxChainTest { final ArgumentCaptor captor1 = ArgumentCaptor.forClass(TxListener.class); verify(writeOnlyTx1).addListener(captor1.capture()); //submit 1st tx - writeTx1.submit(); + writeTx1.commit(); captor1.getValue().onTransactionSubmitted(writeOnlyTx1); //create 2nd tx @@ -193,7 +193,7 @@ public class TxChainTest { final ArgumentCaptor captor2 = ArgumentCaptor.forClass(TxListener.class); verify(writeTx2).addListener(captor2.capture()); //submit 2nd tx - writeTx2.submit(); + writeTx2.commit(); captor2.getValue().onTransactionSubmitted(writeOnlyTx2); //create 3rd tx