Use the collection instance to drop it with its options

Author: GromNaN

tests/DocumentationExamplesTest.php

@@ -953,9 +953,8 @@ public function testChangeStreamExample_1_4(): void
             $this->markTestSkipped('Test does not apply on sharded clusters: need more than a single getMore call on the change stream.');
         }
 
-        $this->dropCollection($this->getDatabaseName(), 'inventory');
+        $this->createCollection($this->getDatabaseName(), 'inventory');
         $db = new Database($this->manager, $this->getDatabaseName());
-        $db->createCollection('inventory');
 
         // Start Changestream Example 1
         $changeStream = $db->inventory->watch();
@@ -1189,9 +1188,8 @@ public function testRunCommand_example_1(): void
 
     public function testRunCommand_example_2(): void
     {
-        $this->dropCollection($this->getDatabaseName(), 'restaurants');
+        $this->createCollection($this->getDatabaseName(), 'restaurants');
         $db = new Database($this->manager, $this->getDatabaseName());
-        $db->createCollection('restaurants');
 
         // Start runCommand Example 2
         $cursor = $db->command(['collStats' => 'restaurants']);
@@ -1290,9 +1288,6 @@ public function testTransactions_intro_example_1(): void
 
         $client = static::createTestClient();
 
-        $this->dropCollection('hr', 'employees');
-        $this->dropCollection('reporting', 'events');
-
         /* Collections need to be created before a transaction starts */
         $this->createCollection('hr', 'employees');
         $this->createCollection('reporting', 'events');
@@ -1469,9 +1464,6 @@ public function testTransactions_retry_example_3(): void
 
         $client = static::createTestClient();
 
-        $this->dropCollection('hr', 'employees');
-        $this->dropCollection('reporting', 'events');
-
         /* Collections need to be created before a transaction starts */
         $this->createCollection('hr', 'employees');
         $this->createCollection('reporting', 'events');
@@ -1491,12 +1483,8 @@ public function testCausalConsistency(): void
         $this->assertNotNull('This test intentionally performs no assertions');
 
         // Prep
-        $this->dropCollection('test', 'items');
         $client = static::createTestClient();
-        $items = $client->selectDatabase(
-            'test',
-            ['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)]
-        )->items;
+        $items = $this->createCollection('test', 'items');
         $items->insertOne(
             ['sku' => '111', 'name' => 'Peanuts', 'start' => new UTCDateTime()]
         );
@@ -1865,17 +1853,16 @@ public function testQueryableEncryption(): void
             $this->markTestSkipped('Automatic encryption requires MongoDB Enterprise');
         }
 
+        // Ensure the collection is dropped by tearDown()
         $this->dropCollection($this->getDatabaseName(), $this->getCollectionName());
 
         // Fetch names for the database and collection under test
         $collectionName = $this->getCollectionName();
         $databaseName = $this->getDatabaseName();
         $namespace = $this->getNamespace();
 
-        /* Create a client without auto encryption. Drop existing data in both
-         * the keyvault and database under test. The latter is necessary since
-         * setUp() only drops the collection under test, which will leave behind
-         * internal collections for queryable encryption. */
+        /* Create a client without auto encryption. Drop existing data in both the keyvault and database under test.
+         * The latter is necessary to clean up any internal collections for queryable encryption. */
         $client = static::createTestClient();
         $client->selectDatabase('keyvault')->drop(['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)]);
         $client->selectDatabase($databaseName)->drop(['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)]);

tests/FunctionalTestCase.php

@@ -5,6 +5,7 @@
 use InvalidArgumentException;
 use MongoDB\BSON\ObjectId;
 use MongoDB\Client;
+use MongoDB\Collection;
 use MongoDB\Driver\Command;
 use MongoDB\Driver\Exception\CommandException;
 use MongoDB\Driver\Manager;
@@ -15,7 +16,6 @@
 use MongoDB\Driver\WriteConcern;
 use MongoDB\Operation\CreateCollection;
 use MongoDB\Operation\DatabaseCommand;
-use MongoDB\Operation\DropCollection;
 use MongoDB\Operation\ListCollections;
 use stdClass;
 use UnexpectedValueException;
@@ -54,7 +54,7 @@ abstract class FunctionalTestCase extends TestCase
     /** @var array */
     private $configuredFailPoints = [];
 
-    /** @var array{string, array{string, true}} */
+    /** @var Collection[] */
     private $collectionsToCleanup = [];
 
     public function setUp(): void
@@ -260,18 +260,21 @@ public static function getModuleInfo(string $row): ?string
 
     /**
      * Creates the test collection with the specified options and ensures it is
-     * dropped again during tearDown().
+     * dropped again during tearDown(). If the collection already exists, it
+     * is dropped and recreated.
      *
      * A majority write concern is applied by default to ensure that the
      * transaction can acquire the required locks.
      * See: https://www.mongodb.com/docs/manual/core/transactions/#transactions-and-operations
      */
-    protected function createCollection(string $databaseName, string $collectionName, array $options = []): void
+    protected function createCollection(string $databaseName, string $collectionName, array $options = []): Collection
     {
-        $options += ['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)];
+        $collection = $this->dropCollection($databaseName, $collectionName, $options);
+
         $operation = new CreateCollection($databaseName, $collectionName, $options);
         $operation->execute($this->getPrimaryServer());
-        $this->collectionsToCleanup[$databaseName][$collectionName] = true;
+
+        return $collection;
     }
 
     /**
@@ -281,20 +284,20 @@ protected function createCollection(string $databaseName, string $collectionName
      * transaction can acquire the required locks.
      * See: https://www.mongodb.com/docs/manual/core/transactions/#transactions-and-operations
      */
-    protected function dropCollection(string $databaseName, string $collectionName): void
+    protected function dropCollection(string $databaseName, string $collectionName, array $options = []): Collection
     {
-        $options = ['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)];
-        $operation = new DropCollection($databaseName, $collectionName, $options);
-        $operation->execute($this->getPrimaryServer());
-        $this->collectionsToCleanup[$databaseName][$collectionName] = true;
+        $options += ['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)];
+        $collection = new Collection($this->manager, $databaseName, $collectionName, $options);
+        $this->collectionsToCleanup[] = $collection;
+        $collection->drop();
+
+        return $collection;
     }
 
     private function cleanupCollections(): void
     {
-        foreach ($this->collectionsToCleanup as $databaseName => $collectionNames) {
-            foreach ($collectionNames as $collectionName => $unused) {
-                $this->dropCollection($databaseName, $collectionName);
-            }
+        foreach ($this->collectionsToCleanup as $collection) {
+            $collection->drop();
         }
 
         $this->collectionsToCleanup = [];

tests/Model/ChangeStreamIteratorTest.php

@@ -28,10 +28,8 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->dropCollection($this->getDatabaseName(), $this->getCollectionName());
-        $this->createCollection($this->getDatabaseName(), $this->getCollectionName(), ['capped' => true, 'size' => 8192]);
-
-        $this->collection = new Collection($this->manager, $this->getDatabaseName(), $this->getCollectionName());
+        // Drop and re-create the collection
+        $this->collection = $this->createCollection($this->getDatabaseName(), $this->getCollectionName(), ['capped' => true, 'size' => 8192]);
     }
 
     /** @dataProvider provideInvalidIntegerValues */