X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FDistributedDataStoreTest.java;h=56bbbf5807d8b788e1411cb66f0e1f8ae4553414;hb=229c55fbdc5907129c9c35b3e98963b5fa2528f0;hp=d3bdc6a6c07f764e83d00cc372b8f854b96406d9;hpb=cf434f30a13bde72c33799e33de39fae5e62a773;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreTest.java
index d3bdc6a6c0..56bbbf5807 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreTest.java
@@ -12,25 +12,34 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+
 import akka.util.Timeout;
 import com.google.common.util.concurrent.Uninterruptibles;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
+import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier;
+import org.opendaylight.controller.cluster.access.concepts.FrontendIdentifier;
+import org.opendaylight.controller.cluster.access.concepts.FrontendType;
+import org.opendaylight.controller.cluster.access.concepts.MemberName;
+import org.opendaylight.controller.cluster.datastore.utils.ActorUtils;
 import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import scala.concurrent.duration.FiniteDuration;
 
 public class DistributedDataStoreTest extends AbstractActorTest {
+    private static final ClientIdentifier UNKNOWN_ID = ClientIdentifier.create(
+            FrontendIdentifier.create(MemberName.forName("local"), FrontendType.forName("unknown")), 0);
 
-    private SchemaContext schemaContext;
+    private static SchemaContext SCHEMA_CONTEXT;
 
     @Mock
-    private ActorContext actorContext;
+    private ActorUtils actorUtils;
 
     @Mock
     private DatastoreContext datastoreContext;
@@ -38,54 +47,63 @@ public class DistributedDataStoreTest extends AbstractActorTest {
     @Mock
     private Timeout shardElectionTimeout;
 
+    @BeforeClass
+    public static void beforeClass() {
+        SCHEMA_CONTEXT = TestModel.createTestContext();
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        SCHEMA_CONTEXT = null;
+    }
+
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        schemaContext = TestModel.createTestContext();
-
-        doReturn(schemaContext).when(actorContext).getSchemaContext();
-        doReturn(DatastoreContext.newBuilder().build()).when(actorContext).getDatastoreContext();
+        doReturn(SCHEMA_CONTEXT).when(actorUtils).getSchemaContext();
+        doReturn(DatastoreContext.newBuilder().build()).when(actorUtils).getDatastoreContext();
     }
 
     @Test
-    public void testRateLimitingUsedInReadWriteTxCreation(){
-        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext)) {
+    public void testRateLimitingUsedInReadWriteTxCreation() {
+        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorUtils, UNKNOWN_ID)) {
 
             distributedDataStore.newReadWriteTransaction();
 
-            verify(actorContext, times(1)).acquireTxCreationPermit();
+            verify(actorUtils, times(1)).acquireTxCreationPermit();
         }
     }
 
     @Test
-    public void testRateLimitingUsedInWriteOnlyTxCreation(){
-        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext)) {
+    public void testRateLimitingUsedInWriteOnlyTxCreation() {
+        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorUtils, UNKNOWN_ID)) {
 
             distributedDataStore.newWriteOnlyTransaction();
 
-            verify(actorContext, times(1)).acquireTxCreationPermit();
+            verify(actorUtils, times(1)).acquireTxCreationPermit();
         }
     }
 
     @Test
-    public void testRateLimitingNotUsedInReadOnlyTxCreation(){
-        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext)) {
+    public void testRateLimitingNotUsedInReadOnlyTxCreation() {
+        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorUtils, UNKNOWN_ID)) {
 
             distributedDataStore.newReadOnlyTransaction();
             distributedDataStore.newReadOnlyTransaction();
             distributedDataStore.newReadOnlyTransaction();
 
-            verify(actorContext, times(0)).acquireTxCreationPermit();
+            verify(actorUtils, times(0)).acquireTxCreationPermit();
         }
     }
 
     @Test
-    public void testWaitTillReadyBlocking(){
-        doReturn(datastoreContext).when(actorContext).getDatastoreContext();
+    public void testWaitTillReadyBlocking() {
+        doReturn(datastoreContext).when(actorUtils).getDatastoreContext();
         doReturn(shardElectionTimeout).when(datastoreContext).getShardLeaderElectionTimeout();
+        doReturn(1).when(datastoreContext).getInitialSettleTimeoutMultiplier();
         doReturn(FiniteDuration.apply(50, TimeUnit.MILLISECONDS)).when(shardElectionTimeout).duration();
-        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext)) {
+        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorUtils, UNKNOWN_ID)) {
 
             long start = System.currentTimeMillis();
 
@@ -93,23 +111,20 @@ public class DistributedDataStoreTest extends AbstractActorTest {
 
             long end = System.currentTimeMillis();
 
-            assertTrue("Expected to be blocked for 50 millis", (end - start) >= 50);
+            assertTrue("Expected to be blocked for 50 millis", end - start >= 50);
         }
     }
 
     @Test
-    public void testWaitTillReadyCountDown(){
-        try (final DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext)) {
-            doReturn(datastoreContext).when(actorContext).getDatastoreContext();
+    public void testWaitTillReadyCountDown() {
+        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorUtils, UNKNOWN_ID)) {
+            doReturn(datastoreContext).when(actorUtils).getDatastoreContext();
             doReturn(shardElectionTimeout).when(datastoreContext).getShardLeaderElectionTimeout();
             doReturn(FiniteDuration.apply(5000, TimeUnit.MILLISECONDS)).when(shardElectionTimeout).duration();
 
-            Executors.newSingleThreadExecutor().submit(new Runnable() {
-                @Override
-                public void run() {
-                    Uninterruptibles.sleepUninterruptibly(500, TimeUnit.MILLISECONDS);
-                    distributedDataStore.getWaitTillReadyCountDownLatch().countDown();
-                }
+            Executors.newSingleThreadExecutor().submit(() -> {
+                Uninterruptibles.sleepUninterruptibly(500, TimeUnit.MILLISECONDS);
+                distributedDataStore.readinessFuture().set(null);
             });
 
             long start = System.currentTimeMillis();
@@ -118,8 +133,7 @@ public class DistributedDataStoreTest extends AbstractActorTest {
 
             long end = System.currentTimeMillis();
 
-            assertTrue("Expected to be released in 500 millis", (end - start) < 5000);
+            assertTrue("Expected to be released in 500 millis", end - start < 5000);
         }
     }
-
 }