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 / SnapshotBackedReadTransactionTest.java

diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadTransactionTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadTransactionTest.java
index 68811fb6778545679624803ee6274323009dedc1..eb3e2fb73ad01b986ceaca2fbe9e6e9425201610 100644 (file)
--- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadTransactionTest.java
+++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedReadTransactionTest.java
@@ -23,24 +23,25 @@ import org.junit.Test;
 import org.opendaylight.mdsal.common.api.ReadFailedException;
 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.DataTreeSnapshot;
+import org.opendaylight.yangtools.yang.data.tree.api.DataTreeSnapshot;
 
 @SuppressWarnings("checkstyle:IllegalCatch")
 public class SnapshotBackedReadTransactionTest {
 
     private static final DataTreeSnapshot DATA_TREE_SNAPSHOT = mock(DataTreeSnapshot.class);
-    private static SnapshotBackedReadTransaction<Object> snapshotBackedReadTransaction =
-            new SnapshotBackedReadTransaction<>(new Object(), false, DATA_TREE_SNAPSHOT);
+
+    private SnapshotBackedReadTransaction<Object> snapshotBackedReadTransaction =
+            new SnapshotBackedReadTransaction<>(new Object(), false, DATA_TREE_SNAPSHOT, null);
 
     @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(Optional.of(testNode)).when(DATA_TREE_SNAPSHOT).readNode(YangInstanceIdentifier.EMPTY);
-        assertTrue(snapshotBackedReadTransaction.exists(YangInstanceIdentifier.EMPTY).get());
+        doReturn(Optional.of(testNode)).when(DATA_TREE_SNAPSHOT).readNode(YangInstanceIdentifier.empty());
+        assertTrue(snapshotBackedReadTransaction.exists(YangInstanceIdentifier.empty()).get());
 
-        assertEquals(optional, snapshotBackedReadTransaction.read(YangInstanceIdentifier.EMPTY).get());
+        assertEquals(optional, snapshotBackedReadTransaction.read(YangInstanceIdentifier.empty()).get());
         final Field stableSnapshotField = SnapshotBackedReadTransaction.class.getDeclaredField("stableSnapshot");
         stableSnapshotField.setAccessible(true);
 
@@ -56,7 +57,7 @@ public class SnapshotBackedReadTransactionTest {
     public void readTestWithException() throws Throwable {
         snapshotBackedReadTransaction.close();
         try {
-            snapshotBackedReadTransaction.read(YangInstanceIdentifier.EMPTY).get();
+            snapshotBackedReadTransaction.read(YangInstanceIdentifier.empty()).get();
             fail("Expected ReadFailedException");
         } catch (Exception e) {
             throw e.getCause();
@@ -67,9 +68,10 @@ public class SnapshotBackedReadTransactionTest {
     @Test(expected = ReadFailedException.class)
     public void readNodeTestWithException() throws Throwable {
         doThrow(new NullPointerException("no Node")).when(DATA_TREE_SNAPSHOT).readNode(any());
-        snapshotBackedReadTransaction = new SnapshotBackedReadTransaction<>(new Object(), false, DATA_TREE_SNAPSHOT);
+        snapshotBackedReadTransaction = new SnapshotBackedReadTransaction<>(new Object(), false, DATA_TREE_SNAPSHOT,
+                null);
         try {
-            snapshotBackedReadTransaction.read(YangInstanceIdentifier.EMPTY).get();
+            snapshotBackedReadTransaction.read(YangInstanceIdentifier.empty()).get();
             fail("Expected ReadFailedException");
         } catch (Exception e) {
             throw e.getCause();
@@ -82,7 +84,7 @@ public class SnapshotBackedReadTransactionTest {
         doThrow(new NullPointerException("no Node")).when(DATA_TREE_SNAPSHOT).readNode(any());
 
         try {
-            snapshotBackedReadTransaction.exists(YangInstanceIdentifier.EMPTY).get();
+            snapshotBackedReadTransaction.exists(YangInstanceIdentifier.empty()).get();
             fail("Expected ReadFailedException");
         } catch (Exception e) {
             throw e.getCause();