Re-sync APM tests for removed upsert/multi fields with

jstewart148 · jstewart148 · commit c0d49e2a1b88 · 2019-11-20T10:37:10.000-05:00
default values in update commands JAVA-3202
diff --git a/driver-core/src/test/resources/command-monitoring/bulkWrite.json b/driver-core/src/test/resources/command-monitoring/bulkWrite.json
@@ -86,9 +86,7 @@
                     "$set": {
                       "x": 333
                     }
-                  },
-                  "upsert": false,
-                  "multi": false
+                  }
                 }
               ],
               "ordered": true
diff --git a/driver-core/src/test/resources/command-monitoring/updateMany.json b/driver-core/src/test/resources/command-monitoring/updateMany.json
@@ -51,8 +51,7 @@
                       "x": 1
                     }
                   },
-                  "multi": true,
-                  "upsert": false
+                  "multi": true
                 }
               ]
             },
@@ -63,7 +62,7 @@
         {
           "command_succeeded_event": {
             "reply": {
-              "ok": 1.0,
+              "ok": 1,
               "n": 2
             },
             "command_name": "update"
@@ -106,8 +105,7 @@
                       "x": 1
                     }
                   },
-                  "multi": true,
-                  "upsert": false
+                  "multi": true
                 }
               ]
             },
@@ -118,7 +116,7 @@
         {
           "command_succeeded_event": {
             "reply": {
-              "ok": 1.0,
+              "ok": 1,
               "n": 0,
               "writeErrors": [
                 {
diff --git a/driver-core/src/test/resources/command-monitoring/updateOne.json b/driver-core/src/test/resources/command-monitoring/updateOne.json
@@ -50,9 +50,7 @@
                     "$inc": {
                       "x": 1
                     }
-                  },
-                  "multi": false,
-                  "upsert": false
+                  }
                 }
               ]
             },
@@ -63,7 +61,7 @@
         {
           "command_succeeded_event": {
             "reply": {
-              "ok": 1.0,
+              "ok": 1,
               "n": 1
             },
             "command_name": "update"
@@ -103,7 +101,6 @@
                       "x": 1
                     }
                   },
-                  "multi": false,
                   "upsert": true
                 }
               ]
@@ -115,7 +112,7 @@
         {
           "command_succeeded_event": {
             "reply": {
-              "ok": 1.0,
+              "ok": 1,
               "n": 1,
               "upserted": [
                 {
@@ -163,9 +160,7 @@
                     "$nothing": {
                       "x": 1
                     }
-                  },
-                  "multi": false,
-                  "upsert": false
+                  }
                 }
               ]
             },
@@ -176,7 +171,7 @@
         {
           "command_succeeded_event": {
             "reply": {
-              "ok": 1.0,
+              "ok": 1,
               "n": 0,
               "writeErrors": [
                 {

Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,7 @@`
`86`	`86`	`"$set": {`
`87`	`87`	`"x": 333`
`88`	`88`	`}`
`89`		`- },`
`90`		`- "upsert": false,`
`91`		`- "multi": false`
	`89`	`+ }`
`92`	`90`	`}`
`93`	`91`	`],`
`94`	`92`	`"ordered": true`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,7 @@`
`51`	`51`	`"x": 1`
`52`	`52`	`}`
`53`	`53`	`},`
`54`		`- "multi": true,`
`55`		`- "upsert": false`
	`54`	`+ "multi": true`
`56`	`55`	`}`
`57`	`56`	`]`
`58`	`57`	`},`
`@@ -63,7 +62,7 @@`
`63`	`62`	`{`
`64`	`63`	`"command_succeeded_event": {`
`65`	`64`	`"reply": {`
`66`		`- "ok": 1.0,`
	`65`	`+ "ok": 1,`
`67`	`66`	`"n": 2`
`68`	`67`	`},`
`69`	`68`	`"command_name": "update"`
`@@ -106,8 +105,7 @@`
`106`	`105`	`"x": 1`
`107`	`106`	`}`
`108`	`107`	`},`
`109`		`- "multi": true,`
`110`		`- "upsert": false`
	`108`	`+ "multi": true`
`111`	`109`	`}`
`112`	`110`	`]`
`113`	`111`	`},`
`@@ -118,7 +116,7 @@`
`118`	`116`	`{`
`119`	`117`	`"command_succeeded_event": {`
`120`	`118`	`"reply": {`
`121`		`- "ok": 1.0,`
	`119`	`+ "ok": 1,`
`122`	`120`	`"n": 0,`
`123`	`121`	`"writeErrors": [`
`124`	`122`	`{`
Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,7 @@`
`50`	`50`	`"$inc": {`
`51`	`51`	`"x": 1`
`52`	`52`	`}`
`53`		`- },`
`54`		`- "multi": false,`
`55`		`- "upsert": false`
	`53`	`+ }`
`56`	`54`	`}`
`57`	`55`	`]`
`58`	`56`	`},`
`@@ -63,7 +61,7 @@`
`63`	`61`	`{`
`64`	`62`	`"command_succeeded_event": {`
`65`	`63`	`"reply": {`
`66`		`- "ok": 1.0,`
	`64`	`+ "ok": 1,`
`67`	`65`	`"n": 1`
`68`	`66`	`},`
`69`	`67`	`"command_name": "update"`
`@@ -103,7 +101,6 @@`
`103`	`101`	`"x": 1`
`104`	`102`	`}`
`105`	`103`	`},`
`106`		`- "multi": false,`
`107`	`104`	`"upsert": true`
`108`	`105`	`}`
`109`	`106`	`]`
`@@ -115,7 +112,7 @@`
`115`	`112`	`{`
`116`	`113`	`"command_succeeded_event": {`
`117`	`114`	`"reply": {`
`118`		`- "ok": 1.0,`
	`115`	`+ "ok": 1,`
`119`	`116`	`"n": 1,`
`120`	`117`	`"upserted": [`
`121`	`118`	`{`
`@@ -163,9 +160,7 @@`
`163`	`160`	`"$nothing": {`
`164`	`161`	`"x": 1`
`165`	`162`	`}`
`166`		`- },`
`167`		`- "multi": false,`
`168`		`- "upsert": false`
	`163`	`+ }`
`169`	`164`	`}`
`170`	`165`	`]`
`171`	`166`	`},`
`@@ -176,7 +171,7 @@`
`176`	`171`	`{`
`177`	`172`	`"command_succeeded_event": {`
`178`	`173`	`"reply": {`
`179`		`- "ok": 1.0,`
	`174`	`+ "ok": 1,`
`180`	`175`	`"n": 0,`
`181`	`176`	`"writeErrors": [`
`182`	`177`	`{`