From 98b95892ef45a57f943f4694a63edfc110be1134 Mon Sep 17 00:00:00 2001 From: Maxim Katcharov Date: Wed, 30 Oct 2024 10:20:57 -0600 Subject: [PATCH] Sync unified change-streams tests --- .../change-streams/change-streams-clusterTime.json | 1 - .../change-streams/change-streams-disambiguatedPaths.json | 1 - .../change-streams/change-streams-errors.json | 4 ++-- .../change-streams/change-streams-pre_and_post_images.json | 2 +- .../change-streams/change-streams-resume-allowlist.json | 2 +- .../change-streams/change-streams-resume-errorLabels.json | 2 +- .../change-streams/change-streams-showExpandedEvents.json | 2 -- .../unified-test-format/change-streams/change-streams.json | 5 ----- .../reactivestreams/client/unified/ChangeStreamsTest.java | 7 +++++++ 9 files changed, 12 insertions(+), 14 deletions(-) diff --git a/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-clusterTime.json b/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-clusterTime.json index 55b4ae3fbcb..2b09e548f1d 100644 --- a/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-clusterTime.json +++ b/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-clusterTime.json @@ -28,7 +28,6 @@ "minServerVersion": "4.0.0", "topologies": [ "replicaset", - "sharded-replicaset", "load-balanced", "sharded" ], diff --git a/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-disambiguatedPaths.json b/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-disambiguatedPaths.json index 91d8e66da20..e6cc5ef66ed 100644 --- a/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-disambiguatedPaths.json +++ b/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-disambiguatedPaths.json @@ -28,7 +28,6 @@ "minServerVersion": "6.1.0", "topologies": [ "replicaset", - "sharded-replicaset", "load-balanced", "sharded" ], diff --git a/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-errors.json b/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-errors.json index 04fe8f04f33..65e99e541ed 100644 --- a/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-errors.json +++ b/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-errors.json @@ -145,7 +145,7 @@ "minServerVersion": "4.1.11", "topologies": [ "replicaset", - "sharded-replicaset", + "sharded", "load-balanced" ] } @@ -190,7 +190,7 @@ "minServerVersion": "4.2", "topologies": [ "replicaset", - "sharded-replicaset", + "sharded", "load-balanced" ] } diff --git a/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-pre_and_post_images.json b/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-pre_and_post_images.json index 8beefb2bc82..e62fc034596 100644 --- a/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-pre_and_post_images.json +++ b/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-pre_and_post_images.json @@ -6,7 +6,7 @@ "minServerVersion": "6.0.0", "topologies": [ "replicaset", - "sharded-replicaset", + "sharded", "load-balanced" ], "serverless": "forbid" diff --git a/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-resume-allowlist.json b/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-resume-allowlist.json index b4953ec736a..1ec72b432be 100644 --- a/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-resume-allowlist.json +++ b/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-resume-allowlist.json @@ -6,7 +6,7 @@ "minServerVersion": "3.6", "topologies": [ "replicaset", - "sharded-replicaset", + "sharded", "load-balanced" ], "serverless": "forbid" diff --git a/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-resume-errorLabels.json b/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-resume-errorLabels.json index f5f4505a9f9..7fd70108f07 100644 --- a/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-resume-errorLabels.json +++ b/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-resume-errorLabels.json @@ -6,7 +6,7 @@ "minServerVersion": "4.3.1", "topologies": [ "replicaset", - "sharded-replicaset", + "sharded", "load-balanced" ], "serverless": "forbid" diff --git a/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-showExpandedEvents.json b/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-showExpandedEvents.json index a59a818493c..b9594e0c1e1 100644 --- a/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-showExpandedEvents.json +++ b/driver-core/src/test/resources/unified-test-format/change-streams/change-streams-showExpandedEvents.json @@ -6,7 +6,6 @@ "minServerVersion": "6.0.0", "topologies": [ "replicaset", - "sharded-replicaset", "sharded" ], "serverless": "forbid" @@ -463,7 +462,6 @@ "runOnRequirements": [ { "topologies": [ - "sharded-replicaset", "sharded" ] } diff --git a/driver-core/src/test/resources/unified-test-format/change-streams/change-streams.json b/driver-core/src/test/resources/unified-test-format/change-streams/change-streams.json index 476154f4e15..c8b60ed4e25 100644 --- a/driver-core/src/test/resources/unified-test-format/change-streams/change-streams.json +++ b/driver-core/src/test/resources/unified-test-format/change-streams/change-streams.json @@ -210,7 +210,6 @@ "expectEvents": [ { "client": "client0", - "ignoreExtraEvents": true, "events": [ { "commandStartedEvent": { @@ -256,7 +255,6 @@ "expectEvents": [ { "client": "client0", - "ignoreExtraEvents": true, "events": [ { "commandStartedEvent": { @@ -293,7 +291,6 @@ "expectEvents": [ { "client": "client0", - "ignoreExtraEvents": true, "events": [ { "commandStartedEvent": { @@ -349,7 +346,6 @@ "expectEvents": [ { "client": "client0", - "ignoreExtraEvents": true, "events": [ { "commandStartedEvent": { @@ -436,7 +432,6 @@ "expectEvents": [ { "client": "client0", - "ignoreExtraEvents": true, "events": [ { "commandStartedEvent": { diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/unified/ChangeStreamsTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/unified/ChangeStreamsTest.java index 5a48dc343af..db5537b12d2 100644 --- a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/unified/ChangeStreamsTest.java +++ b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/unified/ChangeStreamsTest.java @@ -48,6 +48,12 @@ final class ChangeStreamsTest extends UnifiedReactiveStreamsTest { "Test that comment is not set on getMore - pre 4.4" ); + private static final List TESTS_WITH_EXTRA_EVENTS = + Arrays.asList( + "Test with document comment", + "Test with string comment" + ); + private static final List REQUIRES_BATCH_CURSOR_CREATION_WAITING = Arrays.asList( "Change Stream should error when an invalid aggregation stage is passed in", @@ -59,6 +65,7 @@ final class ChangeStreamsTest extends UnifiedReactiveStreamsTest { protected void skips(final String fileDescription, final String testDescription) { assumeFalse(ERROR_REQUIRED_FROM_CHANGE_STREAM_INITIALIZATION_TESTS.contains(testDescription)); assumeFalse(EVENT_SENSITIVE_TESTS.contains(testDescription)); + assumeFalse(TESTS_WITH_EXTRA_EVENTS.contains(testDescription)); } @BeforeEach