test case improving

default db is `mongodb` component in across all application.
so no need `getConnection` method in everywhere except in special cases

Author: ziaratban

tests/ActiveDataProviderTest.php

@@ -5,7 +5,6 @@
 use MongoDB\BSON\ObjectID;
 use yii\data\ActiveDataProvider;
 use yii\mongodb\Query;
-use yiiunit\extensions\mongodb\data\ar\ActiveRecord;
 use yiiunit\extensions\mongodb\data\ar\Customer;
 
 class ActiveDataProviderTest extends TestCase
@@ -14,7 +13,6 @@ protected function setUp()
     {
         parent::setUp();
         $this->mockApplication();
-        ActiveRecord::$db = $this->getConnection();
         $this->setUpTestRows();
     }
 
@@ -29,7 +27,7 @@ protected function tearDown()
      */
     protected function setUpTestRows()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $rows = [];
         for ($i = 1; $i <= 10; $i++) {
             $rows[] = [
@@ -51,14 +49,12 @@ public function testQuery()
 
         $provider = new ActiveDataProvider([
             'query' => $query,
-            'db' => $this->getConnection(),
         ]);
         $models = $provider->getModels();
         $this->assertEquals(10, count($models));
 
         $provider = new ActiveDataProvider([
             'query' => $query,
-            'db' => $this->getConnection(),
             'pagination' => [
                 'pageSize' => 5,
             ]

tests/ActiveFixtureTest.php

@@ -32,7 +32,7 @@ public function testLoadCollection()
         $fixture = $this->getMockBuilder(ActiveFixture::className())
             ->setConstructorArgs([
                 [
-                    'db' => $this->getConnection(),
+                    'db' => yii::$app->mongodb,
                     'collectionName' => Customer::collectionName()
                 ]
             ])
@@ -45,7 +45,7 @@ public function testLoadCollection()
 
         $fixture->load();
 
-        $rows = $this->findAll($this->getConnection()->getCollection(Customer::collectionName()));
+        $rows = $this->findAll(yii::$app->mongodb->getCollection(Customer::collectionName()));
         $this->assertCount(2, $rows);
     }
 
@@ -55,7 +55,7 @@ public function testLoadClass()
         $fixture = $this->getMockBuilder(ActiveFixture::className())
             ->setConstructorArgs([
                 [
-                    'db' => $this->getConnection(),
+                    'db' => yii::$app->mongodb,
                     'collectionName' => Customer::collectionName()
                 ]
             ])
@@ -68,7 +68,7 @@ public function testLoadClass()
 
         $fixture->load();
 
-        $rows = $this->findAll($this->getConnection()->getCollection(Customer::collectionName()));
+        $rows = $this->findAll(yii::$app->mongodb->getCollection(Customer::collectionName()));
         $this->assertCount(2, $rows);
     }
 
@@ -83,7 +83,7 @@ public function testLoadEmptyData()
         $fixture = $this->getMockBuilder(ActiveFixture::className())
             ->setConstructorArgs([
                 [
-                    'db' => $this->getConnection(),
+                    'db' => yii::$app->mongodb,
                     'collectionName' => Customer::collectionName()
                 ]
             ])
@@ -95,7 +95,7 @@ public function testLoadEmptyData()
 
         $fixture->load(); // should be no error
 
-        $rows = $this->findAll($this->getConnection()->getCollection(Customer::collectionName()));
+        $rows = $this->findAll(yii::$app->mongodb->getCollection(Customer::collectionName()));
         $this->assertEmpty($rows);
     }
 
@@ -106,7 +106,6 @@ public function testLoadEmptyData()
      */
     public function testDefaultDataFile()
     {
-        $db = $this->getConnection();
 
         $fixturePath = Yii::getAlias('@runtime/fixtures');
         $fixtureDataPath = $fixturePath . DIRECTORY_SEPARATOR . 'data';
@@ -138,29 +137,27 @@ class {$className} extends \yii\mongodb\ActiveFixture
             ['name' => 'name2'],
             ['name' => 'name3'],
         ];
-        $fixtureDataFile = $fixtureDataPath . DIRECTORY_SEPARATOR . $db->getDefaultDatabaseName() . '.' . Customer::collectionName() . '.php';
+        $fixtureDataFile = $fixtureDataPath . DIRECTORY_SEPARATOR . yii::$app->mongodb->getDefaultDatabaseName() . '.' . Customer::collectionName() . '.php';
         $fixtureDataContent = '<?php return ' . VarDumper::export($fixtureData) . ';';
         file_put_contents($fixtureDataFile, $fixtureDataContent);
 
         /* @var $fixture ActiveFixture */
 
         $fixture = new $className([
-            'db' => $db,
             'collectionName' => Customer::collectionName(),
         ]);
         $fixture->load();
-        $rows = $this->findAll($this->getConnection()->getCollection(Customer::collectionName()));
+        $rows = $this->findAll(yii::$app->mongodb->getCollection(Customer::collectionName()));
         $this->assertCount(2, $rows);
 
         $fixture = new $className([
-            'db' => $db,
             'collectionName' => [
-                $db->getDefaultDatabaseName(),
+                yii::$app->mongodb->getDefaultDatabaseName(),
                 Customer::collectionName()
             ],
         ]);
         $fixture->load();
-        $rows = $this->findAll($this->getConnection()->getCollection(Customer::collectionName()));
+        $rows = $this->findAll(yii::$app->mongodb->getCollection(Customer::collectionName()));
         $this->assertCount(3, $rows);
     }
 }

tests/ActiveRecordTest.php

@@ -6,7 +6,6 @@
 use MongoDB\BSON\ObjectID;
 use MongoDB\BSON\Regex;
 use yii\mongodb\ActiveQuery;
-use yiiunit\extensions\mongodb\data\ar\ActiveRecord;
 use yiiunit\extensions\mongodb\data\ar\Customer;
 use yiiunit\extensions\mongodb\data\ar\Animal;
 use yiiunit\extensions\mongodb\data\ar\Dog;
@@ -22,7 +21,6 @@ class ActiveRecordTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        ActiveRecord::$db = $this->getConnection();
         $this->setUpTestRows();
     }
 
@@ -37,7 +35,7 @@ protected function tearDown()
      */
     protected function setUpTestRows()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $rows = [];
         for ($i = 1; $i <= 10; $i++) {
             $rows[] = [
@@ -282,66 +280,64 @@ public function testExists()
 
     public function testScalar()
     {
-        $connection = $this->getConnection();
 
         $result = Customer::find()
             ->select(['name' => true, '_id' => false])
             ->orderBy(['name' => SORT_ASC])
             ->limit(1)
-            ->scalar($connection);
+            ->scalar();
         $this->assertSame('name1', $result);
 
         $result = Customer::find()
             ->select(['name' => true, '_id' => false])
             ->andWhere(['status' => -1])
-            ->scalar($connection);
+            ->scalar();
         $this->assertSame(false, $result);
 
         $result = Customer::find()
             ->select(['name'])
             ->orderBy(['name' => SORT_ASC])
             ->limit(1)
-            ->scalar($connection);
+            ->scalar();
         $this->assertSame('name1', $result);
 
         $result = Customer::find()
             ->select(['_id'])
             ->limit(1)
-            ->scalar($connection);
+            ->scalar();
         $this->assertTrue($result instanceof ObjectID);
     }
 
     public function testColumn()
     {
-        $connection = $this->getConnection();
 
         $result = Customer::find()
             ->select(['name' => true, '_id' => false])
             ->orderBy(['name' => SORT_ASC])
             ->limit(2)
-            ->column($connection);
+            ->column();
         $this->assertEquals(['name1', 'name10'], $result);
 
         $result = Customer::find()
             ->select(['name' => true, '_id' => false])
             ->andWhere(['status' => -1])
             ->orderBy(['name' => SORT_ASC])
             ->limit(2)
-            ->column($connection);
+            ->column();
         $this->assertEquals([], $result);
 
         $result = Customer::find()
             ->select(['name'])
             ->orderBy(['name' => SORT_ASC])
             ->limit(2)
-            ->column($connection);
+            ->column();
         $this->assertEquals(['name1', 'name10'], $result);
 
         $result = Customer::find()
             ->select(['_id'])
             ->orderBy(['name' => SORT_ASC])
             ->limit(2)
-            ->column($connection);
+            ->column();
         $this->assertTrue($result[0] instanceof ObjectID);
         $this->assertTrue($result[1] instanceof ObjectID);
     }

tests/ActiveRelationTest.php

@@ -2,7 +2,6 @@
 
 namespace yiiunit\extensions\mongodb;
 
-use yiiunit\extensions\mongodb\data\ar\ActiveRecord;
 use yiiunit\extensions\mongodb\data\ar\Customer;
 use yiiunit\extensions\mongodb\data\ar\CustomerOrder;
 use yiiunit\extensions\mongodb\data\ar\Item;
@@ -12,7 +11,6 @@ class ActiveRelationTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        ActiveRecord::$db = $this->getConnection();
         $this->setUpTestRows();
     }
 
@@ -38,7 +36,7 @@ protected function setUpTestRows()
                 'status' => $i,
             ];
         }
-        $customerCollection = $this->getConnection()->getCollection('customer');
+        $customerCollection = yii::$app->mongodb->getCollection('customer');
         $customers = $customerCollection->batchInsert($customers);
 
         $items = [];
@@ -48,7 +46,7 @@ protected function setUpTestRows()
                 'price' => $i,
             ];
         }
-        $itemCollection = $this->getConnection()->getCollection('item');
+        $itemCollection = yii::$app->mongodb->getCollection('item');
         $items = $itemCollection->batchInsert($items);
 
         $customerOrders = [];
@@ -70,7 +68,7 @@ protected function setUpTestRows()
                 ],
             ];
         }
-        $customerOrderCollection = $this->getConnection()->getCollection('customer_order');
+        $customerOrderCollection = yii::$app->mongodb->getCollection('customer_order');
         $customerOrderCollection->batchInsert($customerOrders);
     }
 

tests/BatchQueryResultTest.php

@@ -4,7 +4,6 @@
 
 use yii\mongodb\BatchQueryResult;
 use yii\mongodb\Query;
-use yiiunit\extensions\mongodb\data\ar\ActiveRecord;
 use yiiunit\extensions\mongodb\data\ar\Customer;
 use yiiunit\extensions\mongodb\data\ar\CustomerOrder;
 
@@ -13,7 +12,6 @@ class BatchQueryResultTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        ActiveRecord::$db = $this->getConnection();
         $this->setUpTestRows();
     }
 
@@ -38,7 +36,7 @@ protected function setUpTestRows()
                 'status' => $i,
             ];
         }
-        $customerCollection = $this->getConnection()->getCollection('customer');
+        $customerCollection = yii::$app->mongodb->getCollection('customer');
         $customers = $customerCollection->batchInsert($customers);
 
         $customerOrders = [];
@@ -52,20 +50,19 @@ protected function setUpTestRows()
                 'number' => $customer['status'] + 100,
             ];
         }
-        $customerOrderCollection = $this->getConnection()->getCollection('customer_order');
+        $customerOrderCollection = yii::$app->mongodb->getCollection('customer_order');
         $customerOrderCollection->batchInsert($customerOrders);
     }
 
     // Tests :
 
     public function testQuery()
     {
-        $db = $this->getConnection();
 
         // initialize property test
         $query = new Query();
         $query->from('customer')->orderBy('id');
-        $result = $query->batch(2, $db);
+        $result = $query->batch(2);
         $this->assertTrue($result instanceof BatchQueryResult);
         $this->assertEquals(2, $result->batchSize);
         $this->assertTrue($result->query === $query);
@@ -74,7 +71,7 @@ public function testQuery()
         $query = new Query();
         $query->from('customer');
         $allRows = [];
-        $batch = $query->batch(2, $db);
+        $batch = $query->batch(2);
         foreach ($batch as $rows) {
             $allRows = array_merge($allRows, $rows);
         }
@@ -84,7 +81,7 @@ public function testQuery()
         $query = new Query();
         $query->from('customer')->orderBy('name');
         $allRows = [];
-        $batch = $query->batch(2, $db);
+        $batch = $query->batch(2);
         foreach ($batch as $rows) {
             $allRows = array_merge($allRows, $rows);
         }
@@ -106,7 +103,7 @@ public function testQuery()
         $query = new Query();
         $query->from('customer')->where(['name' => 'unexistingName']);
         $allRows = [];
-        $batch = $query->batch(2, $db);
+        $batch = $query->batch(2);
         foreach ($batch as $rows) {
             $allRows = array_merge($allRows, $rows);
         }
@@ -116,7 +113,7 @@ public function testQuery()
         $query = new Query();
         $query->from('customer')->indexBy('name');
         $allRows = [];
-        foreach ($query->batch(2, $db) as $rows) {
+        foreach ($query->batch(2) as $rows) {
             $allRows = array_merge($allRows, $rows);
         }
         $this->assertEquals(9, count($allRows));
@@ -128,7 +125,7 @@ public function testQuery()
         $query = new Query();
         $query->from('customer')->orderBy('name');
         $allRows = [];
-        foreach ($query->each(100, $db) as $rows) {
+        foreach ($query->each(100) as $rows) {
             $allRows[] = $rows;
         }
         $this->assertEquals(9, count($allRows));
@@ -140,7 +137,7 @@ public function testQuery()
         $query = new Query();
         $query->from('customer')->orderBy('name')->indexBy('name');
         $allRows = [];
-        foreach ($query->each(100, $db) as $key => $row) {
+        foreach ($query->each(100) as $key => $row) {
             $allRows[$key] = $row;
         }
         $this->assertEquals(9, count($allRows));
@@ -151,11 +148,10 @@ public function testQuery()
 
     public function testActiveQuery()
     {
-        $db = $this->getConnection();
 
         $query = Customer::find()->orderBy('id');
         $customers = [];
-        foreach ($query->batch(2, $db) as $models) {
+        foreach ($query->batch(2) as $models) {
             $customers = array_merge($customers, $models);
         }
         $this->assertEquals(9, count($customers));
@@ -166,7 +162,7 @@ public function testActiveQuery()
         // batch with eager loading
         $query = Customer::find()->with('orders')->orderBy('id');
         $customers = [];
-        foreach ($query->batch(2, $db) as $models) {
+        foreach ($query->batch(2) as $models) {
             $customers = array_merge($customers, $models);
             foreach ($models as $model) {
                 $this->assertTrue($model->isRelationPopulated('orders'));

tests/CacheTest.php

@@ -26,7 +26,6 @@ protected function createCache()
     {
         return Yii::createObject([
             'class' => Cache::className(),
-            'db' => $this->getConnection(),
             'cacheCollection' => static::$cacheCollection,
             'gcProbability' => 0,
         ]);

tests/CollectionTest.php

@@ -19,21 +19,21 @@ protected function tearDown()
     public function testGetName()
     {
         $collectionName = 'customer';
-        $collection = $this->getConnection()->getCollection($collectionName);
+        $collection = yii::$app->mongodb->getCollection($collectionName);
         $this->assertEquals($collectionName, $collection->name);
-        $this->assertEquals($this->getConnection()->getDefaultDatabaseName() . '.' . $collectionName, $collection->getFullName());
+        $this->assertEquals(yii::$app->mongodb->getDefaultDatabaseName() . '.' . $collectionName, $collection->getFullName());
     }
 
     public function testFind()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $cursor = $collection->find();
         $this->assertTrue($cursor instanceof Cursor);
     }
 
     public function testInsert()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $data = [
             'name' => 'customer 1',
             'address' => 'customer 1 address',
@@ -49,7 +49,7 @@ public function testInsert()
      */
     public function testFindOne()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $data = [
             'name' => 'customer 1',
             'address' => 'customer 1 address',
@@ -69,7 +69,7 @@ public function testFindOne()
      */
     public function testFindAll()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $data = [
             'name' => 'customer 1',
             'address' => 'customer 1 address',
@@ -90,7 +90,7 @@ public function testFindAll()
      */
     public function testBatchInsert()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $rows = [
             [
                 'name' => 'customer 1',
@@ -109,7 +109,7 @@ public function testBatchInsert()
 
     public function testSave()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $data = [
             'name' => 'customer 1',
             'address' => 'customer 1 address',
@@ -124,7 +124,7 @@ public function testSave()
      */
     public function testUpdateBySave()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $data = [
             'name' => 'customer 1',
             'address' => 'customer 1 address',
@@ -145,7 +145,7 @@ public function testUpdateBySave()
      */
     public function testRemove()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $data = [
             'name' => 'customer 1',
             'address' => 'customer 1 address',
@@ -165,7 +165,7 @@ public function testRemove()
      */
     public function testRemoveComplexCondition()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $collection->batchInsert([
             [
                 'name' => 'customer 1',
@@ -193,7 +193,7 @@ public function testRemoveComplexCondition()
      */
     public function testUpdate()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $data = [
             'name' => 'customer 1',
             'address' => 'customer 1 address',
@@ -215,7 +215,7 @@ public function testUpdate()
      */
     public function testGroup()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $rows = [
             [
                 'name' => 'customer 1',
@@ -239,7 +239,7 @@ public function testGroup()
 
     public function testFindAndModify()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $rows = [
             [
                 'name' => 'customer 1',
@@ -294,7 +294,7 @@ public function testFindAndModify()
      */
     public function testMapReduce()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $rows = [
             [
                 'name' => 'customer 1',
@@ -327,7 +327,7 @@ public function testMapReduce()
         );
         $this->assertEquals('mapReduceOut', $result);
 
-        $outputCollection = $this->getConnection()->getCollection($result);
+        $outputCollection = yii::$app->mongodb->getCollection($result);
         $rows = $this->findAll($outputCollection);
         $expectedRows = [
             [
@@ -347,7 +347,7 @@ public function testMapReduce()
      */
     public function testMapReduceInline()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $rows = [
             [
                 'name' => 'customer 1',
@@ -393,7 +393,7 @@ public function testMapReduceInline()
 
     public function testCreateIndex()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $columns = [
             'name',
             'status' => SORT_DESC
@@ -408,7 +408,7 @@ public function testCreateIndex()
      */
     public function testDropIndex()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
 
         $collection->createIndex('name');
         $this->assertTrue($collection->dropIndex('name'));
@@ -425,7 +425,7 @@ public function testDropIndex()
      */
     public function testDropIndexWithPlugin()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
 
         $columns = [
             'name' => 'text'
@@ -442,7 +442,7 @@ public function testDropIndexWithPlugin()
      */
     public function testDropAllIndexes()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $collection->createIndex('name');
         $this->assertEquals(2, $collection->dropAllIndexes());
         $indexInfo = $collection->listIndexes();
@@ -451,7 +451,7 @@ public function testDropAllIndexes()
 
     public function testCreateIndexes()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $columns = [
             ['key' => ['name']],
             ['key' => ['status' => SORT_DESC]]
@@ -466,7 +466,7 @@ public function testCreateIndexes()
      */
     public function testDropIndexes()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $columns = [
             [
                 'key' => ['name'],
@@ -491,7 +491,7 @@ public function testDropIndexes()
      */
     public function testFindByNotObjectId()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
 
         $data = [
             'name' => 'customer 1',
@@ -516,7 +516,7 @@ public function testFindByNotObjectId()
      */
     public function testInsertMongoBin()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
 
         $fileName = __FILE__;
         $data = [
@@ -534,7 +534,7 @@ public function testInsertMongoBin()
      */
     public function testDistinct()
     {
-        $collection = $this->getConnection()->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
 
         $rows = [
             [

tests/CommandTest.php

@@ -16,7 +16,7 @@ protected function tearDown()
 
     public function testCreateCollection()
     {
-        $command = $this->getConnection()->createCommand();
+        $command = yii::$app->mongodb->createCommand();
         $this->assertTrue($command->createCollection('customer'));
     }
 
@@ -25,20 +25,20 @@ public function testCreateCollection()
      */
     public function testDropCollection()
     {
-        $command = $this->getConnection()->createCommand();
+        $command = yii::$app->mongodb->createCommand();
         $command->createCollection('customer');
         $this->assertTrue($command->dropCollection('customer'));
     }
 
     public function testCount()
     {
-        $command = $this->getConnection()->createCommand();
+        $command = yii::$app->mongodb->createCommand();
         $this->assertEquals(0, $command->count('customer'));
     }
 
     public function testCreateIndexes()
     {
-        $command = $this->getConnection()->createCommand();
+        $command = yii::$app->mongodb->createCommand();
         $this->assertTrue($command->createIndexes('customer', [
             [
                 'key' => ['name' => +1],
@@ -57,7 +57,7 @@ public function testCreateIndexes()
      */
     public function testListIndexes()
     {
-        $command = $this->getConnection()->createCommand();
+        $command = yii::$app->mongodb->createCommand();
         $command->createIndexes('customer', [
             [
                 'key' => ['name' => +1],
@@ -75,7 +75,7 @@ public function testListIndexes()
      */
     public function testDropIndexes()
     {
-        $command = $this->getConnection()->createCommand();
+        $command = yii::$app->mongodb->createCommand();
         $command->createIndexes('customer', [
             [
                 'key' => ['name' => +1],
@@ -100,7 +100,7 @@ public function testDropIndexes()
 
     public function testInsert()
     {
-        $command = $this->getConnection()->createCommand();
+        $command = yii::$app->mongodb->createCommand();
         $insertedId = $command->insert('customer', ['name' => 'John']);
         $this->assertTrue($insertedId instanceof ObjectID);
     }
@@ -110,7 +110,7 @@ public function testInsert()
      */
     public function testBatchInsert()
     {
-        $command = $this->getConnection()->createCommand();
+        $command = yii::$app->mongodb->createCommand();
         $insertedIds = $command->batchInsert('customer', [
             ['name' => 'John'],
             ['name' => 'Sara'],
@@ -124,11 +124,10 @@ public function testBatchInsert()
      */
     public function testUpdate()
     {
-        $connection = $this->getConnection();
 
-        $newRecordId = $connection->createCommand()->insert('customer', ['name' => 'John']);
+        $newRecordId = yii::$app->mongodb->createCommand()->insert('customer', ['name' => 'John']);
 
-        $result = $connection->createCommand()->update('customer', ['_id' => $newRecordId], ['name' => 'Mike']);
+        $result = yii::$app->mongodb->createCommand()->update('customer', ['_id' => $newRecordId], ['name' => 'Mike']);
 
         $this->assertEquals(1, $result->getModifiedCount());
     }
@@ -138,11 +137,10 @@ public function testUpdate()
      */
     public function testDelete()
     {
-        $connection = $this->getConnection();
 
-        $newRecordId = $connection->createCommand()->insert('customer', ['name' => 'John']);
+        $newRecordId = yii::$app->mongodb->createCommand()->insert('customer', ['name' => 'John']);
 
-        $result = $connection->createCommand()->delete('customer', ['_id' => $newRecordId]);
+        $result = yii::$app->mongodb->createCommand()->delete('customer', ['_id' => $newRecordId]);
 
         $this->assertEquals(1, $result->getDeletedCount());
     }
@@ -152,11 +150,10 @@ public function testDelete()
      */
     public function testFind()
     {
-        $connection = $this->getConnection();
 
-        $connection->createCommand()->insert('customer', ['name' => 'John']);
+        yii::$app->mongodb->createCommand()->insert('customer', ['name' => 'John']);
 
-        $cursor = $connection->createCommand()->find('customer', []);
+        $cursor = yii::$app->mongodb->createCommand()->find('customer', []);
         $rows = $cursor->toArray();
         $this->assertCount(1, $rows);
         $this->assertEquals('John', $rows[0]['name']);
@@ -167,7 +164,6 @@ public function testFind()
      */
     public function testFindAndModify()
     {
-        $connection = $this->getConnection();
         $rows = [
             [
                 'name' => 'customer 1',
@@ -180,20 +176,20 @@ public function testFindAndModify()
                 'amount' => 200,
             ],
         ];
-        $command = $connection->createCommand();
+        $command = yii::$app->mongodb->createCommand();
         $command->batchInsert('customer', $rows);
 
         // increment field
-        $result = $connection->createCommand()->findAndModify('customer', ['name' => 'customer 1'], ['$inc' => ['status' => 1]]);
+        $result = yii::$app->mongodb->createCommand()->findAndModify('customer', ['name' => 'customer 1'], ['$inc' => ['status' => 1]]);
         $this->assertEquals('customer 1', $result['name']);
         $this->assertEquals(1, $result['status']);
 
-        $cursor = $connection->createCommand()->find('customer', ['name' => 'customer 1']);
+        $cursor = yii::$app->mongodb->createCommand()->find('customer', ['name' => 'customer 1']);
         $newResult = current($cursor->toArray());
         $this->assertEquals(2, $newResult['status']);
 
         // $set and return modified document
-        $result = $connection->createCommand()->findAndModify(
+        $result = yii::$app->mongodb->createCommand()->findAndModify(
             'customer',
             ['name' => 'customer 2'],
             ['$set' => ['status' => 2]],
@@ -207,7 +203,7 @@ public function testFindAndModify()
             'name' => 'customer 3',
             'city' => 'Minsk'
         ];
-        $result = $connection->createCommand()->findAndModify(
+        $result = yii::$app->mongodb->createCommand()->findAndModify(
             'customer',
             ['name' => 'customer 2'],
             $data,
@@ -219,15 +215,14 @@ public function testFindAndModify()
 
         // Test exceptions
         $this->expectException('\yii\mongodb\Exception');
-        $connection->createCommand()->findAndModify('customer',['name' => 'customer 1'], ['$wrongOperator' => ['status' => 1]]);
+        yii::$app->mongodb->createCommand()->findAndModify('customer',['name' => 'customer 1'], ['$wrongOperator' => ['status' => 1]]);
     }
 
     /**
      * @depends testBatchInsert
      */
     public function testAggregate()
     {
-        $connection = $this->getConnection();
         $rows = [
             [
                 'name' => 'customer 1',
@@ -240,7 +235,7 @@ public function testAggregate()
                 'amount' => 200,
             ],
         ];
-        $command = $connection->createCommand();
+        $command = yii::$app->mongodb->createCommand();
         $command->batchInsert('customer', $rows);
 
         $pipelines = [
@@ -256,7 +251,7 @@ public function testAggregate()
                 ]
             ]
         ];
-        $result = $connection->createCommand()->aggregate('customer', $pipelines);
+        $result = yii::$app->mongodb->createCommand()->aggregate('customer', $pipelines);
 
         $this->assertEquals(['_id' => '1', 'total' => 300], $result[0]);
     }
@@ -268,7 +263,6 @@ public function testAggregate()
      */
     public function testAggregateCursor()
     {
-        $connection = $this->getConnection();
         $rows = [
             [
                 'name' => 'customer 1',
@@ -291,7 +285,7 @@ public function testAggregateCursor()
                 'amount' => 200,
             ],
         ];
-        $command = $connection->createCommand();
+        $command = yii::$app->mongodb->createCommand();
         $command->batchInsert('customer', $rows);
 
         $pipelines = [
@@ -307,7 +301,7 @@ public function testAggregateCursor()
                 ]
             ]
         ];
-        $result = $connection->createCommand()->aggregate('customer', $pipelines, ['cursor' => ['batchSize' => 2]]);
+        $result = yii::$app->mongodb->createCommand()->aggregate('customer', $pipelines, ['cursor' => ['batchSize' => 2]]);
         $this->assertTrue($result instanceof Cursor);
 
         $this->assertEquals(['_id' => '1', 'total' => 600], $result->toArray()[0]);
@@ -318,11 +312,10 @@ public function testAggregateCursor()
      */
     public function testExplain()
     {
-        $connection = $this->getConnection();
 
-        $connection->createCommand()->insert('customer', ['name' => 'John']);
+        yii::$app->mongodb->createCommand()->insert('customer', ['name' => 'John']);
 
-        $result = $connection->createCommand()->explain('customer', [
+        $result = yii::$app->mongodb->createCommand()->explain('customer', [
             'filter' => [
                 'name' => 'John'
             ],
@@ -337,11 +330,10 @@ public function testExplain()
      */
     public function testListCollections()
     {
-        $connection = $this->getConnection();
 
-        $connection->createCommand()->createCollection('customer');
+        yii::$app->mongodb->createCommand()->createCollection('customer');
 
-        $collections = $connection->createCommand()->listCollections();
+        $collections = yii::$app->mongodb->createCommand()->listCollections();
         $collectionNames = ArrayHelper::getColumn($collections, 'name');
         $this->assertContains('customer', $collectionNames);
     }
@@ -354,22 +346,21 @@ public function testListCollections()
      */
     public function testUpdateUpsert()
     {
-        $connection = $this->getConnection();
 
-        $connection->createCommand()->insert('customer', ['name' => 'John']);
+        yii::$app->mongodb->createCommand()->insert('customer', ['name' => 'John']);
 
-        $result = $connection->createCommand()
+        $result = yii::$app->mongodb->createCommand()
             ->update('customer', ['name' => 'Mike'], ['name' => 'Jack']);
 
         $this->assertEquals(0, $result->getModifiedCount());
         $this->assertEquals(0, $result->getUpsertedCount());
-        $this->assertEquals(1, $connection->createCommand()->count('customer'));
+        $this->assertEquals(1, yii::$app->mongodb->createCommand()->count('customer'));
 
-        $result = $connection->createCommand()
+        $result = yii::$app->mongodb->createCommand()
             ->update('customer', ['name' => 'Mike'], ['name' => 'Jack'], ['upsert' => true]);
 
         $this->assertEquals(0, $result->getModifiedCount());
         $this->assertEquals(1, $result->getUpsertedCount());
-        $this->assertEquals(2, $connection->createCommand()->count('customer'));
+        $this->assertEquals(2, yii::$app->mongodb->createCommand()->count('customer'));
     }
 }

tests/ConnectionTest.php

@@ -46,17 +46,16 @@ public function testOpenClose()
 
     public function testGetDatabase()
     {
-        $connection = $this->getConnection();
 
-        $database = $connection->getDatabase($connection->defaultDatabaseName);
+        $database = yii::$app->mongodb->getDatabase(yii::$app->mongodb->defaultDatabaseName);
         $this->assertTrue($database instanceof Database);
-        $this->assertSame($connection, $database->connection);
-        $this->assertSame($connection->defaultDatabaseName, $database->name);
+        $this->assertSame(yii::$app->mongodb, $database->connection);
+        $this->assertSame(yii::$app->mongodb->defaultDatabaseName, $database->name);
 
-        $database2 = $connection->getDatabase($connection->defaultDatabaseName);
+        $database2 = yii::$app->mongodb->getDatabase(yii::$app->mongodb->defaultDatabaseName);
         $this->assertTrue($database === $database2);
 
-        $databaseRefreshed = $connection->getDatabase($connection->defaultDatabaseName, true);
+        $databaseRefreshed = yii::$app->mongodb->getDatabase(yii::$app->mongodb->defaultDatabaseName, true);
         $this->assertFalse($database === $databaseRefreshed);
     }
 
@@ -110,15 +109,14 @@ public function testGetDefaultDatabase()
      */
     public function testGetCollection()
     {
-        $connection = $this->getConnection();
 
-        $collection = $connection->getCollection('customer');
+        $collection = yii::$app->mongodb->getCollection('customer');
         $this->assertTrue($collection instanceof Collection);
 
-        $collection2 = $connection->getCollection('customer');
+        $collection2 = yii::$app->mongodb->getCollection('customer');
         $this->assertTrue($collection === $collection2);
 
-        $collection2 = $connection->getCollection('customer', true);
+        $collection2 = yii::$app->mongodb->getCollection('customer', true);
         $this->assertFalse($collection === $collection2);
     }
 
@@ -127,31 +125,28 @@ public function testGetCollection()
      */
     public function testGetFileCollection()
     {
-        $connection = $this->getConnection();
 
-        $collection = $connection->getFileCollection('testfs');
+        $collection = yii::$app->mongodb->getFileCollection('testfs');
         $this->assertTrue($collection instanceof FileCollection);
 
-        $collection2 = $connection->getFileCollection('testfs');
+        $collection2 = yii::$app->mongodb->getFileCollection('testfs');
         $this->assertTrue($collection === $collection2);
 
-        $collection2 = $connection->getFileCollection('testfs', true);
+        $collection2 = yii::$app->mongodb->getFileCollection('testfs', true);
         $this->assertFalse($collection === $collection2);
     }
 
     public function testGetQueryBuilder()
     {
-        $connection = $this->getConnection();
 
-        $this->assertTrue($connection->getQueryBuilder() instanceof QueryBuilder);
+        $this->assertTrue(yii::$app->mongodb->getQueryBuilder() instanceof QueryBuilder);
     }
 
     public function testCreateCommand()
     {
-        $connection = $this->getConnection();
 
-        $command = $connection->createCommand();
+        $command = yii::$app->mongodb->createCommand();
         $this->assertTrue($command instanceof Command);
-        $this->assertSame($connection, $command->db);
+        $this->assertSame(yii::$app->mongodb, $command->db);
     }
 }

tests/DatabaseTest.php

@@ -19,7 +19,7 @@ protected function tearDown()
 
     public function testGetCollection()
     {
-        $database = $this->getConnection()->getDatabase();
+        $database = yii::$app->mongodb->getDatabase();
 
         $collection = $database->getCollection('customer');
         $this->assertTrue($collection instanceof Collection);
@@ -34,7 +34,7 @@ public function testGetCollection()
 
     public function testGetFileCollection()
     {
-        $database = $this->getConnection()->getDatabase();
+        $database = yii::$app->mongodb->getDatabase();
 
         $collection = $database->getFileCollection('testfs');
         $this->assertTrue($collection instanceof FileCollection);
@@ -49,7 +49,7 @@ public function testGetFileCollection()
 
     public function testCreateCommand()
     {
-        $database = $this->getConnection()->getDatabase();
+        $database = yii::$app->mongodb->getDatabase();
 
         $command = $database->createCommand();
         $this->assertTrue($command instanceof Command);
@@ -58,7 +58,7 @@ public function testCreateCommand()
 
     public function testCreateCollection()
     {
-        $database = $this->getConnection()->getDatabase();
+        $database = yii::$app->mongodb->getDatabase();
         $this->assertTrue($database->createCollection('customer'));
     }
 }

tests/LogBuilderTest.php

@@ -37,7 +37,7 @@ public function dataProviderEncodeData()
      */
     public function testEncodeData($data, $expectedResult)
     {
-        $logBuilder = $this->getConnection()->getLogBuilder();
+        $logBuilder = yii::$app->mongodb->getLogBuilder();
         $this->assertTrue(strcasecmp($expectedResult, $logBuilder->encodeData($data)) === 0);
     }
 }

tests/MigrationTest.php

@@ -12,19 +12,11 @@ protected function tearDown()
         parent::tearDown();
     }
 
-    /**
-     * @return Migration migration instance.
-     */
-    protected function createMigration()
-    {
-        return new Migration(['db' => $this->getConnection()]);
-    }
-
     // Tests :
 
     public function testCollectionOperations()
     {
-        $migration = $this->createMigration();
+        $migration = new Migration;
 
         $migration->createCollection('customer');
         $this->assertNotEmpty($migration->db->getDatabase()->listCollections(['name' => 'customer']));
@@ -35,7 +27,7 @@ public function testCollectionOperations()
 
     public function testIndexOperations()
     {
-        $migration = $this->createMigration();
+        $migration = new Migration;
 
         $migration->createIndexes('customer', [
             ['key' => 'name']
@@ -58,7 +50,7 @@ public function testIndexOperations()
 
     public function testDataOperations()
     {
-        $migration = $this->createMigration();
+        $migration = new Migration;
 
         $id = $migration->insert('customer', ['name' => 'John Doe']);
         $this->assertTrue($id instanceof ObjectID);
@@ -85,7 +77,7 @@ public function testDataOperations()
      */
     public function testCommandOutput()
     {
-        $migration = $this->createMigration();
+        $migration = new Migration;
 
         $migration->compact = false;
         $migration->createCollection('customer');

tests/QueryRunTest.php

@@ -26,7 +26,6 @@ protected function createSession()
     {
         return Yii::createObject([
             'class' => Session::className(),
-            'db' => $this->getConnection(),
             'sessionCollection' => static::$sessionCollection,
         ]);
     }

tests/SessionTest.php

@@ -34,6 +34,7 @@ protected function setUp()
         if (!empty($config)) {
             $this->mongoDbConfig = $config;
         }
+        Yii::$app->setComponents(['mongodb' => $this->getConnection()]);
         //$this->mockApplication();
     }
 

tests/TestCase.php

@@ -49,15 +49,14 @@ public function setUp()
         $this->setUpMigrationPath();
 
         $this->mockApplication();
-        Yii::$app->setComponents(['mongodb' => $this->getConnection()]);
     }
 
     public function tearDown()
     {
         parent::tearDown();
         if (extension_loaded('mongodb')) {
             try {
-                $this->getConnection()->getCollection('migration')->drop();
+                yii::$app->mongodb->getCollection('migration')->drop();
             } catch (Exception $e) {
                 // shutdown exception
             }
@@ -501,17 +500,16 @@ public function testNamespaceTo()
      */
     public function testGetMigrationHistory()
     {
-        $connection = $this->getConnection();
 
         $controllerConfig = [
             'migrationPath' => null,
             'migrationNamespaces' => [$this->migrationNamespace]
         ];
 
         $controller = $this->createMigrateController($controllerConfig);
-        $controller->db = $this->getConnection();
+        $controller->db = yii::$app->mongodb;
 
-        $connection->createCommand()->batchInsert('migration', [
+        yii::$app->mongodb->createCommand()->batchInsert('migration', [
             [
                 'version' => 'app\migrations\M140506102106One',
                 'apply_time' => 10,
@@ -574,9 +572,7 @@ public function testRefreshMigration()
             $this->markTestSkipped('Method "yii\console\controllers\BaseMigrateController::actionFresh()" does not exist in this Yii framework version.');
         }
 
-        $connection = $this->getConnection();
-
-        $collection = $connection->getCollection('hall_of_fame');
+        $collection = yii::$app->mongodb->getCollection('hall_of_fame');
         $collection->insert(['name' => 'Qiang Xue']);
         $collection->insert(['name' => 'Alexander Makarov']);
 
@@ -585,6 +581,6 @@ public function testRefreshMigration()
         $this->assertContains('Collection hall_of_fame dropped.', $result);
         $this->assertContains('No new migrations found. Your system is up-to-date.', $result);
 
-        $this->assertEmpty($connection->getDatabase()->listCollections(['name' => $collection->name]));
+        $this->assertEmpty(yii::$app->mongodb->getDatabase()->listCollections(['name' => $collection->name]));
     }
 }

tests/console/controllers/MigrateControllerTest.php

@@ -2,6 +2,8 @@
 
 namespace yiiunit\extensions\mongodb\data\ar;
 
+use yii\mongodb\ActiveRecord;
+
 /**
  * Animal
  *

tests/data/ar/ActiveRecord.php

@@ -3,6 +3,7 @@
 namespace yiiunit\extensions\mongodb\data\ar;
 
 use yiiunit\extensions\mongodb\data\ar\file\CustomerFile;
+use yii\mongodb\ActiveRecord;
 
 /**
  * @property \MongoDB\BSON\ObjectID|string $_id

tests/data/ar/Animal.php

@@ -2,6 +2,8 @@
 
 namespace yiiunit\extensions\mongodb\data\ar;
 
+use yii\mongodb\ActiveRecord;
+
 /**
  * @property \MongoDB\BSON\ObjectID|string $_id
  * @property int $number

tests/data/ar/Customer.php

@@ -2,6 +2,8 @@
 
 namespace yiiunit\extensions\mongodb\data\ar;
 
+use yii\mongodb\ActiveRecord;
+
 /**
  * Dog
  *

tests/data/ar/CustomerOrder.php

@@ -2,6 +2,8 @@
 
 namespace yiiunit\extensions\mongodb\data\ar;
 
+use \yii\mongodb\ActiveRecord;
+
 /**
  * @property \MongoDB\BSON\ObjectID|string $_id
  * @property string $name

tests/data/ar/Dog.php

@@ -1,7 +1,8 @@
 <?php
-
 namespace yiiunit\extensions\mongodb\data\ar\file;
 
+use yii\mongodb\file\ActiveRecord;
+
 class CustomerFile extends ActiveRecord
 {
     /**

tests/data/ar/Item.php

@@ -23,7 +23,6 @@ class ActiveRecordTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        ActiveRecord::$db = $this->getConnection();
         $this->dropFileCollection(CustomerFile::collectionName());
         $this->setUpTestRows();
         $filePath = $this->getTestFilePath();
@@ -55,7 +54,7 @@ protected function getTestFilePath()
      */
     protected function setUpTestRows()
     {
-        $collection = $this->getConnection()->getFileCollection(CustomerFile::collectionName());
+        $collection = yii::$app->mongodb->getFileCollection(CustomerFile::collectionName());
         $rows = [];
         for ($i = 1; $i <= 10; $i++) {
             $record = [

tests/data/ar/file/ActiveRecord.php

@@ -14,8 +14,6 @@ class ActiveRelationTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        \yiiunit\extensions\mongodb\data\ar\ActiveRecord::$db = $this->getConnection();
-        \yiiunit\extensions\mongodb\data\ar\file\ActiveRecord::$db = $this->getConnection();
         $this->setUpTestRows();
     }
 
@@ -31,7 +29,7 @@ protected function tearDown()
      */
     protected function setUpTestRows()
     {
-        $fileCollection = $this->getConnection()->getFileCollection(CustomerFile::collectionName());
+        $fileCollection = yii::$app->mongodb->getFileCollection(CustomerFile::collectionName());
         $customers = [];
         $files = [];
         for ($i = 1; $i <= 5; $i++) {
@@ -52,7 +50,7 @@ protected function setUpTestRows()
                 'file_id' => $file['_id'],
             ];
         }
-        $customerCollection = $this->getConnection()->getCollection(Customer::collectionName());
+        $customerCollection = yii::$app->mongodb->getCollection(Customer::collectionName());
         $customers = $customerCollection->batchInsert($customers);
     }
 

tests/data/ar/file/CustomerFile.php

@@ -22,23 +22,23 @@ protected function tearDown()
 
     public function testGetChunkCollection()
     {
-        $collection = $this->getConnection()->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
         $chunkCollection = $collection->getChunkCollection();
         $this->assertTrue($chunkCollection instanceof \yii\mongodb\Collection);
         $this->assertTrue($chunkCollection->database instanceof \yii\mongodb\Database);
     }
 
     public function testGetFileCollection()
     {
-        $collection = $this->getConnection()->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
         $fileCollection = $collection->getFileCollection();
         $this->assertTrue($fileCollection instanceof \yii\mongodb\Collection);
         $this->assertTrue($fileCollection->database instanceof \yii\mongodb\Database);
     }
 
     public function testEnsureIndexes()
     {
-        $collection = $this->getConnection()->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
 
         $collection->ensureIndexes();
         $this->assertCount(2, $collection->listIndexes());
@@ -54,14 +54,14 @@ public function testEnsureIndexes()
 
     public function testFind()
     {
-        $collection = $this->getConnection()->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
         $cursor = $collection->find();
         $this->assertTrue($cursor instanceof Cursor);
     }
 
     public function testInsertFile()
     {
-        $collection = $this->getConnection()->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
 
         $filename = __FILE__;
         $id = $collection->insertFile($filename);
@@ -77,7 +77,7 @@ public function testInsertFile()
 
     public function testInsertFileContent()
     {
-        $collection = $this->getConnection()->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
 
         $bytes = 'Test file content';
         $id = $collection->insertFileContent($bytes);
@@ -97,7 +97,7 @@ public function testInsertFileContent()
      */
     public function testGet()
     {
-        $collection = $this->getConnection()->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
 
         $bytes = 'Test file content';
         $id = $collection->insertFileContent($bytes);
@@ -112,7 +112,7 @@ public function testGet()
      */
     public function testDeleteFile()
     {
-        $collection = $this->getConnection()->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
 
         $bytes = 'Test file content';
         $id = $collection->insertFileContent($bytes);
@@ -128,7 +128,7 @@ public function testDeleteFile()
      */
     public function testRemove()
     {
-        $collection = $this->getConnection()->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
 
         for ($i = 1; $i <=10; $i++) {
             $bytes = 'Test file content ' . $i;

tests/file/ActiveRecordTest.php

@@ -19,7 +19,7 @@ protected function tearDown()
 
     public function testToStream()
     {
-        $collection = $this->getConnection()->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
 
         $upload = $collection->createUpload();
         $document = $upload->addContent('test content')->complete();
@@ -34,7 +34,7 @@ public function testToStream()
 
     public function testToFile()
     {
-        $collection = $this->getConnection()->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
 
         $upload = $collection->createUpload();
         $document = $upload->addContent('test content')->complete();
@@ -49,7 +49,7 @@ public function testToFile()
 
     public function testSubstr()
     {
-        $collection = $this->getConnection()->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
 
         $upload = $collection->createUpload();
         $upload->chunkSize = 10;

tests/file/ActiveRelationTest.php

@@ -28,7 +28,7 @@ protected function tearDown()
      */
     protected function setUpTestRows()
     {
-        $collection = $this->getConnection()->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
         for ($i = 1; $i <= 10; $i++) {
             $collection->insertFileContent('content' . $i, [
                 'filename' => 'name' . $i,
@@ -41,28 +41,25 @@ protected function setUpTestRows()
 
     public function testAll()
     {
-        $connection = $this->getConnection();
         $query = new Query();
-        $rows = $query->from('fs')->all($connection);
+        $rows = $query->from('fs')->all();
         $this->assertEquals(10, count($rows));
     }
 
     public function testOne()
     {
-        $connection = $this->getConnection();
         $query = new Query();
-        $row = $query->from('fs')->one($connection);
+        $row = $query->from('fs')->one();
         $this->assertTrue(is_array($row));
         $this->assertTrue($row['file'] instanceof Download);
     }
 
     public function testDirectMatch()
     {
-        $connection = $this->getConnection();
         $query = new Query();
         $rows = $query->from('fs')
             ->where(['file_index' => 5])
-            ->all($connection);
+            ->all();
         $this->assertEquals(1, count($rows));
 
         $file = $rows[0];

tests/file/CollectionTest.php

@@ -8,9 +8,8 @@ class StreamWrapperTest extends TestCase
 {
     protected function tearDown()
     {
-        $connection = $this->getConnection();
-        if (in_array($connection->fileStreamProtocol, stream_get_wrappers())) {
-            stream_wrapper_unregister($connection->fileStreamProtocol);
+        if (in_array(yii::$app->mongodb->fileStreamProtocol, stream_get_wrappers())) {
+            stream_wrapper_unregister(yii::$app->mongodb->fileStreamProtocol);
         }
 
         $this->dropFileCollection('fs');
@@ -22,7 +21,7 @@ protected function tearDown()
 
     public function testCreateFromDownload()
     {
-        $collection = $this->getConnection()->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
 
         $upload = $collection->createUpload();
         $document = $upload->addContent('test content')->complete();
@@ -36,23 +35,22 @@ public function testCreateFromDownload()
 
     public function testWriteResource()
     {
-        $connection = $this->getConnection();
         $this->mockApplication([
             'components' => [
-                'mongodb' => $connection
+                'mongodb' => yii::$app->mongodb
             ],
         ]);
 
-        $connection->registerFileStreamWrapper(true);
-        $databaseName = $connection->getDefaultDatabaseName();
+        yii::$app->mongodb->registerFileStreamWrapper(true);
+        $databaseName = yii::$app->mongodb->getDefaultDatabaseName();
 
         $url = "gridfs://{$databaseName}.fs?filename=test.txt";
         $resource = fopen($url, 'w');
         fwrite($resource, 'begin ');
         fwrite($resource, 'end');
         fclose($resource);
 
-        $collection = $connection->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
         $document = $collection->findOne(['filename' => 'test.txt']);
         $this->assertNotEmpty($document);
 
@@ -61,19 +59,18 @@ public function testWriteResource()
 
     public function testReadResource()
     {
-        $connection = $this->getConnection();
         $this->mockApplication([
             'components' => [
-                'mongodb' => $connection
+                'mongodb' => yii::$app->mongodb
             ],
         ]);
 
-        $collection = $connection->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
         $upload = $collection->createUpload();
         $document = $upload->addContent('test content')->complete();
 
-        $connection->registerFileStreamWrapper(true);
-        $databaseName = $connection->getDefaultDatabaseName();
+        yii::$app->mongodb->registerFileStreamWrapper(true);
+        $databaseName = yii::$app->mongodb->getDefaultDatabaseName();
 
         $url = "gridfs://{$databaseName}.fs?_id=" . $document['_id'];
         $resource = fopen($url, 'r');
@@ -83,15 +80,14 @@ public function testReadResource()
 
     public function testSeek()
     {
-        $connection = $this->getConnection();
         $this->mockApplication([
             'components' => [
-                'mongodb' => $connection
+                'mongodb' => yii::$app->mongodb
             ],
         ]);
 
-        $connection->registerFileStreamWrapper(true);
-        $databaseName = $connection->getDefaultDatabaseName();
+        yii::$app->mongodb->registerFileStreamWrapper(true);
+        $databaseName = yii::$app->mongodb->getDefaultDatabaseName();
 
         $url = "gridfs://{$databaseName}.fs?filename=test.txt";
         $resource = fopen($url, 'w');

tests/file/DownloadTest.php

@@ -20,7 +20,7 @@ protected function tearDown()
 
     public function testAddContent()
     {
-        $collection = $this->getConnection()->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
 
         $upload = $collection->createUpload();
         $document = $upload->addContent('content line 1')
@@ -37,7 +37,7 @@ public function testAddContent()
      */
     public function testAddContentChunk()
     {
-        $collection = $this->getConnection()->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
 
         $upload = $collection->createUpload();
         $upload->chunkSize = 10;
@@ -50,7 +50,7 @@ public function testAddContentChunk()
 
     public function testAddStream()
     {
-        $collection = $this->getConnection()->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
 
         $upload = $collection->createUpload();
 
@@ -68,7 +68,7 @@ public function testAddStream()
      */
     public function testCancel()
     {
-        $collection = $this->getConnection()->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
 
         $upload = $collection->createUpload();
         $document = $upload->addContent('content line 1');
@@ -85,7 +85,7 @@ public function testCancel()
      */
     public function testCustomId()
     {
-        $collection = $this->getConnection()->getFileCollection();
+        $collection = yii::$app->mongodb->getFileCollection();
 
         $id = new ObjectID();
         $upload = $collection->createUpload([

tests/file/QueryTest.php

@@ -33,8 +33,7 @@ protected function tearDown()
      */
     protected function setupTestRows()
     {
-        $db = $this->getConnection();
-        $collection = $db->getCollection('message');
+        $collection = yii::$app->mongodb->getCollection('message');
         $collection->batchInsert([
             [
                 'language' => 'de',
@@ -104,7 +103,6 @@ protected function setupI18N()
         $this->i18n = new I18N([
             'translations' => [
                 '*' => new MongoDbMessageSource([
-                    'db' => $this->getConnection(),
                     'sourceLanguage' => 'en-US',
                 ])
             ]

tests/file/StreamWrapperTest.php

@@ -14,21 +14,11 @@ protected function tearDown()
         parent::tearDown();
     }
 
-    /**
-     * @return MongoDbTarget test log target
-     */
-    protected function createLogTarget()
-    {
-        return new MongoDbTarget([
-            'db' => $this->getConnection(),
-        ]);
-    }
-
     // Tests :
 
     public function testExport()
     {
-        $target = $this->createLogTarget();
+        $target = new MongoDbTarget();
 
         $target->messages = [
             [

tests/file/UploadTest.php

@@ -23,7 +23,7 @@ class MongoDbManagerTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->auth = $this->createManager();
+        $this->auth = new MongoDbManager();
     }
 
     protected function tearDown()
@@ -34,14 +34,6 @@ protected function tearDown()
         parent::tearDown();
     }
 
-    /**
-     * @return MongoDbManager
-     */
-    protected function createManager()
-    {
-        return new MongoDbManager(['db' => $this->getConnection()]);
-    }
-
     // Tests :
 
     public function testCreateRole()
@@ -354,7 +346,7 @@ public function testAssignMultipleRoles()
         $this->auth->assign($reader, 'readingAuthor');
         $this->auth->assign($author, 'readingAuthor');
 
-        $this->auth = $this->createManager();
+        $this->auth = new MongoDbManager();
 
         $roles = $this->auth->getRolesByUser('readingAuthor');
         $roleNames = [];
@@ -376,7 +368,7 @@ public function testAssignmentsToIntegerId()
         $this->auth->assign($author, 1337);
         $this->auth->assign($reader, 1337);
 
-        $this->auth = $this->createManager();
+        $this->auth = new MongoDbManager();
 
         $this->assertEquals(0, count($this->auth->getAssignments(0)));
         $this->assertEquals(1, count($this->auth->getAssignments(42)));
@@ -389,7 +381,7 @@ public function testGetAssignmentsByRole()
         $reader = $this->auth->getRole('reader');
         $this->auth->assign($reader, 123);
 
-        $this->auth = $this->createManager();
+        $this->auth = new MongoDbManager();
 
         $this->assertEquals([], $this->auth->getUserIdsByRole('nonexisting'));
         $this->assertEquals(['reader A', '123'], $this->auth->getUserIdsByRole('reader'), '', 0.0, 10, true);