Skip to content

Commit 8dfb85f

Browse files
jmikolajmikola
authored
PHPLIB-882, PHPLIB-905: Update CSFLE tests for libmongocrypt 1.5.0 (#951)
* PHPLIB-882: Update find payloads in CSFLE spec tests Synced with mongodb/specifications@cf7d5dd * PHPLIB-905: Specify contentionFactor for explicit encryption prose tests
1 parent 8d94d8d commit 8dfb85f

6 files changed

+11
-7
lines changed

Diff for: ‎tests/SpecTests/ClientSideEncryptionSpecTest.php

+4
Original file line numberDiff line numberDiff line change
@@ -1284,6 +1284,7 @@ static function (self $test, ClientEncryption $clientEncryption, Client $encrypt
12841284
$insertPayload = $clientEncryption->encrypt($value, [
12851285
'keyId' => $key1Id,
12861286
'algorithm' => ClientEncryption::ALGORITHM_INDEXED,
1287+
'contentionFactor' => 0,
12871288
]);
12881289

12891290
$collection = $encryptedClient->selectCollection('db', 'explicit_encryption');
@@ -1293,6 +1294,7 @@ static function (self $test, ClientEncryption $clientEncryption, Client $encrypt
12931294
'keyId' => $key1Id,
12941295
'algorithm' => ClientEncryption::ALGORITHM_INDEXED,
12951296
'queryType' => ClientEncryption::QUERY_TYPE_EQUALITY,
1297+
'contentionFactor' => 0,
12961298
]);
12971299

12981300
$results = $collection->find(['encryptedIndexed' => $findPayload])->toArray();
@@ -1323,6 +1325,7 @@ static function (self $test, ClientEncryption $clientEncryption, Client $encrypt
13231325
'keyId' => $key1Id,
13241326
'algorithm' => ClientEncryption::ALGORITHM_INDEXED,
13251327
'queryType' => ClientEncryption::QUERY_TYPE_EQUALITY,
1328+
'contentionFactor' => 0,
13261329
]);
13271330

13281331
$results = $collection->find(['encryptedIndexed' => $findPayload])->toArray();
@@ -1378,6 +1381,7 @@ static function (self $test, ClientEncryption $clientEncryption, Client $encrypt
13781381
$payload = $clientEncryption->encrypt($value, [
13791382
'keyId' => $key1Id,
13801383
'algorithm' => ClientEncryption::ALGORITHM_INDEXED,
1384+
'contentionFactor' => 0,
13811385
]);
13821386

13831387
$test->assertSame($value, $clientEncryption->decrypt($payload));

Diff for: ‎tests/SpecTests/client-side-encryption/tests/fle2-Delete.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
"encryptedIndexed": {
226226
"$eq": {
227227
"$binary": {
228-
"base64": "BYkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcSY20AAAAAAAAAAAAA",
228+
"base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
229229
"subType": "06"
230230
}
231231
}

Diff for: ‎tests/SpecTests/client-side-encryption/tests/fle2-EncryptedFields-vs-jsonSchema.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@
230230
"encryptedIndexed": {
231231
"$eq": {
232232
"$binary": {
233-
"base64": "BYkAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVjACAAAAAAWuidNu47c9A4Clic3DvFhn1AQJVC+FJtoE5bGZuz6PsSY20AAAAAAAAAAAAA",
233+
"base64": "BbEAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVjACAAAAAAWuidNu47c9A4Clic3DvFhn1AQJVC+FJtoE5bGZuz6PsFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
234234
"subType": "06"
235235
}
236236
}

Diff for: ‎tests/SpecTests/client-side-encryption/tests/fle2-FindOneAndUpdate.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@
230230
"encryptedIndexed": {
231231
"$eq": {
232232
"$binary": {
233-
"base64": "BYkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcSY20AAAAAAAAAAAAA",
233+
"base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
234234
"subType": "06"
235235
}
236236
}
@@ -490,7 +490,7 @@
490490
"encryptedIndexed": {
491491
"$eq": {
492492
"$binary": {
493-
"base64": "BYkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcSY20AAAAAAAAAAAAA",
493+
"base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
494494
"subType": "06"
495495
}
496496
}

Diff for: ‎tests/SpecTests/client-side-encryption/tests/fle2-InsertFind-Indexed.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@
226226
"encryptedIndexed": {
227227
"$eq": {
228228
"$binary": {
229-
"base64": "BYkAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVjACAAAAAAWuidNu47c9A4Clic3DvFhn1AQJVC+FJtoE5bGZuz6PsSY20AAAAAAAAAAAAA",
229+
"base64": "BbEAAAAFZAAgAAAAAPGmZcUzdE/FPILvRSyAScGvZparGI2y9rJ/vSBxgCujBXMAIAAAAACi1RjmndKqgnXy7xb22RzUbnZl1sOZRXPOC0KcJkAxmQVjACAAAAAAWuidNu47c9A4Clic3DvFhn1AQJVC+FJtoE5bGZuz6PsFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
230230
"subType": "06"
231231
}
232232
}

Diff for: ‎tests/SpecTests/client-side-encryption/tests/fle2-Update.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@
232232
"encryptedIndexed": {
233233
"$eq": {
234234
"$binary": {
235-
"base64": "BYkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcSY20AAAAAAAAAAAAA",
235+
"base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
236236
"subType": "06"
237237
}
238238
}
@@ -496,7 +496,7 @@
496496
"encryptedIndexed": {
497497
"$eq": {
498498
"$binary": {
499-
"base64": "BYkAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcSY20AAAAAAAAAAAAA",
499+
"base64": "BbEAAAAFZAAgAAAAAPtVteJQAlgb2YMa/+7YWH00sbQPyt7L6Rb8OwBdMmL2BXMAIAAAAAAd44hgVKnEnTFlwNVC14oyc9OZOTspeymusqkRQj57nAVjACAAAAAA19X9v9NlWidu/wR5/C/7WUV54DfL5CkNmT5WYrhxdDcFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
500500
"subType": "06"
501501
}
502502
}

0 commit comments

Comments
 (0)