Use TestHazelcastFactory
- Modified Hazelcast related tests to use TestHazelcastFactory.
Hazelcast instances generated by it uses mocked network, which might resolve timing issue (ONOS-368).
See: https://github.com/hazelcast/hazelcast/blob/master/hazelcast/src/test/java/com/hazelcast/test/TestHazelcastInstanceFactory.java
Change-Id: I18f1c2d855eebf679a4be97a53cea2c808acfd04
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 3d993cd..1a96161 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
@@ -19,8 +19,6 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.onosproject.net.MastershipRole.*;
-import static org.onosproject.net.intent.TestTools.delay;
-
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
@@ -51,8 +49,6 @@
import org.onlab.packet.IpAddress;
import com.google.common.collect.Sets;
-import com.hazelcast.config.Config;
-import com.hazelcast.core.Hazelcast;
/**
* Test of the Hazelcast-based distributed MastershipStore implementation.
@@ -87,9 +83,9 @@
@Before
public void setUp() throws Exception {
// TODO should find a way to clean Hazelcast instance without shutdown.
- Config config = TestStoreManager.getTestConfig();
-
- storeMgr = new TestStoreManager(Hazelcast.newHazelcastInstance(config));
+ TestStoreManager testStoreMgr = new TestStoreManager();
+ testStoreMgr.setHazelcastInstance(testStoreMgr.initSingleInstance());
+ storeMgr = testStoreMgr;
storeMgr.activate();
serializationMgr = new KryoSerializer();
@@ -122,7 +118,6 @@
assertTrue("wrong store state:", dms.roleMap.isEmpty());
testStore.put(DID1, N1, true, false, false);
- delay(10); //TODO there seems to be a race here.
assertEquals("wrong master:", N1, dms.getMaster(DID1));
assertNull("wrong master:", dms.getMaster(DID2));
}