Skip to content

Commit ae003ab

Browse files
baileympearsonbaileympearson
committed
sync test files
1 parent 8b1a510 commit ae003ab

File tree

95 files changed

+804
-1221
lines changed

Some content is hidden

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

95 files changed

+804
-1221
lines changed

‎test/spec/client-side-encryption/etc/data/range-encryptedFields-Date.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@
1010
"path": "encryptedDate",
1111
"bsonType": "date",
1212
"queries": {
13-
"queryType": "rangePreview",
13+
"queryType": "range",
1414
"contention": {
1515
"$numberLong": "0"
1616
},
17+
"trimFactor": {
18+
"$numberInt": "1"
19+
},
1720
"sparsity": {
1821
"$numberLong": "1"
1922
},
@@ -30,4 +33,4 @@
3033
}
3134
}
3235
]
33-
}
36+
}

‎test/spec/client-side-encryption/etc/data/range-encryptedFields-DecimalNoPrecision.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,17 @@
1010
"path": "encryptedDecimalNoPrecision",
1111
"bsonType": "decimal",
1212
"queries": {
13-
"queryType": "rangePreview",
13+
"queryType": "range",
1414
"contention": {
1515
"$numberLong": "0"
1616
},
17+
"trimFactor": {
18+
"$numberInt": "1"
19+
},
1720
"sparsity": {
1821
"$numberLong": "1"
1922
}
2023
}
2124
}
2225
]
23-
}
26+
}

‎test/spec/client-side-encryption/etc/data/range-encryptedFields-DecimalPrecision.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@
1010
"path": "encryptedDecimalPrecision",
1111
"bsonType": "decimal",
1212
"queries": {
13-
"queryType": "rangePreview",
13+
"queryType": "range",
1414
"contention": {
1515
"$numberLong": "0"
1616
},
17+
"trimFactor": {
18+
"$numberInt": "1"
19+
},
1720
"sparsity": {
1821
"$numberLong": "1"
1922
},
@@ -29,4 +32,4 @@
2932
}
3033
}
3134
]
32-
}
35+
}

‎test/spec/client-side-encryption/etc/data/range-encryptedFields-DoubleNoPrecision.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,17 @@
1010
"path": "encryptedDoubleNoPrecision",
1111
"bsonType": "double",
1212
"queries": {
13-
"queryType": "rangePreview",
13+
"queryType": "range",
1414
"contention": {
1515
"$numberLong": "0"
1616
},
17+
"trimFactor": {
18+
"$numberInt": "1"
19+
},
1720
"sparsity": {
1821
"$numberLong": "1"
1922
}
2023
}
2124
}
2225
]
23-
}
26+
}

‎test/spec/client-side-encryption/etc/data/range-encryptedFields-DoublePrecision.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@
1010
"path": "encryptedDoublePrecision",
1111
"bsonType": "double",
1212
"queries": {
13-
"queryType": "rangePreview",
13+
"queryType": "range",
1414
"contention": {
1515
"$numberLong": "0"
1616
},
17+
"trimFactor": {
18+
"$numberInt": "1"
19+
},
1720
"sparsity": {
1821
"$numberLong": "1"
1922
},
@@ -29,4 +32,4 @@
2932
}
3033
}
3134
]
32-
}
35+
}

‎test/spec/client-side-encryption/etc/data/range-encryptedFields-Int.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@
1010
"path": "encryptedInt",
1111
"bsonType": "int",
1212
"queries": {
13-
"queryType": "rangePreview",
13+
"queryType": "range",
1414
"contention": {
1515
"$numberLong": "0"
1616
},
17+
"trimFactor": {
18+
"$numberInt": "1"
19+
},
1720
"sparsity": {
1821
"$numberLong": "1"
1922
},
@@ -26,4 +29,4 @@
2629
}
2730
}
2831
]
29-
}
32+
}

‎test/spec/client-side-encryption/etc/data/range-encryptedFields-Long.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@
1010
"path": "encryptedLong",
1111
"bsonType": "long",
1212
"queries": {
13-
"queryType": "rangePreview",
13+
"queryType": "range",
1414
"contention": {
1515
"$numberLong": "0"
1616
},
17+
"trimFactor": {
18+
"$numberInt": "1"
19+
},
1720
"sparsity": {
1821
"$numberLong": "1"
1922
},
@@ -26,4 +29,4 @@
2629
}
2730
}
2831
]
29-
}
32+
}

‎test/spec/client-side-encryption/tests/legacy/fle2v2-Compact.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "7.0.0",
4+
"minServerVersion": "8.0.0",
55
"topology": [
66
"replicaset",
77
"sharded",

‎test/spec/client-side-encryption/tests/legacy/fle2v2-Compact.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Requires libmongocrypt 1.8.0.
22
runOn:
3-
- minServerVersion: "7.0.0"
3+
# TODO(NODE-6128): lower server version to 7.0.0
4+
- minServerVersion: "8.0.0"
45
# Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
56
# FLE 2 Encrypted collections are not supported on standalone.
67
topology: [ "replicaset", "sharded", "load-balanced" ]
@@ -79,4 +80,4 @@ tests:
7980
command:
8081
compactStructuredEncryptionData: *collection_name
8182
result:
82-
errorContains: "'compactStructuredEncryptionData.compactionTokens' is missing"
83+
errorContains: "'compactStructuredEncryptionData.compactionTokens' is missing"

‎test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.json‎ renamed to ‎test/spec/client-side-encryption/tests/legacy/fle2v2-Rangev2-Date-Aggregate.json‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
{
22
"runOn": [
33
{
4-
"minServerVersion": "7.0.0",
4+
"minServerVersion": "8.0.0",
55
"topology": [
66
"replicaset",
77
"sharded",
88
"load-balanced"
9-
],
10-
"maxServerVersion": "7.99.99"
9+
]
1110
}
1211
],
1312
"database_name": "default",
@@ -25,10 +24,13 @@
2524
"path": "encryptedDate",
2625
"bsonType": "date",
2726
"queries": {
28-
"queryType": "rangePreview",
27+
"queryType": "range",
2928
"contention": {
3029
"$numberLong": "0"
3130
},
31+
"trimFactor": {
32+
"$numberInt": "1"
33+
},
3234
"sparsity": {
3335
"$numberLong": "1"
3436
},
@@ -226,10 +228,13 @@
226228
"path": "encryptedDate",
227229
"bsonType": "date",
228230
"queries": {
229-
"queryType": "rangePreview",
231+
"queryType": "range",
230232
"contention": {
231233
"$numberLong": "0"
232234
},
235+
"trimFactor": {
236+
"$numberInt": "1"
237+
},
233238
"sparsity": {
234239
"$numberLong": "1"
235240
},
@@ -283,10 +288,13 @@
283288
"path": "encryptedDate",
284289
"bsonType": "date",
285290
"queries": {
286-
"queryType": "rangePreview",
291+
"queryType": "range",
287292
"contention": {
288293
"$numberLong": "0"
289294
},
295+
"trimFactor": {
296+
"$numberInt": "1"
297+
},
290298
"sparsity": {
291299
"$numberLong": "1"
292300
},
@@ -346,10 +354,13 @@
346354
"path": "encryptedDate",
347355
"bsonType": "date",
348356
"queries": {
349-
"queryType": "rangePreview",
357+
"queryType": "range",
350358
"contention": {
351359
"$numberLong": "0"
352360
},
361+
"trimFactor": {
362+
"$numberInt": "1"
363+
},
353364
"sparsity": {
354365
"$numberLong": "1"
355366
},
@@ -383,12 +394,6 @@
383394
"$$type": "binData"
384395
},
385396
"__safeContent__": [
386-
{
387-
"$binary": {
388-
"base64": "5nRutVIyq7URVOVtbE4vM01APSIajAVnsShMwjBlzkM=",
389-
"subType": "00"
390-
}
391-
},
392397
{
393398
"$binary": {
394399
"base64": "RjBYT2h3ZAoHxhf8DU6/dFbDkEBZp0IxREcsRTu2MXs=",
@@ -445,12 +450,6 @@
445450
"$$type": "binData"
446451
},
447452
"__safeContent__": [
448-
{
449-
"$binary": {
450-
"base64": "bE1vqWj3KNyM7cCYUv/cnYm8BPaUL3eMp5syTHq6NF4=",
451-
"subType": "00"
452-
}
453-
},
454453
{
455454
"$binary": {
456455
"base64": "25j9sQXZCihCmHKvTHgaBsAVZFcGPn7JjHdrCGlwyyw=",

0 commit comments

Comments
 (0)