test(NODE-3412): sync spec tests for serverless testing (#2911)

mongodb · Jul 19, 2021 · d270610 · d270610
1 parent 51ea86d
commit d270610
Show file tree

Hide file tree

Showing 331 changed files with 16,364 additions and 11,231 deletions.
diff --git a/src/collection.ts b/src/collection.ts
@@ -1237,11 +1237,11 @@ export class Collection<TSchema extends Document = Document> {
    * @param callback - An optional callback, a Promise will be returned if none is provided
    */
   findOneAndDelete(filter: Filter<TSchema>): Promise<ModifyResult<TSchema>>;
-  findOneAndDelete(filter: Filter<TSchema>, callback: Callback<ModifyResult<TSchema>>): void;
   findOneAndDelete(
     filter: Filter<TSchema>,
     options: FindOneAndDeleteOptions
   ): Promise<ModifyResult<TSchema>>;
+  findOneAndDelete(filter: Filter<TSchema>, callback: Callback<ModifyResult<TSchema>>): void;
   findOneAndDelete(
     filter: Filter<TSchema>,
     options: FindOneAndDeleteOptions,

diff --git a/test/functional/crud_spec.test.js b/test/functional/crud_spec.test.js
@@ -6,10 +6,6 @@ const chai = require('chai');
 const expect = chai.expect;
 chai.use(require('chai-subset'));
 
-const TestRunnerContext = require('./spec-runner').TestRunnerContext;
-const gatherTestSuites = require('./spec-runner').gatherTestSuites;
-const generateTopologyTests = require('./spec-runner').generateTopologyTests;
-
 const { loadSpecTests } = require('../spec/index');
 const { runUnifiedTest } = require('./unified-spec-runner/runner');
 
@@ -425,17 +421,6 @@ describe('CRUD spec', function () {
   }
 });
 
-describe('CRUD v2', function () {
-  const testContext = new TestRunnerContext();
-  const testSuites = gatherTestSuites(path.resolve(__dirname, '../spec/crud/v2'));
-  after(() => testContext.teardown());
-  before(function () {
-    return testContext.setup(this.configuration);
-  });
-
-  generateTopologyTests(testSuites, testContext);
-});
-
 describe('CRUD unified', function () {
   for (const crudSpecTest of loadSpecTests('crud/unified')) {
     expect(crudSpecTest).to.exist;

diff --git a/test/functional/unified-spec-runner/operations.ts b/test/functional/unified-spec-runner/operations.ts
@@ -270,6 +270,12 @@ operations.set('findOneAndUpdate', async ({ entities, operation }) => {
   return (await collection.findOneAndUpdate(filter, update, translateOptions(opts))).value;
 });
 
+operations.set('findOneAndDelete', async ({ entities, operation }) => {
+  const collection = entities.getEntity('collection', operation.object);
+  const { filter, ...opts } = operation.arguments;
+  return (await collection.findOneAndDelete(filter, opts)).value;
+});
+
 operations.set('failPoint', async ({ entities, operation }) => {
   const client = entities.getEntity('client', operation.arguments.client);
   return entities.failPoints.enableFailPoint(client, operation.arguments.failPoint);
@@ -409,12 +415,6 @@ operations.set('estimatedDocumentCount', async ({ entities, operation }) => {
   return collection.estimatedDocumentCount(operation.arguments);
 });
 
-operations.set('findOneAndDelete', async ({ entities, operation }) => {
-  const collection = entities.getEntity('collection', operation.object);
-  const { filter, ...opts } = operation.arguments;
-  return collection.findOneAndDelete(filter, opts);
-});
-
 operations.set('runCommand', async ({ entities, operation }: OperationFunctionParams) => {
   const db = entities.getEntity('db', operation.object);
   const { command, ...opts } = operation.arguments;

diff --git a/test/spec/crud/unified/aggregate-let.json b/test/spec/crud/unified/aggregate-let.json
@@ -1,6 +1,6 @@
 {
   "description": "aggregate-let",
-  "schemaVersion": "1.0",
+  "schemaVersion": "1.4",
   "createEntities": [
     {
       "client": {
@@ -23,6 +23,13 @@
         "database": "database0",
         "collectionName": "coll0"
       }
+    },
+    {
+      "collection": {
+        "id": "collection1",
+        "database": "database0",
+        "collectionName": "coll1"
+      }
     }
   ],
   "initialData": [
@@ -34,6 +41,11 @@
           "_id": 1
         }
       ]
+    },
+    {
+      "collectionName": "coll1",
+      "databaseName": "crud-tests",
+      "documents": []
     }
   ],
   "tests": [
@@ -293,6 +305,175 @@
           ]
         }
       ]
+    },
+    {
+      "description": "Aggregate to collection with let option",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "5.0",
+          "serverless": "forbid"
+        }
+      ],
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "$expr": {
+                    "$eq": [
+                      "$_id",
+                      "$$id"
+                    ]
+                  }
+                }
+              },
+              {
+                "$project": {
+                  "_id": 1
+                }
+              },
+              {
+                "$out": "coll1"
+              }
+            ],
+            "let": {
+              "id": 1
+            }
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "coll0",
+                  "pipeline": [
+                    {
+                      "$match": {
+                        "$expr": {
+                          "$eq": [
+                            "$_id",
+                            "$$id"
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "$project": {
+                        "_id": 1
+                      }
+                    },
+                    {
+                      "$out": "coll1"
+                    }
+                  ],
+                  "let": {
+                    "id": 1
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ],
+      "outcome": [
+        {
+          "collectionName": "coll1",
+          "databaseName": "crud-tests",
+          "documents": [
+            {
+              "_id": 1
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "description": "Aggregate to collection with let option unsupported (server-side error)",
+      "runOnRequirements": [
+        {
+          "minServerVersion": "2.6.0",
+          "maxServerVersion": "4.4.99"
+        }
+      ],
+      "operations": [
+        {
+          "name": "aggregate",
+          "object": "collection0",
+          "arguments": {
+            "pipeline": [
+              {
+                "$match": {
+                  "$expr": {
+                    "$eq": [
+                      "$_id",
+                      "$$id"
+                    ]
+                  }
+                }
+              },
+              {
+                "$project": {
+                  "_id": 1
+                }
+              },
+              {
+                "$out": "coll1"
+              }
+            ],
+            "let": {
+              "id": 1
+            }
+          },
+          "expectError": {
+            "errorContains": "unrecognized field 'let'",
+            "isClientError": false
+          }
+        }
+      ],
+      "expectEvents": [
+        {
+          "client": "client0",
+          "events": [
+            {
+              "commandStartedEvent": {
+                "command": {
+                  "aggregate": "coll0",
+                  "pipeline": [
+                    {
+                      "$match": {
+                        "$expr": {
+                          "$eq": [
+                            "$_id",
+                            "$$id"
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "$project": {
+                        "_id": 1
+                      }
+                    },
+                    {
+                      "$out": "coll1"
+                    }
+                  ],
+                  "let": {
+                    "id": 1
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
     }
   ]
 }
diff --git a/test/spec/crud/unified/aggregate-let.yml b/test/spec/crud/unified/aggregate-let.yml
@@ -1,6 +1,6 @@
 description: "aggregate-let"
 
-schemaVersion: "1.0"
+schemaVersion: "1.4"
 
 createEntities:
   - client:
@@ -14,12 +14,19 @@ createEntities:
       id: &collection0 collection0
       database: *database0
       collectionName: &collection0Name coll0
+  - collection:
+      id: &collection1 collection1
+      database: *database0
+      collectionName: &collection1Name coll1
 
 initialData: &initialData
   - collectionName: *collection0Name
     databaseName: *database0Name
     documents:
       - { _id: 1 }
+  - collectionName: *collection1Name
+    databaseName: *database0Name
+    documents: [ ]
 
 tests:
   # TODO: Once SERVER-57403 is resolved, this test can be removed in favor of
@@ -115,3 +122,53 @@ tests:
                 aggregate: *collection0Name
                 pipeline: *pipeline1
                 let: *let1
+
+  - description: "Aggregate to collection with let option"
+    runOnRequirements:
+      - minServerVersion: "5.0"
+        serverless: "forbid"
+    operations:
+      - name: aggregate
+        object: *collection0
+        arguments:
+          pipeline: &pipeline2
+            - $match: { $expr: { $eq: ["$_id", "$$id"] } }
+            - $project: { _id: 1 }
+            - $out: *collection1Name
+          let: &let2
+            id: 1
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0Name
+                pipeline: *pipeline2
+                let: *let2
+    outcome:
+      - collectionName: *collection1Name
+        databaseName: *database0Name
+        documents:
+          - { _id: 1 }
+
+  - description: "Aggregate to collection with let option unsupported (server-side error)"
+    runOnRequirements:
+      - minServerVersion: "2.6.0"
+        maxServerVersion: "4.4.99"
+    operations:
+      - name: aggregate
+        object: *collection0
+        arguments:
+          pipeline: *pipeline2
+          let: *let2
+        expectError:
+          errorContains: "unrecognized field 'let'"
+          isClientError: false
+    expectEvents:
+      - client: *client0
+        events:
+          - commandStartedEvent:
+              command:
+                aggregate: *collection0Name
+                pipeline: *pipeline2
+                let: *let2