Skip to content
Permalink
Browse files

Fixed all tests in DatabaseSuite

  • Loading branch information...
lorenzo committed Feb 17, 2014
1 parent dbfb3de commit 6ce497890bb0c33304167d08adff84e54c82ab41
@@ -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;
@@ -16,7 +16,7 @@
*/
namespace Cake\Test\TestCase;
use Cake\Database\ConnectionManager;
use Cake\Datasource\ConnectionManager;
use Cake\TestSuite\TestPermutationDecorator;
use Cake\TestSuite\TestSuite;
@@ -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;
@@ -19,6 +19,7 @@
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 @@ public function testLinkWithNotPersistedTarget() {
* @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 @@ public function testUnlinkWithNotPersistedTarget() {
* @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 @@ public function testUnlinkSuccess() {
* @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 @@ public function testReplaceWithMissingPrimaryKey() {
* @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 @@ public function testSaveWithReplaceReturnFalse() {
* @return void
*/
public function testSaveOnlyEntities() {
$connection = \Cake\Database\ConnectionManager::get('test');
$connection = ConnectionManager::get('test');
$mock = $this->getMock(
'Cake\ORM\Table',
['save', 'schema'],
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;

0 comments on commit 6ce4978

Please sign in to comment.
You can’t perform that action at this time.