CSHARP-3450: Versioned API database aggregation test only works on 4.9+ servers. (#480)

DmitryLukyanov · web-flow · commit b0614b479054 · 2021-03-24T18:56:14.000+03:00
diff --git a/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/crud-api-version-1-strict.json b/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/crud-api-version-1-strict.json
@@ -3,7 +3,7 @@
   "schemaVersion": "1.1",
   "runOnRequirements": [
     {
-      "minServerVersion": "4.7"
+      "minServerVersion": "4.9"
     }
   ],
   "createEntities": [
@@ -608,12 +608,6 @@
     },
     {
       "description": "estimatedDocumentCount appends declared API version",
-      "skipReason": "DRIVERS-1561 collStats is not in API version 1",
-      "runOnRequirements": [
-        {
-          "minServerVersion": "4.9.0"
-        }
-      ],
       "operations": [
         {
           "name": "estimatedDocumentCount",
diff --git a/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/crud-api-version-1-strict.yml b/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/crud-api-version-1-strict.yml
@@ -3,7 +3,7 @@ description: "CRUD Api Version 1 (strict)"
 schemaVersion: "1.1"
 
 runOnRequirements:
-  - minServerVersion: "4.7"
+  - minServerVersion: "4.9"
 
 createEntities:
   - client:
@@ -225,9 +225,6 @@ tests:
                 <<: *expectedApiVersion
 
   - description: "estimatedDocumentCount appends declared API version"
-    skipReason: "DRIVERS-1561 collStats is not in API version 1"
-    runOnRequirements:
-      - minServerVersion: "4.9.0" # $collStats is not used in estimatedDocumentCount on < 4.9
     operations:
       - name: estimatedDocumentCount
         object: *collection
diff --git a/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/crud-api-version-1.json b/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/crud-api-version-1.json
@@ -3,7 +3,7 @@
   "schemaVersion": "1.1",
   "runOnRequirements": [
     {
-      "minServerVersion": "4.7"
+      "minServerVersion": "4.9"
     }
   ],
   "createEntities": [
@@ -598,47 +598,8 @@
         }
       ]
     },
-    {
-      "description": "estimatedDocumentCount appends declared API version on less than 4.9.0",
-      "runOnRequirements": [
-        {
-          "maxServerVersion": "4.8.99"
-        }
-      ],
-      "operations": [
-        {
-          "name": "estimatedDocumentCount",
-          "object": "collection",
-          "arguments": {}
-        }
-      ],
-      "expectEvents": [
-        {
-          "client": "client",
-          "events": [
-            {
-              "commandStartedEvent": {
-                "command": {
-                  "count": "test",
-                  "apiVersion": "1",
-                  "apiStrict": {
-                    "$$unsetOrMatches": false
-                  },
-                  "apiDeprecationErrors": true
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
     {
       "description": "estimatedDocumentCount appends declared API version on 4.9.0 or greater",
-      "runOnRequirements": [
-        {
-          "minServerVersion": "4.9.0"
-        }
-      ],
       "operations": [
         {
           "name": "estimatedDocumentCount",
diff --git a/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/crud-api-version-1.yml b/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/crud-api-version-1.yml
@@ -3,7 +3,7 @@ description: "CRUD Api Version 1"
 schemaVersion: "1.1"
 
 runOnRequirements:
-  - minServerVersion: "4.7"
+  - minServerVersion: "4.9"
 
 createEntities:
   - client:
@@ -218,24 +218,7 @@ tests:
                 key: x
                 <<: *expectedApiVersion
 
-  - description: "estimatedDocumentCount appends declared API version on less than 4.9.0"
-    runOnRequirements:
-      - maxServerVersion: "4.8.99"
-    operations:
-      - name: estimatedDocumentCount
-        object: *collection
-        arguments: {}
-    expectEvents:
-      - client: *client
-        events:
-          - commandStartedEvent:
-              command:
-                count: *collectionName
-                <<: *expectedApiVersion
-
   - description: "estimatedDocumentCount appends declared API version on 4.9.0 or greater"
-    runOnRequirements:
-      - minServerVersion: "4.9.0"
     operations:
       - name: estimatedDocumentCount
         object: *collection
diff --git a/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/runcommand-helper-no-api-version-declared.json b/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/runcommand-helper-no-api-version-declared.json
@@ -3,7 +3,7 @@
   "schemaVersion": "1.1",
   "runOnRequirements": [
     {
-      "minServerVersion": "4.7",
+      "minServerVersion": "4.9",
       "serverParameters": {
         "requireApiVersion": false
       }
diff --git a/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/runcommand-helper-no-api-version-declared.yml b/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/runcommand-helper-no-api-version-declared.yml
@@ -3,7 +3,7 @@ description: "RunCommand helper: No API version declared"
 schemaVersion: "1.1"
 
 runOnRequirements:
-  - minServerVersion: "4.7"
+  - minServerVersion: "4.9"
     serverParameters:
       requireApiVersion: false
 
diff --git a/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/test-commands-deprecation-errors.json b/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/test-commands-deprecation-errors.json
@@ -3,7 +3,7 @@
   "schemaVersion": "1.1",
   "runOnRequirements": [
     {
-      "minServerVersion": "4.7",
+      "minServerVersion": "4.9",
       "serverParameters": {
         "enableTestCommands": true,
         "acceptAPIVersion2": true,
diff --git a/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/test-commands-deprecation-errors.yml b/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/test-commands-deprecation-errors.yml
@@ -3,7 +3,7 @@ description: "Test commands: deprecation errors"
 schemaVersion: "1.1"
 
 runOnRequirements:
-  - minServerVersion: "4.7"
+  - minServerVersion: "4.9"
     serverParameters:
       enableTestCommands: true
       acceptAPIVersion2: true
diff --git a/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/test-commands-strict-mode.json b/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/test-commands-strict-mode.json
@@ -3,7 +3,7 @@
   "schemaVersion": "1.1",
   "runOnRequirements": [
     {
-      "minServerVersion": "4.7",
+      "minServerVersion": "4.9",
       "serverParameters": {
         "enableTestCommands": true
       }
diff --git a/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/test-commands-strict-mode.yml b/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/test-commands-strict-mode.yml
@@ -3,7 +3,7 @@ description: "Test commands: strict mode"
 schemaVersion: "1.1"
 
 runOnRequirements:
-  - minServerVersion: "4.7"
+  - minServerVersion: "4.9"
     serverParameters:
       enableTestCommands: true
 
diff --git a/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/transaction-handling.json b/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/transaction-handling.json
diff --git a/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/transaction-handling.yml b/tests/MongoDB.Driver.Tests/Specifications/versioned-api/tests/transaction-handling.yml

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"schemaVersion": "1.1",`
`4`	`4`	`"runOnRequirements": [`
`5`	`5`	`{`
`6`		`- "minServerVersion": "4.7"`
	`6`	`+ "minServerVersion": "4.9"`
`7`	`7`	`}`
`8`	`8`	`],`
`9`	`9`	`"createEntities": [`
`@@ -608,12 +608,6 @@`
`608`	`608`	`},`
`609`	`609`	`{`
`610`	`610`	`"description": "estimatedDocumentCount appends declared API version",`
`611`		`- "skipReason": "DRIVERS-1561 collStats is not in API version 1",`
`612`		`- "runOnRequirements": [`
`613`		`- {`
`614`		`- "minServerVersion": "4.9.0"`
`615`		`- }`
`616`		`- ],`
`617`	`611`	`"operations": [`
`618`	`612`	`{`
`619`	`613`	`"name": "estimatedDocumentCount",`