Adopt odlparent-10.0.0/yangtools-8.0.0-SNAPSHOT

[mdsal.git] / dom / mdsal-dom-spi / src / test / java / org / opendaylight / mdsal / dom / spi / store / SnapshotBackedReadWriteTransactionTest.java

diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadWriteTransactionTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadWriteTransactionTest.java
index d4a8262816acec6d6e6fc8a7722cb98bbd7c409c..b568c45a75d5cbc2c76a6cd323fbda8c6f1b7c88 100644 (file)
--- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadWriteTransactionTest.java
+++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadWriteTransactionTest.java
@@ -10,7 +10,7 @@ package org.opendaylight.mdsal.dom.spi.store;
 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.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
@@ -23,8 +23,8 @@ import org.opendaylight.mdsal.common.api.ReadFailedException;
 import org.opendaylight.mdsal.dom.spi.store.SnapshotBackedWriteTransaction.TransactionReadyPrototype;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeModification;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeSnapshot;
 
 public class SnapshotBackedReadWriteTransactionTest {
 
@@ -43,20 +43,20 @@ public class SnapshotBackedReadWriteTransactionTest {
 
     @Test
     public void basicTest() throws Exception {
-        final NormalizedNode<?, ?> testNode = mock(NormalizedNode.class);
-        final Optional<NormalizedNode<?, ?>> optional = Optional.of(testNode);
+        final NormalizedNode testNode = mock(NormalizedNode.class);
+        final Optional<NormalizedNode> optional = Optional.of(testNode);
         doReturn("testNode").when(testNode).toString();
-        doReturn(java.util.Optional.of(testNode)).when(DATA_TREE_MODIFICATION).readNode(YangInstanceIdentifier.EMPTY);
-        assertTrue(snapshotBackedReadWriteTransaction.exists(YangInstanceIdentifier.EMPTY).get());
-        assertEquals(optional, snapshotBackedReadWriteTransaction.read(YangInstanceIdentifier.EMPTY).get());
+        doReturn(Optional.of(testNode)).when(DATA_TREE_MODIFICATION).readNode(YangInstanceIdentifier.empty());
+        assertTrue(snapshotBackedReadWriteTransaction.exists(YangInstanceIdentifier.empty()).get());
+        assertEquals(optional, snapshotBackedReadWriteTransaction.read(YangInstanceIdentifier.empty()).get());
     }
 
     @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:avoidHidingCauseException" })
     @Test(expected = ReadFailedException.class)
     public void readTestWithNullException() throws Throwable {
-        doReturn(null).when(DATA_TREE_MODIFICATION).readNode(YangInstanceIdentifier.EMPTY);
+        doReturn(null).when(DATA_TREE_MODIFICATION).readNode(YangInstanceIdentifier.empty());
         try {
-            snapshotBackedReadWriteTransaction.read(YangInstanceIdentifier.EMPTY).get();
+            snapshotBackedReadWriteTransaction.read(YangInstanceIdentifier.empty()).get();
             fail("Expected ReadFailedException");
         } catch (ExecutionException e) {
             throw e.getCause();
@@ -68,7 +68,7 @@ public class SnapshotBackedReadWriteTransactionTest {
     public void readNodeTestWithException() throws Throwable {
         doThrow(new NullPointerException("no Node")).when(DATA_TREE_MODIFICATION).readNode(any());
         try {
-            snapshotBackedReadWriteTransaction.read(YangInstanceIdentifier.EMPTY).get();
+            snapshotBackedReadWriteTransaction.read(YangInstanceIdentifier.empty()).get();
             fail("Expected ReadFailedException");
         } catch (ExecutionException e) {
             throw e.getCause();
@@ -80,7 +80,7 @@ public class SnapshotBackedReadWriteTransactionTest {
     public void existsTestWithException() throws Throwable {
         doThrow(new NullPointerException("no Node")).when(DATA_TREE_MODIFICATION).readNode(any());
         try {
-            snapshotBackedReadWriteTransaction.exists(YangInstanceIdentifier.EMPTY).get();
+            snapshotBackedReadWriteTransaction.exists(YangInstanceIdentifier.empty()).get();
             fail("Expected ReadFailedException");
         } catch (ExecutionException e) {
             throw e.getCause();