Merge pull request #473

tests/Model/BSONArrayTest.php

 <?php
 
-namespace MongoDB\Tests;
+namespace MongoDB\Tests\Model;
 
 use MongoDB\Model\BSONArray;
 use MongoDB\Model\BSONDocument;
+use MongoDB\Tests\TestCase;
 
 class BSONArrayTest extends TestCase
 {

tests/Model/BSONDocumentTest.php

 <?php
 
-namespace MongoDB\Tests;
+namespace MongoDB\Tests\Model;
 
 use MongoDB\Model\BSONArray;
 use MongoDB\Model\BSONDocument;
+use MongoDB\Tests\TestCase;
 use ArrayObject;
 
 class BSONDocumentTest extends TestCase

tests/Model/CollectionInfoTest.php

 <?php
 
-namespace MongoDB\Tests;
+namespace MongoDB\Tests\Model;
 
 use MongoDB\Model\CollectionInfo;
 use MongoDB\Tests\TestCase;

tests/Model/DatabaseInfoTest.php

 <?php
 
-namespace MongoDB\Tests;
+namespace MongoDB\Tests\Model;
 
 use MongoDB\Model\DatabaseInfo;
 use MongoDB\Tests\TestCase;

tests/Model/IndexInfoTest.php

 <?php
 
-namespace MongoDB\Tests;
+namespace MongoDB\Tests\Model;
 
 use MongoDB\Model\IndexInfo;
 use MongoDB\Tests\TestCase;

tests/Model/IndexInputTest.php

 <?php
 
-namespace MongoDB\Tests;
+namespace MongoDB\Tests\Model;
 
 use MongoDB\Model\IndexInput;
 use MongoDB\Tests\TestCase;

tests/Model/TypeMapArrayIteratorTest.php

 <?php
 
-namespace MongoDB\Tests;
+namespace MongoDB\Tests\Model;
 
 use MongoDB\Model\TypeMapArrayIterator;
+use MongoDB\Tests\TestCase;
 
 class TypeMapArrayIteratorTest extends TestCase
 {

tests/Operation/BulkWriteFunctionalTest.php

 <?php
 
-namespace MongoDB\Tests\Collection;
+namespace MongoDB\Tests\Operation;
 
 use MongoDB\BulkWriteResult;
+use MongoDB\Collection;
 use MongoDB\Driver\BulkWrite as Bulk;
 use MongoDB\Driver\WriteConcern;
 use MongoDB\Model\BSONDocument;
@@ -10,12 +11,14 @@ use MongoDB\Operation\BulkWrite;
 
 class BulkWriteFunctionalTest extends FunctionalTestCase
 {
+    private $collection;
     private $omitModifiedCount;
 
     public function setUp()
     {
         parent::setUp();
 
+        $this->collection = new Collection($this->manager, $this->getDatabaseName(), $this->getCollectionName());
         $this->omitModifiedCount = version_compare($this->getServerVersion(), '2.6.0', '<');
     }
 

tests/Operation/DeleteFunctionalTest.php

 <?php
 
-namespace MongoDB\Tests\Collection;
+namespace MongoDB\Tests\Operation;
 
 use MongoDB\DeleteResult;
+use MongoDB\Collection;
 use MongoDB\Driver\BulkWrite;
 use MongoDB\Driver\WriteConcern;
 use MongoDB\Operation\Delete;
 
 class DeleteFunctionalTest extends FunctionalTestCase
 {
+    private $collection;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->collection = new Collection($this->manager, $this->getDatabaseName(), $this->getCollectionName());
+    }
+
     public function testDeleteOne()
     {
         $this->createFixtures(3);

tests/Operation/InsertManyFunctionalTest.php

 <?php
 
-namespace MongoDB\Tests\Collection;
+namespace MongoDB\Tests\Operation;
 
+use MongoDB\Collection;
 use MongoDB\InsertManyResult;
 use MongoDB\Driver\WriteConcern;
 use MongoDB\Model\BSONDocument;
@@ -9,6 +10,15 @@ use MongoDB\Operation\InsertMany;
 
 class InsertManyFunctionalTest extends FunctionalTestCase
 {
+    private $collection;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->collection = new Collection($this->manager, $this->getDatabaseName(), $this->getCollectionName());
+    }
+
     public function testInsertMany()
     {
         $documents = [

tests/Operation/InsertOneFunctionalTest.php

 <?php
 
-namespace MongoDB\Tests\Collection;
+namespace MongoDB\Tests\Operation;
 
+use MongoDB\Collection;
 use MongoDB\InsertOneResult;
 use MongoDB\Driver\WriteConcern;
 use MongoDB\Model\BSONDocument;
@@ -9,6 +10,15 @@ use MongoDB\Operation\InsertOne;
 
 class InsertOneFunctionalTest extends FunctionalTestCase
 {
+    private $collection;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->collection = new Collection($this->manager, $this->getDatabaseName(), $this->getCollectionName());
+    }
+
     /**
      * @dataProvider provideDocumentWithExistingId
      */

tests/Operation/UpdateFunctionalTest.php

 <?php
 
-namespace MongoDB\Tests\Collection;
+namespace MongoDB\Tests\Operation;
 
+use MongoDB\Collection;
 use MongoDB\UpdateResult;
 use MongoDB\Driver\BulkWrite;
 use MongoDB\Driver\WriteConcern;
@@ -9,12 +10,14 @@ use MongoDB\Operation\Update;
 
 class UpdateFunctionalTest extends FunctionalTestCase
 {
+    private $collection;
     private $omitModifiedCount;
 
     public function setUp()
     {
         parent::setUp();
 
+        $this->collection = new Collection($this->manager, $this->getDatabaseName(), $this->getCollectionName());
         $this->omitModifiedCount = version_compare($this->getServerVersion(), '2.6.0', '<');
     }