Tweak tests to make less database connections

Author: mnphpexpert

src/Jenssegers/Mongodb/Connection.php

@@ -126,7 +126,7 @@ protected function getDsn(array $config)
      */
     public function __call($method, $parameters)
     {
-        return call_user_func_array(array($this->connection, $method), $parameters);
+        return call_user_func_array(array($this->db, $method), $parameters);
     }
 
 }

tests/CacheTest.php

@@ -1,18 +1,14 @@
 <?php
 require_once('vendor/autoload.php');
 require_once('models/User.php');
+require_once('tests/app.php');
 
 use Jenssegers\Mongodb\Facades\DB;
 
 class CacheTest extends PHPUnit_Framework_TestCase {
 
-	protected $app;
-
 	public function setUp()
 	{
-		include('tests/app.php');
-		$this->app = $app;
-
 		// test data
 		User::create(array('name' => 'John Doe', 'age' => 35, 'title' => 'admin'));
 		User::create(array('name' => 'Jane Doe', 'age' => 33, 'title' => 'admin'));
@@ -37,8 +33,10 @@ public function testCache()
 		$users = User::where('age', '>', 10)->remember(10, 'db.users')->get();
 		$this->assertEquals(3, count($users));
 
+		global $app;
+
 		# get from cache driver
-		$cache = $this->app['cache'];
+		$cache = $app['cache'];
 		$users = $cache->get('db.users');
 		$this->assertEquals(3, count($users));
 	}

tests/ConnectionTest.php

@@ -1,43 +1,51 @@
 <?php
 require_once('vendor/autoload.php');
+require_once('tests/app.php');
 
+use Jenssegers\Mongodb\Facades\DB;
 use Jenssegers\Mongodb\Connection;
 
 class ConnectionTest extends PHPUnit_Framework_TestCase {
 
-	private $connection;
+	public function setUp() {}
 
-	public function setUp()
-	{
-		include('tests/app.php');
-		$this->connection = new Connection($app['config']['database.connections']['mongodb']);
-	}
+	public function tearDown() {}
 
-	public function tearDown()
+	public function testConnection()
 	{
+		$connection = DB::connection('mongodb');
+		$this->assertInstanceOf('Jenssegers\Mongodb\Connection', $connection);
+
+		$c1 = DB::connection('mongodb');
+		$c2 = DB::connection('mongodb');
+		$this->assertEquals($c1, $c2);
+
+		$c1 = DB::connection('mongodb');
+		$c2 = DB::reconnect('mongodb');
+		$this->assertNotEquals($c1, $c2);
 	}
 
 	public function testDb()
 	{
-		$db = $this->connection->getDb();
-		$this->assertInstanceOf('MongoDB', $db);
+		$connection = DB::connection('mongodb');
+		$this->assertInstanceOf('MongoDB', $connection->getDb());
 	}
 
 	public function testCollection()
 	{
-		$collection = $this->connection->getCollection('unittest');
+		$collection = DB::connection('mongodb')->getCollection('unittest');
 		$this->assertInstanceOf('MongoCollection', $collection);
 
-		$collection = $this->connection->collection('unittests');
+		$collection = DB::connection('mongodb')->collection('unittests');
 		$this->assertInstanceOf('Jenssegers\Mongodb\Builder', $collection);
 
-		$collection = $this->connection->table('unittests');
+		$collection = DB::connection('mongodb')->table('unittests');
 		$this->assertInstanceOf('Jenssegers\Mongodb\Builder', $collection);
 	}
 
 	public function testDynamic()
 	{
-		$dbs = $this->connection->listDBs();
+		$dbs = DB::connection('mongodb')->listCollections();
 		$this->assertTrue(is_array($dbs));
 	}
 

tests/ModelQueryTest.php

@@ -1,6 +1,7 @@
 <?php
 require_once('vendor/autoload.php');
 require_once('models/User.php');
+require_once('tests/app.php');
 
 use Jenssegers\Mongodb\Connection;
 use Jenssegers\Mongodb\Model;
@@ -10,8 +11,6 @@ class ModelQueryTest extends PHPUnit_Framework_TestCase {
 
 	public function setUp()
 	{
-		include('tests/app.php');
-		
 		// test data
 		User::create(array('name' => 'John Doe', 'age' => 35, 'title' => 'admin'));
 		User::create(array('name' => 'Jane Doe', 'age' => 33, 'title' => 'admin'));

tests/ModelTest.php

@@ -3,17 +3,15 @@
 require_once('models/User.php');
 require_once('models/Soft.php');
 require_once('models/Book.php');
+require_once('tests/app.php');
 
 use Jenssegers\Mongodb\Connection;
 use Jenssegers\Mongodb\Model;
 use Jenssegers\Mongodb\DatabaseManager;
 
 class ModelTest extends PHPUnit_Framework_TestCase {
 
-	public function setUp()
-	{
-		include('tests/app.php');
-	}
+	public function setUp() {}
 
 	public function tearDown()
 	{

tests/QueryTest.php

@@ -1,14 +1,12 @@
 <?php
 require_once('vendor/autoload.php');
+require_once('tests/app.php');
 
 use Jenssegers\Mongodb\Facades\DB;
 
 class QueryTest extends PHPUnit_Framework_TestCase {
 
-	public function setUp()
-	{
-		include('tests/app.php');
-	}
+	public function setUp() {}
 
 	public function tearDown()
 	{

tests/app.php

@@ -27,5 +27,5 @@
 $app['mongodb'] = new DatabaseManager($app);
 
 # Static setup
-Model::setConnectionResolver(new DatabaseManager($app));
+Model::setConnectionResolver($app['mongodb']);
 DB::setFacadeApplication($app);