From 819789086bd21c818de6cde34a452bf5c05ab0b8 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 19 Feb 2018 11:25:59 +0100 Subject: [PATCH] DATACASS-56 - Polishing. Improve test synchronization. --- .../core/AsyncCassandraTemplateIntegrationTests.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/AsyncCassandraTemplateIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/AsyncCassandraTemplateIntegrationTests.java index 59308e01d..c6cd243d3 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/AsyncCassandraTemplateIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/AsyncCassandraTemplateIntegrationTests.java @@ -15,16 +15,17 @@ */ package org.springframework.data.cassandra.core; -import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; +import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedHashSet; +import java.util.List; import java.util.Set; import java.util.concurrent.Future; import org.junit.Before; import org.junit.Test; - import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; import org.springframework.data.cassandra.core.cql.AsyncCqlTemplate; import org.springframework.data.cassandra.core.query.CassandraPageRequest; @@ -52,7 +53,7 @@ public class AsyncCassandraTemplateIntegrationTests extends AbstractKeyspaceCrea private AsyncCassandraTemplate template; @Before - public void setUp() throws Exception { + public void setUp() { MappingCassandraConverter converter = new MappingCassandraConverter(); CassandraTemplate cassandraTemplate = new CassandraTemplate(session, converter); @@ -265,13 +266,16 @@ public class AsyncCassandraTemplateIntegrationTests extends AbstractKeyspaceCrea public void shouldPageRequests() { Set expectedIds = new LinkedHashSet<>(); + List> futures = new ArrayList<>(); for (int count = 0; count < 100; count++) { User user = new User("heisenberg" + count, "Walter", "White"); expectedIds.add(user.getId()); - template.insert(user); + futures.add(template.insert(user)); } + futures.forEach(AsyncCassandraTemplateIntegrationTests::getUninterruptibly); + Set ids = new HashSet<>(); Query query = Query.empty();