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/net/src/test/java/org/onosproject/cluster/impl/MastershipManagerTest.java

diff --git a/core/net/src/test/java/org/onosproject/cluster/impl/MastershipManagerTest.java b/core/net/src/test/java/org/onosproject/cluster/impl/MastershipManagerTest.java
index 87b08d6..b5ae31b 100644
--- a/core/net/src/test/java/org/onosproject/cluster/impl/MastershipManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/cluster/impl/MastershipManagerTest.java
@@ -34,6 +34,7 @@
 import org.onosproject.store.trivial.impl.SimpleMastershipStore;
 
 import com.google.common.collect.Sets;
+import com.google.common.util.concurrent.Futures;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -77,7 +78,7 @@
     public void setRole() {
         mgr.setRole(NID_OTHER, DEV_MASTER, MASTER);
         assertEquals("wrong local role:", NONE, mgr.getLocalRole(DEV_MASTER));
-        assertEquals("wrong obtained role:", STANDBY, mgr.requestRoleFor(DEV_MASTER));
+        assertEquals("wrong obtained role:", STANDBY, Futures.getUnchecked(mgr.requestRoleFor(DEV_MASTER)));
 
         //set to master
         mgr.setRole(NID_LOCAL, DEV_MASTER, MASTER);
@@ -112,8 +113,8 @@
         mgr.setRole(NID_OTHER, DEV_OTHER, MASTER);
 
         //local should be master for one but standby for other
-        assertEquals("wrong role:", MASTER, mgr.requestRoleFor(DEV_MASTER));
-        assertEquals("wrong role:", STANDBY, mgr.requestRoleFor(DEV_OTHER));
+        assertEquals("wrong role:", MASTER, Futures.getUnchecked(mgr.requestRoleFor(DEV_MASTER)));
+        assertEquals("wrong role:", STANDBY, Futures.getUnchecked(mgr.requestRoleFor(DEV_OTHER)));
     }
 
     @Test