DRIVERS-555 Unified test format changes for CSOT (#959)

Divjot Arora · web-flow · commit a8a7d0103661 · 2022-04-27T15:18:24.000-07:00
Add timeoutMS, createEntities, createOptions, and $$lte.
diff --git a/source/unified-test-format/schema-1.9.json b/source/unified-test-format/schema-1.9.json
diff --git a/source/unified-test-format/tests/Makefile b/source/unified-test-format/tests/Makefile
@@ -1,4 +1,4 @@
-SCHEMA=../schema-1.8.json
+SCHEMA=../schema-1.9.json
 
 .PHONY: all invalid valid-fail valid-pass versioned-api load-balancers gridfs transactions crud collection-management sessions command-monitoring HAS_AJV
 
diff --git a/source/unified-test-format/tests/invalid/collectionData-additionalProperties.json b/source/unified-test-format/tests/invalid/collectionData-additionalProperties.json
@@ -18,8 +18,7 @@
       "collection": {
         "id": "collection0",
         "database": "database0",
-        "collectionName": "foo",
-        "foo": 0
+        "collectionName": "foo"
       }
     }
   ],
diff --git a/source/unified-test-format/tests/invalid/collectionData-additionalProperties.yml b/source/unified-test-format/tests/invalid/collectionData-additionalProperties.yml
@@ -13,7 +13,6 @@ createEntities:
       id: &collection0 "collection0"
       database: *database0
       collectionName: &collection0Name "foo"
-      foo: 0
 
 initialData:
   - collectionName: *collection0Name
diff --git a/source/unified-test-format/tests/invalid/collectionData-collectionName-required.json b/source/unified-test-format/tests/invalid/collectionData-collectionName-required.json
@@ -18,8 +18,7 @@
       "collection": {
         "id": "collection0",
         "database": "database0",
-        "collectionName": "foo",
-        "foo": 0
+        "collectionName": "foo"
       }
     }
   ],
diff --git a/source/unified-test-format/tests/invalid/collectionData-collectionName-required.yml b/source/unified-test-format/tests/invalid/collectionData-collectionName-required.yml
@@ -13,7 +13,6 @@ createEntities:
       id: &collection0 "collection0"
       database: *database0
       collectionName: &collection0Name "foo"
-      foo: 0
 
 initialData:
   - databaseName: *database0Name
diff --git a/source/unified-test-format/tests/invalid/collectionData-collectionName-type.json b/source/unified-test-format/tests/invalid/collectionData-collectionName-type.json
@@ -18,8 +18,7 @@
       "collection": {
         "id": "collection0",
         "database": "database0",
-        "collectionName": "foo",
-        "foo": 0
+        "collectionName": "foo"
       }
     }
   ],
diff --git a/source/unified-test-format/tests/invalid/collectionData-collectionName-type.yml b/source/unified-test-format/tests/invalid/collectionData-collectionName-type.yml
@@ -13,7 +13,6 @@ createEntities:
       id: &collection0 "collection0"
       database: *database0
       collectionName: &collection0Name "foo"
-      foo: 0
 
 initialData:
   - collectionName: 0
diff --git a/source/unified-test-format/tests/invalid/collectionData-createOptions-type.json b/source/unified-test-format/tests/invalid/collectionData-createOptions-type.json
@@ -0,0 +1,39 @@
+{
+  "description": "collectionData-createOptions-type",
+  "schemaVersion": "1.9",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    },
+    {
+      "database": {
+        "id": "database0",
+        "client": "client0",
+        "databaseName": "foo"
+      }
+    },
+    {
+      "collection": {
+        "id": "collection0",
+        "database": "database0",
+        "collectionName": "foo"
+      }
+    }
+  ],
+  "initialData": [
+    {
+      "collectionName": "foo",
+      "databaseName": "foo",
+      "createOptions": 0,
+      "documents": []
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": []
+    }
+  ]
+}
diff --git a/source/unified-test-format/tests/invalid/collectionData-createOptions-type.yml b/source/unified-test-format/tests/invalid/collectionData-createOptions-type.yml
@@ -0,0 +1,25 @@
+description: "collectionData-createOptions-type"
+
+schemaVersion: "1.9"
+
+createEntities:
+  - client:
+      id: &client0 "client0"
+  - database:
+      id: &database0 "database0"
+      client: *client0
+      databaseName: &database0Name "foo"
+  - collection:
+      id: &collection0 "collection0"
+      database: *database0
+      collectionName: &collection0Name "foo"
+
+initialData:
+  - collectionName: *collection0Name
+    databaseName: *database0Name
+    createOptions: 0
+    documents: []
+
+tests:
+  - description: "foo"
+    operations: []
diff --git a/source/unified-test-format/tests/invalid/collectionData-databaseName-required.json b/source/unified-test-format/tests/invalid/collectionData-databaseName-required.json
@@ -18,8 +18,7 @@
       "collection": {
         "id": "collection0",
         "database": "database0",
-        "collectionName": "foo",
-        "foo": 0
+        "collectionName": "foo"
       }
     }
   ],
diff --git a/source/unified-test-format/tests/invalid/collectionData-databaseName-required.yml b/source/unified-test-format/tests/invalid/collectionData-databaseName-required.yml
@@ -13,7 +13,6 @@ createEntities:
       id: &collection0 "collection0"
       database: *database0
       collectionName: &collection0Name "foo"
-      foo: 0
 
 initialData:
   - collectionName: *collection0Name
diff --git a/source/unified-test-format/tests/invalid/collectionData-databaseName-type.json b/source/unified-test-format/tests/invalid/collectionData-databaseName-type.json
@@ -18,8 +18,7 @@
       "collection": {
         "id": "collection0",
         "database": "database0",
-        "collectionName": "foo",
-        "foo": 0
+        "collectionName": "foo"
       }
     }
   ],
diff --git a/source/unified-test-format/tests/invalid/collectionData-databaseName-type.yml b/source/unified-test-format/tests/invalid/collectionData-databaseName-type.yml
@@ -13,7 +13,6 @@ createEntities:
       id: &collection0 "collection0"
       database: *database0
       collectionName: &collection0Name "foo"
-      foo: 0
 
 initialData:
   - collectionName: *collection0Name
diff --git a/source/unified-test-format/tests/invalid/collectionData-documents-items.json b/source/unified-test-format/tests/invalid/collectionData-documents-items.json
@@ -18,8 +18,7 @@
       "collection": {
         "id": "collection0",
         "database": "database0",
-        "collectionName": "foo",
-        "foo": 0
+        "collectionName": "foo"
       }
     }
   ],
diff --git a/source/unified-test-format/tests/invalid/collectionData-documents-items.yml b/source/unified-test-format/tests/invalid/collectionData-documents-items.yml
@@ -13,7 +13,6 @@ createEntities:
       id: &collection0 "collection0"
       database: *database0
       collectionName: &collection0Name "foo"
-      foo: 0
 
 initialData:
   - collectionName: *collection0Name
diff --git a/source/unified-test-format/tests/invalid/collectionData-documents-required.json b/source/unified-test-format/tests/invalid/collectionData-documents-required.json
@@ -18,8 +18,7 @@
       "collection": {
         "id": "collection0",
         "database": "database0",
-        "collectionName": "foo",
-        "foo": 0
+        "collectionName": "foo"
       }
     }
   ],
diff --git a/source/unified-test-format/tests/invalid/collectionData-documents-required.yml b/source/unified-test-format/tests/invalid/collectionData-documents-required.yml
@@ -13,7 +13,6 @@ createEntities:
       id: &collection0 "collection0"
       database: *database0
       collectionName: &collection0Name "foo"
-      foo: 0
 
 initialData:
   - collectionName: *collection0Name
diff --git a/source/unified-test-format/tests/invalid/collectionData-documents-type.json b/source/unified-test-format/tests/invalid/collectionData-documents-type.json
@@ -18,8 +18,7 @@
       "collection": {
         "id": "collection0",
         "database": "database0",
-        "collectionName": "foo",
-        "foo": 0
+        "collectionName": "foo"
       }
     }
   ],
diff --git a/source/unified-test-format/tests/invalid/collectionData-documents-type.yml b/source/unified-test-format/tests/invalid/collectionData-documents-type.yml
@@ -13,7 +13,6 @@ createEntities:
       id: &collection0 "collection0"
       database: *database0
       collectionName: &collection0Name "foo"
-      foo: 0
 
 initialData:
   - collectionName: *collection0Name
diff --git a/source/unified-test-format/tests/invalid/collectionOrDatabaseOptions-timeoutMS-type.json b/source/unified-test-format/tests/invalid/collectionOrDatabaseOptions-timeoutMS-type.json
@@ -0,0 +1,27 @@
+{
+  "description": "collectionOrDatabaseOptions-timeoutMS-type",
+  "schemaVersion": "1.9",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    },
+    {
+      "database": {
+        "id": "database0",
+        "client": "client0",
+        "databaseName": "foo",
+        "databaseOptions": {
+          "timeoutMS": 4.5
+        }
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": []
+    }
+  ]
+}
diff --git a/source/unified-test-format/tests/invalid/collectionOrDatabaseOptions-timeoutMS-type.yml b/source/unified-test-format/tests/invalid/collectionOrDatabaseOptions-timeoutMS-type.yml
@@ -0,0 +1,17 @@
+description: "collectionOrDatabaseOptions-timeoutMS-type"
+
+schemaVersion: "1.9"
+
+createEntities:
+  - client:
+      id: &client0 "client0"
+  - database:
+      id: &database0 "database0"
+      client: *client0
+      databaseName: "foo"
+      databaseOptions:
+        timeoutMS: 4.5  # Must be an integer, not a float.
+
+tests:
+  - description: "foo"
+    operations: []
diff --git a/source/unified-test-format/tests/invalid/expectedError-isTimeoutError-type.json b/source/unified-test-format/tests/invalid/expectedError-isTimeoutError-type.json
@@ -0,0 +1,25 @@
+{
+  "description": "expectedError-isTimeoutError-type",
+  "schemaVersion": "1.9",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": [
+        {
+          "name": "foo",
+          "object": "client0",
+          "expectError": {
+            "isTimeoutError": 0
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/source/unified-test-format/tests/invalid/expectedError-isTimeoutError-type.yml b/source/unified-test-format/tests/invalid/expectedError-isTimeoutError-type.yml
@@ -0,0 +1,15 @@
+description: "expectedError-isTimeoutError-type"
+
+schemaVersion: "1.9"
+
+createEntities:
+  - client:
+      id: &client0 "client0"
+
+tests:
+  - description: "foo"
+    operations:
+      - name: "foo"
+        object: *client0
+        expectError:
+          isTimeoutError: 0
diff --git a/source/unified-test-format/tests/valid-pass/collectionData-createOptions.json b/source/unified-test-format/tests/valid-pass/collectionData-createOptions.json
@@ -0,0 +1,68 @@
+{
+  "description": "collectionData-createOptions",
+  "schemaVersion": "1.9",
+  "runOnRequirements": [
+    {
+      "minServerVersion": "3.6"
+    }
+  ],
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0"
+      }
+    },
+    {
+      "database": {
+        "id": "database0",
+        "client": "client0",
+        "databaseName": "database0"
+      }
+    },
+    {
+      "collection": {
+        "id": "collection0",
+        "database": "database0",
+        "collectionName": "coll0"
+      }
+    }
+  ],
+  "initialData": [
+    {
+      "collectionName": "coll0",
+      "databaseName": "database0",
+      "createOptions": {
+        "capped": true,
+        "size": 512
+      },
+      "documents": [
+        {
+          "_id": 1,
+          "x": 11
+        }
+      ]
+    }
+  ],
+  "tests": [
+    {
+      "description": "collection is created with the correct options",
+      "operations": [
+        {
+          "name": "runCommand",
+          "object": "database0",
+          "arguments": {
+            "commandName": "collStats",
+            "command": {
+              "collStats": "coll0",
+              "scale": 1
+            }
+          },
+          "expectResult": {
+            "capped": true,
+            "maxSize": 512
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/source/unified-test-format/tests/valid-pass/collectionData-createOptions.yml b/source/unified-test-format/tests/valid-pass/collectionData-createOptions.yml
diff --git a/source/unified-test-format/tests/valid-pass/createEntities-operation.json b/source/unified-test-format/tests/valid-pass/createEntities-operation.json
diff --git a/source/unified-test-format/tests/valid-pass/createEntities-operation.yml b/source/unified-test-format/tests/valid-pass/createEntities-operation.yml
diff --git a/source/unified-test-format/tests/valid-pass/entity-cursor-iterateOnce.json b/source/unified-test-format/tests/valid-pass/entity-cursor-iterateOnce.json
diff --git a/source/unified-test-format/tests/valid-pass/entity-cursor-iterateOnce.yml b/source/unified-test-format/tests/valid-pass/entity-cursor-iterateOnce.yml
diff --git a/source/unified-test-format/tests/valid-pass/matches-lte-operator.json b/source/unified-test-format/tests/valid-pass/matches-lte-operator.json
diff --git a/source/unified-test-format/tests/valid-pass/matches-lte-operator.yml b/source/unified-test-format/tests/valid-pass/matches-lte-operator.yml
diff --git a/source/unified-test-format/unified-test-format.rst b/source/unified-test-format/unified-test-format.rst

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-SCHEMA=../schema-1.8.json`
	`1`	`+SCHEMA=../schema-1.9.json`
`2`	`2`
`3`	`3`	`.PHONY: all invalid valid-fail valid-pass versioned-api load-balancers gridfs transactions crud collection-management sessions command-monitoring HAS_AJV`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,7 @@`
`18`	`18`	`"collection": {`
`19`	`19`	`"id": "collection0",`
`20`	`20`	`"database": "database0",`
`21`		`- "collectionName": "foo",`
`22`		`- "foo": 0`
	`21`	`+ "collectionName": "foo"`
`23`	`22`	`}`
`24`	`23`	`}`
`25`	`24`	`],`