Do not generate 'isFoo()' methods

[mdsal.git] / dom / mdsal-dom-broker / src / test / java / org / opendaylight / mdsal / dom / broker / ShardedDOMTransactionChainAdapterTest.java

diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/ShardedDOMTransactionChainAdapterTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/ShardedDOMTransactionChainAdapterTest.java
index 1755349858a1aabc1db22d0323959d0c5d3f28a8..5e91d17cf214c895716525455c68567de7e032c2 100644 (file)
--- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/ShardedDOMTransactionChainAdapterTest.java
+++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/ShardedDOMTransactionChainAdapterTest.java
@@ -10,23 +10,24 @@ package org.opendaylight.mdsal.dom.broker;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.OPERATIONAL;
 
-import com.google.common.util.concurrent.Futures;
 import org.junit.Test;
-import org.opendaylight.mdsal.common.api.TransactionChainListener;
+import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeCursorAwareTransaction;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeProducer;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeService;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteCursor;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
+import org.opendaylight.mdsal.dom.api.DOMTransactionChainListener;
 import org.opendaylight.mdsal.dom.broker.util.TestModel;
+import org.opendaylight.yangtools.util.concurrent.FluentFutures;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 
 public class ShardedDOMTransactionChainAdapterTest {
@@ -44,7 +45,7 @@ public class ShardedDOMTransactionChainAdapterTest {
         doNothing().when(producer).close();
 
 
-        TransactionChainListener chainListener = new BlockingTransactionChainListener();
+        DOMTransactionChainListener chainListener = new BlockingTransactionChainListener();
         ShardedDOMTransactionChainAdapter transactionChainAdapter =
                 new ShardedDOMTransactionChainAdapter(identifier, dataTreeService, chainListener);
 
@@ -65,20 +66,19 @@ public class ShardedDOMTransactionChainAdapterTest {
         verify(cursor).delete(any());
 
         doNothing().when(cursor).close();
-        doReturn(Futures.immediateCheckedFuture(null)).when(transaction).submit();
+        doReturn(CommitInfo.emptyFluentFuture()).when(transaction).commit();
         doReturn(true).when(transaction).cancel();
         assertTrue(writeTransaction.cancel());
-        transactionChainAdapter.closeWriteTransaction(Futures.immediateFuture(null));
+        transactionChainAdapter.closeWriteTransaction(FluentFutures.immediateNullFluentFuture());
 
-        transactionChainAdapter =
-                new ShardedDOMTransactionChainAdapter(identifier, dataTreeService, chainListener);
+        transactionChainAdapter = new ShardedDOMTransactionChainAdapter(identifier, dataTreeService, chainListener);
         writeTransaction = transactionChainAdapter.newWriteOnlyTransaction();
         writeTransaction.put(OPERATIONAL, TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME));
-        assertNotNull(writeTransaction.submit());
+        assertNotNull(writeTransaction.commit());
         assertFalse(writeTransaction.cancel());
-        transactionChainAdapter.closeWriteTransaction(Futures.immediateFuture(null));
+        transactionChainAdapter.closeWriteTransaction(FluentFutures.immediateNullFluentFuture());
 
-        assertNotNull(transactionChainAdapter.newWriteOnlyTransaction().submit());
+        assertNotNull(transactionChainAdapter.newWriteOnlyTransaction().commit());
 
         DOMDataTreeReadTransaction readTransaction = transactionChainAdapter.newReadOnlyTransaction();
         assertNotNull(readTransaction);