Fix exception handling and assertions in invalid keyId test

Author: jmikola

src/Database.php

@@ -25,6 +25,7 @@
 use MongoDB\Driver\ReadConcern;
 use MongoDB\Driver\ReadPreference;
 use MongoDB\Driver\WriteConcern;
+use MongoDB\Exception\CreateEncryptedCollectionException;
 use MongoDB\Exception\InvalidArgumentException;
 use MongoDB\Exception\UnexpectedValueException;
 use MongoDB\Exception\UnsupportedException;
@@ -44,6 +45,7 @@
 use MongoDB\Operation\RenameCollection;
 use MongoDB\Operation\Watch;
 use Traversable;
+use Exception;
 
 use function array_key_exists;
 use function is_array;

tests/SpecTests/ClientSideEncryption/Prose21_AutomaticDataEncryptionKeysTest.php

@@ -6,6 +6,7 @@
 use MongoDB\Driver\ClientEncryption;
 use MongoDB\Driver\Exception\BulkWriteException;
 use MongoDB\Driver\Exception\CommandException;
+use MongoDB\Exception\CreateEncryptedCollectionException;
 use MongoDB\Exception\InvalidArgumentException;
 
 use function base64_decode;
@@ -121,17 +122,23 @@ public function testCase2_MissingEncryptedFields(string $kmsProvider, ?array $ma
      */
     public function testCase3_InvalidKeyId(string $kmsProvider, ?array $masterKey): void
     {
-        $this->expectException(CommandException::class);
-        $this->expectExceptionCode(self::SERVER_ERROR_TYPEMISMATCH);
-        $this->expectExceptionMessage('keyId');
-
-        $this->database->createEncryptedCollection(
-            $this->getCollectionName(),
-            $this->clientEncryption,
-            $kmsProvider,
-            $masterKey,
-            ['encryptedFields' => ['fields' => [['path' => 'ssn', 'bsonType' => 'string', 'keyId' => false]]]]
-        );
+        try {
+            $this->database->createEncryptedCollection(
+                $this->getCollectionName(),
+                $this->clientEncryption,
+                $kmsProvider,
+                $masterKey,
+                ['encryptedFields' => ['fields' => [['path' => 'ssn', 'bsonType' => 'string', 'keyId' => false]]]]
+            );
+            $this->fail('CreateEncryptedCollectionException was not thrown');
+        } catch (CreateEncryptedCollectionException $e) {
+            $this->assertFalse($e->getEncryptedFields()['fields'][0]['keyId'], 'Invalid keyId should not be modified');
+
+            $previous = $e->getPrevious();
+            $this->assertInstanceOf(CommandException::class, $previous);
+            $this->assertSame(self::SERVER_ERROR_TYPEMISMATCH, $previous->getCode());
+            $this->assertStringContainsString('keyId', $previous->getMessage());
+        }
     }
 
     /**