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%2FOperationLimiterTest.java;h=31a8776e5b86e09aba774c07951acbf2163add33;hb=refs%2Fchanges%2F02%2F38802%2F16;hp=40ce84b234d033d2cda630105c631459bbf91be5;hpb=c7e1ddeaf842ebb696c8dd38c0ca14c925ee31a1;p=controller.git 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..31a8776e5b 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,8 +8,8 @@ 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.access.concepts.MemberName; import org.opendaylight.controller.cluster.datastore.identifiers.TransactionIdentifier; import org.opendaylight.controller.cluster.datastore.messages.BatchedModificationsReply; import org.opendaylight.controller.cluster.datastore.messages.DataExistsReply; @@ -24,22 +24,22 @@ public class OperationLimiterTest { @Test 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); + OperationLimiter limiter = new OperationLimiter(new TransactionIdentifier(MemberName.forName("foo"), 1), permits, 1); + 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()); } + }