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/mastership/impl/DistributedMastershipStoreTest.java

diff --git a/core/store/dist/src/test/java/org/onosproject/store/mastership/impl/DistributedMastershipStoreTest.java b/core/store/dist/src/test/java/org/onosproject/store/mastership/impl/DistributedMastershipStoreTest.java
index 56879e8..1745687 100644
--- a/core/store/dist/src/test/java/org/onosproject/store/mastership/impl/DistributedMastershipStoreTest.java
+++ b/core/store/dist/src/test/java/org/onosproject/store/mastership/impl/DistributedMastershipStoreTest.java
@@ -145,22 +145,22 @@
 
         //if already MASTER, nothing should happen
         testStore.put(DID2, N1, true, false, true);
-        assertEquals("wrong role for MASTER:", MASTER, dms.requestRole(DID2));
+        assertEquals("wrong role for MASTER:", MASTER, Futures.getUnchecked(dms.requestRole(DID2)));
 
         //populate maps with DID1, N1 thru NONE case
-        assertEquals("wrong role for NONE:", MASTER, dms.requestRole(DID1));
+        assertEquals("wrong role for NONE:", MASTER, Futures.getUnchecked(dms.requestRole(DID1)));
         assertTrue("wrong state for store:", !dms.terms.isEmpty());
         assertEquals("wrong term",
                 MastershipTerm.of(N1, 1), dms.getTermFor(DID1));
 
         //CN2 now local. DID2 has N1 as MASTER so N2 is STANDBY
         testStore.setCurrent(CN2);
-        assertEquals("wrong role for STANDBY:", STANDBY, dms.requestRole(DID2));
+        assertEquals("wrong role for STANDBY:", STANDBY, Futures.getUnchecked(dms.requestRole(DID2)));
         assertEquals("wrong number of entries:", 2, dms.terms.size());
 
         //change term and requestRole() again; should persist
         testStore.increment(DID2);
-        assertEquals("wrong role for STANDBY:", STANDBY, dms.requestRole(DID2));
+        assertEquals("wrong role for STANDBY:", STANDBY, Futures.getUnchecked(dms.requestRole(DID2)));
         assertEquals("wrong term", MastershipTerm.of(N1, 1), dms.getTermFor(DID2));
     }
 
@@ -168,7 +168,7 @@
     public void setMaster() {
         //populate maps with DID1, N1 as MASTER thru NONE case
         testStore.setCurrent(CN1);
-        assertEquals("wrong role for NONE:", MASTER, dms.requestRole(DID1));
+        assertEquals("wrong role for NONE:", MASTER, Futures.getUnchecked(dms.requestRole(DID1)));
         assertNull("wrong event:", Futures.getUnchecked(dms.setMaster(N1, DID1)));
 
         //switch over to N2
@@ -189,7 +189,7 @@
     public void relinquishRole() {
         //populate maps with DID1, N1 as MASTER thru NONE case
         testStore.setCurrent(CN1);
-        assertEquals("wrong role for NONE:", MASTER, dms.requestRole(DID1));
+        assertEquals("wrong role for NONE:", MASTER, Futures.getUnchecked(dms.requestRole(DID1)));
         //no backup, no new MASTER/event
         assertNull("wrong event:", Futures.getUnchecked(dms.relinquishRole(N1, DID1)));
 
@@ -197,7 +197,7 @@
 
         //add backup CN2, get it elected MASTER by relinquishing
         testStore.setCurrent(CN2);
-        assertEquals("wrong role for NONE:", STANDBY, dms.requestRole(DID1));
+        assertEquals("wrong role for NONE:", STANDBY, Futures.getUnchecked(dms.requestRole(DID1)));
         assertEquals("wrong event:", Type.MASTER_CHANGED, Futures.getUnchecked(dms.relinquishRole(N1, DID1)).type());
         assertEquals("wrong master", N2, dms.getMaster(DID1));
 
@@ -209,9 +209,9 @@
                 dms.roleMap.get(DID1).nodesOfRole(NONE).size());
 
         //bring nodes back
-        assertEquals("wrong role for NONE:", MASTER, dms.requestRole(DID1));
+        assertEquals("wrong role for NONE:", MASTER, Futures.getUnchecked(dms.requestRole(DID1)));
         testStore.setCurrent(CN1);
-        assertEquals("wrong role for NONE:", STANDBY, dms.requestRole(DID1));
+        assertEquals("wrong role for NONE:", STANDBY, Futures.getUnchecked(dms.requestRole(DID1)));
         assertEquals("wrong number of backup nodes", 1,
                 dms.roleMap.get(DID1).nodesOfRole(STANDBY).size());