DRIVERS-2192 Fix comment helper specification tests (#1137)

mongodb · Feb 8, 2022 · 96caeef · 96caeef
1 parent 71c67c0
commit 96caeef
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 94 deletions.
diff --git a/source/crud/tests/unified/bulkWrite-comment.json b/source/crud/tests/unified/bulkWrite-comment.json
@@ -88,7 +88,9 @@
                     "_id": 2
                   },
                   "update": {
-                    "x": "updated"
+                    "$set": {
+                      "x": "updated"
+                    }
                   }
                 }
               },
@@ -106,7 +108,9 @@
             "deletedCount": 1,
             "insertedCount": 1,
             "insertedIds": {
-              "0": 5
+              "$$unsetOrMatches": {
+                "0": 5
+              }
             },
             "matchedCount": 2,
             "modifiedCount": 2,
@@ -147,24 +151,15 @@
                         "_id": 1,
                         "x": "replaced"
                       }
-                    }
-                  ],
-                  "ordered": true,
-                  "comment": "comment"
-                }
-              }
-            },
-            {
-              "commandStartedEvent": {
-                "command": {
-                  "update": "BulkWrite_comment",
-                  "updates": [
+                    },
                     {
                       "q": {
                         "_id": 2
                       },
                       "u": {
-                        "x": "updated"
+                        "$set": {
+                          "x": "updated"
+                        }
                       }
                     }
                   ],
@@ -181,7 +176,8 @@
                     {
                       "q": {
                         "_id": 3
-                      }
+                      },
+                      "limit": 1
                     }
                   ],
                   "ordered": true,
@@ -255,7 +251,9 @@
                     "_id": 2
                   },
                   "update": {
-                    "x": "updated"
+                    "$set": {
+                      "x": "updated"
+                    }
                   }
                 }
               },
@@ -275,7 +273,9 @@
             "deletedCount": 1,
             "insertedCount": 1,
             "insertedIds": {
-              "0": 5
+              "$$unsetOrMatches": {
+                "0": 5
+              }
             },
             "matchedCount": 2,
             "modifiedCount": 2,
@@ -318,26 +318,15 @@
                         "_id": 1,
                         "x": "replaced"
                       }
-                    }
-                  ],
-                  "ordered": true,
-                  "comment": {
-                    "key": "value"
-                  }
-                }
-              }
-            },
-            {
-              "commandStartedEvent": {
-                "command": {
-                  "update": "BulkWrite_comment",
-                  "updates": [
+                    },
                     {
                       "q": {
                         "_id": 2
                       },
                       "u": {
-                        "x": "updated"
+                        "$set": {
+                          "x": "updated"
+                        }
                       }
                     }
                   ],
@@ -356,7 +345,8 @@
                     {
                       "q": {
                         "_id": 3
-                      }
+                      },
+                      "limit": 1
                     }
                   ],
                   "ordered": true,
@@ -432,7 +422,9 @@
                     "_id": 2
                   },
                   "update": {
-                    "x": "updated"
+                    "$set": {
+                      "x": "updated"
+                    }
                   }
                 }
               },

diff --git a/source/crud/tests/unified/bulkWrite-comment.yml b/source/crud/tests/unified/bulkWrite-comment.yml
@@ -48,15 +48,15 @@ tests:
             - updateOne:
                 filter: &updateOne_filter
                   _id: 2
-                update: &update { x: "updated" }
+                update: &update { $set: {x: "updated"} }
             - deleteOne:
                 filter: &deleteOne_filter
                   _id: 3
           comment: &string_comment "comment"
         expectResult: &expect_results
           deletedCount: 1
           insertedCount: 1
-          insertedIds: { 0: 5 }
+          insertedIds: { $$unsetOrMatches: { 0: 5} }
           matchedCount: 2
           modifiedCount: 2
           upsertedCount: 0
@@ -77,12 +77,6 @@ tests:
                 updates:
                   - q: *replaceOne_filter
                     u: *replacement
-                ordered: true
-                comment: *string_comment
-          - commandStartedEvent:
-              command:
-                update: *collection_name
-                updates:
                   - q: *updateOne_filter
                     u: *update
                 ordered: true
@@ -92,6 +86,7 @@ tests:
                 delete: *collection_name
                 deletes:
                   - q: *deleteOne_filter
+                    limit: 1
                 ordered: true
                 comment: *string_comment
     outcome: &outcome
@@ -133,12 +128,6 @@ tests:
                 updates:
                   - q: *replaceOne_filter
                     u: *replacement
-                ordered: true
-                comment: *document_comment
-          - commandStartedEvent:
-              command:
-                update: *collection_name
-                updates:
                   - q: *updateOne_filter
                     u: *update
                 ordered: true
@@ -148,6 +137,7 @@ tests:
                 delete: *collection_name
                 deletes:
                   - q: *deleteOne_filter
+                    limit: 1
                 ordered: true
                 comment: *document_comment
     outcome: *outcome

diff --git a/source/crud/tests/unified/updateMany-comment.json b/source/crud/tests/unified/updateMany-comment.json
@@ -53,13 +53,11 @@
             "filter": {
               "_id": 1
             },
-            "update": [
-              {
-                "$set": {
-                  "x": 22
-                }
+            "update": {
+              "$set": {
+                "x": 22
               }
-            ],
+            },
             "comment": "comment"
           }
         }
@@ -77,13 +75,12 @@
                       "q": {
                         "_id": 1
                       },
-                      "u": [
-                        {
-                          "$set": {
-                            "x": 22
-                          }
+                      "u": {
+                        "$set": {
+                          "x": 22
                         }
-                      ]
+                      },
+                      "multi": true
                     }
                   ],
                   "comment": "comment"
@@ -121,13 +118,11 @@
             "filter": {
               "_id": 1
             },
-            "update": [
-              {
-                "$set": {
-                  "x": 22
-                }
+            "update": {
+              "$set": {
+                "x": 22
               }
-            ],
+            },
             "comment": {
               "key": "value"
             }
@@ -147,13 +142,12 @@
                       "q": {
                         "_id": 1
                       },
-                      "u": [
-                        {
-                          "$set": {
-                            "x": 22
-                          }
+                      "u": {
+                        "$set": {
+                          "x": 22
                         }
-                      ]
+                      },
+                      "multi": true
                     }
                   ],
                   "comment": {
@@ -193,13 +187,11 @@
             "filter": {
               "_id": 1
             },
-            "update": [
-              {
-                "$set": {
-                  "x": 22
-                }
+            "update": {
+              "$set": {
+                "x": 22
               }
-            ],
+            },
             "comment": "comment"
           },
           "expectError": {
@@ -220,13 +212,12 @@
                       "q": {
                         "_id": 1
                       },
-                      "u": [
-                        {
-                          "$set": {
-                            "x": 22
-                          }
+                      "u": {
+                        "$set": {
+                          "x": 22
                         }
-                      ]
+                      },
+                      "multi": true
                     }
                   ],
                   "comment": "comment"

diff --git a/source/crud/tests/unified/updateMany-comment.yml b/source/crud/tests/unified/updateMany-comment.yml
@@ -29,8 +29,7 @@ tests:
         object: *collection0
         arguments:
           filter: &filter { _id: 1 }
-          update: &update
-            - $set: { x: 22 }
+          update: &update { $set: {x: 22} }
           comment: "comment"
     expectEvents:
       - client: *client0
@@ -42,6 +41,7 @@ tests:
                   -
                     q: *filter
                     u: *update
+                    multi: true
                 comment: "comment"
     outcome: &outcome
       - collectionName: *collection0Name
@@ -69,6 +69,7 @@ tests:
                   -
                     q: *filter
                     u: *update
+                    multi: true
                 comment: *comment
     outcome: *outcome
 
@@ -94,5 +95,6 @@ tests:
                   -
                     q: *filter
                     u: *update
+                    multi: true
                 comment: "comment"
     outcome: *initialData