Update test on dropping encrypted collection

Author: GromNaN

composer.json

@@ -30,7 +30,7 @@
         "doctrine/persistence": "^3.2 || ^4",
         "friendsofphp/proxy-manager-lts": "^1.0",
         "jean85/pretty-package-versions": "^1.3.0 || ^2.0.1",
-        "mongodb/mongodb": "^1.21 || ^2.0@dev",
+        "mongodb/mongodb": "~1.21.2 || ^2.1.1@dev",
         "psr/cache": "^1.0 || ^2.0 || ^3.0",
         "symfony/console": "^5.4 || ^6.0 || ^7.0",
         "symfony/deprecation-contracts": "^2.2 || ^3.0",

tests/Doctrine/ODM/MongoDB/Tests/Functional/QueryableEncryptionTest.php

@@ -10,10 +10,10 @@
 use Documents\Encryption\PatientBilling;
 use Documents\Encryption\PatientRecord;
 use MongoDB\BSON\Binary;
+use MongoDB\BSON\Regex;
 use MongoDB\Client;
 use MongoDB\Model\BSONDocument;
 
-use function count;
 use function getenv;
 use function iterator_to_array;
 use function random_bytes;
@@ -27,6 +27,13 @@ public function setUp(): void
         $this->skipTestIfQueryableEncryptionNotSupported();
     }
 
+    public function tearDown(): void
+    {
+        $this->dm?->getDocumentCollection(Patient::class)?->drop(['encryptedFields' => []]);
+
+        parent::tearDown();
+    }
+
     public function testCreateAndQueryEncryptedCollection(): void
     {
         $nonEncryptedClient   = new Client(self::getUri());
@@ -64,8 +71,11 @@ public function testCreateAndQueryEncryptedCollection(): void
         self::assertSame('Jon Doe', $document->patientName);
         self::assertSame(12345678, $document->patientId);
         self::assertInstanceOf(Binary::class, $document->patientRecord->ssn);
+        self::assertSame(Binary::TYPE_ENCRYPTED, $document->patientRecord->ssn->getType());
         self::assertInstanceOf(Binary::class, $document->patientRecord->billing);
+        self::assertSame(Binary::TYPE_ENCRYPTED, $document->patientRecord->billing->getType());
         self::assertInstanceOf(Binary::class, $document->patientRecord->billingAmount);
+        self::assertSame(Binary::TYPE_ENCRYPTED, $document->patientRecord->billingAmount->getType());
 
         // Queryable with equality
         $result = $this->dm->getRepository(Patient::class)->findOneBy(['patientRecord.ssn' => '987-65-4320']);
@@ -84,11 +94,9 @@ public function testCreateAndQueryEncryptedCollection(): void
         self::assertSame('4111111111111111', $result->patientRecord->billing->number);
 
         // Drop the encrypted collection
-        $collectionCount = count($nonEncryptedDatabase->listCollectionNames());
         $this->dm->getSchemaManager()->dropDocumentCollection(Patient::class);
-        $collectionNames = iterator_to_array($nonEncryptedDatabase->listCollectionNames());
-        self::assertNotContains('patients', $collectionNames);
-        self::assertSame($collectionCount - 3, count($collectionNames), 'The 2 metadata collections should also be dropped');
+        $collectionNames = iterator_to_array($nonEncryptedDatabase->listCollectionNames(['filter' => ['name' => new Regex('patients')]]));
+        self::assertSame([], $collectionNames, 'The 2 metadata collections should also be dropped');
     }
 
     protected static function createTestDocumentManager(): DocumentManager