Sync unified change-streams tests (#1550)

katcharov · web-flow · commit 4c16a45ece25 · 2024-10-31T16:00:16.000-06:00
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -48,6 +48,12 @@ final class ChangeStreamsTest extends UnifiedReactiveStreamsTest {
                     "Test that comment is not set on getMore - pre 4.4"
             );
 
+    private static final List<String> TESTS_WITH_EXTRA_EVENTS =
+            Arrays.asList(
+                    "Test with document comment",
+                    "Test with string comment"
+            );
+
     private static final List<String> 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

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@`
`145`	`145`	`"minServerVersion": "4.1.11",`
`146`	`146`	`"topologies": [`
`147`	`147`	`"replicaset",`
`148`		`- "sharded-replicaset",`
	`148`	`+ "sharded",`
`149`	`149`	`"load-balanced"`
`150`	`150`	`]`
`151`	`151`	`}`
`@@ -190,7 +190,7 @@`
`190`	`190`	`"minServerVersion": "4.2",`
`191`	`191`	`"topologies": [`
`192`	`192`	`"replicaset",`
`193`		`- "sharded-replicaset",`
	`193`	`+ "sharded",`
`194`	`194`	`"load-balanced"`
`195`	`195`	`]`
`196`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`"minServerVersion": "6.0.0",`
`7`	`7`	`"topologies": [`
`8`	`8`	`"replicaset",`
`9`		`- "sharded-replicaset",`
`10`	`9`	`"sharded"`
`11`	`10`	`],`
`12`	`11`	`"serverless": "forbid"`
`@@ -463,7 +462,6 @@`
`463`	`462`	`"runOnRequirements": [`
`464`	`463`	`{`
`465`	`464`	`"topologies": [`
`466`		`- "sharded-replicaset",`
`467`	`465`	`"sharded"`
`468`	`466`	`]`
`469`	`467`	`}`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,6 @@`
`210`	`210`	`"expectEvents": [`
`211`	`211`	`{`
`212`	`212`	`"client": "client0",`
`213`		`- "ignoreExtraEvents": true,`
`214`	`213`	`"events": [`
`215`	`214`	`{`
`216`	`215`	`"commandStartedEvent": {`
`@@ -256,7 +255,6 @@`
`256`	`255`	`"expectEvents": [`
`257`	`256`	`{`
`258`	`257`	`"client": "client0",`
`259`		`- "ignoreExtraEvents": true,`
`260`	`258`	`"events": [`
`261`	`259`	`{`
`262`	`260`	`"commandStartedEvent": {`
`@@ -293,7 +291,6 @@`
`293`	`291`	`"expectEvents": [`
`294`	`292`	`{`
`295`	`293`	`"client": "client0",`
`296`		`- "ignoreExtraEvents": true,`
`297`	`294`	`"events": [`
`298`	`295`	`{`
`299`	`296`	`"commandStartedEvent": {`
`@@ -349,7 +346,6 @@`
`349`	`346`	`"expectEvents": [`
`350`	`347`	`{`
`351`	`348`	`"client": "client0",`
`352`		`- "ignoreExtraEvents": true,`
`353`	`349`	`"events": [`
`354`	`350`	`{`
`355`	`351`	`"commandStartedEvent": {`
`@@ -436,7 +432,6 @@`
`436`	`432`	`"expectEvents": [`
`437`	`433`	`{`
`438`	`434`	`"client": "client0",`
`439`		`- "ignoreExtraEvents": true,`
`440`	`435`	`"events": [`
`441`	`436`	`{`
`442`	`437`	`"commandStartedEvent": {`