Updated unified crud test

rozza · rozza · commit 3672e3f66383 · 2022-04-07T09:25:00.000+01:00
JAVA-4547 JAVA-4548
diff --git a/driver-core/src/test/resources/unified-test-format/crud/aggregate.json b/driver-core/src/test/resources/unified-test-format/crud/aggregate.json
@@ -330,11 +330,7 @@
       "description": "aggregate with comment sets comment on getMore",
       "runOnRequirements": [
         {
-          "minServerVersion": "4.4.0",
-          "topologies": [
-            "single",
-            "replicaset"
-          ]
+          "minServerVersion": "4.4.0"
         }
       ],
       "operations": [
@@ -351,7 +347,9 @@
               }
             ],
             "batchSize": 2,
-            "comment": "comment"
+            "comment": {
+              "content": "test"
+            }
           },
           "object": "collection0",
           "expectResult": [
@@ -398,7 +396,9 @@
                   "cursor": {
                     "batchSize": 2
                   },
-                  "comment": "comment"
+                  "comment": {
+                    "content": "test"
+                  }
                 },
                 "commandName": "aggregate",
                 "databaseName": "aggregate-tests"
@@ -415,7 +415,9 @@
                   },
                   "collection": "coll0",
                   "batchSize": 2,
-                  "comment": "comment"
+                  "comment": {
+                    "content": "test"
+                  }
                 },
                 "commandName": "getMore",
                 "databaseName": "aggregate-tests"
@@ -432,7 +434,9 @@
                   },
                   "collection": "coll0",
                   "batchSize": 2,
-                  "comment": "comment"
+                  "comment": {
+                    "content": "test"
+                  }
                 },
                 "commandName": "getMore",
                 "databaseName": "aggregate-tests"
@@ -443,15 +447,11 @@
       ]
     },
     {
-      "description": "aggregate with comment sets comment on getMore - pre 4.4",
+      "description": "aggregate with comment does not set comment on getMore - pre 4.4",
       "runOnRequirements": [
         {
           "minServerVersion": "3.6.0",
-          "maxServerVersion": "4.4.0",
-          "topologies": [
-            "single",
-            "replicaset"
-          ]
+          "maxServerVersion": "4.3.99"
         }
       ],
       "operations": [
@@ -531,7 +531,10 @@
                     ]
                   },
                   "collection": "coll0",
-                  "batchSize": 2
+                  "batchSize": 2,
+                  "comment": {
+                    "$$exists": false
+                  }
                 },
                 "commandName": "getMore",
                 "databaseName": "aggregate-tests"
@@ -547,7 +550,10 @@
                     ]
                   },
                   "collection": "coll0",
-                  "batchSize": 2
+                  "batchSize": 2,
+                  "comment": {
+                    "$$exists": false
+                  }
                 },
                 "commandName": "getMore",
                 "databaseName": "aggregate-tests"
diff --git a/driver-core/src/test/resources/unified-test-format/crud/bulkWrite-comment.json b/driver-core/src/test/resources/unified-test-format/crud/bulkWrite-comment.json
@@ -414,7 +414,6 @@
       "description": "BulkWrite with comment - pre 4.4",
       "runOnRequirements": [
         {
-          "minServerVersion": "3.6.0",
           "maxServerVersion": "4.2.99"
         }
       ],
diff --git a/driver-core/src/test/resources/unified-test-format/crud/deleteMany-comment.json b/driver-core/src/test/resources/unified-test-format/crud/deleteMany-comment.json
@@ -175,7 +175,6 @@
       "description": "deleteMany with comment - pre 4.4",
       "runOnRequirements": [
         {
-          "minServerVersion": "3.6.0",
           "maxServerVersion": "4.2.99"
         }
       ],
diff --git a/driver-core/src/test/resources/unified-test-format/crud/deleteOne-comment.json b/driver-core/src/test/resources/unified-test-format/crud/deleteOne-comment.json
@@ -177,7 +177,6 @@
       "description": "deleteOne with comment - pre 4.4",
       "runOnRequirements": [
         {
-          "minServerVersion": "3.6.0",
           "maxServerVersion": "4.2.99"
         }
       ],
diff --git a/driver-core/src/test/resources/unified-test-format/crud/find-comment.json b/driver-core/src/test/resources/unified-test-format/crud/find-comment.json
@@ -77,7 +77,7 @@
           },
           "expectResult": [
             {
-              "_id": 1, "x": 11
+              "_id": 1
             }
           ]
         }
@@ -195,15 +195,10 @@
       ]
     },
     {
-      "description": "find with comment sets comment on getMore - pre 4.4",
+      "description": "find with comment sets comment on getMore",
       "runOnRequirements": [
         {
-          "minServerVersion": "3.6.0",
-          "maxServerVersion": "4.4.0",
-          "topologies": [
-            "single",
-            "replicaset"
-          ]
+          "minServerVersion": "4.4.0"
         }
       ],
       "operations": [
@@ -217,7 +212,9 @@
               }
             },
             "batchSize": 2,
-            "comment": "comment"
+            "comment": {
+              "key": "value"
+            }
           },
           "expectResult": [
             {
@@ -257,7 +254,9 @@
                     }
                   },
                   "batchSize": 2,
-                  "comment": "comment"
+                  "comment": {
+                    "key": "value"
+                  }
                 }
               }
             },
@@ -271,7 +270,10 @@
                     ]
                   },
                   "collection": "coll0",
-                  "batchSize": 2
+                  "batchSize": 2,
+                  "comment": {
+                    "key": "value"
+                  }
                 }
               }
             },
@@ -285,7 +287,10 @@
                     ]
                   },
                   "collection": "coll0",
-                  "batchSize": 2
+                  "batchSize": 2,
+                  "comment": {
+                    "key": "value"
+                  }
                 }
               }
             }
@@ -294,14 +299,11 @@
       ]
     },
     {
-      "description": "find with comment sets comment on getMore",
+      "description": "find with comment does not set comment on getMore - pre 4.4",
       "runOnRequirements": [
         {
-          "minServerVersion": "4.4.0",
-          "topologies": [
-            "single",
-            "replicaset"
-          ]
+          "minServerVersion": "3.6.0",
+          "maxServerVersion": "4.3.99"
         }
       ],
       "operations": [
@@ -370,7 +372,9 @@
                   },
                   "collection": "coll0",
                   "batchSize": 2,
-                  "comment": "comment"
+                  "comment": {
+                    "$$exists": false
+                  }
                 }
               }
             },
@@ -385,7 +389,9 @@
                   },
                   "collection": "coll0",
                   "batchSize": 2,
-                  "comment": "comment"
+                  "comment": {
+                    "$$exists": false
+                  }
                 }
               }
             }
diff --git a/driver-core/src/test/resources/unified-test-format/crud/findOneAndReplace-hint-unacknowledged.json b/driver-core/src/test/resources/unified-test-format/crud/findOneAndReplace-hint-unacknowledged.json
@@ -146,9 +146,9 @@
             },
             "hint": "_id_"
           },
-            "expectResult": {
-              "$$unsetOrMatches": null
-            }
+          "expectResult": {
+            "$$unsetOrMatches": null
+          }
         }
       ],
       "expectEvents": [
diff --git a/driver-core/src/test/resources/unified-test-format/crud/insertMany-comment.json b/driver-core/src/test/resources/unified-test-format/crud/insertMany-comment.json
@@ -166,7 +166,6 @@
       "description": "insertMany with comment - pre 4.4",
       "runOnRequirements": [
         {
-          "minServerVersion": "3.6.0",
           "maxServerVersion": "4.2.99"
         }
       ],
diff --git a/driver-core/src/test/resources/unified-test-format/crud/insertOne-comment.json b/driver-core/src/test/resources/unified-test-format/crud/insertOne-comment.json
@@ -162,7 +162,6 @@
       "description": "insertOne with comment - pre 4.4",
       "runOnRequirements": [
         {
-          "minServerVersion": "3.6.0",
           "maxServerVersion": "4.2.99"
         }
       ],
diff --git a/driver-core/src/test/resources/unified-test-format/crud/replaceOne-comment.json b/driver-core/src/test/resources/unified-test-format/crud/replaceOne-comment.json
@@ -166,7 +166,6 @@
       "description": "ReplaceOne with comment - pre 4.4",
       "runOnRequirements": [
         {
-          "minServerVersion": "3.6.0",
           "maxServerVersion": "4.2.99"
         }
       ],
diff --git a/driver-core/src/test/resources/unified-test-format/crud/updateMany-comment.json b/driver-core/src/test/resources/unified-test-format/crud/updateMany-comment.json
@@ -176,7 +176,6 @@
       "description": "UpdateMany with comment - pre 4.4",
       "runOnRequirements": [
         {
-          "minServerVersion": "3.6.0",
           "maxServerVersion": "4.2.99"
         }
       ],
diff --git a/driver-core/src/test/resources/unified-test-format/crud/updateOne-comment.json b/driver-core/src/test/resources/unified-test-format/crud/updateOne-comment.json
@@ -174,7 +174,6 @@
       "description": "UpdateOne with comment - pre 4.4",
       "runOnRequirements": [
         {
-          "minServerVersion": "3.6.0",
           "maxServerVersion": "4.2.99"
         }
       ],

Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,6 @@`
`414`	`414`	`"description": "BulkWrite with comment - pre 4.4",`
`415`	`415`	`"runOnRequirements": [`
`416`	`416`	`{`
`417`		`- "minServerVersion": "3.6.0",`
`418`	`417`	`"maxServerVersion": "4.2.99"`
`419`	`418`	`}`
`420`	`419`	`],`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,6 @@`
`175`	`175`	`"description": "deleteMany with comment - pre 4.4",`
`176`	`176`	`"runOnRequirements": [`
`177`	`177`	`{`
`178`		`- "minServerVersion": "3.6.0",`
`179`	`178`	`"maxServerVersion": "4.2.99"`
`180`	`179`	`}`
`181`	`180`	`],`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,6 @@`
`177`	`177`	`"description": "deleteOne with comment - pre 4.4",`
`178`	`178`	`"runOnRequirements": [`
`179`	`179`	`{`
`180`		`- "minServerVersion": "3.6.0",`
`181`	`180`	`"maxServerVersion": "4.2.99"`
`182`	`181`	`}`
`183`	`182`	`],`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@`
`77`	`77`	`},`
`78`	`78`	`"expectResult": [`
`79`	`79`	`{`
`80`		`- "_id": 1, "x": 11`
	`80`	`+ "_id": 1`
`81`	`81`	`}`
`82`	`82`	`]`
`83`	`83`	`}`
`@@ -195,15 +195,10 @@`
`195`	`195`	`]`
`196`	`196`	`},`
`197`	`197`	`{`
`198`		`- "description": "find with comment sets comment on getMore - pre 4.4",`
	`198`	`+ "description": "find with comment sets comment on getMore",`
`199`	`199`	`"runOnRequirements": [`
`200`	`200`	`{`
`201`		`- "minServerVersion": "3.6.0",`
`202`		`- "maxServerVersion": "4.4.0",`
`203`		`- "topologies": [`
`204`		`- "single",`
`205`		`- "replicaset"`
`206`		`- ]`
	`201`	`+ "minServerVersion": "4.4.0"`
`207`	`202`	`}`
`208`	`203`	`],`
`209`	`204`	`"operations": [`
`@@ -217,7 +212,9 @@`
`217`	`212`	`}`
`218`	`213`	`},`
`219`	`214`	`"batchSize": 2,`
`220`		`- "comment": "comment"`
	`215`	`+ "comment": {`
	`216`	`+ "key": "value"`
	`217`	`+ }`
`221`	`218`	`},`
`222`	`219`	`"expectResult": [`
`223`	`220`	`{`
`@@ -257,7 +254,9 @@`
`257`	`254`	`}`
`258`	`255`	`},`
`259`	`256`	`"batchSize": 2,`
`260`		`- "comment": "comment"`
	`257`	`+ "comment": {`
	`258`	`+ "key": "value"`
	`259`	`+ }`
`261`	`260`	`}`
`262`	`261`	`}`
`263`	`262`	`},`
`@@ -271,7 +270,10 @@`
`271`	`270`	`]`
`272`	`271`	`},`
`273`	`272`	`"collection": "coll0",`
`274`		`- "batchSize": 2`
	`273`	`+ "batchSize": 2,`
	`274`	`+ "comment": {`
	`275`	`+ "key": "value"`
	`276`	`+ }`
`275`	`277`	`}`
`276`	`278`	`}`
`277`	`279`	`},`
`@@ -285,7 +287,10 @@`
`285`	`287`	`]`
`286`	`288`	`},`
`287`	`289`	`"collection": "coll0",`
`288`		`- "batchSize": 2`
	`290`	`+ "batchSize": 2,`
	`291`	`+ "comment": {`
	`292`	`+ "key": "value"`
	`293`	`+ }`
`289`	`294`	`}`
`290`	`295`	`}`
`291`	`296`	`}`
`@@ -294,14 +299,11 @@`
`294`	`299`	`]`
`295`	`300`	`},`
`296`	`301`	`{`
`297`		`- "description": "find with comment sets comment on getMore",`
	`302`	`+ "description": "find with comment does not set comment on getMore - pre 4.4",`
`298`	`303`	`"runOnRequirements": [`
`299`	`304`	`{`
`300`		`- "minServerVersion": "4.4.0",`
`301`		`- "topologies": [`
`302`		`- "single",`
`303`		`- "replicaset"`
`304`		`- ]`
	`305`	`+ "minServerVersion": "3.6.0",`
	`306`	`+ "maxServerVersion": "4.3.99"`
`305`	`307`	`}`
`306`	`308`	`],`
`307`	`309`	`"operations": [`
`@@ -370,7 +372,9 @@`
`370`	`372`	`},`
`371`	`373`	`"collection": "coll0",`
`372`	`374`	`"batchSize": 2,`
`373`		`- "comment": "comment"`
	`375`	`+ "comment": {`
	`376`	`+ "$$exists": false`
	`377`	`+ }`
`374`	`378`	`}`
`375`	`379`	`}`
`376`	`380`	`},`
`@@ -385,7 +389,9 @@`
`385`	`389`	`},`
`386`	`390`	`"collection": "coll0",`
`387`	`391`	`"batchSize": 2,`
`388`		`- "comment": "comment"`
	`392`	`+ "comment": {`
	`393`	`+ "$$exists": false`
	`394`	`+ }`
`389`	`395`	`}`
`390`	`396`	`}`
`391`	`397`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,6 @@`
`166`	`166`	`"description": "insertMany with comment - pre 4.4",`
`167`	`167`	`"runOnRequirements": [`
`168`	`168`	`{`
`169`		`- "minServerVersion": "3.6.0",`
`170`	`169`	`"maxServerVersion": "4.2.99"`
`171`	`170`	`}`
`172`	`171`	`],`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,6 @@`
`162`	`162`	`"description": "insertOne with comment - pre 4.4",`
`163`	`163`	`"runOnRequirements": [`
`164`	`164`	`{`
`165`		`- "minServerVersion": "3.6.0",`
`166`	`165`	`"maxServerVersion": "4.2.99"`
`167`	`166`	`}`
`168`	`167`	`],`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,6 @@`
`176`	`176`	`"description": "UpdateMany with comment - pre 4.4",`
`177`	`177`	`"runOnRequirements": [`
`178`	`178`	`{`
`179`		`- "minServerVersion": "3.6.0",`
`180`	`179`	`"maxServerVersion": "4.2.99"`
`181`	`180`	`}`
`182`	`181`	`],`