From 461975cf1a4408ab02b04b675ed42e3ad22d5020 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 29 Jan 2020 11:31:30 +0100 Subject: [PATCH] DATACASS-722 - Relax test plan for LWT tests. LWT tests are now simplified and to not attempt to issue another query as Cassandra becomes eventually consistent. --- .../core/AsyncCassandraTemplateIntegrationTests.java | 6 ------ .../cassandra/core/CassandraTemplateIntegrationTests.java | 8 +------- 2 files changed, 1 insertion(+), 13 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 7997d2543..6e748feb8 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 @@ -217,11 +217,6 @@ public class AsyncCassandraTemplateIntegrationTests extends AbstractKeyspaceCrea assertThat(getUninterruptibly(updated).wasApplied()).isTrue(); assertThat(getUninterruptibly(updated).getEntity()).isSameAs(user); - - // Cassandra requires a while to apply that change... - Thread.sleep(200); - - assertThat(getUser(user.getId()).getFirstname()).isEqualTo("Walter Hartwell"); } @Test // DATACASS-343 @@ -298,7 +293,6 @@ public class AsyncCassandraTemplateIntegrationTests extends AbstractKeyspaceCrea getUninterruptibly(template.insert(user)); assertThat(getUninterruptibly(template.delete(user, lwtOptions)).wasApplied()).isTrue(); - assertThat(getUninterruptibly(template.delete(user, lwtOptions)).wasApplied()).isFalse(); } @Test // DATACASS-606 diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateIntegrationTests.java index 0d319d994..575ddbdbf 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraTemplateIntegrationTests.java @@ -316,7 +316,7 @@ public class CassandraTemplateIntegrationTests extends AbstractKeyspaceCreatingI } @Test // DATACASS-292 - public void updateShouldUpdateEntityWithLwt() throws InterruptedException { + public void updateShouldUpdateEntityWithLwt() { UpdateOptions lwtOptions = UpdateOptions.builder().withIfExists().build(); @@ -329,10 +329,6 @@ public class CassandraTemplateIntegrationTests extends AbstractKeyspaceCreatingI WriteResult lwt = template.update(user, lwtOptions); assertThat(lwt.wasApplied()).isTrue(); - - // Await until Cassandra has persisted the change - Thread.sleep(300); - assertThat(template.selectOneById(user.getId(), User.class).getFirstname()).isEqualTo("Walter Hartwell"); } @Test // DATACASS-343 @@ -407,7 +403,6 @@ public class CassandraTemplateIntegrationTests extends AbstractKeyspaceCreatingI template.insert(user); assertThat(template.delete(user, lwtOptions).wasApplied()).isTrue(); - assertThat(template.delete(user, lwtOptions).wasApplied()).isFalse(); } @Test // DATACASS-606 @@ -420,7 +415,6 @@ public class CassandraTemplateIntegrationTests extends AbstractKeyspaceCreatingI Query query = Query.query(where("id").is("heisenberg")).queryOptions(lwtOptions); assertThat(template.delete(query, User.class)).isTrue(); - assertThat(template.delete(query, User.class)).isFalse(); } @Test // DATACASS-182