Correctly read database and collection options for operations

Author: alcaeus

tests/SpecTests/Context.php

@@ -268,12 +268,13 @@ public function getClient()
         return $this->useEncryptedClient && $this->encryptedClient ? $this->encryptedClient : $this->client;
     }
 
-    public function getCollection(array $collectionOptions = [])
+    public function getCollection(array $collectionOptions = [], array $databaseOptions = [])
     {
         return $this->selectCollection(
             $this->databaseName,
             $this->collectionName,
-            $this->prepareOptions($collectionOptions)
+            $collectionOptions,
+            $databaseOptions
         );
     }
 
@@ -399,13 +400,11 @@ public function replaceCommandSessionPlaceholder(stdClass $command)
         }
     }
 
-    public function selectCollection($databaseName, $collectionName, array $collectionOptions = [])
+    public function selectCollection($databaseName, $collectionName, array $collectionOptions = [], array $databaseOptions = [])
     {
-        return $this->getClient()->selectCollection(
-            $databaseName,
-            $collectionName,
-            $this->prepareOptions($collectionOptions)
-        );
+        return $this
+            ->selectDatabase($databaseName, $databaseOptions)
+            ->selectCollection($collectionName, $this->prepareOptions($collectionOptions));
     }
 
     public function selectDatabase($databaseName, array $databaseOptions = [])

tests/SpecTests/Operation.php

@@ -61,6 +61,9 @@ final class Operation
     /** @var string|null */
     private $databaseName;
 
+    /** @var array */
+    private $databaseOptions = [];
+
     /** @var string */
     private $name;
 
@@ -191,6 +194,14 @@ public static function fromReadWriteConcern(stdClass $operation)
         $o->errorExpectation = ErrorExpectation::fromReadWriteConcern($operation);
         $o->resultExpectation = ResultExpectation::fromReadWriteConcern($operation, $o->getResultAssertionType());
 
+        if (isset($operation->databaseOptions)) {
+            $o->databaseOptions = (array) $operation->databaseOptions;
+        }
+
+        if (isset($operation->collectionOptions)) {
+            $o->collectionOptions = (array) $operation->collectionOptions;
+        }
+
         return $o;
     }
 
@@ -287,7 +298,7 @@ private function execute(FunctionalTestCase $test, Context $context)
 
                 return $this->executeForClient($client, $context);
             case self::OBJECT_COLLECTION:
-                $collection = $context->getCollection($this->collectionOptions);
+                $collection = $context->getCollection($this->collectionOptions, $this->databaseOptions);
 
                 return $this->executeForCollection($collection, $context);
             case self::OBJECT_DATABASE:
@@ -299,7 +310,7 @@ private function execute(FunctionalTestCase $test, Context $context)
 
                 return $this->executeForGridFSBucket($bucket, $context);
             case self::OBJECT_SELECT_COLLECTION:
-                $collection = $context->selectCollection($this->databaseName, $this->collectionName, $this->collectionOptions);
+                $collection = $context->selectCollection($this->databaseName, $this->collectionName, $this->collectionOptions, $this->databaseOptions);
 
                 return $this->executeForCollection($collection, $context);
             case self::OBJECT_SELECT_DATABASE: