PHPLIB-655: Sync Versioned API tests

jmikola · jmikola · commit a518473c7e03 · 2021-07-06T12:11:02.000-04:00
Synced with mongodb/specifications@72249aa
diff --git a/tests/UnifiedSpecTests/versioned-api/crud-api-version-1-strict.json b/tests/UnifiedSpecTests/versioned-api/crud-api-version-1-strict.json
@@ -1,6 +1,6 @@
 {
   "description": "CRUD Api Version 1 (strict)",
-  "schemaVersion": "1.1",
+  "schemaVersion": "1.4",
   "runOnRequirements": [
     {
       "minServerVersion": "4.9"
@@ -141,6 +141,11 @@
     },
     {
       "description": "aggregate on database appends declared API version",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "aggregate",
@@ -608,7 +613,6 @@
     },
     {
       "description": "estimatedDocumentCount appends declared API version",
-      "skipReason": "DRIVERS-1561 collStats is not in API version 1",
       "operations": [
         {
           "name": "estimatedDocumentCount",
@@ -652,7 +656,7 @@
       ]
     },
     {
-      "description": "find command with declared API version appends to the command, but getMore does not",
+      "description": "find and getMore append API version",
       "operations": [
         {
           "name": "find",
@@ -713,14 +717,10 @@
                       "long"
                     ]
                   },
-                  "apiVersion": {
-                    "$$exists": false
-                  },
-                  "apiStrict": {
-                    "$$exists": false
-                  },
+                  "apiVersion": "1",
+                  "apiStrict": true,
                   "apiDeprecationErrors": {
-                    "$$exists": false
+                    "$$unsetOrMatches": false
                   }
                 }
               }
diff --git a/tests/UnifiedSpecTests/versioned-api/crud-api-version-1.json b/tests/UnifiedSpecTests/versioned-api/crud-api-version-1.json
@@ -1,6 +1,6 @@
 {
   "description": "CRUD Api Version 1",
-  "schemaVersion": "1.1",
+  "schemaVersion": "1.4",
   "runOnRequirements": [
     {
       "minServerVersion": "4.9"
@@ -141,6 +141,11 @@
     },
     {
       "description": "aggregate on database appends declared API version",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "aggregate",
@@ -643,7 +648,7 @@
       ]
     },
     {
-      "description": "find command with declared API version appends to the command, but getMore does not",
+      "description": "find and getMore append API version",
       "operations": [
         {
           "name": "find",
@@ -704,15 +709,11 @@
                       "long"
                     ]
                   },
-                  "apiVersion": {
-                    "$$exists": false
-                  },
+                  "apiVersion": "1",
                   "apiStrict": {
-                    "$$exists": false
+                    "$$unsetOrMatches": false
                   },
-                  "apiDeprecationErrors": {
-                    "$$exists": false
-                  }
+                  "apiDeprecationErrors": true
                 }
               }
             }
diff --git a/tests/UnifiedSpecTests/versioned-api/runcommand-helper-no-api-version-declared.json b/tests/UnifiedSpecTests/versioned-api/runcommand-helper-no-api-version-declared.json
@@ -1,6 +1,6 @@
 {
   "description": "RunCommand helper: No API version declared",
-  "schemaVersion": "1.1",
+  "schemaVersion": "1.4",
   "runOnRequirements": [
     {
       "minServerVersion": "4.9",
@@ -29,6 +29,11 @@
   "tests": [
     {
       "description": "runCommand does not inspect or change the command document",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "runCommand",
@@ -72,6 +77,11 @@
     },
     {
       "description": "runCommand does not prevent sending invalid API version declarations",
+      "runOnRequirements": [
+        {
+          "serverless": "forbid"
+        }
+      ],
       "operations": [
         {
           "name": "runCommand",
diff --git a/tests/UnifiedSpecTests/versioned-api/test-commands-deprecation-errors.json b/tests/UnifiedSpecTests/versioned-api/test-commands-deprecation-errors.json
@@ -6,7 +6,7 @@
       "minServerVersion": "4.9",
       "serverParameters": {
         "enableTestCommands": true,
-        "acceptAPIVersion2": true,
+        "acceptApiVersion2": true,
         "requireApiVersion": false
       }
     }
diff --git a/tests/UnifiedSpecTests/versioned-api/test-commands-strict-mode.json b/tests/UnifiedSpecTests/versioned-api/test-commands-strict-mode.json
@@ -1,12 +1,13 @@
 {
   "description": "Test commands: strict mode",
-  "schemaVersion": "1.1",
+  "schemaVersion": "1.4",
   "runOnRequirements": [
     {
       "minServerVersion": "4.9",
       "serverParameters": {
         "enableTestCommands": true
-      }
+      },
+      "serverless": "forbid"
     }
   ],
   "createEntities": [
diff --git a/tests/UnifiedSpecTests/versioned-api/transaction-handling.json b/tests/UnifiedSpecTests/versioned-api/transaction-handling.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"description": "CRUD Api Version 1 (strict)",`
`3`		`- "schemaVersion": "1.1",`
	`3`	`+ "schemaVersion": "1.4",`
`4`	`4`	`"runOnRequirements": [`
`5`	`5`	`{`
`6`	`6`	`"minServerVersion": "4.9"`
`@@ -141,6 +141,11 @@`
`141`	`141`	`},`
`142`	`142`	`{`
`143`	`143`	`"description": "aggregate on database appends declared API version",`
	`144`	`+ "runOnRequirements": [`
	`145`	`+ {`
	`146`	`+ "serverless": "forbid"`
	`147`	`+ }`
	`148`	`+ ],`
`144`	`149`	`"operations": [`
`145`	`150`	`{`
`146`	`151`	`"name": "aggregate",`
`@@ -608,7 +613,6 @@`
`608`	`613`	`},`
`609`	`614`	`{`
`610`	`615`	`"description": "estimatedDocumentCount appends declared API version",`
`611`		`- "skipReason": "DRIVERS-1561 collStats is not in API version 1",`
`612`	`616`	`"operations": [`
`613`	`617`	`{`
`614`	`618`	`"name": "estimatedDocumentCount",`
`@@ -652,7 +656,7 @@`
`652`	`656`	`]`
`653`	`657`	`},`
`654`	`658`	`{`
`655`		`- "description": "find command with declared API version appends to the command, but getMore does not",`
	`659`	`+ "description": "find and getMore append API version",`
`656`	`660`	`"operations": [`
`657`	`661`	`{`
`658`	`662`	`"name": "find",`
`@@ -713,14 +717,10 @@`
`713`	`717`	`"long"`
`714`	`718`	`]`
`715`	`719`	`},`
`716`		`- "apiVersion": {`
`717`		`- "$$exists": false`
`718`		`- },`
`719`		`- "apiStrict": {`
`720`		`- "$$exists": false`
`721`		`- },`
	`720`	`+ "apiVersion": "1",`
	`721`	`+ "apiStrict": true,`
`722`	`722`	`"apiDeprecationErrors": {`
`723`		`- "$$exists": false`
	`723`	`+ "$$unsetOrMatches": false`
`724`	`724`	`}`
`725`	`725`	`}`
`726`	`726`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"description": "CRUD Api Version 1",`
`3`		`- "schemaVersion": "1.1",`
	`3`	`+ "schemaVersion": "1.4",`
`4`	`4`	`"runOnRequirements": [`
`5`	`5`	`{`
`6`	`6`	`"minServerVersion": "4.9"`
`@@ -141,6 +141,11 @@`
`141`	`141`	`},`
`142`	`142`	`{`
`143`	`143`	`"description": "aggregate on database appends declared API version",`
	`144`	`+ "runOnRequirements": [`
	`145`	`+ {`
	`146`	`+ "serverless": "forbid"`
	`147`	`+ }`
	`148`	`+ ],`
`144`	`149`	`"operations": [`
`145`	`150`	`{`
`146`	`151`	`"name": "aggregate",`
`@@ -643,7 +648,7 @@`
`643`	`648`	`]`
`644`	`649`	`},`
`645`	`650`	`{`
`646`		`- "description": "find command with declared API version appends to the command, but getMore does not",`
	`651`	`+ "description": "find and getMore append API version",`
`647`	`652`	`"operations": [`
`648`	`653`	`{`
`649`	`654`	`"name": "find",`
`@@ -704,15 +709,11 @@`
`704`	`709`	`"long"`
`705`	`710`	`]`
`706`	`711`	`},`
`707`		`- "apiVersion": {`
`708`		`- "$$exists": false`
`709`		`- },`
	`712`	`+ "apiVersion": "1",`
`710`	`713`	`"apiStrict": {`
`711`		`- "$$exists": false`
	`714`	`+ "$$unsetOrMatches": false`
`712`	`715`	`},`
`713`		`- "apiDeprecationErrors": {`
`714`		`- "$$exists": false`
`715`		`- }`
	`716`	`+ "apiDeprecationErrors": true`
`716`	`717`	`}`
`717`	`718`	`}`
`718`	`719`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"description": "RunCommand helper: No API version declared",`
`3`		`- "schemaVersion": "1.1",`
	`3`	`+ "schemaVersion": "1.4",`
`4`	`4`	`"runOnRequirements": [`
`5`	`5`	`{`
`6`	`6`	`"minServerVersion": "4.9",`
`@@ -29,6 +29,11 @@`
`29`	`29`	`"tests": [`
`30`	`30`	`{`
`31`	`31`	`"description": "runCommand does not inspect or change the command document",`
	`32`	`+ "runOnRequirements": [`
	`33`	`+ {`
	`34`	`+ "serverless": "forbid"`
	`35`	`+ }`
	`36`	`+ ],`
`32`	`37`	`"operations": [`
`33`	`38`	`{`
`34`	`39`	`"name": "runCommand",`
`@@ -72,6 +77,11 @@`
`72`	`77`	`},`
`73`	`78`	`{`
`74`	`79`	`"description": "runCommand does not prevent sending invalid API version declarations",`
	`80`	`+ "runOnRequirements": [`
	`81`	`+ {`
	`82`	`+ "serverless": "forbid"`
	`83`	`+ }`
	`84`	`+ ],`
`75`	`85`	`"operations": [`
`76`	`86`	`{`
`77`	`87`	`"name": "runCommand",`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`"minServerVersion": "4.9",`
`7`	`7`	`"serverParameters": {`
`8`	`8`	`"enableTestCommands": true,`
`9`		`- "acceptAPIVersion2": true,`
	`9`	`+ "acceptApiVersion2": true,`
`10`	`10`	`"requireApiVersion": false`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
`1`	`1`	`{`
`2`	`2`	`"description": "Test commands: strict mode",`
`3`		`- "schemaVersion": "1.1",`
	`3`	`+ "schemaVersion": "1.4",`
`4`	`4`	`"runOnRequirements": [`
`5`	`5`	`{`
`6`	`6`	`"minServerVersion": "4.9",`
`7`	`7`	`"serverParameters": {`
`8`	`8`	`"enableTestCommands": true`
`9`		`- }`
	`9`	`+ },`
	`10`	`+ "serverless": "forbid"`
`10`	`11`	`}`
`11`	`12`	`],`
`12`	`13`	`"createEntities": [`