Use UnsignedLongSet instead of RangeSet in metadata

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java
index c01949c9306b8f31d2e28b77a649de5705042365..da219faaf1cdd893fc67bf687145b7798849faee 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreRemotingIntegrationTest.java
@@ -32,7 +32,6 @@ import akka.testkit.javadsl.TestKit;
 import com.google.common.base.Stopwatch;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Range;
 import com.google.common.primitives.UnsignedLong;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -45,7 +44,6 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
-import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -402,8 +400,12 @@ public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest {
                         }
 
                         assertEquals(0, metadata.getClosedTransactions().size());
-                        assertEquals(Range.closedOpen(UnsignedLong.valueOf(0), UnsignedLong.valueOf(11)),
-                                metadata.getPurgedTransactions().asRanges().iterator().next());
+
+                        final var purgedRanges = metadata.getPurgedTransactions().ranges();
+                        assertEquals(1, purgedRanges.size());
+                        final var purgedRange = purgedRanges.first();
+                        assertEquals(UnsignedLong.ZERO, purgedRange.lower());
+                        assertEquals(UnsignedLong.valueOf(10), purgedRange.upper());
                     } else {
                         // ask based should track no metadata
                         assertTrue(frontendMetadata.getClients().get(0).getCurrentHistories().isEmpty());
@@ -466,10 +468,8 @@ public class DistributedDataStoreRemotingIntegrationTest extends AbstractTest {
                             metadata = iterator.next();
                         }
 
-                        Set<Range<UnsignedLong>> ranges = metadata.getPurgedTransactions().asRanges();
-
                         assertEquals(0, metadata.getClosedTransactions().size());
-                        assertEquals(1, ranges.size());
+                        assertEquals(1, metadata.getPurgedTransactions().size());
                     } else {
                         // ask based should track no metadata
                         assertTrue(frontendMetadata.getClients().get(0).getCurrentHistories().isEmpty());