Browse Source

Fixed all tests in DatabaseSuite

Jose Lorenzo Rodriguez 12 years ago
parent
commit
6ce497890b

+ 1 - 1
src/ORM/TableRegistry.php

@@ -17,7 +17,7 @@
 namespace Cake\ORM;
 
 use Cake\Core\App;
-use Cake\Database\ConnectionManager;
+use Cake\Datasource\ConnectionManager;
 use Cake\Utility\Inflector;
 use RuntimeException;
 

+ 1 - 1
tests/TestCase/DatabaseSuite.php

@@ -16,7 +16,7 @@
  */
 namespace Cake\Test\TestCase;
 
-use Cake\Database\ConnectionManager;
+use Cake\Datasource\ConnectionManager;
 use Cake\TestSuite\TestPermutationDecorator;
 use Cake\TestSuite\TestSuite;
 

+ 1 - 1
tests/TestCase/Model/Behavior/CounterCacheBehaviorTest.php

@@ -14,7 +14,7 @@
  */
 namespace Cake\Test\TestCase\Model\Behavior;
 
-use Cake\Database\ConnectionManager;
+use Cake\Datasource\ConnectionManager;
 use Cake\Database\Query;
 use Cake\Event\Event;
 use Cake\Model\Behavior\CounterCacheBehavior;

+ 6 - 5
tests/TestCase/ORM/Association/BelongsToManyTest.php

@@ -19,6 +19,7 @@ namespace Cake\Test\TestCase\ORM\Association;
 use Cake\Database\Expression\IdentifierExpression;
 use Cake\Database\Expression\QueryExpression;
 use Cake\Database\Expression\TupleComparison;
+use Cake\Datasource\ConnectionManager;
 use Cake\ORM\Association\BelongsToMany;
 use Cake\ORM\Entity;
 use Cake\ORM\Query;
@@ -988,7 +989,7 @@ class BelongsToManyTest extends TestCase {
  * @return void
  */
 	public function testLinkSuccess() {
-		$connection = \Cake\Database\ConnectionManager::get('test');
+		$connection = ConnectionManager::get('test');
 		$joint = $this->getMock(
 			'\Cake\ORM\Table',
 			['save'],
@@ -1071,7 +1072,7 @@ class BelongsToManyTest extends TestCase {
  * @return void
  */
 	public function testUnlinkSuccess() {
-		$connection = \Cake\Database\ConnectionManager::get('test');
+		$connection = ConnectionManager::get('test');
 		$joint = $this->getMock(
 			'\Cake\ORM\Table',
 			['delete', 'find'],
@@ -1160,7 +1161,7 @@ class BelongsToManyTest extends TestCase {
  * @return void
  */
 	public function testUnlinkWithoutPropertyClean() {
-		$connection = \Cake\Database\ConnectionManager::get('test');
+		$connection = ConnectionManager::get('test');
 		$joint = $this->getMock(
 			'\Cake\ORM\Table',
 			['delete', 'find'],
@@ -1230,7 +1231,7 @@ class BelongsToManyTest extends TestCase {
  * @return void
  */
 	public function testReplaceLinkSuccess() {
-		$connection = \Cake\Database\ConnectionManager::get('test');
+		$connection = ConnectionManager::get('test');
 		$joint = $this->getMock(
 			'\Cake\ORM\Table',
 			['delete', 'find'],
@@ -1374,7 +1375,7 @@ class BelongsToManyTest extends TestCase {
  * @return void
  */
 	public function testSaveOnlyEntities() {
-		$connection = \Cake\Database\ConnectionManager::get('test');
+		$connection = ConnectionManager::get('test');
 		$mock = $this->getMock(
 			'Cake\ORM\Table',
 			['save', 'schema'],

+ 1 - 1
tests/TestCase/ORM/CompositeKeysTest.php

@@ -14,7 +14,7 @@
  */
 namespace Cake\Test\TestCase\ORM;
 
-use Cake\Database\ConnectionManager;
+use Cake\Datasource\ConnectionManager;
 use Cake\ORM\Entity;
 use Cake\ORM\Marshaller;
 use Cake\ORM\Query;

+ 1 - 1
tests/TestCase/ORM/EagerLoaderTest.php

@@ -14,7 +14,7 @@
  */
 namespace Cake\Test\TestCase\ORM;
 
-use Cake\Database\ConnectionManager;
+use Cake\Datasource\ConnectionManager;
 use Cake\Database\Expression\IdentifierExpression;
 use Cake\Database\Expression\QueryExpression;
 use Cake\ORM\EagerLoader;

+ 1 - 1
tests/TestCase/ORM/ResultSetTest.php

@@ -17,7 +17,7 @@
 namespace Cake\Test\TestCase\ORM;
 
 use Cake\Core\Configure;
-use Cake\Database\ConnectionManager;
+use Cake\Datasource\ConnectionManager;
 use Cake\ORM\Entity;
 use Cake\ORM\Query;
 use Cake\ORM\ResultSet;

+ 1 - 1
tests/TestCase/ORM/TableRegistryTest.php

@@ -17,7 +17,7 @@
 namespace Cake\Test\TestCase\ORM;
 
 use Cake\Core\Configure;
-use Cake\Database\ConnectionManager;
+use Cake\Datasource\ConnectionManager;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;

+ 1 - 1
tests/TestCase/ORM/TableTest.php

@@ -15,7 +15,7 @@
 namespace Cake\Test\TestCase\ORM;
 
 use Cake\Core\Configure;
-use Cake\Database\ConnectionManager;
+use Cake\Datasource\ConnectionManager;
 use Cake\Database\Expression\OrderByExpression;
 use Cake\Database\Expression\QueryExpression;
 use Cake\ORM\Table;

+ 1 - 1
tests/TestCase/ORM/TableUuidTest.php

@@ -17,8 +17,8 @@
 namespace Cake\Test\TestCase\ORM;
 
 use Cake\Core\Configure;
-use Cake\Database\ConnectionManager;
 use Cake\Database\Expression\QueryExpression;
+use Cake\Datasource\ConnectionManager;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;