commit de003d9763b64a9887cd0427c8080bab61e96ded
author Madan Jampani <madan@onlab.us> Mon May 11 17:14:20 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu May 14 23:31:27 2015 +0000
tree eeda2677f66d42975ad21f61d453b1b889882abf
parent 3cc2330018584191153d1998f57404b69b27689d

LeadershipService and MastershipService/Store APIs return CompletableFutures so that callers can (optionally) chain together dependent operations

Change-Id: Ia00fcb7d98fbfce897527f67ea9690abf6fe846a

core/store/dist/src/test/java/org/onosproject/store/intent/impl/PartitionManagerTest.java

diff --git a/core/store/dist/src/test/java/org/onosproject/store/intent/impl/PartitionManagerTest.java b/core/store/dist/src/test/java/org/onosproject/store/intent/impl/PartitionManagerTest.java
index c3b529e..9655b2d 100644
--- a/core/store/dist/src/test/java/org/onosproject/store/intent/impl/PartitionManagerTest.java
+++ b/core/store/dist/src/test/java/org/onosproject/store/intent/impl/PartitionManagerTest.java
@@ -35,6 +35,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 
 import static junit.framework.TestCase.assertFalse;
 import static org.easymock.EasyMock.anyObject;
@@ -74,8 +75,11 @@
 
         leadershipService.addListener(anyObject(LeadershipEventListener.class));
         expectLastCall().andDelegateTo(new TestLeadershipService());
-        leadershipService.runForLeadership(anyString());
-        expectLastCall().anyTimes();
+        for (int i = 0; i < PartitionManager.NUM_PARTITIONS; i++) {
+            expect(leadershipService.runForLeadership(ELECTION_PREFIX + i))
+                .andReturn(CompletableFuture.completedFuture(null))
+                .times(1);
+        }
 
         partitionManager = new PartitionManager()
                 .withScheduledExecutor(new NullScheduledExecutor());
@@ -92,6 +96,7 @@
      * @param numMine number of partitions that should be owned by the local node
      */
     private void setUpLeadershipService(int numMine) {
+
         Map<String, Leadership> leaderBoard = new HashMap<>();
 
         for (int i = 0; i < numMine; i++) {
@@ -123,7 +128,9 @@
         leadershipService.addListener(anyObject(LeadershipEventListener.class));
 
         for (int i = 0; i < PartitionManager.NUM_PARTITIONS; i++) {
-            leadershipService.runForLeadership(ELECTION_PREFIX + i);
+            expect(leadershipService.runForLeadership(ELECTION_PREFIX + i))
+                .andReturn(CompletableFuture.completedFuture(null))
+                .times(1);
         }
 
         replay(leadershipService);
@@ -172,8 +179,9 @@
         // We have all the partitions so we'll need to relinquish some
         setUpLeadershipService(PartitionManager.NUM_PARTITIONS);
 
-        leadershipService.withdraw(anyString());
-        expectLastCall().times(7);
+        expect(leadershipService.withdraw(anyString()))
+                                .andReturn(CompletableFuture.completedFuture(null))
+                                .times(7);
 
         replay(leadershipService);