Bump upstreams

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / datastore / DataTreeCohortIntegrationTest.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortIntegrationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortIntegrationTest.java
index ad74a4ba16e68abf4ad7710d71447fe02af398c1..9a447677f6d67f70a8f09103c0b4a94d663a99a7 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortIntegrationTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortIntegrationTest.java
@@ -310,18 +310,20 @@ public class DataTreeCohortIntegrationTest {
             final Optional<NormalizedNode> expDataAfter, final Optional<NormalizedNode> expDataBefore) {
         assertNotNull("Expected candidate for path " + expTreeId.getRootIdentifier(), candidate);
         assertEquals("rootPath", expTreeId, candidate.getRootPath());
-        assertEquals("modificationType", expType, candidate.getRootNode().getModificationType());
+        assertEquals("modificationType", expType, candidate.getRootNode().modificationType());
 
-        assertEquals("dataAfter present", expDataAfter.isPresent(), candidate.getRootNode().getDataAfter().isPresent());
+        assertEquals("dataAfter present", expDataAfter.isPresent(),
+            candidate.getRootNode().findDataAfter().isPresent());
         if (expDataAfter.isPresent()) {
-            assertEquals("dataAfter", expDataAfter.orElseThrow(), candidate.getRootNode().getDataAfter().orElseThrow());
+            assertEquals("dataAfter", expDataAfter.orElseThrow(),
+                candidate.getRootNode().findDataAfter().orElseThrow());
         }
 
         assertEquals("dataBefore present", expDataBefore.isPresent(),
-                candidate.getRootNode().getDataBefore().isPresent());
+                candidate.getRootNode().findDataBefore().isPresent());
         if (expDataBefore.isPresent()) {
             assertEquals("dataBefore", expDataBefore.orElseThrow(),
-                candidate.getRootNode().getDataBefore().orElseThrow());
+                candidate.getRootNode().findDataBefore().orElseThrow());
         }
     }
 }