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

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..8a4069e2e6 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,6 +12,7 @@ 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;
@@ -20,12 +21,18 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+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.ActorContext;
 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;
 
@@ -49,8 +56,8 @@ public class DistributedDataStoreTest extends AbstractActorTest {
     }
 
     @Test
-    public void testRateLimitingUsedInReadWriteTxCreation(){
-        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext)) {
+    public void testRateLimitingUsedInReadWriteTxCreation() {
+        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext, UNKNOWN_ID)) {
 
             distributedDataStore.newReadWriteTransaction();
 
@@ -59,8 +66,8 @@ public class DistributedDataStoreTest extends AbstractActorTest {
     }
 
     @Test
-    public void testRateLimitingUsedInWriteOnlyTxCreation(){
-        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext)) {
+    public void testRateLimitingUsedInWriteOnlyTxCreation() {
+        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext, UNKNOWN_ID)) {
 
             distributedDataStore.newWriteOnlyTransaction();
 
@@ -69,8 +76,8 @@ public class DistributedDataStoreTest extends AbstractActorTest {
     }
 
     @Test
-    public void testRateLimitingNotUsedInReadOnlyTxCreation(){
-        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext)) {
+    public void testRateLimitingNotUsedInReadOnlyTxCreation() {
+        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext, UNKNOWN_ID)) {
 
             distributedDataStore.newReadOnlyTransaction();
             distributedDataStore.newReadOnlyTransaction();
@@ -81,11 +88,11 @@ public class DistributedDataStoreTest extends AbstractActorTest {
     }
 
     @Test
-    public void testWaitTillReadyBlocking(){
+    public void testWaitTillReadyBlocking() {
         doReturn(datastoreContext).when(actorContext).getDatastoreContext();
         doReturn(shardElectionTimeout).when(datastoreContext).getShardLeaderElectionTimeout();
         doReturn(FiniteDuration.apply(50, TimeUnit.MILLISECONDS)).when(shardElectionTimeout).duration();
-        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext)) {
+        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext, UNKNOWN_ID)) {
 
             long start = System.currentTimeMillis();
 
@@ -93,23 +100,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)) {
+    public void testWaitTillReadyCountDown() {
+        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext, UNKNOWN_ID)) {
             doReturn(datastoreContext).when(actorContext).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.getWaitTillReadyCountDownLatch().countDown();
             });
 
             long start = System.currentTimeMillis();
@@ -118,8 +122,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);
         }
     }
-
 }