Update client side encryption tests

rozza · rozza · commit 61ac1d44df29 · 2022-07-30T15:40:39.000+01:00
JAVA-4695
diff --git a/driver-core/src/test/resources/unified-test-format/client-side-encryption/addKeyAltName.json b/driver-core/src/test/resources/unified-test-format/client-side-encryption/addKeyAltName.json
@@ -98,7 +98,9 @@
             },
             "keyAltName": "new_key_alt_name"
           },
-          "expectResult": {"$$unsetOrMatches": null}
+          "expectResult": {
+            "$$unsetOrMatches": null
+          }
         }
       ],
       "expectEvents": [
diff --git a/driver-core/src/test/resources/unified-test-format/client-side-encryption/createDataKey-kms_providers-invalid.json b/driver-core/src/test/resources/unified-test-format/client-side-encryption/createDataKey-kms_providers-invalid.json
@@ -1,5 +1,5 @@
 {
-  "description": "createDataKey-provider-invalid",
+  "description": "createDataKey-kms_providers-invalid",
   "schemaVersion": "1.8",
   "runOnRequirements": [
     {
diff --git a/driver-core/src/test/resources/unified-test-format/client-side-encryption/getKey.json b/driver-core/src/test/resources/unified-test-format/client-side-encryption/getKey.json
@@ -133,7 +133,9 @@
               }
             }
           },
-          "expectResult": {"$$unsetOrMatches": null}
+          "expectResult": {
+            "$$unsetOrMatches": null
+          }
         }
       ],
       "expectEvents": [
diff --git a/driver-core/src/test/resources/unified-test-format/client-side-encryption/getKeyByAltName.json b/driver-core/src/test/resources/unified-test-format/client-side-encryption/getKeyByAltName.json
@@ -128,7 +128,9 @@
           "arguments": {
             "keyAltName": "does_not_exist"
           },
-          "expectResult": {"$$unsetOrMatches": null}
+          "expectResult": {
+            "$$unsetOrMatches": null
+          }
         }
       ],
       "expectEvents": [
diff --git a/driver-core/src/test/resources/unified-test-format/client-side-encryption/removeKeyAltName.json b/driver-core/src/test/resources/unified-test-format/client-side-encryption/removeKeyAltName.json
@@ -102,7 +102,9 @@
             },
             "keyAltName": "does_not_exist"
           },
-          "expectResult": {"$$unsetOrMatches": null}
+          "expectResult": {
+            "$$unsetOrMatches": null
+          }
         }
       ],
       "expectEvents": [
diff --git a/driver-core/src/test/resources/unified-test-format/client-side-encryption/rewrapManyDataKey.json b/driver-core/src/test/resources/unified-test-format/client-side-encryption/rewrapManyDataKey.json
@@ -1,5 +1,5 @@
 {
-  "description": "rewrapManyDataKey-kms_providers",
+  "description": "rewrapManyDataKey",
   "schemaVersion": "1.8",
   "runOnRequirements": [
     {
@@ -128,7 +128,7 @@
           ],
           "keyMaterial": {
             "$binary": {
-              "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEGkNTybTc7Eyif0f+qqE0lAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDB2j78AeuIQxcRh8cQIBEIB7vj9buHEaT7XHFIsKBJiyzZRmNnjvqMK5LSdzonKdx97jlqauvPvTDXSsdQDcspUs5oLrGmAXpbFResscxmbwZoKgUtWiuIOpeAcYuszCiMKt15s1WIMLDXUhYtfCmhRhekvgHnRAaK4HJMlGE+lKJXYI84E0b86Cd/g+",
+              "base64": "pr01l7qDygUkFE/0peFwpnNlv3iIy8zrQK38Q9i12UCN2jwZHDmfyx8wokiIKMb9kAleeY+vnt3Cf1MKu9kcDmI+KxbNDd+V3ytAAGzOVLDJr77CiWjF9f8ntkXRHrAY9WwnVDANYkDwXlyU0Y2GQFTiW65jiQhUtYLYH63Tk48SsJuQvnWw1Q+PzY8ga+QeVec8wbcThwtm+r2IHsCFnc72Gv73qq7weISw+O4mN08z3wOp5FOS2ZM3MK7tBGmPdBcktW7F8ODGsOQ1FU53OrWUnyX2aTi2ftFFFMWVHqQo7EYuBZHru8RRODNKMyQk0BFfKovAeTAVRv9WH9QU7g==",
               "subType": "00"
             }
           },
@@ -196,7 +196,7 @@
           ],
           "keyMaterial": {
             "$binary": {
-              "base64": "VoI9J8HusQ3u2gT9i8Awgg/6W4/igvLwRzn3SRDGx0Dl/1ayDMubphOw0ONPVKfuvS6HL3e4gAoCJ/uEz2KLFTVsEqYCpMhfAhgXxm8Ena8vDcOkCzFX+euvN/N2ES3wpzAD18b3qIH0MbBwKJP82d5GQ4pVfGnPW8Ujp9aO1qC/s0EqNqYyzJ1SyzhV9lAjHHGIENYJx+bBrekg2EeZBA==",
+              "base64": "CklVctHzke4mcytd0TxGqvepkdkQN8NUF4+jV7aZQITAKdz6WjdDpq3lMt9nSzWGG2vAEfvRb3mFEVjV57qqGqxjq2751gmiMRHXz0btStbIK3mQ5xbY9kdye4tsixlCryEwQONr96gwlwKKI9Nubl9/8+uRF6tgYjje7Q7OjauEf1SrJwKcoQ3WwnjZmEqAug0kImCpJ/irhdqPzivRiA==",
               "subType": "00"
             }
           },

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "description": "createDataKey-provider-invalid",`
	`2`	`+ "description": "createDataKey-kms_providers-invalid",`
`3`	`3`	`"schemaVersion": "1.8",`
`4`	`4`	`"runOnRequirements": [`
`5`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,9 @@`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`	`},`
`136`		`- "expectResult": {"$$unsetOrMatches": null}`
	`136`	`+ "expectResult": {`
	`137`	`+ "$$unsetOrMatches": null`
	`138`	`+ }`
`137`	`139`	`}`
`138`	`140`	`],`
`139`	`141`	`"expectEvents": [`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "description": "rewrapManyDataKey-kms_providers",`
	`2`	`+ "description": "rewrapManyDataKey",`
`3`	`3`	`"schemaVersion": "1.8",`
`4`	`4`	`"runOnRequirements": [`
`5`	`5`	`{`
`@@ -128,7 +128,7 @@`
`128`	`128`	`],`
`129`	`129`	`"keyMaterial": {`
`130`	`130`	`"$binary": {`
`131`		`- "base64": "AQICAHhQNmWG2CzOm1dq3kWLM+iDUZhEqnhJwH9wZVpuZ94A8gEGkNTybTc7Eyif0f+qqE0lAAAAwjCBvwYJKoZIhvcNAQcGoIGxMIGuAgEAMIGoBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDB2j78AeuIQxcRh8cQIBEIB7vj9buHEaT7XHFIsKBJiyzZRmNnjvqMK5LSdzonKdx97jlqauvPvTDXSsdQDcspUs5oLrGmAXpbFResscxmbwZoKgUtWiuIOpeAcYuszCiMKt15s1WIMLDXUhYtfCmhRhekvgHnRAaK4HJMlGE+lKJXYI84E0b86Cd/g+",`
	`131`	`+ "base64": "pr01l7qDygUkFE/0peFwpnNlv3iIy8zrQK38Q9i12UCN2jwZHDmfyx8wokiIKMb9kAleeY+vnt3Cf1MKu9kcDmI+KxbNDd+V3ytAAGzOVLDJr77CiWjF9f8ntkXRHrAY9WwnVDANYkDwXlyU0Y2GQFTiW65jiQhUtYLYH63Tk48SsJuQvnWw1Q+PzY8ga+QeVec8wbcThwtm+r2IHsCFnc72Gv73qq7weISw+O4mN08z3wOp5FOS2ZM3MK7tBGmPdBcktW7F8ODGsOQ1FU53OrWUnyX2aTi2ftFFFMWVHqQo7EYuBZHru8RRODNKMyQk0BFfKovAeTAVRv9WH9QU7g==",`
`132`	`132`	`"subType": "00"`
`133`	`133`	`}`
`134`	`134`	`},`
`@@ -196,7 +196,7 @@`
`196`	`196`	`],`
`197`	`197`	`"keyMaterial": {`
`198`	`198`	`"$binary": {`
`199`		`- "base64": "VoI9J8HusQ3u2gT9i8Awgg/6W4/igvLwRzn3SRDGx0Dl/1ayDMubphOw0ONPVKfuvS6HL3e4gAoCJ/uEz2KLFTVsEqYCpMhfAhgXxm8Ena8vDcOkCzFX+euvN/N2ES3wpzAD18b3qIH0MbBwKJP82d5GQ4pVfGnPW8Ujp9aO1qC/s0EqNqYyzJ1SyzhV9lAjHHGIENYJx+bBrekg2EeZBA==",`
	`199`	`+ "base64": "CklVctHzke4mcytd0TxGqvepkdkQN8NUF4+jV7aZQITAKdz6WjdDpq3lMt9nSzWGG2vAEfvRb3mFEVjV57qqGqxjq2751gmiMRHXz0btStbIK3mQ5xbY9kdye4tsixlCryEwQONr96gwlwKKI9Nubl9/8+uRF6tgYjje7Q7OjauEf1SrJwKcoQ3WwnjZmEqAug0kImCpJ/irhdqPzivRiA==",`
`200`	`200`	`"subType": "00"`
`201`	`201`	`}`
`202`	`202`	`},`