Use $$unsetOrMatches for upsert and multi in spec tests (#922)

jyemin · web-flow · commit 7fb524716405 · 2022-04-18T17:00:54.000-04:00
* Modifications made in a previous commit of bulkWrite-comment.json had to be preserved, so this is not an exact copy of the spec tests * Modifications to require minServerVersion of 3.6 also had to be preserved, since Java driver still supports older server versions JAVA-4568
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
@@ -151,6 +151,12 @@
                       "u": {
                         "_id": 1,
                         "x": "replaced"
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
                       }
                     }
                   ],
@@ -172,6 +178,12 @@
                         "$set": {
                           "x": "updated"
                         }
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
                       }
                     }
                   ],
@@ -330,6 +342,12 @@
                       "u": {
                         "_id": 1,
                         "x": "replaced"
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
                       }
                     }
                   ],
@@ -353,6 +371,12 @@
                         "$set": {
                           "x": "updated"
                         }
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
                       }
                     }
                   ],
diff --git a/driver-core/src/test/resources/unified-test-format/crud/bulkWrite-replaceOne-let.json b/driver-core/src/test/resources/unified-test-format/crud/bulkWrite-replaceOne-let.json
@@ -95,6 +95,12 @@
                       },
                       "u": {
                         "x": 3
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
                       }
                     }
                   ],
@@ -183,6 +189,12 @@
                       },
                       "u": {
                         "x": 3
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
                       }
                     }
                   ],
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
@@ -75,6 +75,12 @@
                       },
                       "u": {
                         "x": 22
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
                       }
                     }
                   ],
@@ -137,6 +143,12 @@
                       },
                       "u": {
                         "x": 22
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
                       }
                     }
                   ],
@@ -203,6 +215,12 @@
                       },
                       "u": {
                         "x": 22
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
                       }
                     }
                   ],
diff --git a/driver-core/src/test/resources/unified-test-format/crud/replaceOne-let.json b/driver-core/src/test/resources/unified-test-format/crud/replaceOne-let.json
@@ -94,6 +94,12 @@
                       },
                       "u": {
                         "x": "foo"
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
                       }
                     }
                   ],
@@ -176,6 +182,12 @@
                       },
                       "u": {
                         "x": "foo"
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
                       }
                     }
                   ],
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
@@ -80,7 +80,10 @@
                           "x": 22
                         }
                       },
-                      "multi": true
+                      "multi": true,
+                      "upsert": {
+                        "$$unsetOrMatches": false
+                      }
                     }
                   ],
                   "comment": "comment"
@@ -147,7 +150,10 @@
                           "x": 22
                         }
                       },
-                      "multi": true
+                      "multi": true,
+                      "upsert": {
+                        "$$unsetOrMatches": false
+                      }
                     }
                   ],
                   "comment": {
@@ -218,7 +224,10 @@
                           "x": 22
                         }
                       },
-                      "multi": true
+                      "multi": true,
+                      "upsert": {
+                        "$$unsetOrMatches": false
+                      }
                     }
                   ],
                   "comment": "comment"
diff --git a/driver-core/src/test/resources/unified-test-format/crud/updateMany-let.json b/driver-core/src/test/resources/unified-test-format/crud/updateMany-let.json
@@ -114,7 +114,10 @@
                           }
                         }
                       ],
-                      "multi": true
+                      "multi": true,
+                      "upsert": {
+                        "$$unsetOrMatches": false
+                      }
                     }
                   ],
                   "let": {
@@ -207,7 +210,10 @@
                           }
                         }
                       ],
-                      "multi": true
+                      "multi": true,
+                      "upsert": {
+                        "$$unsetOrMatches": false
+                      }
                     }
                   ],
                   "let": {
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
@@ -79,6 +79,12 @@
                         "$set": {
                           "x": 22
                         }
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
                       }
                     }
                   ],
@@ -145,6 +151,12 @@
                         "$set": {
                           "x": 22
                         }
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
                       }
                     }
                   ],
@@ -215,6 +227,12 @@
                         "$set": {
                           "x": 22
                         }
+                      },
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
                       }
                     }
                   ],
diff --git a/driver-core/src/test/resources/unified-test-format/crud/updateOne-let.json b/driver-core/src/test/resources/unified-test-format/crud/updateOne-let.json
@@ -103,7 +103,13 @@
                             "x": "$$x"
                           }
                         }
-                      ]
+                      ],
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
+                      }
                     }
                   ],
                   "let": {
@@ -184,7 +190,13 @@
                             "x": "$$x"
                           }
                         }
-                      ]
+                      ],
+                      "multi": {
+                        "$$unsetOrMatches": false
+                      },
+                      "upsert": {
+                        "$$unsetOrMatches": false
+                      }
                     }
                   ],
                   "let": {

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,12 @@`
`151`	`151`	`"u": {`
`152`	`152`	`"_id": 1,`
`153`	`153`	`"x": "replaced"`
	`154`	`+ },`
	`155`	`+ "multi": {`
	`156`	`+ "$$unsetOrMatches": false`
	`157`	`+ },`
	`158`	`+ "upsert": {`
	`159`	`+ "$$unsetOrMatches": false`
`154`	`160`	`}`
`155`	`161`	`}`
`156`	`162`	`],`
`@@ -172,6 +178,12 @@`
`172`	`178`	`"$set": {`
`173`	`179`	`"x": "updated"`
`174`	`180`	`}`
	`181`	`+ },`
	`182`	`+ "multi": {`
	`183`	`+ "$$unsetOrMatches": false`
	`184`	`+ },`
	`185`	`+ "upsert": {`
	`186`	`+ "$$unsetOrMatches": false`
`175`	`187`	`}`
`176`	`188`	`}`
`177`	`189`	`],`
`@@ -330,6 +342,12 @@`
`330`	`342`	`"u": {`
`331`	`343`	`"_id": 1,`
`332`	`344`	`"x": "replaced"`
	`345`	`+ },`
	`346`	`+ "multi": {`
	`347`	`+ "$$unsetOrMatches": false`
	`348`	`+ },`
	`349`	`+ "upsert": {`
	`350`	`+ "$$unsetOrMatches": false`
`333`	`351`	`}`
`334`	`352`	`}`
`335`	`353`	`],`
`@@ -353,6 +371,12 @@`
`353`	`371`	`"$set": {`
`354`	`372`	`"x": "updated"`
`355`	`373`	`}`
	`374`	`+ },`
	`375`	`+ "multi": {`
	`376`	`+ "$$unsetOrMatches": false`
	`377`	`+ },`
	`378`	`+ "upsert": {`
	`379`	`+ "$$unsetOrMatches": false`
`356`	`380`	`}`
`357`	`381`	`}`
`358`	`382`	`],`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,10 @@`
`80`	`80`	`"x": 22`
`81`	`81`	`}`
`82`	`82`	`},`
`83`		`- "multi": true`
	`83`	`+ "multi": true,`
	`84`	`+ "upsert": {`
	`85`	`+ "$$unsetOrMatches": false`
	`86`	`+ }`
`84`	`87`	`}`
`85`	`88`	`],`
`86`	`89`	`"comment": "comment"`
`@@ -147,7 +150,10 @@`
`147`	`150`	`"x": 22`
`148`	`151`	`}`
`149`	`152`	`},`
`150`		`- "multi": true`
	`153`	`+ "multi": true,`
	`154`	`+ "upsert": {`
	`155`	`+ "$$unsetOrMatches": false`
	`156`	`+ }`
`151`	`157`	`}`
`152`	`158`	`],`
`153`	`159`	`"comment": {`
`@@ -218,7 +224,10 @@`
`218`	`224`	`"x": 22`
`219`	`225`	`}`
`220`	`226`	`},`
`221`		`- "multi": true`
	`227`	`+ "multi": true,`
	`228`	`+ "upsert": {`
	`229`	`+ "$$unsetOrMatches": false`
	`230`	`+ }`
`222`	`231`	`}`
`223`	`232`	`],`
`224`	`233`	`"comment": "comment"`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,10 @@`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`	`],`
`117`		`- "multi": true`
	`117`	`+ "multi": true,`
	`118`	`+ "upsert": {`
	`119`	`+ "$$unsetOrMatches": false`
	`120`	`+ }`
`118`	`121`	`}`
`119`	`122`	`],`
`120`	`123`	`"let": {`
`@@ -207,7 +210,10 @@`
`207`	`210`	`}`
`208`	`211`	`}`
`209`	`212`	`],`
`210`		`- "multi": true`
	`213`	`+ "multi": true,`
	`214`	`+ "upsert": {`
	`215`	`+ "$$unsetOrMatches": false`
	`216`	`+ }`
`211`	`217`	`}`
`212`	`218`	`],`
`213`	`219`	`"let": {`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,12 @@`
`79`	`79`	`"$set": {`
`80`	`80`	`"x": 22`
`81`	`81`	`}`
	`82`	`+ },`
	`83`	`+ "multi": {`
	`84`	`+ "$$unsetOrMatches": false`
	`85`	`+ },`
	`86`	`+ "upsert": {`
	`87`	`+ "$$unsetOrMatches": false`
`82`	`88`	`}`
`83`	`89`	`}`
`84`	`90`	`],`
`@@ -145,6 +151,12 @@`
`145`	`151`	`"$set": {`
`146`	`152`	`"x": 22`
`147`	`153`	`}`
	`154`	`+ },`
	`155`	`+ "multi": {`
	`156`	`+ "$$unsetOrMatches": false`
	`157`	`+ },`
	`158`	`+ "upsert": {`
	`159`	`+ "$$unsetOrMatches": false`
`148`	`160`	`}`
`149`	`161`	`}`
`150`	`162`	`],`
`@@ -215,6 +227,12 @@`
`215`	`227`	`"$set": {`
`216`	`228`	`"x": 22`
`217`	`229`	`}`
	`230`	`+ },`
	`231`	`+ "multi": {`
	`232`	`+ "$$unsetOrMatches": false`
	`233`	`+ },`
	`234`	`+ "upsert": {`
	`235`	`+ "$$unsetOrMatches": false`
`218`	`236`	`}`
`219`	`237`	`}`
`220`	`238`	`],`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,13 @@`
`103`	`103`	`"x": "$$x"`
`104`	`104`	`}`
`105`	`105`	`}`
`106`		`- ]`
	`106`	`+ ],`
	`107`	`+ "multi": {`
	`108`	`+ "$$unsetOrMatches": false`
	`109`	`+ },`
	`110`	`+ "upsert": {`
	`111`	`+ "$$unsetOrMatches": false`
	`112`	`+ }`
`107`	`113`	`}`
`108`	`114`	`],`
`109`	`115`	`"let": {`
`@@ -184,7 +190,13 @@`
`184`	`190`	`"x": "$$x"`
`185`	`191`	`}`
`186`	`192`	`}`
`187`		`- ]`
	`193`	`+ ],`
	`194`	`+ "multi": {`
	`195`	`+ "$$unsetOrMatches": false`
	`196`	`+ },`
	`197`	`+ "upsert": {`
	`198`	`+ "$$unsetOrMatches": false`
	`199`	`+ }`
`188`	`200`	`}`
`189`	`201`	`],`
`190`	`202`	`"let": {`