Fixed remaining tests

cakephp · Feb 17, 2014 · 4cdddde · 4cdddde
1 parent 6ce4978
commit 4cdddde
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 20 deletions.
diff --git a/src/Console/Command/Task/DbConfigTask.php b/src/Console/Command/Task/DbConfigTask.php
@@ -18,7 +18,7 @@
 
 use Cake\Console\Shell;
 use Cake\Core\Configure;
-use Cake\Database\ConnectionManager;
+use Cake\Datasource\ConnectionManager;
 
 /**
  * Task class for creating and updating the database configuration file.

diff --git a/src/TestSuite/Fixture/TestFixture.php b/src/TestSuite/Fixture/TestFixture.php
@@ -16,9 +16,9 @@
 
 use Cake\Core\App;
 use Cake\Database\Connection;
-use Cake\Database\ConnectionManager;
 use Cake\Database\Schema\Collection as SchemaCollection;
 use Cake\Database\Schema\Table;
+use Cake\Datasource\ConnectionManager;
 use Cake\Error;
 use Cake\Log\Log;
 use Cake\Utility\Hash;

diff --git a/tests/TestCase/Controller/Component/PaginatorComponentTest.php b/tests/TestCase/Controller/Component/PaginatorComponentTest.php
@@ -18,7 +18,7 @@
 use Cake\Controller\Component\PaginatorComponent;
 use Cake\Controller\Controller;
 use Cake\Core\Configure;
-use Cake\Database\ConnectionManager;
+use Cake\Datasource\ConnectionManager;
 use Cake\Error;
 use Cake\Network\Request;
 use Cake\ORM\TableRegistry;

diff --git a/tests/TestCase/Error/ExceptionRendererTest.php b/tests/TestCase/Error/ExceptionRendererTest.php
@@ -554,22 +554,6 @@ public static function testProvider() {
 				),
 				500
 			),
-			array(
-				new Error\MissingDatasourceConfigException(array('config' => 'default')),
-				array(
-					'/<h2>Missing Datasource Configuration<\/h2>/',
-					'/The datasource configuration <em>default<\/em> was not found in datasources.php/'
-				),
-				500
-			),
-			array(
-				new Error\MissingDatasourceException(array('class' => 'MyDatasource', 'plugin' => 'MyPlugin')),
-				array(
-					'/<h2>Missing Datasource<\/h2>/',
-					'/Datasource class <em>MyPlugin.MyDatasource<\/em> could not be found/'
-				),
-				500
-			),
 			array(
 				new Error\MissingHelperException(array('class' => 'MyCustomHelper')),
 				array(

diff --git a/tests/TestCase/Network/Session/DatabaseSessionTest.php b/tests/TestCase/Network/Session/DatabaseSessionTest.php
@@ -17,7 +17,7 @@
 namespace Cake\Test\TestCase\Network\Session;
 
 use Cake\Core\Configure;
-use Cake\Database\ConnectionManager;
+use Cake\Datasource\ConnectionManager;
 use Cake\Network\Session;
 use Cake\Network\Session\DatabaseSession;
 use Cake\ORM\Table;