Fixing ConnectionManager tests

cakephp · Feb 17, 2014 · 8eec058 · 8eec058
1 parent e33938f
commit 8eec058
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 128 deletions.
diff --git a/tests/TestCase/Datasource/ConnectionManagerTest.php b/tests/TestCase/Datasource/ConnectionManagerTest.php
@@ -73,7 +73,7 @@ public function testConfigVariants($settings) {
 /**
  * Test invalid classes cause exceptions
  *
- * @expectedException Cake\Database\Exception\MissingDriverException
+ * @expectedException Cake\Datasource\Error\MissingDatasourceException
  */
 	public function testConfigInvalidOptions() {
 		ConnectionManager::config('test_variant', [
@@ -91,7 +91,7 @@ public function testConfigInvalidOptions() {
  */
 	public function testConfigDuplicateConfig() {
 		$settings = [
-			'className' => 'Sqlite',
+			'className' => __NAMESPACE__ . '\FakeConnection',
 			'database' => ':memory:',
 		];
 		ConnectionManager::config('test_variant', $settings);
@@ -146,7 +146,7 @@ public function testGetNoAlias() {
  */
 	public function testConfigured() {
 		ConnectionManager::config('test_variant', [
-			'className' => 'Sqlite',
+			'className' => __NAMESPACE__ . '\FakeConnection',
 			'database' => ':memory:'
 		]);
 		$results = ConnectionManager::configured();
@@ -161,12 +161,13 @@ public function testConfigured() {
 	public function testGetPluginDataSource() {
 		Plugin::load('TestPlugin');
 		$name = 'test_variant';
-		$config = array('className' => 'TestPlugin.TestSource');
+		$config = array('className' => 'TestPlugin.TestSource', 'foo' => 'bar');
 		ConnectionManager::config($name, $config);
 		$connection = ConnectionManager::get($name);
 
-		$this->assertInstanceOf('Cake\Database\Connection', $connection);
-		$this->assertInstanceOf('TestPlugin\Database\Driver\TestSource', $connection->driver());
+		$this->assertInstanceOf('TestPlugin\Datasource\TestSource', $connection);
+		unset($config['className']);
+		$this->assertSame($config + ['name' => 'test_variant'], $connection->settings);
 	}
 
 /**
@@ -176,7 +177,7 @@ public function testGetPluginDataSource() {
  */
 	public function testDrop() {
 		ConnectionManager::config('test_variant', [
-			'className' => 'Sqlite',
+			'className' => __NAMESPACE__ . '\FakeConnection',
 			'database' => ':memory:'
 		]);
 		$result = ConnectionManager::configured();
@@ -196,7 +197,7 @@ public function testDrop() {
  */
 	public function testAlias() {
 		ConnectionManager::config('test_variant', [
-			'className' => 'Sqlite',
+			'className' => __NAMESPACE__ . '\FakeConnection',
 			'database' => ':memory:'
 		]);
 		ConnectionManager::alias('test_variant', 'other_name');
@@ -207,7 +208,7 @@ public function testAlias() {
 /**
  * Test alias() raises an error when aliasing an undefined connection.
  *
- * @expectedException Cake\Error\MissingDatasourceConfigException
+ * @expectedException Cake\Datasource\Error\MissingDatasourceConfigException
  * @return void
  */
 	public function testAliasError() {

diff --git a/tests/test_app/Plugin/TestPlugin/Database/Driver/TestSource.php b/tests/test_app/Plugin/TestPlugin/Database/Driver/TestSource.php
diff --git a/tests/test_app/Plugin/TestPlugin/Datasource/TestSource.php b/tests/test_app/Plugin/TestPlugin/Datasource/TestSource.php
@@ -0,0 +1,23 @@
+<?php
+namespace TestPlugin\Datasource;
+
+
+class TestSource {
+
+/**
+ * Settings
+ *
+ * @var array
+ */
+	public $settings;
+
+/**
+ * Constructor
+ *
+ * @return void
+ */
+	public function __construct(array $settings) {
+		$this->settings = $settings;
+	}
+
+}