CDRIVER-4051 Sync valid-pass and CRUD unified tests (#819)

jmikola · kevinAlbs · commit 0caddece1a92 · 2021-07-12T20:54:03.000-04:00
Synced with mongodb/specifications@44f8310
diff --git a/src/libmongoc/tests/json/crud/unified/insertMany-dots_and_dollars.json b/src/libmongoc/tests/json/crud/unified/insertMany-dots_and_dollars.json
@@ -53,10 +53,11 @@
             ]
           },
           "expectResult": {
-            "insertedCount": 1,
-            "insertedIds": {
-              "$$unsetOrMatches": {
-                "0": 1
+            "$$unsetOrMatches": {
+              "insertedIds": {
+                "$$unsetOrMatches": {
+                  "0": 1
+                }
               }
             }
           }
@@ -162,10 +163,11 @@
             ]
           },
           "expectResult": {
-            "insertedCount": 1,
-            "insertedIds": {
-              "$$unsetOrMatches": {
-                "0": 1
+            "$$unsetOrMatches": {
+              "insertedIds": {
+                "$$unsetOrMatches": {
+                  "0": 1
+                }
               }
             }
           }
@@ -221,10 +223,11 @@
             ]
           },
           "expectResult": {
-            "insertedCount": 1,
-            "insertedIds": {
-              "$$unsetOrMatches": {
-                "0": 1
+            "$$unsetOrMatches": {
+              "insertedIds": {
+                "$$unsetOrMatches": {
+                  "0": 1
+                }
               }
             }
           }
@@ -284,10 +287,11 @@
             ]
           },
           "expectResult": {
-            "insertedCount": 1,
-            "insertedIds": {
-              "$$unsetOrMatches": {
-                "0": 1
+            "$$unsetOrMatches": {
+              "insertedIds": {
+                "$$unsetOrMatches": {
+                  "0": 1
+                }
               }
             }
           }
diff --git a/src/libmongoc/tests/json/crud/unified/insertOne-dots_and_dollars.json b/src/libmongoc/tests/json/crud/unified/insertOne-dots_and_dollars.json
@@ -63,8 +63,10 @@
             }
           },
           "expectResult": {
-            "insertedId": {
-              "$$unsetOrMatches": 1
+            "$$unsetOrMatches": {
+              "insertedId": {
+                "$$unsetOrMatches": 1
+              }
             }
           }
         }
@@ -165,8 +167,10 @@
             }
           },
           "expectResult": {
-            "insertedId": {
-              "$$unsetOrMatches": 1
+            "$$unsetOrMatches": {
+              "insertedId": {
+                "$$unsetOrMatches": 1
+              }
             }
           }
         }
@@ -219,8 +223,10 @@
             }
           },
           "expectResult": {
-            "insertedId": {
-              "$$unsetOrMatches": 1
+            "$$unsetOrMatches": {
+              "insertedId": {
+                "$$unsetOrMatches": 1
+              }
             }
           }
         }
@@ -277,8 +283,10 @@
             }
           },
           "expectResult": {
-            "insertedId": {
-              "$$unsetOrMatches": 1
+            "$$unsetOrMatches": {
+              "insertedId": {
+                "$$unsetOrMatches": 1
+              }
             }
           }
         }
@@ -386,9 +394,11 @@
             }
           },
           "expectResult": {
-            "insertedId": {
-              "$$unsetOrMatches": {
-                "a.b": 1
+            "$$unsetOrMatches": {
+              "insertedId": {
+                "$$unsetOrMatches": {
+                  "a.b": 1
+                }
               }
             }
           }
@@ -496,8 +506,10 @@
             }
           },
           "expectResult": {
-            "insertedId": {
-              "$$unsetOrMatches": 1
+            "$$unsetOrMatches": {
+              "insertedId": {
+                "$$unsetOrMatches": 1
+              }
             }
           }
         }
@@ -558,8 +570,10 @@
             }
           },
           "expectResult": {
-            "acknowledged": {
-              "$$unsetOrMatches": false
+            "$$unsetOrMatches": {
+              "acknowledged": {
+                "$$unsetOrMatches": false
+              }
             }
           }
         }
diff --git a/src/libmongoc/tests/json/unified/poc-crud.json b/src/libmongoc/tests/json/unified/poc-crud.json
@@ -242,12 +242,14 @@
           },
           "expectError": {
             "expectResult": {
-              "deletedCount": 0,
-              "insertedCount": 2,
-              "matchedCount": 0,
-              "modifiedCount": 0,
-              "upsertedCount": 0,
-              "upsertedIds": {}
+              "$$unsetOrMatches": {
+                "deletedCount": 0,
+                "insertedCount": 2,
+                "matchedCount": 0,
+                "modifiedCount": 0,
+                "upsertedCount": 0,
+                "upsertedIds": {}
+              }
             }
           }
         }
diff --git a/src/libmongoc/tests/json/unified/poc-retryable-writes.json b/src/libmongoc/tests/json/unified/poc-retryable-writes.json
@@ -298,9 +298,6 @@
           },
           "expectResult": {
             "$$unsetOrMatches": {
-              "insertedCount": {
-                "$$unsetOrMatches": 2
-              },
               "insertedIds": {
                 "$$unsetOrMatches": {
                   "0": 3,

Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,11 @@`
`53`	`53`	`]`
`54`	`54`	`},`
`55`	`55`	`"expectResult": {`
`56`		`- "insertedCount": 1,`
`57`		`- "insertedIds": {`
`58`		`- "$$unsetOrMatches": {`
`59`		`- "0": 1`
	`56`	`+ "$$unsetOrMatches": {`
	`57`	`+ "insertedIds": {`
	`58`	`+ "$$unsetOrMatches": {`
	`59`	`+ "0": 1`
	`60`	`+ }`
`60`	`61`	`}`
`61`	`62`	`}`
`62`	`63`	`}`
`@@ -162,10 +163,11 @@`
`162`	`163`	`]`
`163`	`164`	`},`
`164`	`165`	`"expectResult": {`
`165`		`- "insertedCount": 1,`
`166`		`- "insertedIds": {`
`167`		`- "$$unsetOrMatches": {`
`168`		`- "0": 1`
	`166`	`+ "$$unsetOrMatches": {`
	`167`	`+ "insertedIds": {`
	`168`	`+ "$$unsetOrMatches": {`
	`169`	`+ "0": 1`
	`170`	`+ }`
`169`	`171`	`}`
`170`	`172`	`}`
`171`	`173`	`}`
`@@ -221,10 +223,11 @@`
`221`	`223`	`]`
`222`	`224`	`},`
`223`	`225`	`"expectResult": {`
`224`		`- "insertedCount": 1,`
`225`		`- "insertedIds": {`
`226`		`- "$$unsetOrMatches": {`
`227`		`- "0": 1`
	`226`	`+ "$$unsetOrMatches": {`
	`227`	`+ "insertedIds": {`
	`228`	`+ "$$unsetOrMatches": {`
	`229`	`+ "0": 1`
	`230`	`+ }`
`228`	`231`	`}`
`229`	`232`	`}`
`230`	`233`	`}`
`@@ -284,10 +287,11 @@`
`284`	`287`	`]`
`285`	`288`	`},`
`286`	`289`	`"expectResult": {`
`287`		`- "insertedCount": 1,`
`288`		`- "insertedIds": {`
`289`		`- "$$unsetOrMatches": {`
`290`		`- "0": 1`
	`290`	`+ "$$unsetOrMatches": {`
	`291`	`+ "insertedIds": {`
	`292`	`+ "$$unsetOrMatches": {`
	`293`	`+ "0": 1`
	`294`	`+ }`
`291`	`295`	`}`
`292`	`296`	`}`
`293`	`297`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,10 @@`
`63`	`63`	`}`
`64`	`64`	`},`
`65`	`65`	`"expectResult": {`
`66`		`- "insertedId": {`
`67`		`- "$$unsetOrMatches": 1`
	`66`	`+ "$$unsetOrMatches": {`
	`67`	`+ "insertedId": {`
	`68`	`+ "$$unsetOrMatches": 1`
	`69`	`+ }`
`68`	`70`	`}`
`69`	`71`	`}`
`70`	`72`	`}`
`@@ -165,8 +167,10 @@`
`165`	`167`	`}`
`166`	`168`	`},`
`167`	`169`	`"expectResult": {`
`168`		`- "insertedId": {`
`169`		`- "$$unsetOrMatches": 1`
	`170`	`+ "$$unsetOrMatches": {`
	`171`	`+ "insertedId": {`
	`172`	`+ "$$unsetOrMatches": 1`
	`173`	`+ }`
`170`	`174`	`}`
`171`	`175`	`}`
`172`	`176`	`}`
`@@ -219,8 +223,10 @@`
`219`	`223`	`}`
`220`	`224`	`},`
`221`	`225`	`"expectResult": {`
`222`		`- "insertedId": {`
`223`		`- "$$unsetOrMatches": 1`
	`226`	`+ "$$unsetOrMatches": {`
	`227`	`+ "insertedId": {`
	`228`	`+ "$$unsetOrMatches": 1`
	`229`	`+ }`
`224`	`230`	`}`
`225`	`231`	`}`
`226`	`232`	`}`
`@@ -277,8 +283,10 @@`
`277`	`283`	`}`
`278`	`284`	`},`
`279`	`285`	`"expectResult": {`
`280`		`- "insertedId": {`
`281`		`- "$$unsetOrMatches": 1`
	`286`	`+ "$$unsetOrMatches": {`
	`287`	`+ "insertedId": {`
	`288`	`+ "$$unsetOrMatches": 1`
	`289`	`+ }`
`282`	`290`	`}`
`283`	`291`	`}`
`284`	`292`	`}`
`@@ -386,9 +394,11 @@`
`386`	`394`	`}`
`387`	`395`	`},`
`388`	`396`	`"expectResult": {`
`389`		`- "insertedId": {`
`390`		`- "$$unsetOrMatches": {`
`391`		`- "a.b": 1`
	`397`	`+ "$$unsetOrMatches": {`
	`398`	`+ "insertedId": {`
	`399`	`+ "$$unsetOrMatches": {`
	`400`	`+ "a.b": 1`
	`401`	`+ }`
`392`	`402`	`}`
`393`	`403`	`}`
`394`	`404`	`}`
`@@ -496,8 +506,10 @@`
`496`	`506`	`}`
`497`	`507`	`},`
`498`	`508`	`"expectResult": {`
`499`		`- "insertedId": {`
`500`		`- "$$unsetOrMatches": 1`
	`509`	`+ "$$unsetOrMatches": {`
	`510`	`+ "insertedId": {`
	`511`	`+ "$$unsetOrMatches": 1`
	`512`	`+ }`
`501`	`513`	`}`
`502`	`514`	`}`
`503`	`515`	`}`
`@@ -558,8 +570,10 @@`
`558`	`570`	`}`
`559`	`571`	`},`
`560`	`572`	`"expectResult": {`
`561`		`- "acknowledged": {`
`562`		`- "$$unsetOrMatches": false`
	`573`	`+ "$$unsetOrMatches": {`
	`574`	`+ "acknowledged": {`
	`575`	`+ "$$unsetOrMatches": false`
	`576`	`+ }`
`563`	`577`	`}`
`564`	`578`	`}`
`565`	`579`	`}`