diff --git a/core/src/test/java/de/bwaldvogel/mongo/backend/aggregation/ExpressionTest.java b/core/src/test/java/de/bwaldvogel/mongo/backend/aggregation/ExpressionTest.java index 031fee44..3d2b482e 100644 --- a/core/src/test/java/de/bwaldvogel/mongo/backend/aggregation/ExpressionTest.java +++ b/core/src/test/java/de/bwaldvogel/mongo/backend/aggregation/ExpressionTest.java @@ -4,10 +4,9 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.InstanceOfAssertFactories.COLLECTION; -import static org.assertj.core.api.InstanceOfAssertFactories.LIST; +import static org.assertj.core.api.InstanceOfAssertFactories.list; import java.time.Instant; -import java.util.Collection; import java.util.Collections; import java.util.List; @@ -631,7 +630,7 @@ void testEvaluateOr() { @Test void testEvaluateObjectToArray() { assertThat(Expression.evaluate(json("$objectToArray: '$v'"), json("v: {a: 1, b: 2}"))) - .asInstanceOf(LIST) + .asInstanceOf(list(Document.class)) .containsExactly( json("{k: 'a', v: 1}"), json("{k: 'b', v: 2}") @@ -945,8 +944,8 @@ void testEvaluateSetEquals() { void testEvaluateSetIntersection() { assertThat(Expression.evaluate(json("$setIntersection: null"), json(""))).isNull(); assertThat(Expression.evaluate(json("$setIntersection: '$field'"), json(""))).isNull(); - assertThat((Collection) Expression.evaluate(json("$setIntersection: []"), json(""))).isEmpty(); - assertThat((Collection) Expression.evaluate(json("$setIntersection: [[]]"), json(""))).isEmpty(); + assertThat(Expression.evaluate(json("$setIntersection: []"), json(""))).asInstanceOf(COLLECTION).isEmpty(); + assertThat(Expression.evaluate(json("$setIntersection: [[]]"), json(""))).asInstanceOf(COLLECTION).isEmpty(); assertThat(Expression.evaluate(json("$setIntersection: [null]"), json(""))).isNull(); assertThat(Expression.evaluate(json("$setIntersection: [['a'], null]"), json(""))).isNull(); assertThat(Expression.evaluate(json("$setIntersection: ['$a', null]"), json(""))).isNull(); @@ -1121,10 +1120,10 @@ void testEvaluateSlice() { @Test void testEvaluateSplit() { assertThat(Expression.evaluate(json("$split: ['June-15-2013', '-']"), json(""))) - .asInstanceOf(LIST) + .asInstanceOf(list(String.class)) .containsExactly("June", "15", "2013"); assertThat(Expression.evaluate(json("$split: ['$a', '$b']"), json("a: 'foo bar', b: ' '"))) - .asInstanceOf(LIST) + .asInstanceOf(list(String.class)) .containsExactly("foo", "bar"); assertThat(Expression.evaluate(json("$split: [null, ' ']"), json(""))).isNull(); assertThat(Expression.evaluate(json("$split: ['$doesNotExist', ' ']"), json(""))).isNull(); diff --git a/test-common/src/main/java/de/bwaldvogel/mongo/backend/AbstractBackendTest.java b/test-common/src/main/java/de/bwaldvogel/mongo/backend/AbstractBackendTest.java index ab4f93a5..e4c9e1bd 100755 --- a/test-common/src/main/java/de/bwaldvogel/mongo/backend/AbstractBackendTest.java +++ b/test-common/src/main/java/de/bwaldvogel/mongo/backend/AbstractBackendTest.java @@ -18,6 +18,7 @@ import static de.bwaldvogel.mongo.backend.TestUtils.instant; import static de.bwaldvogel.mongo.backend.TestUtils.json; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.InstanceOfAssertFactories.list; import static org.junit.jupiter.api.Assumptions.assumeTrue; import java.time.Duration; @@ -28,13 +29,11 @@ import java.util.Comparator; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.NoSuchElementException; import java.util.Queue; import java.util.Random; -import java.util.Set; import java.util.UUID; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -818,8 +817,7 @@ void testListCollectionsEmpty() { assertThat(cursor.keySet()).containsExactly("id", "ns", "firstBatch"); assertThat(cursor.get("id")).isEqualTo(Long.valueOf(0)); assertThat(cursor.get("ns")).isEqualTo(db.getName() + ".$cmd.listCollections"); - List firstBatch = (List) cursor.get("firstBatch"); - assertThat(firstBatch).isEmpty(); + assertThat(cursor.get("firstBatch")).asInstanceOf(list(Document.class)).isEmpty(); } @Test @@ -835,25 +833,18 @@ void testListCollections() { assertThat(cursor.keySet()).containsExactly("id", "ns", "firstBatch"); assertThat(cursor.get("id")).isEqualTo(Long.valueOf(0)); assertThat(cursor.get("ns")).isEqualTo(db.getName() + ".$cmd.listCollections"); - assertThat(cursor.get("firstBatch")).isInstanceOf(List.class); - @SuppressWarnings("unchecked") - List firstBatch = (List) cursor.get("firstBatch"); - - assertThat(firstBatch).hasSameSizeAs(collections); - - Set collectionNames = new HashSet<>(); - for (Document collection : firstBatch) { - assertThat(collection).containsOnlyKeys("name", "options", "type", "idIndex", "info"); - String name = (String) collection.get("name"); - assertThat(collection.get("options")).isEqualTo(json("")); - assertThat(collection.get("name")).isInstanceOf(String.class); - assertThat(collection.get("type")).isEqualTo("collection"); - assertThat(collection.get("idIndex")).isEqualTo(json("key: {_id: 1}, name: '_id_', v: 2")); - assertThat(collection.get("info")).isInstanceOf(Document.class); - collectionNames.add(name); - } - - assertThat(collectionNames).containsExactlyInAnyOrderElementsOf(collections); + assertThat(cursor.get("firstBatch")).asInstanceOf(list(Document.class)) + .hasSameSizeAs(collections) + .allSatisfy(collection -> { + assertThat(collection).containsOnlyKeys("name", "options", "type", "idIndex", "info"); + assertThat(collection.get("options")).isEqualTo(json("")); + assertThat(collection.get("name")).isInstanceOf(String.class); + assertThat(collection.get("type")).isEqualTo("collection"); + assertThat(collection.get("idIndex")).isEqualTo(json("key: {_id: 1}, name: '_id_', v: 2")); + assertThat(collection.get("info")).isInstanceOf(Document.class); + }) + .extracting(collection -> collection.get("name")) + .containsExactlyInAnyOrderElementsOf(collections); } @Test