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%2FOperationLimiterTest.java;h=ffe069b78c38e0bd4c1ad47002aa070be72c4ec7;hp=40ce84b234d033d2cda630105c631459bbf91be5;hb=20e100c1377799a60976c4153e4f664578896cb9;hpb=c7e1ddeaf842ebb696c8dd38c0ca14c925ee31a1 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/OperationLimiterTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/OperationLimiterTest.java index 40ce84b234..ffe069b78c 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/OperationLimiterTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/OperationLimiterTest.java @@ -8,7 +8,6 @@ package org.opendaylight.controller.cluster.datastore; import static org.junit.Assert.assertEquals; -import java.util.concurrent.Semaphore; import org.junit.Test; import org.opendaylight.controller.cluster.datastore.identifiers.TransactionIdentifier; import org.opendaylight.controller.cluster.datastore.messages.BatchedModificationsReply; @@ -25,21 +24,21 @@ public class OperationLimiterTest { public void testOnComplete() throws Exception { int permits = 10; OperationLimiter limiter = new OperationLimiter(new TransactionIdentifier("foo", 1), permits, 1); - Semaphore semaphore = limiter.getSemaphore(); - semaphore.acquire(permits); + limiter.acquire(permits); int availablePermits = 0; - limiter.onComplete(null, DataExistsReply.create(true)); - assertEquals("availablePermits", ++availablePermits, semaphore.availablePermits()); + limiter.onComplete(null, new DataExistsReply(true, DataStoreVersions.CURRENT_VERSION)); + assertEquals("availablePermits", ++availablePermits, limiter.availablePermits()); - limiter.onComplete(null, DataExistsReply.create(true)); - assertEquals("availablePermits", ++availablePermits, semaphore.availablePermits()); + limiter.onComplete(null, new DataExistsReply(true, DataStoreVersions.CURRENT_VERSION)); + assertEquals("availablePermits", ++availablePermits, limiter.availablePermits()); limiter.onComplete(null, new IllegalArgumentException()); - assertEquals("availablePermits", ++availablePermits, semaphore.availablePermits()); + assertEquals("availablePermits", ++availablePermits, limiter.availablePermits()); limiter.onComplete(null, new BatchedModificationsReply(4)); availablePermits += 4; - assertEquals("availablePermits", availablePermits, semaphore.availablePermits()); + assertEquals("availablePermits", availablePermits, limiter.availablePermits()); } + }