X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FTransactionChainProxyTest.java;h=37cdc4a019d8444ff415fddf21b73e287512056c;hp=72d47711da6da82afb273df07365bc403ad29d05;hb=abaef4a5ae37f27542155457fe7306a4662b1eeb;hpb=70b924258e6c87219c38bcfefb3781ee3d2e2d02 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxyTest.java index 72d47711da..37cdc4a019 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxyTest.java @@ -8,11 +8,11 @@ package org.opendaylight.controller.cluster.datastore; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isA; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.timeout; @@ -20,6 +20,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.opendaylight.controller.cluster.datastore.TransactionType.READ_WRITE; import static org.opendaylight.controller.cluster.datastore.TransactionType.WRITE_ONLY; + import akka.actor.ActorRef; import akka.util.Timeout; import java.util.concurrent.CountDownLatch; @@ -33,10 +34,10 @@ import org.opendaylight.controller.cluster.datastore.messages.BatchedModificatio import org.opendaylight.controller.cluster.datastore.modification.WriteModification; import org.opendaylight.controller.cluster.datastore.shardstrategy.DefaultShardStrategy; import org.opendaylight.controller.md.cluster.datastore.model.TestModel; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreTransaction; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadTransaction; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadWriteTransaction; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreTransaction; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import scala.concurrent.Promise; @@ -75,6 +76,7 @@ public class TransactionChainProxyTest extends AbstractTransactionProxyTest { } + @SuppressWarnings("unchecked") @Test public void testClose() { new TransactionChainProxy(mockComponentFactory, historyId).close(); @@ -117,6 +119,7 @@ public class TransactionChainProxyTest extends AbstractTransactionProxyTest { * initiated until the first one completes its read future. */ @Test + @SuppressWarnings("checkstyle:IllegalCatch") public void testChainedWriteOnlyTransactions() throws Exception { dataStoreContextBuilder.writeOnlyTransactionOptimizationsEnabled(true); @@ -130,7 +133,7 @@ public class TransactionChainProxyTest extends AbstractTransactionProxyTest { DOMStoreWriteTransaction writeTx1 = txChainProxy.newWriteOnlyTransaction(); - NormalizedNode writeNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode writeNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); writeTx1.write(TestModel.TEST_PATH, writeNode1); writeTx1.ready(); @@ -143,26 +146,23 @@ public class TransactionChainProxyTest extends AbstractTransactionProxyTest { expectBatchedModifications(txActorRef2, 1); - final NormalizedNode writeNode2 = ImmutableNodes.containerNode(TestModel.OUTER_LIST_QNAME); + final NormalizedNode writeNode2 = ImmutableNodes.containerNode(TestModel.OUTER_LIST_QNAME); final DOMStoreWriteTransaction writeTx2 = txChainProxy.newWriteOnlyTransaction(); final AtomicReference caughtEx = new AtomicReference<>(); final CountDownLatch write2Complete = new CountDownLatch(1); - new Thread() { - @Override - public void run() { - try { - writeTx2.write(TestModel.OUTER_LIST_PATH, writeNode2); - } catch (Exception e) { - caughtEx.set(e); - } finally { - write2Complete.countDown(); - } + new Thread(() -> { + try { + writeTx2.write(TestModel.OUTER_LIST_PATH, writeNode2); + } catch (Exception e) { + caughtEx.set(e); + } finally { + write2Complete.countDown(); } - }.start(); + }).start(); - assertEquals("Tx 2 write should've completed", true, write2Complete.await(5, TimeUnit.SECONDS)); + assertTrue("Tx 2 write should've completed", write2Complete.await(5, TimeUnit.SECONDS)); if (caughtEx.get() != null) { throw caughtEx.get(); @@ -187,6 +187,7 @@ public class TransactionChainProxyTest extends AbstractTransactionProxyTest { * initiated until the first one completes its read future. */ @Test + @SuppressWarnings("checkstyle:IllegalCatch") public void testChainedReadWriteTransactions() throws Exception { try (TransactionChainProxy txChainProxy = new TransactionChainProxy(mockComponentFactory, historyId)) { @@ -200,7 +201,7 @@ public class TransactionChainProxyTest extends AbstractTransactionProxyTest { DOMStoreWriteTransaction writeTx1 = txChainProxy.newReadWriteTransaction(); - NormalizedNode writeNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode writeNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); writeTx1.write(TestModel.TEST_PATH, writeNode1); writeTx1.ready(); @@ -214,26 +215,23 @@ public class TransactionChainProxyTest extends AbstractTransactionProxyTest { expectBatchedModifications(txActorRef2, 1); - final NormalizedNode writeNode2 = ImmutableNodes.containerNode(TestModel.OUTER_LIST_QNAME); + final NormalizedNode writeNode2 = ImmutableNodes.containerNode(TestModel.OUTER_LIST_QNAME); final DOMStoreWriteTransaction writeTx2 = txChainProxy.newReadWriteTransaction(); final AtomicReference caughtEx = new AtomicReference<>(); final CountDownLatch write2Complete = new CountDownLatch(1); - new Thread() { - @Override - public void run() { - try { - writeTx2.write(TestModel.OUTER_LIST_PATH, writeNode2); - } catch (Exception e) { - caughtEx.set(e); - } finally { - write2Complete.countDown(); - } + new Thread(() -> { + try { + writeTx2.write(TestModel.OUTER_LIST_PATH, writeNode2); + } catch (Exception e) { + caughtEx.set(e); + } finally { + write2Complete.countDown(); } - }.start(); + }).start(); - assertEquals("Tx 2 write should've completed", true, write2Complete.await(5, TimeUnit.SECONDS)); + assertTrue("Tx 2 write should've completed", write2Complete.await(5, TimeUnit.SECONDS)); if (caughtEx.get() != null) { throw caughtEx.get(); @@ -265,11 +263,9 @@ public class TransactionChainProxyTest extends AbstractTransactionProxyTest { DOMStoreWriteTransaction writeTx1 = txChainProxy.newWriteOnlyTransaction(); - NormalizedNode writeNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + NormalizedNode writeNode1 = ImmutableNodes.containerNode(TestModel.TEST_QNAME); writeTx1.write(TestModel.TEST_PATH, writeNode1); - NormalizedNode writeNode2 = ImmutableNodes.containerNode(TestModel.OUTER_LIST_QNAME); - txChainProxy.newWriteOnlyTransaction(); } }