Skip to content

DRIVERS-555 Unified test format changes for CSOT #959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Apr 27, 2022
Merged

DRIVERS-555 Unified test format changes for CSOT #959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d4aa44e
DRIVERS-555 Unified test format changes for CSOT
Apr 13, 2021
c2ca520
DRIVERS-555 rename schema-1.8.json
ShaneHarvey Apr 22, 2022
716f9c4
Merge branch 'master' into divjotarora-csot-test-format-changes
ShaneHarvey Apr 22, 2022
48136ee
DRIVERS-555 Restore schema-1.4.json
ShaneHarvey Apr 22, 2022
c80874d
DRIVERS-555 Require 3.6 for collStats test
ShaneHarvey Apr 22, 2022
ff0b3c9
DRIVERS-555 Add valid-pass test for createEntities operation
ShaneHarvey Apr 22, 2022
8ff24ee
DRIVERS-555 Fix createEntities test
ShaneHarvey Apr 22, 2022
f60cc1a
DRIVERS-555 Merge outcomeCollectionData and initialCollectionData, ma…
ShaneHarvey Apr 26, 2022
39d3f34
DRIVERS-555 bump 1.9
ShaneHarvey Apr 26, 2022
103f6c1
Merge branch 'master' into csot-test-format-changes
ShaneHarvey Apr 26, 2022
a6b5745
DRIVERS-555 rename initialCollectionData -> collectionData
ShaneHarvey Apr 27, 2022
92e26af
Merge branch 'master' into csot-test-format-changes
ShaneHarvey Apr 27, 2022
f5ef38a
DRIVERS-555 Use anchors
ShaneHarvey Apr 27, 2022
3f4d7ca
DRIVERS-555 Remove redundant createEntities and initialData
ShaneHarvey Apr 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
563 changes: 563 additions & 0 deletions source/unified-test-format/schema-1.9.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion source/unified-test-format/tests/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
3 changes: 1 addition & 2 deletions source/unified-test-format/tests/invalid/collectionData-additionalProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"collection": {
"id": "collection0",
"database": "database0",
"collectionName": "foo",
"foo": 0
"collectionName": "foo"
}
}
],
Expand Down
1 change: 0 additions & 1 deletion source/unified-test-format/tests/invalid/collectionData-additionalProperties.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ createEntities:
id: &collection0 "collection0"
database: *database0
collectionName: &collection0Name "foo"
foo: 0

initialData:
- collectionName: *collection0Name
Expand Down
3 changes: 1 addition & 2 deletions source/unified-test-format/tests/invalid/collectionData-collectionName-required.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"collection": {
"id": "collection0",
"database": "database0",
"collectionName": "foo",
"foo": 0
"collectionName": "foo"
}
}
],
Expand Down
1 change: 0 additions & 1 deletion source/unified-test-format/tests/invalid/collectionData-collectionName-required.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ createEntities:
id: &collection0 "collection0"
database: *database0
collectionName: &collection0Name "foo"
foo: 0

initialData:
- databaseName: *database0Name
Expand Down
3 changes: 1 addition & 2 deletions source/unified-test-format/tests/invalid/collectionData-collectionName-type.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"collection": {
"id": "collection0",
"database": "database0",
"collectionName": "foo",
"foo": 0
"collectionName": "foo"
}
}
],
Expand Down
1 change: 0 additions & 1 deletion source/unified-test-format/tests/invalid/collectionData-collectionName-type.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ createEntities:
id: &collection0 "collection0"
database: *database0
collectionName: &collection0Name "foo"
foo: 0

initialData:
- collectionName: 0
Expand Down
39 changes: 39 additions & 0 deletions source/unified-test-format/tests/invalid/collectionData-createOptions-type.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": []
}
]
}
25 changes: 25 additions & 0 deletions source/unified-test-format/tests/invalid/collectionData-createOptions-type.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: []
3 changes: 1 addition & 2 deletions source/unified-test-format/tests/invalid/collectionData-databaseName-required.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"collection": {
"id": "collection0",
"database": "database0",
"collectionName": "foo",
"foo": 0
"collectionName": "foo"
}
}
],
Expand Down
1 change: 0 additions & 1 deletion source/unified-test-format/tests/invalid/collectionData-databaseName-required.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ createEntities:
id: &collection0 "collection0"
database: *database0
collectionName: &collection0Name "foo"
foo: 0

initialData:
- collectionName: *collection0Name
Expand Down
3 changes: 1 addition & 2 deletions source/unified-test-format/tests/invalid/collectionData-databaseName-type.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"collection": {
"id": "collection0",
"database": "database0",
"collectionName": "foo",
"foo": 0
"collectionName": "foo"
}
}
],
Expand Down
1 change: 0 additions & 1 deletion source/unified-test-format/tests/invalid/collectionData-databaseName-type.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ createEntities:
id: &collection0 "collection0"
database: *database0
collectionName: &collection0Name "foo"
foo: 0

initialData:
- collectionName: *collection0Name
Expand Down
3 changes: 1 addition & 2 deletions source/unified-test-format/tests/invalid/collectionData-documents-items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"collection": {
"id": "collection0",
"database": "database0",
"collectionName": "foo",
"foo": 0
"collectionName": "foo"
}
}
],
Expand Down
1 change: 0 additions & 1 deletion source/unified-test-format/tests/invalid/collectionData-documents-items.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ createEntities:
id: &collection0 "collection0"
database: *database0
collectionName: &collection0Name "foo"
foo: 0

initialData:
- collectionName: *collection0Name
Expand Down
3 changes: 1 addition & 2 deletions source/unified-test-format/tests/invalid/collectionData-documents-required.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"collection": {
"id": "collection0",
"database": "database0",
"collectionName": "foo",
"foo": 0
"collectionName": "foo"
}
}
],
Expand Down
1 change: 0 additions & 1 deletion source/unified-test-format/tests/invalid/collectionData-documents-required.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ createEntities:
id: &collection0 "collection0"
database: *database0
collectionName: &collection0Name "foo"
foo: 0

initialData:
- collectionName: *collection0Name
Expand Down
3 changes: 1 addition & 2 deletions source/unified-test-format/tests/invalid/collectionData-documents-type.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"collection": {
"id": "collection0",
"database": "database0",
"collectionName": "foo",
"foo": 0
"collectionName": "foo"
}
}
],
Expand Down
1 change: 0 additions & 1 deletion source/unified-test-format/tests/invalid/collectionData-documents-type.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ createEntities:
id: &collection0 "collection0"
database: *database0
collectionName: &collection0Name "foo"
foo: 0

initialData:
- collectionName: *collection0Name
Expand Down
27 changes: 27 additions & 0 deletions source/unified-test-format/tests/invalid/collectionOrDatabaseOptions-timeoutMS-type.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": []
}
]
}
17 changes: 17 additions & 0 deletions source/unified-test-format/tests/invalid/collectionOrDatabaseOptions-timeoutMS-type.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: []
25 changes: 25 additions & 0 deletions source/unified-test-format/tests/invalid/expectedError-isTimeoutError-type.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
}
]
}
]
}
15 changes: 15 additions & 0 deletions source/unified-test-format/tests/invalid/expectedError-isTimeoutError-type.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
68 changes: 68 additions & 0 deletions source/unified-test-format/tests/valid-pass/collectionData-createOptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
}
]
}
]
}
Loading