Align tested boolean/Boolean expectations

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipIntegrationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipIntegrationTest.java
index 9bdacd73f544e6cc7812c690847e8d42ce9d6773..5394a87dd4003a0107455234a000bfb3d9717e3d 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipIntegrationTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipIntegrationTest.java
@@ -29,7 +29,6 @@ import akka.actor.Status.Success;
 import akka.cluster.Cluster;
 import akka.pattern.Patterns;
 import akka.util.Timeout;
-import com.google.common.base.Optional;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
@@ -39,6 +38,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.Before;
@@ -540,10 +540,11 @@ public class DistributedEntityOwnershipIntegrationTest {
         boolean passed = false;
         for (int i = 0; i < 100; i++) {
             Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS);
-            final Optional<EntityOwnershipState> leaderState = leaderEntityOwnershipService.getOwnershipState(ENTITY1);
-            final Optional<EntityOwnershipState> follower1State =
+            final com.google.common.base.Optional<EntityOwnershipState> leaderState =
+                    leaderEntityOwnershipService.getOwnershipState(ENTITY1);
+            final com.google.common.base.Optional<EntityOwnershipState> follower1State =
                     follower1EntityOwnershipService.getOwnershipState(ENTITY1);
-            final Optional<EntityOwnershipState> follower2State =
+            final com.google.common.base.Optional<EntityOwnershipState> follower2State =
                     follower2EntityOwnershipService.getOwnershipState(ENTITY1);
             final Optional<DOMEntityOwnershipChange> leaderChange = getValueSafely(leaderChangeCaptor);
             final Optional<DOMEntityOwnershipChange> follower1Change = getValueSafely(follower1ChangeCaptor);
@@ -564,10 +565,10 @@ public class DistributedEntityOwnershipIntegrationTest {
 
     private static Optional<DOMEntityOwnershipChange> getValueSafely(ArgumentCaptor<DOMEntityOwnershipChange> captor) {
         try {
-            return Optional.fromNullable(captor.getValue());
+            return Optional.ofNullable(captor.getValue());
         } catch (MockitoException e) {
             // No value was captured
-            return Optional.absent();
+            return Optional.empty();
         }
     }
 
@@ -789,7 +790,8 @@ public class DistributedEntityOwnershipIntegrationTest {
 
         Future<Object> future = Patterns.ask(leaderDistributedDataStore.getActorContext().getShardManager(),
                 new ChangeShardMembersVotingStatus(ENTITY_OWNERSHIP_SHARD_NAME,
-                        ImmutableMap.of("member-4", false, "member-5", false)), new Timeout(10, TimeUnit.SECONDS));
+                        ImmutableMap.of("member-4", Boolean.FALSE, "member-5", Boolean.FALSE)),
+                new Timeout(10, TimeUnit.SECONDS));
         Object response = Await.result(future, FiniteDuration.apply(10, TimeUnit.SECONDS));
         if (response instanceof Throwable) {
             throw new AssertionError("ChangeShardMembersVotingStatus failed", (Throwable)response);
@@ -822,7 +824,7 @@ public class DistributedEntityOwnershipIntegrationTest {
 
         future = Patterns.ask(leaderDistributedDataStore.getActorContext().getShardManager(),
                 new ChangeShardMembersVotingStatus(ENTITY_OWNERSHIP_SHARD_NAME,
-                        ImmutableMap.of("member-3", false, "member-4", true, "member-5", true)),
+                        ImmutableMap.of("member-3", Boolean.FALSE, "member-4", Boolean.TRUE, "member-5", Boolean.TRUE)),
                 new Timeout(10, TimeUnit.SECONDS));
         response = Await.result(future, FiniteDuration.apply(10, TimeUnit.SECONDS));
         if (response instanceof Throwable) {
@@ -837,7 +839,7 @@ public class DistributedEntityOwnershipIntegrationTest {
 
     private static void verifyGetOwnershipState(final DOMEntityOwnershipService service, final DOMEntity entity,
             final EntityOwnershipState expState) {
-        Optional<EntityOwnershipState> state = service.getOwnershipState(entity);
+        com.google.common.base.Optional<EntityOwnershipState> state = service.getOwnershipState(entity);
         assertEquals("getOwnershipState present", true, state.isPresent());
         assertEquals("EntityOwnershipState", expState, state.get());
     }
@@ -851,7 +853,7 @@ public class DistributedEntityOwnershipIntegrationTest {
                     .read(entityPath(entity.getType(), entity.getIdentifier()).node(Candidate.QNAME))
                     .get(5, TimeUnit.SECONDS);
             try {
-                assertEquals("Candidates not found for " + entity, true, possible.isPresent());
+                assertTrue("Candidates not found for " + entity, possible.isPresent());
                 Collection<String> actual = new ArrayList<>();
                 for (MapEntryNode candidate: ((MapNode)possible.get()).getValue()) {
                     actual.add(candidate.getChild(CANDIDATE_NAME_NODE_ID).get().getValue().toString());