Skip to content

Commit d4aa44e

Browse files
author
Divjot Arora
committed
DRIVERS-555 Unified test format changes for CSOT
1 parent d2de776 commit d4aa44e

File tree

47 files changed

+1190
-85
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1190
-85
lines changed

‎source/unified-test-format/schema-1.4.json renamed to ‎source/unified-test-format/schema-1.5.json

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"initialData": {
2222
"type": "array",
2323
"minItems": 1,
24-
"items": { "$ref": "#/definitions/collectionData" }
24+
"items": { "$ref": "#/definitions/initialCollectionData" }
2525
},
2626
"tests": {
2727
"type": "array",
@@ -194,7 +194,22 @@
194194
}
195195
},
196196

197-
"collectionData": {
197+
"initialCollectionData": {
198+
"type": "object",
199+
"additionalProperties": false,
200+
"required": ["collectionName", "databaseName", "documents"],
201+
"properties": {
202+
"collectionName": { "type": "string" },
203+
"databaseName": { "type": "string" },
204+
"collectionOptions": { "type": "object" },
205+
"documents": {
206+
"type": "array",
207+
"items": { "type": "object" }
208+
}
209+
}
210+
},
211+
212+
"outcomeCollectionData": {
198213
"type": "object",
199214
"additionalProperties": false,
200215
"required": ["collectionName", "databaseName", "documents"],
@@ -366,7 +381,8 @@
366381
"properties": {
367382
"readConcern": { "type": "object" },
368383
"readPreference": { "type": "object" },
369-
"writeConcern": { "type": "object" }
384+
"writeConcern": { "type": "object" },
385+
"timeoutMS": { "type": "number" }
370386
}
371387
},
372388

@@ -426,7 +442,8 @@
426442
"minItems": 1,
427443
"items": { "type": "string" }
428444
},
429-
"expectResult": {}
445+
"expectResult": {},
446+
"isTimeoutError": { "type": "boolean" }
430447
}
431448
},
432449

@@ -453,7 +470,7 @@
453470
"outcome": {
454471
"type": "array",
455472
"minItems": 1,
456-
"items": { "$ref": "#/definitions/collectionData" }
473+
"items": { "$ref": "#/definitions/outcomeCollectionData" }
457474
}
458475
}
459476
}

‎source/unified-test-format/tests/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SCHEMA=../schema-1.4.json
1+
SCHEMA=../schema-1.5.json
22

33
.PHONY: all invalid valid-fail valid-pass versioned-api load-balancers gridfs transactions crud HAS_AJV
44

‎source/unified-test-format/tests/invalid/collectionOrDatabaseOptions-timeoutMS-type.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"description": "collectionOrDatabaseOptions-timeoutMS-type",
3+
"schemaVersion": "1.5",
4+
"createEntities": [
5+
{
6+
"client": {
7+
"id": "client0"
8+
}
9+
},
10+
{
11+
"database": {
12+
"id": "database0",
13+
"client": "client0",
14+
"databaseName": "foo",
15+
"databaseOptions": {
16+
"timeoutMS": {}
17+
}
18+
}
19+
}
20+
],
21+
"tests": [
22+
{
23+
"description": "foo",
24+
"operations": []
25+
}
26+
]
27+
}

‎source/unified-test-format/tests/invalid/collectionOrDatabaseOptions-timeoutMS-type.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
description: "collectionOrDatabaseOptions-timeoutMS-type"
2+
3+
schemaVersion: "1.5"
4+
5+
createEntities:
6+
- client:
7+
id: &client0 "client0"
8+
- database:
9+
id: &database0 "database0"
10+
client: *client0
11+
databaseName: "foo"
12+
databaseOptions:
13+
timeoutMS: {}
14+
15+
tests:
16+
- description: "foo"
17+
operations: []

‎source/unified-test-format/tests/invalid/expectedError-isTimeoutError-type.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"description": "expectedError-isTimeoutError-type",
3+
"schemaVersion": "1.5",
4+
"createEntities": [
5+
{
6+
"client": {
7+
"id": "client0"
8+
}
9+
}
10+
],
11+
"tests": [
12+
{
13+
"description": "foo",
14+
"operations": [
15+
{
16+
"name": "foo",
17+
"object": "client0",
18+
"expectError": {
19+
"isTimeoutError": 0
20+
}
21+
}
22+
]
23+
}
24+
]
25+
}

‎source/unified-test-format/tests/invalid/expectedError-isTimeoutError-type.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
description: "expectedError-isTimeoutError-type"
2+
3+
schemaVersion: "1.5"
4+
5+
createEntities:
6+
- client:
7+
id: &client0 "client0"
8+
9+
tests:
10+
- description: "foo"
11+
operations:
12+
- name: "foo"
13+
object: *client0
14+
expectError:
15+
isTimeoutError: 0

‎source/unified-test-format/tests/invalid/collectionData-additionalProperties.json renamed to ‎source/unified-test-format/tests/invalid/initialCollectionData-additionalProperties.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"description": "collectionData-additionalProperties",
2+
"description": "initialCollectionData-additionalProperties",
33
"schemaVersion": "1.0",
44
"createEntities": [
55
{
@@ -18,8 +18,7 @@
1818
"collection": {
1919
"id": "collection0",
2020
"database": "database0",
21-
"collectionName": "foo",
22-
"foo": 0
21+
"collectionName": "foo"
2322
}
2423
}
2524
],

‎source/unified-test-format/tests/invalid/collectionData-additionalProperties.yml renamed to ‎source/unified-test-format/tests/invalid/initialCollectionData-additionalProperties.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description: "collectionData-additionalProperties"
1+
description: "initialCollectionData-additionalProperties"
22

33
schemaVersion: "1.0"
44

@@ -13,7 +13,6 @@ createEntities:
1313
id: &collection0 "collection0"
1414
database: *database0
1515
collectionName: &collection0Name "foo"
16-
foo: 0
1716

1817
initialData:
1918
- collectionName: *collection0Name

‎source/unified-test-format/tests/invalid/collectionData-collectionName-required.json renamed to ‎source/unified-test-format/tests/invalid/initialCollectionData-collectionName-required.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"description": "collectionData-collectionName-required",
2+
"description": "initialCollectionData-collectionName-required",
33
"schemaVersion": "1.0",
44
"createEntities": [
55
{
@@ -18,8 +18,7 @@
1818
"collection": {
1919
"id": "collection0",
2020
"database": "database0",
21-
"collectionName": "foo",
22-
"foo": 0
21+
"collectionName": "foo"
2322
}
2423
}
2524
],

‎source/unified-test-format/tests/invalid/collectionData-collectionName-required.yml renamed to ‎source/unified-test-format/tests/invalid/initialCollectionData-collectionName-required.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description: "collectionData-collectionName-required"
1+
description: "initialCollectionData-collectionName-required"
22

33
schemaVersion: "1.0"
44

@@ -13,7 +13,6 @@ createEntities:
1313
id: &collection0 "collection0"
1414
database: *database0
1515
collectionName: &collection0Name "foo"
16-
foo: 0
1716

1817
initialData:
1918
- databaseName: *database0Name

‎source/unified-test-format/tests/invalid/collectionData-collectionName-type.json renamed to ‎source/unified-test-format/tests/invalid/initialCollectionData-collectionName-type.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"description": "collectionData-collectionName-type",
2+
"description": "initialCollectionData-collectionName-type",
33
"schemaVersion": "1.0",
44
"createEntities": [
55
{
@@ -18,8 +18,7 @@
1818
"collection": {
1919
"id": "collection0",
2020
"database": "database0",
21-
"collectionName": "foo",
22-
"foo": 0
21+
"collectionName": "foo"
2322
}
2423
}
2524
],

‎source/unified-test-format/tests/invalid/collectionData-collectionName-type.yml renamed to ‎source/unified-test-format/tests/invalid/initialCollectionData-collectionName-type.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description: "collectionData-collectionName-type"
1+
description: "initialCollectionData-collectionName-type"
22

33
schemaVersion: "1.0"
44

@@ -13,7 +13,6 @@ createEntities:
1313
id: &collection0 "collection0"
1414
database: *database0
1515
collectionName: &collection0Name "foo"
16-
foo: 0
1716

1817
initialData:
1918
- collectionName: 0

‎source/unified-test-format/tests/invalid/initialCollectionData-collectionOptions-type.json

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"description": "initialCollectionData-collectionOptions-type",
3+
"schemaVersion": "1.5",
4+
"createEntities": [
5+
{
6+
"client": {
7+
"id": "client0"
8+
}
9+
},
10+
{
11+
"database": {
12+
"id": "database0",
13+
"client": "client0",
14+
"databaseName": "foo"
15+
}
16+
},
17+
{
18+
"collection": {
19+
"id": "collection0",
20+
"database": "database0",
21+
"collectionName": "foo"
22+
}
23+
}
24+
],
25+
"initialData": [
26+
{
27+
"collectionName": "foo",
28+
"databaseName": "foo",
29+
"collectionOptions": 0,
30+
"documents": []
31+
}
32+
],
33+
"tests": [
34+
{
35+
"description": "foo",
36+
"operations": []
37+
}
38+
]
39+
}

‎source/unified-test-format/tests/invalid/initialCollectionData-collectionOptions-type.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
description: "initialCollectionData-collectionOptions-type"
2+
3+
schemaVersion: "1.5"
4+
5+
createEntities:
6+
- client:
7+
id: &client0 "client0"
8+
- database:
9+
id: &database0 "database0"
10+
client: *client0
11+
databaseName: &database0Name "foo"
12+
- collection:
13+
id: &collection0 "collection0"
14+
database: *database0
15+
collectionName: &collection0Name "foo"
16+
17+
initialData:
18+
- collectionName: *collection0Name
19+
databaseName: *database0Name
20+
collectionOptions: 0
21+
documents: []
22+
23+
tests:
24+
- description: "foo"
25+
operations: []

‎source/unified-test-format/tests/invalid/collectionData-databaseName-required.json renamed to ‎source/unified-test-format/tests/invalid/initialCollectionData-databaseName-required.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"description": "collectionData-databaseName-required",
2+
"description": "initialCollectionData-databaseName-required",
33
"schemaVersion": "1.0",
44
"createEntities": [
55
{
@@ -18,8 +18,7 @@
1818
"collection": {
1919
"id": "collection0",
2020
"database": "database0",
21-
"collectionName": "foo",
22-
"foo": 0
21+
"collectionName": "foo"
2322
}
2423
}
2524
],

‎source/unified-test-format/tests/invalid/collectionData-databaseName-required.yml renamed to ‎source/unified-test-format/tests/invalid/initialCollectionData-databaseName-required.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description: "collectionData-databaseName-required"
1+
description: "initialCollectionData-databaseName-required"
22

33
schemaVersion: "1.0"
44

@@ -13,7 +13,6 @@ createEntities:
1313
id: &collection0 "collection0"
1414
database: *database0
1515
collectionName: &collection0Name "foo"
16-
foo: 0
1716

1817
initialData:
1918
- collectionName: *collection0Name

‎source/unified-test-format/tests/invalid/collectionData-databaseName-type.json renamed to ‎source/unified-test-format/tests/invalid/initialCollectionData-databaseName-type.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"description": "collectionData-databaseName-type",
2+
"description": "initialCollectionData-databaseName-type",
33
"schemaVersion": "1.0",
44
"createEntities": [
55
{
@@ -18,8 +18,7 @@
1818
"collection": {
1919
"id": "collection0",
2020
"database": "database0",
21-
"collectionName": "foo",
22-
"foo": 0
21+
"collectionName": "foo"
2322
}
2423
}
2524
],

‎source/unified-test-format/tests/invalid/collectionData-databaseName-type.yml renamed to ‎source/unified-test-format/tests/invalid/initialCollectionData-databaseName-type.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description: "collectionData-databaseName-type"
1+
description: "initialCollectionData-databaseName-type"
22

33
schemaVersion: "1.0"
44

@@ -13,7 +13,6 @@ createEntities:
1313
id: &collection0 "collection0"
1414
database: *database0
1515
collectionName: &collection0Name "foo"
16-
foo: 0
1716

1817
initialData:
1918
- collectionName: *collection0Name

‎source/unified-test-format/tests/invalid/collectionData-documents-items.json renamed to ‎source/unified-test-format/tests/invalid/initialCollectionData-documents-items.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"description": "collectionData-documents-items",
2+
"description": "initialCollectionData-documents-items",
33
"schemaVersion": "1.0",
44
"createEntities": [
55
{
@@ -18,8 +18,7 @@
1818
"collection": {
1919
"id": "collection0",
2020
"database": "database0",
21-
"collectionName": "foo",
22-
"foo": 0
21+
"collectionName": "foo"
2322
}
2423
}
2524
],

0 commit comments

Comments
 (0)