Skip to content

Commit 203e6b9

Browse files
benjirewisbenjirewis
authored
Sync Versioned API Tests (#757)
CDRIVER-3920 Add versioned API test for abortTransaction CDRIVER-3919 Use 4.9 as minServerVersion for versioned API tests CDRIVER-3932 Remove skipReason from edc test in versioned API
1 parent 56ebd0f commit 203e6b9

File tree

6 files changed

+193
-59
lines changed

6 files changed

+193
-59
lines changed

‎src/libmongoc/tests/json/versioned_api/crud-api-version-1-strict.json

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"schemaVersion": "1.1",
44
"runOnRequirements": [
55
{
6-
"minServerVersion": "4.7"
6+
"minServerVersion": "4.9"
77
}
88
],
99
"createEntities": [
@@ -301,6 +301,12 @@
301301
"$inc": {
302302
"x": 1
303303
}
304+
},
305+
"multi": {
306+
"$$unsetOrMatches": false
307+
},
308+
"upsert": {
309+
"$$unsetOrMatches": false
304310
}
305311
}
306312
],
@@ -353,7 +359,10 @@
353359
"x": 1
354360
}
355361
},
356-
"multi": true
362+
"multi": true,
363+
"upsert": {
364+
"$$unsetOrMatches": false
365+
}
357366
}
358367
],
359368
"apiVersion": "1",
@@ -397,6 +406,9 @@
397406
"_id": 4,
398407
"x": 44
399408
},
409+
"multi": {
410+
"$$unsetOrMatches": false
411+
},
400412
"upsert": true
401413
}
402414
],
@@ -596,12 +608,6 @@
596608
},
597609
{
598610
"description": "estimatedDocumentCount appends declared API version",
599-
"skipReason": "DRIVERS-1561 collStats is not in API version 1",
600-
"runOnRequirements": [
601-
{
602-
"minServerVersion": "4.9.0"
603-
}
604-
],
605611
"operations": [
606612
{
607613
"name": "estimatedDocumentCount",
@@ -972,6 +978,9 @@
972978
"_id": 4,
973979
"x": 44
974980
},
981+
"multi": {
982+
"$$unsetOrMatches": false
983+
},
975984
"upsert": true
976985
}
977986
],
@@ -1027,7 +1036,10 @@
10271036
"x": 1
10281037
}
10291038
},
1030-
"multi": true
1039+
"multi": true,
1040+
"upsert": {
1041+
"$$unsetOrMatches": false
1042+
}
10311043
}
10321044
],
10331045
"apiVersion": "1",
@@ -1077,6 +1089,12 @@
10771089
"$inc": {
10781090
"x": 1
10791091
}
1092+
},
1093+
"multi": {
1094+
"$$unsetOrMatches": false
1095+
},
1096+
"upsert": {
1097+
"$$unsetOrMatches": false
10801098
}
10811099
}
10821100
],
@@ -1093,4 +1111,4 @@
10931111
]
10941112
}
10951113
]
1096-
}
1114+
}

‎src/libmongoc/tests/json/versioned_api/crud-api-version-1.json

Lines changed: 29 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"schemaVersion": "1.1",
44
"runOnRequirements": [
55
{
6-
"minServerVersion": "4.7"
6+
"minServerVersion": "4.9"
77
}
88
],
99
"createEntities": [
@@ -298,6 +298,12 @@
298298
"$inc": {
299299
"x": 1
300300
}
301+
},
302+
"multi": {
303+
"$$unsetOrMatches": false
304+
},
305+
"upsert": {
306+
"$$unsetOrMatches": false
301307
}
302308
}
303309
],
@@ -350,7 +356,10 @@
350356
"x": 1
351357
}
352358
},
353-
"multi": true
359+
"multi": true,
360+
"upsert": {
361+
"$$unsetOrMatches": false
362+
}
354363
}
355364
],
356365
"apiVersion": "1",
@@ -394,6 +403,9 @@
394403
"_id": 4,
395404
"x": 44
396405
},
406+
"multi": {
407+
"$$unsetOrMatches": false
408+
},
397409
"upsert": true
398410
}
399411
],
@@ -587,46 +599,7 @@
587599
]
588600
},
589601
{
590-
"description": "estimatedDocumentCount appends declared API version on less than 4.9.0",
591-
"runOnRequirements": [
592-
{
593-
"maxServerVersion": "4.8.99"
594-
}
595-
],
596-
"operations": [
597-
{
598-
"name": "estimatedDocumentCount",
599-
"object": "collection",
600-
"arguments": {}
601-
}
602-
],
603-
"expectEvents": [
604-
{
605-
"client": "client",
606-
"events": [
607-
{
608-
"commandStartedEvent": {
609-
"command": {
610-
"count": "test",
611-
"apiVersion": "1",
612-
"apiStrict": {
613-
"$$unsetOrMatches": false
614-
},
615-
"apiDeprecationErrors": true
616-
}
617-
}
618-
}
619-
]
620-
}
621-
]
622-
},
623-
{
624-
"description": "estimatedDocumentCount appends declared API version on 4.9.0 or greater",
625-
"runOnRequirements": [
626-
{
627-
"minServerVersion": "4.9.0"
628-
}
629-
],
602+
"description": "estimatedDocumentCount appends declared API version",
630603
"operations": [
631604
{
632605
"name": "estimatedDocumentCount",
@@ -997,6 +970,9 @@
997970
"_id": 4,
998971
"x": 44
999972
},
973+
"multi": {
974+
"$$unsetOrMatches": false
975+
},
1000976
"upsert": true
1001977
}
1002978
],
@@ -1052,7 +1028,10 @@
10521028
"x": 1
10531029
}
10541030
},
1055-
"multi": true
1031+
"multi": true,
1032+
"upsert": {
1033+
"$$unsetOrMatches": false
1034+
}
10561035
}
10571036
],
10581037
"apiVersion": "1",
@@ -1102,6 +1081,12 @@
11021081
"$inc": {
11031082
"x": 1
11041083
}
1084+
},
1085+
"multi": {
1086+
"$$unsetOrMatches": false
1087+
},
1088+
"upsert": {
1089+
"$$unsetOrMatches": false
11051090
}
11061091
}
11071092
],
@@ -1118,4 +1103,4 @@
11181103
]
11191104
}
11201105
]
1121-
}
1106+
}

‎src/libmongoc/tests/json/versioned_api/runcommand-helper-no-api-version-declared.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"schemaVersion": "1.1",
44
"runOnRequirements": [
55
{
6-
"minServerVersion": "4.7",
6+
"minServerVersion": "4.9",
77
"serverParameters": {
88
"requireApiVersion": false
99
}

‎src/libmongoc/tests/json/versioned_api/test-commands-deprecation-errors.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"schemaVersion": "1.1",
44
"runOnRequirements": [
55
{
6-
"minServerVersion": "4.7",
6+
"minServerVersion": "4.9",
77
"serverParameters": {
88
"enableTestCommands": true,
99
"acceptAPIVersion2": true,

‎src/libmongoc/tests/json/versioned_api/test-commands-strict-mode.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"schemaVersion": "1.1",
44
"runOnRequirements": [
55
{
6-
"minServerVersion": "4.7",
6+
"minServerVersion": "4.9",
77
"serverParameters": {
88
"enableTestCommands": true
99
}

0 commit comments

Comments
 (0)