From 89ac6cfb084c0680a1bfa96f9b0215aa3a350146 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 27 Jan 2020 12:09:49 +0100 Subject: [PATCH] DATACASS-720 - 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 | 2 -- .../cassandra/core/CassandraTemplateIntegrationTests.java | 4 ---- 2 files changed, 6 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 e82de4b11..acad4712b 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 @@ -138,7 +138,6 @@ public class AsyncCassandraTemplateIntegrationTests extends AbstractKeyspaceCrea ListenableFuture> lwt = template.insert(user, lwtOptions); assertThat(getUninterruptibly(lwt).wasApplied()).isFalse(); - assertThat(getUser(user.getId()).getFirstname()).isEqualTo("Walter"); } @Test // DATACASS-292 @@ -199,7 +198,6 @@ public class AsyncCassandraTemplateIntegrationTests extends AbstractKeyspaceCrea ListenableFuture> lwt = template.update(user, lwtOptions); assertThat(getUninterruptibly(lwt).wasApplied()).isFalse(); - assertThat(getUser(user.getId())).isNull(); } @Test // DATACASS-292 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 c1af5a82f..ad9cde361 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 @@ -32,7 +32,6 @@ import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import java.util.UUID; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -330,7 +329,6 @@ public class CassandraTemplateIntegrationTests extends AbstractKeyspaceCreatingI WriteResult lwt = template.update(user, lwtOptions); assertThat(lwt.wasApplied()).isTrue(); - assertThat(template.selectOneById(user.getId(), User.class).getFirstname()).isEqualTo("Walter Hartwell"); } @Test // DATACASS-343 @@ -405,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 @@ -418,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