From f63d2cb26a386d632c98123bcd52639961555d82 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 1 Jul 2016 12:10:06 +0200 Subject: [PATCH] DATACASS-182 - Use hasItem instead of contains in MappingCassandraConverterUnitTests assertions. Use hasItem assertion matchers for asserting insert values as contains asserts all values within the collection and we just want to pick particular entries to assert. --- .../MappingCassandraConverterUnitTests.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/MappingCassandraConverterUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/MappingCassandraConverterUnitTests.java index fcc04c42b..a17d0fa51 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/MappingCassandraConverterUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/MappingCassandraConverterUnitTests.java @@ -152,7 +152,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(unsupportedEnumToOrdinalMapping, insert); - assertThat(getValues(insert), contains((Object) Integer.valueOf(Condition.USED.ordinal()))); + assertThat(getValues(insert), hasItem((Object) Integer.valueOf(Condition.USED.ordinal()))); } /** @@ -168,7 +168,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(key, insert); - assertThat(getValues(insert), contains((Object) "MINT")); + assertThat(getValues(insert), hasItem((Object) "MINT")); } /** @@ -187,7 +187,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(composite, insert); - assertThat(getValues(insert), contains((Object) "MINT")); + assertThat(getValues(insert), hasItem((Object) "MINT")); } /** @@ -203,7 +203,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(withEnumColumns, update); - assertThat(getAssignmentValues(update), contains((Object) "MINT")); + assertThat(getAssignmentValues(update), hasItem((Object) "MINT")); } /** @@ -219,7 +219,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(key, update); - assertThat(getWhereValues(update), contains((Object) "MINT")); + assertThat(getWhereValues(update), hasItem((Object) "MINT")); } /** @@ -238,7 +238,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(composite, update); - assertThat(getWhereValues(update), contains((Object) "MINT")); + assertThat(getWhereValues(update), hasItem((Object) "MINT")); } /** @@ -254,7 +254,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(key, where); - assertThat(getWhereValues(where), contains((Object) "MINT")); + assertThat(getWhereValues(where), hasItem((Object) "MINT")); } /** @@ -273,7 +273,7 @@ public class MappingCassandraConverterUnitTests { mappingCassandraConverter.write(composite, where); - assertThat(getWhereValues(where), contains((Object) "MINT")); + assertThat(getWhereValues(where), hasItem((Object) "MINT")); } /**