Update tests to use new ConnectionManager.

Update tests to use the new API's in ConnectionManager.
cakephp · Aug 24, 2013 · dfe4355 · dfe4355
1 parent 7413b34
commit dfe4355
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 37 deletions.
diff --git a/lib/Cake/Database/Connection.php b/lib/Cake/Database/Connection.php
@@ -90,7 +90,10 @@ class Connection {
  */
 	public function __construct($config) {
 		$this->_config = $config;
-		$this->driver($config['datasource'], $config);
+
+		if (!empty($config['datasource'])) {
+			$this->driver($config['datasource'], $config);
+		}
 
 		if (!empty($config['log'])) {
 			$this->logQueries($config['log']);
@@ -152,7 +155,7 @@ public function driver($driver = null, $config = null) {
 			$driver = new $driver($config);
 		}
 		if (!$driver->enabled()) {
-			throw new MissingExtensionException(['driver' => get_class($this->_driver)]);
+			throw new MissingExtensionException(['driver' => get_class($driver)]);
 		}
 		return $this->_driver = $driver;
 	}

diff --git a/lib/Cake/Test/TestCase/Database/ConnectionTest.php b/lib/Cake/Test/TestCase/Database/ConnectionTest.php
@@ -18,7 +18,7 @@
 
 use Cake\Core\Configure;
 use Cake\Database\Connection;
-use Cake\Model\ConnectionManager;
+use Cake\Database\ConnectionManager;
 use Cake\TestSuite\TestCase;
 
 /**
@@ -60,13 +60,14 @@ public function testMissingDriver() {
 
 /**
  * Tests trying to use a disabled driver throws an exception
+ *
  * @expectedException Cake\Database\Exception\MissingExtensionException
  * @expectedExceptionMessage Database driver DriverMock cannot be used due to a missing PHP extension or unmet dependency
  * @return void
- **/
+ */
 	public function testDisabledDriver() {
 		$mock = $this->getMock('\Cake\Database\Connection\Driver', ['enabled'], [], 'DriverMock');
-		$connection = new Connection(['datasource' => get_class($mock)]);
+		$connection = new Connection(['datasource' => $mock]);
 	}
 
 /**
@@ -76,10 +77,10 @@ public function testDisabledDriver() {
  * @return void
  **/
 	public function testWrongCredentials() {
-		$this->skipIf(Configure::read('Datasource.test.dsn'));
-		$connection = new Connection(['database' => 'foobar'] + Configure::read('Datasource.test'));
+		$config = ConnectionManager::config('test');
+		$this->skipIf(isset($config['dsn']), 'Datasource has dsn, skipping.');
+		$connection = new Connection(['database' => '_probably_not_there_'] + ConnectionManager::config('test'));
 		$connection->connect();
-		$this->skipIf($connection->driver() instanceof \Cake\Database\Driver\Sqlite);
 	}
 
 /**
@@ -546,10 +547,11 @@ public function testQuote() {
  * @return void
  */
 	public function testQuoteIdentifier() {
-		$connection = new Connection(Configure::read('Datasource.test'));
-
-		$driver = $this->getObjectForTrait('\Cake\Database\Dialect\SqliteDialectTrait');
-		$connection->driver($driver);
+		$driver = $this->getMock('Cake\Database\Driver\Sqlite', ['enabled']);
+		$driver->expects($this->once())
+			->method('enabled')
+			->will($this->returnValue(true));
+		$connection = new Connection(['datasource' => $driver]);
 
 		$result = $connection->quoteIdentifier('name');
 		$expected = '"name"';
@@ -676,8 +678,14 @@ public function testLogBeginRollbackTransaction() {
 		$connection = $this->getMock(
 			'\Cake\Database\Connection',
 			['connect'],
-			[Configure::read('Datasource.test')]
+			[['log' => true]]
 		);
+		$driver = $this->getMock('Cake\Database\Driver');
+		$driver->expects($this->once())
+			->method('enabled')
+			->will($this->returnValue(true));
+		$connection->driver($driver);
+
 		$logger = $this->getMock('\Cake\Database\Log\QueryLogger');
 		$connection->logger($logger);
 		$logger->expects($this->at(0))->method('log')
@@ -690,7 +698,7 @@ public function testLogBeginRollbackTransaction() {
 				$this->isInstanceOf('\Cake\Database\Log\LoggedQuery'),
 				$this->attributeEqualTo('query', 'ROLLBACK')
 			));
-		$connection->logQueries(true);
+
 		$connection->begin();
 		$connection->begin(); //This one will not be logged
 		$connection->rollback();
@@ -702,13 +710,19 @@ public function testLogBeginRollbackTransaction() {
  * @return void
  */
 	public function testLogCommitTransaction() {
-		$logger = $this->getMock('\Cake\Database\Log\QueryLogger');
+		$driver = $this->getMock('Cake\Database\Driver');
+		$driver->expects($this->once())
+			->method('enabled')
+			->will($this->returnValue(true));
 		$connection = $this->getMock(
 			'\Cake\Database\Connection',
 			['connect'],
-			[Configure::read('Datasource.test')]
+			[['datasource' => $driver]]
 		);
+
+		$logger = $this->getMock('\Cake\Database\Log\QueryLogger');
 		$connection->logger($logger);
+
 		$logger->expects($this->at(1))->method('log')
 			->with($this->logicalAnd(
 				$this->isInstanceOf('\Cake\Database\Log\LoggedQuery'),

diff --git a/lib/Cake/Test/TestCase/Database/QueryTest.php b/lib/Cake/Test/TestCase/Database/QueryTest.php
@@ -18,7 +18,7 @@
 
 use Cake\Core\Configure;
 use Cake\Database\Query;
-use Cake\Model\ConnectionManager;
+use Cake\Database\ConnectionManager;
 use Cake\TestSuite\TestCase;
 
 /**

diff --git a/lib/Cake/Test/TestCase/Database/Schema/CollectionTest.php b/lib/Cake/Test/TestCase/Database/Schema/CollectionTest.php
@@ -17,7 +17,7 @@
 namespace Cake\Test\TestCase\Database\Schema;
 
 use Cake\Core\Configure;
-use Cake\Database\Connection;
+use Cake\Database\ConnectionManager;
 use Cake\Database\Schema\Collection;
 use Cake\Database\Schema\Table;
 use Cake\TestSuite\TestCase;
@@ -34,7 +34,7 @@ class CollectionTest extends TestCase {
  */
 	public function setUp() {
 		parent::setUp();
-		$this->connection = new Connection(Configure::read('Datasource.test'));
+		$this->connection = ConnectionManager::get('test');
 	}
 
 /**

diff --git a/lib/Cake/Test/TestCase/Database/Schema/MysqlSchemaTest.php b/lib/Cake/Test/TestCase/Database/Schema/MysqlSchemaTest.php
@@ -17,7 +17,7 @@
 namespace Cake\Test\TestCase\Database\Schema;
 
 use Cake\Core\Configure;
-use Cake\Database\Connection;
+use Cake\Database\ConnectionManager;
 use Cake\Database\Schema\Collection as SchemaCollection;
 use Cake\Database\Schema\MysqlSchema;
 use Cake\Database\Schema\Table;
@@ -34,8 +34,8 @@ class MysqlSchemaTest extends TestCase {
  * @return void
  */
 	protected function _needsConnection() {
-		$config = Configure::read('Datasource.test');
-		$this->skipIf(strpos($config['datasource'], 'Mysql') === false, 'Not using Mysql for test config');
+		$config = ConnectionManager::config('test');
+		$this->skipIf(strpos($config['className'], 'Mysql') === false, 'Not using Mysql for test config');
 	}
 
 /**
@@ -171,7 +171,7 @@ protected function _createTables($connection) {
  * @return void
  */
 	public function testListTables() {
-		$connection = new Connection(Configure::read('Datasource.test'));
+		$connection = ConnectionManager::get('test');
 		$this->_createTables($connection);
 
 		$schema = new SchemaCollection($connection);
@@ -189,7 +189,7 @@ public function testListTables() {
  * @return void
  */
 	public function testDescribeTable() {
-		$connection = new Connection(Configure::read('Datasource.test'));
+		$connection = ConnectionManager::get('test');
 		$this->_createTables($connection);
 
 		$schema = new SchemaCollection($connection);
@@ -276,7 +276,7 @@ public function testDescribeTable() {
  * @return void
  */
 	public function testDescribeTableIndexes() {
-		$connection = new Connection(Configure::read('Datasource.test'));
+		$connection = ConnectionManager::get('test');
 		$this->_createTables($connection);
 
 		$schema = new SchemaCollection($connection);

diff --git a/lib/Cake/Test/TestCase/Database/Schema/PostgresSchemaTest.php b/lib/Cake/Test/TestCase/Database/Schema/PostgresSchemaTest.php
@@ -17,7 +17,7 @@
 namespace Cake\Test\TestCase\Database\Schema;
 
 use Cake\Core\Configure;
-use Cake\Database\Connection;
+use Cake\Database\ConnectionManager;
 use Cake\Database\Schema\Collection as SchemaCollection;
 use Cake\Database\Schema\PostgresSchema;
 use Cake\Database\Schema\Table;
@@ -34,8 +34,8 @@ class PostgresSchemaTest extends TestCase {
  * @return void
  */
 	protected function _needsConnection() {
-		$config = Configure::read('Datasource.test');
-		$this->skipIf(strpos($config['datasource'], 'Postgres') === false, 'Not using Postgres for test config');
+		$config = ConnectionManager::config('test');
+		$this->skipIf(strpos($config['className'], 'Postgres') === false, 'Not using Postgres for test config');
 	}
 
 /**
@@ -202,7 +202,7 @@ public function testConvertColumnType($input, $expected) {
  * @return void
  */
 	public function testListTables() {
-		$connection = new Connection(Configure::read('Datasource.test'));
+		$connection = ConnectionManager::get('test');
 		$this->_createTables($connection);
 
 		$schema = new SchemaCollection($connection);
@@ -219,7 +219,7 @@ public function testListTables() {
  * @return void
  */
 	public function testDescribeTable() {
-		$connection = new Connection(Configure::read('Datasource.test'));
+		$connection = ConnectionManager::get('test');
 		$this->_createTables($connection);
 
 		$schema = new SchemaCollection($connection);
@@ -301,7 +301,7 @@ public function testDescribeTable() {
  * @return void
  */
 	public function testDescribeTableIndexes() {
-		$connection = new Connection(Configure::read('Datasource.test'));
+		$connection = ConnectionManager::get('test');
 		$this->_createTables($connection);
 
 		$schema = new SchemaCollection($connection);

diff --git a/lib/Cake/Test/TestCase/Database/Schema/SqliteSchemaTest.php b/lib/Cake/Test/TestCase/Database/Schema/SqliteSchemaTest.php
@@ -17,7 +17,7 @@
 namespace Cake\Test\TestCase\Database\Schema;
 
 use Cake\Core\Configure;
-use Cake\Database\Connection;
+use Cake\Database\ConnectionManager;
 use Cake\Database\Schema\Collection as SchemaCollection;
 use Cake\Database\Schema\SqliteSchema;
 use Cake\Database\Schema\Table;
@@ -34,8 +34,8 @@ class SqliteSchemaTest extends TestCase {
  * @return void
  */
 	protected function _needsConnection() {
-		$config = Configure::read('Datasource.test');
-		$this->skipIf(strpos($config['datasource'], 'Sqlite') === false, 'Not using Sqlite for test config');
+		$config = ConnectionManager::config('test');
+		$this->skipIf(strpos($config['className'], 'Sqlite') === false, 'Not using Sqlite for test config');
 	}
 
 /**
@@ -163,7 +163,7 @@ protected function _createTables($connection) {
  * @return void
  */
 	public function testListTables() {
-		$connection = new Connection(Configure::read('Datasource.test'));
+		$connection = ConnectionManager::get('test');
 		$this->_createTables($connection);
 
 		$schema = new SchemaCollection($connection);
@@ -182,7 +182,7 @@ public function testListTables() {
  * @return void
  */
 	public function testDescribeTable() {
-		$connection = new Connection(Configure::read('Datasource.test'));
+		$connection = ConnectionManager::get('test');
 		$this->_createTables($connection);
 
 		$schema = new SchemaCollection($connection);
@@ -256,7 +256,7 @@ public function testDescribeTable() {
  * @return void
  */
 	public function testDescribeTableIndexes() {
-		$connection = new Connection(Configure::read('Datasource.test'));
+		$connection = ConnectionManager::get('test');
 		$this->_createTables($connection);
 
 		$schema = new SchemaCollection($connection);