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=d3bdc6a6c07f764e83d00cc372b8f854b96406d9;hp=a53f4b4ae365f7b57deb8ecbb8181bb2e437aee5;hb=d594cf3be29ab746695eb5a3b0d220be89b57566;hpb=c3ea6ff9c64bcd51e46767a18a1370a2b3819dca

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 a53f4b4ae3..d3bdc6a6c0 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
@@ -50,32 +50,34 @@ public class DistributedDataStoreTest extends AbstractActorTest {
 
     @Test
     public void testRateLimitingUsedInReadWriteTxCreation(){
-        DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext);
+        try (DistributedDataStore distributedDataStore = new DistributedDataStore(actorContext)) {
 
-        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)) {
 
-        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)) {
 
-        distributedDataStore.newReadOnlyTransaction();
-        distributedDataStore.newReadOnlyTransaction();
-        distributedDataStore.newReadOnlyTransaction();
+            distributedDataStore.newReadOnlyTransaction();
+            distributedDataStore.newReadOnlyTransaction();
+            distributedDataStore.newReadOnlyTransaction();
 
-        verify(actorContext, times(0)).acquireTxCreationPermit();
+            verify(actorContext, times(0)).acquireTxCreationPermit();
+        }
     }
 
     @Test
@@ -83,40 +85,41 @@ 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)) {
 
-        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();
-
-        Executors.newSingleThreadExecutor().submit(new Runnable() {
-            @Override
-            public void run() {
-                Uninterruptibles.sleepUninterruptibly(500, TimeUnit.MILLISECONDS);
-                distributedDataStore.getWaitTillReadyCountDownLatch().countDown();
-            }
-        });
+        try (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();
 
-        long start = System.currentTimeMillis();
+            Executors.newSingleThreadExecutor().submit(new Runnable() {
+                @Override
+                public void run() {
+                    Uninterruptibles.sleepUninterruptibly(500, TimeUnit.MILLISECONDS);
+                    distributedDataStore.getWaitTillReadyCountDownLatch().countDown();
+                }
+            });
 
-        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
+}