Migrate Optional.get() callers

[mdsal.git] / dom / mdsal-dom-inmemory-datastore / src / test / java / org / opendaylight / mdsal / dom / store / inmemory / InMemoryDataStoreTest.java

diff --git a/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDataStoreTest.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDataStoreTest.java
index ac943862277d2708762df6a8114c047d3014ba18..f46ee58c4bbc238c54ea1f1cd78ea9ad0da3afd8 100644 (file)
--- a/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDataStoreTest.java
+++ b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDataStoreTest.java
@@ -20,6 +20,7 @@ import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 
+import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import java.util.Optional;
@@ -85,15 +86,12 @@ public class InMemoryDataStoreTest {
         /**
          * Reads /test from writeTx Read should return container.
          */
-        ListenableFuture<Optional<NormalizedNode>> writeTxContainer = writeTx.read(TestModel.TEST_PATH);
-        assertEquals("read: isPresent", true, writeTxContainer.get().isPresent());
-        assertEquals("read: data", testNode, writeTxContainer.get().get());
+        assertEquals(Optional.of(testNode), Futures.getDone(writeTx.read(TestModel.TEST_PATH)));
 
         /**
          * Reads /test from readTx Read should return Absent.
          */
-        ListenableFuture<Optional<NormalizedNode>> readTxContainer = readTx.read(TestModel.TEST_PATH);
-        assertEquals("read: isPresent", false, readTxContainer.get().isPresent());
+        assertEquals(Optional.empty(), Futures.getDone(readTx.read(TestModel.TEST_PATH)));
     }
 
     @Test
@@ -111,17 +109,14 @@ public class InMemoryDataStoreTest {
         /**
          * Reads /test from writeTx Read should return container.
          */
-        ListenableFuture<Optional<NormalizedNode>> writeTxContainer = writeTx.read(TestModel.TEST_PATH);
-        assertEquals("read: isPresent", true, writeTxContainer.get().isPresent());
-        assertEquals("read: data", testNode, writeTxContainer.get().get());
+        assertEquals(Optional.of(testNode), Futures.getDone(writeTx.read(TestModel.TEST_PATH)));
 
         DOMStoreThreePhaseCommitCohort cohort = writeTx.ready();
 
         assertThreePhaseCommit(cohort);
 
-        Optional<NormalizedNode> afterCommitRead = domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH).get();
-        assertEquals("After commit read: isPresent", true, afterCommitRead.isPresent());
-        assertEquals("After commit read: data", testNode, afterCommitRead.get());
+        assertEquals(Optional.of(testNode),
+            Futures.getDone(domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH)));
     }
 
     @Test
@@ -136,8 +131,7 @@ public class InMemoryDataStoreTest {
 
         assertThreePhaseCommit(writeTx.ready());
 
-        Optional<NormalizedNode> afterCommitRead = domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH).get();
-        assertEquals("After commit read: isPresent", true, afterCommitRead.isPresent());
+        assertTrue(Futures.getDone(domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH)).isPresent());
 
         // Delete /test and verify
 
@@ -147,8 +141,7 @@ public class InMemoryDataStoreTest {
 
         assertThreePhaseCommit(writeTx.ready());
 
-        afterCommitRead = domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH).get();
-        assertEquals("After commit read: isPresent", false, afterCommitRead.isPresent());
+        assertEquals(Optional.empty(), Futures.getDone(domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH)));
     }
 
     @Test
@@ -167,10 +160,8 @@ public class InMemoryDataStoreTest {
 
         assertThreePhaseCommit(writeTx.ready());
 
-        Optional<NormalizedNode> afterCommitRead =
-                domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH).get();
-        assertEquals("After commit read: isPresent", true, afterCommitRead.isPresent());
-        assertEquals("After commit read: data", containerNode, afterCommitRead.get());
+        assertEquals(Optional.of(containerNode),
+            Futures.getDone(domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH)));
 
         // Merge a new list entry node
 
@@ -189,9 +180,8 @@ public class InMemoryDataStoreTest {
 
         assertThreePhaseCommit(writeTx.ready());
 
-        afterCommitRead = domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH).get();
-        assertEquals("After commit read: isPresent", true, afterCommitRead.isPresent());
-        assertEquals("After commit read: data", containerNode, afterCommitRead.get());
+        assertEquals(Optional.of(containerNode),
+            Futures.getDone(domStore.newReadOnlyTransaction().read(TestModel.TEST_PATH)));
     }
 
     @Test
@@ -208,9 +198,7 @@ public class InMemoryDataStoreTest {
 
         writeTx.merge(TestModel.TEST_PATH, containerNode);
 
-        ListenableFuture<Boolean> exists = writeTx.exists(TestModel.TEST_PATH);
-
-        assertEquals(Boolean.TRUE, exists.get());
+        assertEquals(Boolean.TRUE, Futures.getDone(writeTx.exists(TestModel.TEST_PATH)));
 
         DOMStoreThreePhaseCommitCohort ready = writeTx.ready();
 
@@ -221,9 +209,7 @@ public class InMemoryDataStoreTest {
         DOMStoreReadTransaction readTx = domStore.newReadOnlyTransaction();
         assertNotNull(readTx);
 
-        exists = readTx.exists(TestModel.TEST_PATH);
-
-        assertEquals(Boolean.TRUE, exists.get());
+        assertEquals(Boolean.TRUE, Futures.getDone(readTx.exists(TestModel.TEST_PATH)));
     }
 
     @Test