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%2FAbstractTransactionProxyTest.java;h=2dd62ab72da29e0bed352eed95a79eb989faadbe;hp=73eb41064c1f2ec3d4f2b927db49d1e8bfa757b8;hb=12fcdfe39aa26dcba7fd3bb4d4c68e3d02e65c51;hpb=4d1709660b7af992d4c382a2a38debb5c7d64fb9 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionProxyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionProxyTest.java index 73eb41064c..2dd62ab72d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionProxyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractTransactionProxyTest.java @@ -9,6 +9,7 @@ package org.opendaylight.controller.cluster.datastore; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.Matchers.any; import static org.mockito.Matchers.argThat; @@ -17,25 +18,27 @@ import static org.mockito.Matchers.isA; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; + import akka.actor.ActorRef; import akka.actor.ActorSelection; import akka.actor.ActorSystem; import akka.actor.Props; import akka.dispatch.Futures; -import akka.testkit.JavaTestKit; +import akka.testkit.javadsl.TestKit; import akka.util.Timeout; import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.Timer; +import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; -import com.google.common.util.concurrent.CheckedFuture; +import com.google.common.util.concurrent.FluentFuture; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; -import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.Before; @@ -73,7 +76,8 @@ import org.opendaylight.controller.cluster.datastore.utils.MockConfiguration; import org.opendaylight.controller.cluster.raft.utils.DoNothingActor; import org.opendaylight.controller.md.cluster.datastore.model.CarsModel; import org.opendaylight.controller.md.cluster.datastore.model.TestModel; -import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.mdsal.common.api.ReadFailedException; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.model.api.SchemaContext; @@ -95,30 +99,40 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest { private final Configuration configuration = new MockConfiguration() { Map strategyMap = ImmutableMap.builder().put( - "junk", new ShardStrategy() { + TestModel.JUNK_QNAME.getLocalName(), new ShardStrategy() { @Override - public String findShard(YangInstanceIdentifier path) { - return "junk"; + public String findShard(final YangInstanceIdentifier path) { + return TestModel.JUNK_QNAME.getLocalName(); + } + + @Override + public YangInstanceIdentifier getPrefixForPath(final YangInstanceIdentifier path) { + return YangInstanceIdentifier.EMPTY; } }).put( - "cars", new ShardStrategy() { + CarsModel.BASE_QNAME.getLocalName(), new ShardStrategy() { + @Override + public String findShard(final YangInstanceIdentifier path) { + return CarsModel.BASE_QNAME.getLocalName(); + } + @Override - public String findShard(YangInstanceIdentifier path) { - return "cars"; + public YangInstanceIdentifier getPrefixForPath(final YangInstanceIdentifier path) { + return YangInstanceIdentifier.EMPTY; } }).build(); @Override - public ShardStrategy getStrategyForModule(String moduleName) { + public ShardStrategy getStrategyForModule(final String moduleName) { return strategyMap.get(moduleName); } @Override - public String getModuleNameFromNameSpace(String nameSpace) { - if(TestModel.JUNK_QNAME.getNamespace().toASCIIString().equals(nameSpace)) { - return "junk"; - } else if(CarsModel.BASE_QNAME.getNamespace().toASCIIString().equals(nameSpace)){ - return "cars"; + public String getModuleNameFromNameSpace(final String nameSpace) { + if (TestModel.JUNK_QNAME.getNamespace().toASCIIString().equals(nameSpace)) { + return TestModel.JUNK_QNAME.getLocalName(); + } else if (CarsModel.BASE_QNAME.getNamespace().toASCIIString().equals(nameSpace)) { + return CarsModel.BASE_QNAME.getLocalName(); } return null; } @@ -141,23 +155,23 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest { .operationTimeoutInSeconds(operationTimeoutInSeconds); @BeforeClass - public static void setUpClass() throws IOException { + public static void setUpClass() { - Config config = ConfigFactory.parseMap(ImmutableMap.builder(). - put("akka.actor.default-dispatcher.type", - "akka.testkit.CallingThreadDispatcherConfigurator").build()). - withFallback(ConfigFactory.load()); + Config config = ConfigFactory.parseMap(ImmutableMap.builder() + .put("akka.actor.default-dispatcher.type", + "akka.testkit.CallingThreadDispatcherConfigurator").build()) + .withFallback(ConfigFactory.load()); system = ActorSystem.create("test", config); } @AfterClass - public static void tearDownClass() throws IOException { - JavaTestKit.shutdownActorSystem(system); + public static void tearDownClass() { + TestKit.shutdownActorSystem(system); system = null; } @Before - public void setUp(){ + public void setUp() { MockitoAnnotations.initMocks(this); schemaContext = TestModel.createTestContext(); @@ -165,7 +179,8 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest { doReturn(getSystem()).when(mockActorContext).getActorSystem(); doReturn(getSystem().dispatchers().defaultGlobalDispatcher()).when(mockActorContext).getClientDispatcher(); doReturn(MemberName.forName(memberName)).when(mockActorContext).getCurrentMemberName(); - doReturn(new ShardStrategyFactory(configuration)).when(mockActorContext).getShardStrategyFactory(); + doReturn(new ShardStrategyFactory(configuration, + LogicalDatastoreType.CONFIGURATION)).when(mockActorContext).getShardStrategyFactory(); doReturn(schemaContext).when(mockActorContext).getSchemaContext(); doReturn(new Timeout(operationTimeoutInSeconds, TimeUnit.SECONDS)).when(mockActorContext).getOperationTimeout(); doReturn(mockClusterWrapper).when(mockActorContext).getClusterWrapper(); @@ -183,15 +198,15 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest { return system; } - protected CreateTransaction eqCreateTransaction(final String memberName, + protected CreateTransaction eqCreateTransaction(final String expMemberName, final TransactionType type) { ArgumentMatcher matcher = new ArgumentMatcher() { @Override - public boolean matches(Object argument) { - if(CreateTransaction.class.equals(argument.getClass())) { + public boolean matches(final Object argument) { + if (CreateTransaction.class.equals(argument.getClass())) { CreateTransaction obj = CreateTransaction.fromSerializable(argument); - return obj.getTransactionId().getHistoryId().getClientId().getFrontendId().getMemberName().getName().equals(memberName) && - obj.getTransactionType() == type.ordinal(); + return obj.getTransactionId().getHistoryId().getClientId().getFrontendId().getMemberName() + .getName().equals(expMemberName) && obj.getTransactionType() == type.ordinal(); } return false; @@ -204,9 +219,8 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest { protected DataExists eqDataExists() { ArgumentMatcher matcher = new ArgumentMatcher() { @Override - public boolean matches(Object argument) { - return (argument instanceof DataExists) && - ((DataExists)argument).getPath().equals(TestModel.TEST_PATH); + public boolean matches(final Object argument) { + return argument instanceof DataExists && ((DataExists)argument).getPath().equals(TestModel.TEST_PATH); } }; @@ -220,28 +234,28 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest { protected ReadData eqReadData(final YangInstanceIdentifier path) { ArgumentMatcher matcher = new ArgumentMatcher() { @Override - public boolean matches(Object argument) { - return (argument instanceof ReadData) && ((ReadData)argument).getPath().equals(path); + public boolean matches(final Object argument) { + return argument instanceof ReadData && ((ReadData)argument).getPath().equals(path); } }; return argThat(matcher); } - protected Future readyTxReply(String path) { + protected Future readyTxReply(final String path) { return Futures.successful((Object)new ReadyTransactionReply(path)); } - protected Future readDataReply(NormalizedNode data) { + protected Future readDataReply(final NormalizedNode data) { return Futures.successful(new ReadDataReply(data, DataStoreVersions.CURRENT_VERSION)); } - protected Future dataExistsReply(boolean exists) { + protected Future dataExistsReply(final boolean exists) { return Futures.successful(new DataExistsReply(exists, DataStoreVersions.CURRENT_VERSION)); } - protected Future batchedModificationsReply(int count) { + protected Future batchedModificationsReply(final int count) { return Futures.successful(new BatchedModificationsReply(count)); } @@ -250,84 +264,86 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest { return mock(Future.class); } - protected ActorSelection actorSelection(ActorRef actorRef) { + protected ActorSelection actorSelection(final ActorRef actorRef) { return getSystem().actorSelection(actorRef.path()); } - protected void expectBatchedModifications(ActorRef actorRef, int count) { + protected void expectBatchedModifications(final ActorRef actorRef, final int count) { doReturn(batchedModificationsReply(count)).when(mockActorContext).executeOperationAsync( eq(actorSelection(actorRef)), isA(BatchedModifications.class), any(Timeout.class)); } - protected void expectBatchedModificationsReady(ActorRef actorRef) { + protected void expectBatchedModifications(final int count) { + doReturn(batchedModificationsReply(count)).when(mockActorContext).executeOperationAsync( + any(ActorSelection.class), isA(BatchedModifications.class), any(Timeout.class)); + } + + protected void expectBatchedModificationsReady(final ActorRef actorRef) { expectBatchedModificationsReady(actorRef, false); } - protected void expectBatchedModificationsReady(ActorRef actorRef, boolean doCommitOnReady) { + protected void expectBatchedModificationsReady(final ActorRef actorRef, final boolean doCommitOnReady) { doReturn(doCommitOnReady ? Futures.successful(new CommitTransactionReply().toSerializable()) : readyTxReply(actorRef.path().toString())).when(mockActorContext).executeOperationAsync( eq(actorSelection(actorRef)), isA(BatchedModifications.class), any(Timeout.class)); } - protected void expectBatchedModifications(int count) { - doReturn(batchedModificationsReply(count)).when(mockActorContext).executeOperationAsync( - any(ActorSelection.class), isA(BatchedModifications.class), any(Timeout.class)); - } - protected void expectIncompleteBatchedModifications() { doReturn(incompleteFuture()).when(mockActorContext).executeOperationAsync( any(ActorSelection.class), isA(BatchedModifications.class), any(Timeout.class)); } - protected void expectFailedBatchedModifications(ActorRef actorRef) { + protected void expectFailedBatchedModifications(final ActorRef actorRef) { doReturn(Futures.failed(new TestException())).when(mockActorContext).executeOperationAsync( eq(actorSelection(actorRef)), isA(BatchedModifications.class), any(Timeout.class)); } - protected void expectReadyLocalTransaction(ActorRef actorRef, boolean doCommitOnReady) { + protected void expectReadyLocalTransaction(final ActorRef actorRef, final boolean doCommitOnReady) { doReturn(doCommitOnReady ? Futures.successful(new CommitTransactionReply().toSerializable()) : readyTxReply(actorRef.path().toString())).when(mockActorContext).executeOperationAsync( eq(actorSelection(actorRef)), isA(ReadyLocalTransaction.class), any(Timeout.class)); } - protected CreateTransactionReply createTransactionReply(ActorRef actorRef, short transactionVersion){ + protected CreateTransactionReply createTransactionReply(final ActorRef actorRef, final short transactionVersion) { return new CreateTransactionReply(actorRef.path().toString(), nextTransactionId(), transactionVersion); } - protected ActorRef setupActorContextWithoutInitialCreateTransaction(ActorSystem actorSystem) { + protected ActorRef setupActorContextWithoutInitialCreateTransaction(final ActorSystem actorSystem) { return setupActorContextWithoutInitialCreateTransaction(actorSystem, DefaultShardStrategy.DEFAULT_SHARD); } - protected Future primaryShardInfoReply(ActorSystem actorSystem, ActorRef actorRef) { - return primaryShardInfoReply(actorSystem, actorRef, DataStoreVersions.CURRENT_VERSION); - } - - protected Future primaryShardInfoReply(ActorSystem actorSystem, ActorRef actorRef, - short transactionVersion) { - return Futures.successful(new PrimaryShardInfo(actorSystem.actorSelection(actorRef.path()), - transactionVersion)); - } - - protected ActorRef setupActorContextWithoutInitialCreateTransaction(ActorSystem actorSystem, String shardName) { - return setupActorContextWithoutInitialCreateTransaction(actorSystem, shardName, DataStoreVersions.CURRENT_VERSION); + protected ActorRef setupActorContextWithoutInitialCreateTransaction(final ActorSystem actorSystem, + final String shardName) { + return setupActorContextWithoutInitialCreateTransaction(actorSystem, shardName, + DataStoreVersions.CURRENT_VERSION); } - protected ActorRef setupActorContextWithoutInitialCreateTransaction(ActorSystem actorSystem, String shardName, - short transactionVersion) { + protected ActorRef setupActorContextWithoutInitialCreateTransaction(final ActorSystem actorSystem, + final String shardName, final short transactionVersion) { ActorRef actorRef = actorSystem.actorOf(Props.create(DoNothingActor.class)); log.info("Created mock shard actor {}", actorRef); - doReturn(actorSystem.actorSelection(actorRef.path())). - when(mockActorContext).actorSelection(actorRef.path().toString()); + doReturn(actorSystem.actorSelection(actorRef.path())) + .when(mockActorContext).actorSelection(actorRef.path().toString()); - doReturn(primaryShardInfoReply(actorSystem, actorRef, transactionVersion)). - when(mockActorContext).findPrimaryShardAsync(eq(shardName)); + doReturn(primaryShardInfoReply(actorSystem, actorRef, transactionVersion)) + .when(mockActorContext).findPrimaryShardAsync(eq(shardName)); return actorRef; } - protected ActorRef setupActorContextWithInitialCreateTransaction(ActorSystem actorSystem, - TransactionType type, short transactionVersion, String shardName) { + protected Future primaryShardInfoReply(final ActorSystem actorSystem, final ActorRef actorRef) { + return primaryShardInfoReply(actorSystem, actorRef, DataStoreVersions.CURRENT_VERSION); + } + + protected Future primaryShardInfoReply(final ActorSystem actorSystem, final ActorRef actorRef, + final short transactionVersion) { + return Futures.successful(new PrimaryShardInfo(actorSystem.actorSelection(actorRef.path()), + transactionVersion)); + } + + protected ActorRef setupActorContextWithInitialCreateTransaction(final ActorSystem actorSystem, + final TransactionType type, final short transactionVersion, final String shardName) { ActorRef shardActorRef = setupActorContextWithoutInitialCreateTransaction(actorSystem, shardName, transactionVersion); @@ -335,56 +351,55 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest { memberName, shardActorRef); } - protected ActorRef setupActorContextWithInitialCreateTransaction(ActorSystem actorSystem, - TransactionType type, short transactionVersion, String prefix, ActorRef shardActorRef) { + protected ActorRef setupActorContextWithInitialCreateTransaction(final ActorSystem actorSystem, + final TransactionType type, final short transactionVersion, final String prefix, + final ActorRef shardActorRef) { ActorRef txActorRef; - if(type == TransactionType.WRITE_ONLY && - dataStoreContextBuilder.build().isWriteOnlyTransactionOptimizationsEnabled()) { + if (type == TransactionType.WRITE_ONLY + && dataStoreContextBuilder.build().isWriteOnlyTransactionOptimizationsEnabled()) { txActorRef = shardActorRef; } else { txActorRef = actorSystem.actorOf(Props.create(DoNothingActor.class)); log.info("Created mock shard Tx actor {}", txActorRef); - doReturn(actorSystem.actorSelection(txActorRef.path())). - when(mockActorContext).actorSelection(txActorRef.path().toString()); + doReturn(actorSystem.actorSelection(txActorRef.path())) + .when(mockActorContext).actorSelection(txActorRef.path().toString()); - doReturn(Futures.successful(createTransactionReply(txActorRef, transactionVersion))).when(mockActorContext). - executeOperationAsync(eq(actorSystem.actorSelection(shardActorRef.path())), + doReturn(Futures.successful(createTransactionReply(txActorRef, transactionVersion))).when(mockActorContext) + .executeOperationAsync(eq(actorSystem.actorSelection(shardActorRef.path())), eqCreateTransaction(prefix, type), any(Timeout.class)); } return txActorRef; } - protected ActorRef setupActorContextWithInitialCreateTransaction(ActorSystem actorSystem, TransactionType type) { + protected ActorRef setupActorContextWithInitialCreateTransaction(final ActorSystem actorSystem, + final TransactionType type) { return setupActorContextWithInitialCreateTransaction(actorSystem, type, DataStoreVersions.CURRENT_VERSION, DefaultShardStrategy.DEFAULT_SHARD); } - protected ActorRef setupActorContextWithInitialCreateTransaction(ActorSystem actorSystem, TransactionType type, - String shardName) { + protected ActorRef setupActorContextWithInitialCreateTransaction(final ActorSystem actorSystem, + final TransactionType type, + final String shardName) { return setupActorContextWithInitialCreateTransaction(actorSystem, type, DataStoreVersions.CURRENT_VERSION, shardName); } - protected void propagateReadFailedExceptionCause(CheckedFuture future) - throws Throwable { - + @SuppressWarnings({"checkstyle:avoidHidingCauseException", "checkstyle:IllegalThrows"}) + protected void propagateReadFailedExceptionCause(final FluentFuture future) throws Throwable { try { - future.checkedGet(5, TimeUnit.SECONDS); + future.get(5, TimeUnit.SECONDS); fail("Expected ReadFailedException"); - } catch(ReadFailedException e) { - assertNotNull("Expected a cause", e.getCause()); - if(e.getCause().getCause() != null) { - throw e.getCause().getCause(); - } else { - throw e.getCause(); - } + } catch (ExecutionException e) { + final Throwable cause = e.getCause(); + assertTrue("Unexpected cause: " + cause.getClass(), cause instanceof ReadFailedException); + throw Throwables.getRootCause(cause); } } - protected List captureBatchedModifications(ActorRef actorRef) { + protected List captureBatchedModifications(final ActorRef actorRef) { ArgumentCaptor batchedModificationsCaptor = ArgumentCaptor.forClass(BatchedModifications.class); verify(mockActorContext, Mockito.atLeastOnce()).executeOperationAsync( @@ -395,10 +410,10 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest { return batchedModifications; } - protected List filterCaptured(ArgumentCaptor captor, Class type) { + protected List filterCaptured(final ArgumentCaptor captor, final Class type) { List captured = new ArrayList<>(); - for(T c: captor.getAllValues()) { - if(type.isInstance(c)) { + for (T c: captor.getAllValues()) { + if (type.isInstance(c)) { captured.add(c); } } @@ -406,74 +421,77 @@ public abstract class AbstractTransactionProxyTest extends AbstractTest { return captured; } - protected void verifyOneBatchedModification(ActorRef actorRef, Modification expected, boolean expIsReady) { + protected void verifyOneBatchedModification(final ActorRef actorRef, final Modification expected, + final boolean expIsReady) { List batchedModifications = captureBatchedModifications(actorRef); assertEquals("Captured BatchedModifications count", 1, batchedModifications.size()); verifyBatchedModifications(batchedModifications.get(0), expIsReady, expIsReady, expected); } - protected void verifyBatchedModifications(Object message, boolean expIsReady, Modification... expected) { + protected void verifyBatchedModifications(final Object message, final boolean expIsReady, + final Modification... expected) { verifyBatchedModifications(message, expIsReady, false, expected); } - protected void verifyBatchedModifications(Object message, boolean expIsReady, boolean expIsDoCommitOnReady, - Modification... expected) { + protected void verifyBatchedModifications(final Object message, final boolean expIsReady, + final boolean expIsDoCommitOnReady, final Modification... expected) { assertEquals("Message type", BatchedModifications.class, message.getClass()); BatchedModifications batchedModifications = (BatchedModifications)message; assertEquals("BatchedModifications size", expected.length, batchedModifications.getModifications().size()); assertEquals("isReady", expIsReady, batchedModifications.isReady()); assertEquals("isDoCommitOnReady", expIsDoCommitOnReady, batchedModifications.isDoCommitOnReady()); - for(int i = 0; i < batchedModifications.getModifications().size(); i++) { + for (int i = 0; i < batchedModifications.getModifications().size(); i++) { Modification actual = batchedModifications.getModifications().get(i); assertEquals("Modification type", expected[i].getClass(), actual.getClass()); assertEquals("getPath", ((AbstractModification)expected[i]).getPath(), ((AbstractModification)actual).getPath()); - if(actual instanceof WriteModification) { + if (actual instanceof WriteModification) { assertEquals("getData", ((WriteModification)expected[i]).getData(), ((WriteModification)actual).getData()); } } } - protected void verifyCohortFutures(AbstractThreePhaseCommitCohort proxy, - Object... expReplies) throws Exception { - assertEquals("getReadyOperationFutures size", expReplies.length, - proxy.getCohortFutures().size()); + @SuppressWarnings("checkstyle:IllegalCatch") + protected void verifyCohortFutures(final AbstractThreePhaseCommitCohort proxy, + final Object... expReplies) { + assertEquals("getReadyOperationFutures size", expReplies.length, + proxy.getCohortFutures().size()); - List futureResults = new ArrayList<>(); - for( Future future: proxy.getCohortFutures()) { - assertNotNull("Ready operation Future is null", future); - try { - futureResults.add(Await.result(future, Duration.create(5, TimeUnit.SECONDS))); - } catch(Exception e) { - futureResults.add(e); - } + List futureResults = new ArrayList<>(); + for (Future future : proxy.getCohortFutures()) { + assertNotNull("Ready operation Future is null", future); + try { + futureResults.add(Await.result(future, Duration.create(5, TimeUnit.SECONDS))); + } catch (Exception e) { + futureResults.add(e); } + } - for (Object expReply : expReplies) { - boolean found = false; - Iterator iter = futureResults.iterator(); - while(iter.hasNext()) { - Object actual = iter.next(); - if(CommitTransactionReply.isSerializedType(expReply) && - CommitTransactionReply.isSerializedType(actual)) { - found = true; - } else if(expReply instanceof ActorSelection && Objects.equals(expReply, actual)) { - found = true; - } else if(expReply instanceof Class && ((Class)expReply).isInstance(actual)) { - found = true; - } - - if(found) { - iter.remove(); - break; - } + for (Object expReply : expReplies) { + boolean found = false; + Iterator iter = futureResults.iterator(); + while (iter.hasNext()) { + Object actual = iter.next(); + if (CommitTransactionReply.isSerializedType(expReply) + && CommitTransactionReply.isSerializedType(actual)) { + found = true; + } else if (expReply instanceof ActorSelection && Objects.equals(expReply, actual)) { + found = true; + } else if (expReply instanceof Class && ((Class) expReply).isInstance(actual)) { + found = true; } - if(!found) { - fail(String.format("No cohort Future response found for %s. Actual: %s", expReply, futureResults)); + if (found) { + iter.remove(); + break; } } + + if (!found) { + fail(String.format("No cohort Future response found for %s. Actual: %s", expReply, futureResults)); + } } + } }