Sync unified change-streams tests (#1550)

Author: katcharov

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"
       ],

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"
       ],

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"
           ]
         }

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"

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"

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"

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"
           ]
         }

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": {

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