Do not generate 'isFoo()' methods

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

diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeProducerSingleShardTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeProducerSingleShardTest.java
index fb50e386f25a0db240d43a45174a904091489d63..7d1e8a8ad745c1b23dbc8828651da2ea8f6cf9e3 100644 (file)
--- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeProducerSingleShardTest.java
+++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeProducerSingleShardTest.java
@@ -8,8 +8,8 @@
 package org.opendaylight.mdsal.dom.broker;
 
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyMap;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyMap;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 
@@ -31,9 +31,9 @@ import org.opendaylight.mdsal.dom.api.DOMDataTreeShardingConflictException;
 import org.opendaylight.mdsal.dom.broker.util.TestModel;
 import org.opendaylight.mdsal.dom.spi.shard.DOMDataTreeShardProducer;
 import org.opendaylight.mdsal.dom.spi.shard.DOMDataTreeShardWriteTransaction;
+import org.opendaylight.mdsal.dom.spi.shard.WriteableDOMDataTreeShard;
 import org.opendaylight.mdsal.dom.spi.store.DOMStoreTransactionChain;
 import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction;
-import org.opendaylight.mdsal.dom.store.inmemory.WriteableDOMDataTreeShard;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
@@ -41,7 +41,7 @@ public class ShardedDOMDataTreeProducerSingleShardTest {
 
 
     private static final DOMDataTreeIdentifier ROOT_ID = new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL,
-            YangInstanceIdentifier.EMPTY);
+            YangInstanceIdentifier.empty());
     private static final DOMDataTreeIdentifier TEST_ID = new DOMDataTreeIdentifier(LogicalDatastoreType.OPERATIONAL,
             TestModel.TEST_PATH);
 
@@ -87,6 +87,7 @@ public class ShardedDOMDataTreeProducerSingleShardTest {
         doReturn("rootShard").when(rootShard).toString();
         doReturn(producerMock).when(rootShard).createProducer(any(Collection.class));
         doReturn(shardTxMock).when(producerMock).createTransaction();
+        doNothing().when(producerMock).close();
         doNothing().when(shardTxMock).ready();
         doReturn(Futures.immediateFuture(null)).when(shardTxMock).submit();
 
@@ -95,7 +96,7 @@ public class ShardedDOMDataTreeProducerSingleShardTest {
 
     @Test(expected = IllegalArgumentException.class)
     public void createProducerWithEmptyList() {
-        treeService.createProducer(Collections.<DOMDataTreeIdentifier>emptySet());
+        treeService.createProducer(Collections.emptySet());
     }
 
     @Test(expected = DOMDataTreeProducerBusyException.class)
@@ -107,7 +108,7 @@ public class ShardedDOMDataTreeProducerSingleShardTest {
     @Test
     public void closeWithTxSubmitted() throws DOMDataTreeProducerException {
         final DOMDataTreeCursorAwareTransaction tx = producer.createTransaction(false);
-        tx.submit();
+        tx.commit();
         producer.close();
     }
 
@@ -126,7 +127,7 @@ public class ShardedDOMDataTreeProducerSingleShardTest {
 
     @Test
     public void allocateChildProducerWithTxSubmmited() {
-        producer.createTransaction(false).submit();
+        producer.createTransaction(false).commit();
         final DOMDataTreeProducer childProducer = producer.createProducer(SUBTREES_TEST);
         assertNotNull(childProducer);
     }
@@ -141,7 +142,7 @@ public class ShardedDOMDataTreeProducerSingleShardTest {
 
     @Test
     public void allocateTxWithTxSubmitted() {
-        producer.createTransaction(false).submit();
+        producer.createTransaction(false).commit();
         producer.createTransaction(false);
     }