Merge pull request mongodb#712

Author: jmikola

tests/SpecTests/Context.php

@@ -38,7 +38,7 @@ final class Context
     public $defaultWriteOptions = [];
 
     /** @var array */
-    public $outcomeFindOptions = [];
+    public $outcomeReadOptions = [];
 
     /** @var string */
     public $outcomeCollectionName;
@@ -98,7 +98,7 @@ public static function fromCrud(stdClass $test, $databaseName, $collectionName)
             'writeConcern' => new WriteConcern(WriteConcern::MAJORITY),
         ];
 
-        $o->outcomeFindOptions = [
+        $o->outcomeReadOptions = [
             'readConcern' => new ReadConcern('local'),
             'readPreference' => new ReadPreference('primary'),
         ];
@@ -147,7 +147,7 @@ public static function fromTransactions(stdClass $test, $databaseName, $collecti
             'writeConcern' => new WriteConcern(WriteConcern::MAJORITY),
         ];
 
-        $o->outcomeFindOptions = [
+        $o->outcomeReadOptions = [
             'readConcern' => new ReadConcern('local'),
             'readPreference' => new ReadPreference('primary'),
         ];

tests/SpecTests/FunctionalTestCase.php

@@ -101,12 +101,11 @@ protected static function assertDocumentsMatch($expectedDocument, $actualDocumen
      */
     protected function assertOutcomeCollectionData(array $expectedDocuments)
     {
-        $outcomeCollection = $this->getOutcomeCollection();
-        $findOptions = $this->getContext()->outcomeFindOptions;
+        $outcomeCollection = $this->getOutcomeCollection($this->getContext()->outcomeReadOptions);
 
         $mi = new MultipleIterator(MultipleIterator::MIT_NEED_ANY);
         $mi->attachIterator(new ArrayIterator($expectedDocuments));
-        $mi->attachIterator(new IteratorIterator($outcomeCollection->find([], $findOptions)));
+        $mi->attachIterator(new IteratorIterator($outcomeCollection->find()));
 
         foreach ($mi as $documents) {
             list($expectedDocument, $actualDocument) = $documents;
@@ -193,16 +192,16 @@ protected function dropTestAndOutcomeCollections()
 
         $collection = null;
         if ($context->collectionName !== null) {
-            $collection = $context->getCollection();
-            $collection->drop($context->defaultWriteOptions);
+            $collection = $context->getCollection($context->defaultWriteOptions);
+            $collection->drop();
         }
 
         if ($context->outcomeCollectionName !== null) {
-            $outcomeCollection = $this->getOutcomeCollection();
+            $outcomeCollection = $this->getOutcomeCollection($context->defaultWriteOptions);
 
             // Avoid redundant drop if the test and outcome collections are the same
             if ($collection === null || $outcomeCollection->getNamespace() !== $collection->getNamespace()) {
-                $outcomeCollection->drop($context->defaultWriteOptions);
+                $outcomeCollection->drop();
             }
         }
     }
@@ -226,12 +225,12 @@ protected function insertDataFixtures(array $documents, $collectionName = null)
         return;
     }
 
-    private function getOutcomeCollection()
+    private function getOutcomeCollection(array $collectionOptions = [])
     {
         $context = $this->getContext();
 
         // Outcome collection need not use the client under test
-        return new Collection($this->manager, $context->databaseName, $context->outcomeCollectionName);
+        return new Collection($this->manager, $context->databaseName, $context->outcomeCollectionName, $collectionOptions);
     }
 
     /**