X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=dom%2Fmdsal-dom-spi%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fdom%2Fspi%2Fstore%2FSnapshotBackedReadWriteTransactionTest.java;h=b568c45a75d5cbc2c76a6cd323fbda8c6f1b7c88;hb=11408d627adca7eb71ac956c3ad01f75b6b91596;hp=31fbf03329cfd0486ce02e05bc9b1ff5ac1a47f0;hpb=c4d02d92b7125cb5b0aa2e67e3a8b5a7c6f92b21;p=mdsal.git

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 31fbf03329..b568c45a75 100644
--- 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,20 +10,21 @@ 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;
 
-import com.google.common.base.Optional;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
 import org.junit.Before;
 import org.junit.Test;
 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 {
 
@@ -42,46 +43,46 @@ 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(optional).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:IllegalCatch"})
+    @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 (Exception e) {
+        } catch (ExecutionException e) {
             throw e.getCause();
         }
     }
 
-    @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:IllegalCatch"})
+    @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:avoidHidingCauseException"})
     @Test(expected = ReadFailedException.class)
     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 (Exception e) {
+        } catch (ExecutionException e) {
             throw e.getCause();
         }
     }
 
-    @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:IllegalCatch"})
+    @SuppressWarnings({"checkstyle:IllegalThrows", "checkstyle:avoidHidingCauseException"})
     @Test(expected = ReadFailedException.class)
     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 (Exception e) {
+        } catch (ExecutionException e) {
             throw e.getCause();
         }
     }