From 1437bf347c9027fb952eb464073860df60cb132e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 15 Feb 2019 11:27:51 +0100 Subject: [PATCH] DATACASS-628 - Adapt tests to AssertJ 3.12.0. --- .../data/cassandra/core/cql/AsyncCqlTemplateUnitTests.java | 3 ++- .../data/cassandra/core/cql/CqlTemplateUnitTests.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplateUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplateUnitTests.java index 440f2ff84..a23f3aacc 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplateUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplateUnitTests.java @@ -36,6 +36,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; + import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.dao.IncorrectResultSizeDataAccessException; import org.springframework.data.cassandra.CassandraConnectionFailureException; @@ -560,7 +561,7 @@ public class AsyncCqlTemplateUnitTests { ListenableFuture> future = template.query(session -> new AsyncResult<>(preparedStatement), ResultSet::iterator); - assertThat(getUninterruptibly(future)).hasSize(1).contains(row); + assertThat((Iterable) () -> getUninterruptibly(future)).contains(row); verify(preparedStatement).bind(); } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CqlTemplateUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CqlTemplateUnitTests.java index 7dd5913be..37e4ba89c 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CqlTemplateUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/CqlTemplateUnitTests.java @@ -504,7 +504,7 @@ public class CqlTemplateUnitTests { Iterator iterator = template.query(session -> preparedStatement, ResultSet::iterator); - assertThat(iterator).hasSize(1).contains(row); + assertThat(iterator).hasNext(); verify(preparedStatement).bind(); }