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=c8c254879cf64ed73e6278fc37ab8aa137ba9583;hp=3034004bb0ad2209f43602749206a36f187c67ba;hb=c796596b5c46b5203c30b143e6282662e66c5642;hpb=ceb41a4fe9c36a2036c5dcae0fc02359be8bdd66

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 3034004bb0..c8c254879c 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
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2014, 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 package org.opendaylight.controller.cluster.datastore;
 
 import static org.junit.Assert.assertTrue;
@@ -12,12 +20,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;
 
@@ -42,32 +56,34 @@ public class DistributedDataStoreTest extends AbstractActorTest {
 
     @Test
     public void testRateLimitingUsedInReadWriteTxCreation(){
-        DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext);
+        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext, UNKNOWN_ID)) {
 
-        distributedDataStore.newReadWriteTransaction();
+            distributedDataStore.newReadWriteTransaction();
 
-        verify(actorContext, times(1)).acquireTxCreationPermit();
+            verify(actorContext, times(1)).acquireTxCreationPermit();
+        }
     }
 
     @Test
     public void testRateLimitingUsedInWriteOnlyTxCreation(){
-        DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext);
+        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext, UNKNOWN_ID)) {
 
-        distributedDataStore.newWriteOnlyTransaction();
+            distributedDataStore.newWriteOnlyTransaction();
 
-        verify(actorContext, times(1)).acquireTxCreationPermit();
+            verify(actorContext, times(1)).acquireTxCreationPermit();
+        }
     }
 
-
     @Test
     public void testRateLimitingNotUsedInReadOnlyTxCreation(){
-        DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext);
+        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext, UNKNOWN_ID)) {
 
-        distributedDataStore.newReadOnlyTransaction();
-        distributedDataStore.newReadOnlyTransaction();
-        distributedDataStore.newReadOnlyTransaction();
+            distributedDataStore.newReadOnlyTransaction();
+            distributedDataStore.newReadOnlyTransaction();
+            distributedDataStore.newReadOnlyTransaction();
 
-        verify(actorContext, times(0)).acquireTxCreationPermit();
+            verify(actorContext, times(0)).acquireTxCreationPermit();
+        }
     }
 
     @Test
@@ -75,40 +91,38 @@ public class DistributedDataStoreTest extends AbstractActorTest {
         doReturn(datastoreContext).when(actorContext).getDatastoreContext();
         doReturn(shardElectionTimeout).when(datastoreContext).getShardLeaderElectionTimeout();
         doReturn(FiniteDuration.apply(50, TimeUnit.MILLISECONDS)).when(shardElectionTimeout).duration();
-        DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext);
+        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext, UNKNOWN_ID)) {
 
-        long start = System.currentTimeMillis();
+            long start = System.currentTimeMillis();
 
-        distributedDataStore.waitTillReady();
+            distributedDataStore.waitTillReady();
 
-        long end = System.currentTimeMillis();
+            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(){
-        final DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext);
-        doReturn(datastoreContext).when(actorContext).getDatastoreContext();
-        doReturn(shardElectionTimeout).when(datastoreContext).getShardLeaderElectionTimeout();
-        doReturn(FiniteDuration.apply(5000, TimeUnit.MILLISECONDS)).when(shardElectionTimeout).duration();
+        try (final 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() {
+            Executors.newSingleThreadExecutor().submit(() -> {
                 Uninterruptibles.sleepUninterruptibly(500, TimeUnit.MILLISECONDS);
                 distributedDataStore.getWaitTillReadyCountDownLatch().countDown();
-            }
-        });
-
-        long start = System.currentTimeMillis();
+            });
 
-        distributedDataStore.waitTillReady();
+            long start = System.currentTimeMillis();
 
-        long end = System.currentTimeMillis();
+            distributedDataStore.waitTillReady();
 
-        assertTrue("Expected to be released in 500 millis", (end-start) < 5000);
+            long end = System.currentTimeMillis();
 
+            assertTrue("Expected to be released in 500 millis", (end - start) < 5000);
+        }
     }
 
-}
\ No newline at end of file
+}