adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 17:16:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improving ConnectionManager tests

Browse source
This commit is contained in:
Jose Lorenzo Rodriguez 2011-05-27 02:13:35 -04:30
parent 2c32d34faf
commit b320e4323f
3 changed files with 32 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Model/ConnectionManager.php
View file

@ -113,7 +113,7 @@ class ConnectionManager {
if (empty(self::$_init)) { if (empty(self::$_init)) {
self::init(); self::init();
} }
return array_keys(self::$_dataSources); return array_keys((array)self::$config);
} }
/** /**
@ -132,7 +132,7 @@ class ConnectionManager {
return $name; return $name;
} }
} }
return ''; return null;
} }
/** /**

44
lib/Cake/Test/Case/Model/ConnectionManagerTest.php
View file

@ -55,11 +55,22 @@ class ConnectionManagerTest extends CakeTestCase {
* @return void * @return void
*/ */
function testGetDataSource() { function testGetDataSource() {
App::build(array(
'Model/Datasource' => array(
CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS
)
));
$name = 'test_get_datasource';
$config = array('datasource' => 'Test2Source');
$connection = ConnectionManager::create($name, $config);
$connections = ConnectionManager::enumConnectionObjects(); $connections = ConnectionManager::enumConnectionObjects();
$this->assertTrue((bool)(count(array_keys($connections) >= 1))); $this->assertTrue((bool)(count(array_keys($connections) >= 1)));
$source = ConnectionManager::getDataSource(key($connections)); $source = ConnectionManager::getDataSource('test_get_datasource');
$this->assertTrue(is_object($source)); $this->assertTrue(is_object($source));
ConnectionManager::drop('test_get_datasource');
} }
/** /**
@ -91,7 +102,7 @@ class ConnectionManagerTest extends CakeTestCase {
$this->assertEqual($connection->configKeyName, $name); $this->assertEqual($connection->configKeyName, $name);
$this->assertEqual($connection->config, $config); $this->assertEqual($connection->config, $config);
App::build(); ConnectionManager::drop($name);
} }
/** /**
@ -115,7 +126,7 @@ class ConnectionManagerTest extends CakeTestCase {
$this->assertEqual($connection->configKeyName, $name); $this->assertEqual($connection->configKeyName, $name);
$this->assertEqual($connection->config, $config); $this->assertEqual($connection->config, $config);
App::build(); ConnectionManager::drop($name);
} }
/** /**
@ -138,7 +149,7 @@ class ConnectionManagerTest extends CakeTestCase {
$this->assertTrue(class_exists('DboDummy')); $this->assertTrue(class_exists('DboDummy'));
$this->assertEqual($connection->configKeyName, $name); $this->assertEqual($connection->configKeyName, $name);
App::build(); ConnectionManager::drop($name);
} }
/** /**
@ -164,7 +175,7 @@ class ConnectionManagerTest extends CakeTestCase {
$this->assertTrue(class_exists('TestLocalDriver')); $this->assertTrue(class_exists('TestLocalDriver'));
$this->assertEqual($connection->configKeyName, $name); $this->assertEqual($connection->configKeyName, $name);
$this->assertEqual($connection->config, $config); $this->assertEqual($connection->config, $config);
App::build(); ConnectionManager::drop($name);
} }
/** /**
@ -176,9 +187,7 @@ class ConnectionManagerTest extends CakeTestCase {
function testSourceList() { function testSourceList() {
$sources = ConnectionManager::sourceList(); $sources = ConnectionManager::sourceList();
$this->assertTrue(count($sources) >= 1); $this->assertTrue(count($sources) >= 1);
$this->assertTrue(in_array('test', array_keys($sources)));
$connections = array('default', 'test', 'test');
$this->assertTrue(count(array_intersect($sources, $connections)) >= 1);
} }
/** /**
@ -189,15 +198,14 @@ class ConnectionManagerTest extends CakeTestCase {
*/ */
function testGetSourceName() { function testGetSourceName() {
$connections = ConnectionManager::enumConnectionObjects(); $connections = ConnectionManager::enumConnectionObjects();
$name = key($connections); $source = ConnectionManager::getDataSource('test');
$source = ConnectionManager::getDataSource($name);
$result = ConnectionManager::getSourceName($source); $result = ConnectionManager::getSourceName($source);
$this->assertEqual($result, $name); $this->assertEqual('test', $result);
$source = new StdClass(); $source = new StdClass();
$result = ConnectionManager::getSourceName($source); $result = ConnectionManager::getSourceName($source);
$this->assertEqual($result, null); $this->assertNull($result);
} }
/** /**
@ -243,7 +251,7 @@ class ConnectionManagerTest extends CakeTestCase {
$connections = ConnectionManager::enumConnectionObjects(); $connections = ConnectionManager::enumConnectionObjects();
$this->assertTrue((bool)(count(array_keys($connections) >= 1))); $this->assertTrue((bool)(count(array_keys($connections) >= 1)));
$source = ConnectionManager::getDataSource(key($connections)); $source = ConnectionManager::getDataSource('test');
$this->assertTrue(is_object($source)); $this->assertTrue(is_object($source));
$config = $source->config; $config = $source->config;
@ -285,39 +293,45 @@ class ConnectionManagerTest extends CakeTestCase {
ConnectionManager::create('connection1', array('datasource' => 'Test2Source')); ConnectionManager::create('connection1', array('datasource' => 'Test2Source'));
$connections = ConnectionManager::enumConnectionObjects(); $connections = ConnectionManager::enumConnectionObjects();
$this->assertEqual($expected, $connections['connection1']); $this->assertEqual($expected, $connections['connection1']);
ConnectionManager::drop('connection1');
ConnectionManager::create('connection2', array('datasource' => 'Test2Source')); ConnectionManager::create('connection2', array('datasource' => 'Test2Source'));
$connections = ConnectionManager::enumConnectionObjects(); $connections = ConnectionManager::enumConnectionObjects();
$this->assertEqual($expected, $connections['connection2']); $this->assertEqual($expected, $connections['connection2']);
ConnectionManager::drop('connection2');
ConnectionManager::create('connection3', array('datasource' => 'TestPlugin.TestSource')); ConnectionManager::create('connection3', array('datasource' => 'TestPlugin.TestSource'));
$connections = ConnectionManager::enumConnectionObjects(); $connections = ConnectionManager::enumConnectionObjects();
$expected['datasource'] = 'TestPlugin.TestSource'; $expected['datasource'] = 'TestPlugin.TestSource';
$this->assertEqual($expected, $connections['connection3']); $this->assertEqual($expected, $connections['connection3']);
ConnectionManager::drop('connection3');
ConnectionManager::create('connection4', array('datasource' => 'TestPlugin.TestSource')); ConnectionManager::create('connection4', array('datasource' => 'TestPlugin.TestSource'));
$connections = ConnectionManager::enumConnectionObjects(); $connections = ConnectionManager::enumConnectionObjects();
$this->assertEqual($expected, $connections['connection4']); $this->assertEqual($expected, $connections['connection4']);
ConnectionManager::drop('connection4');
ConnectionManager::create('connection5', array('datasource' => 'Test2OtherSource')); ConnectionManager::create('connection5', array('datasource' => 'Test2OtherSource'));
$connections = ConnectionManager::enumConnectionObjects(); $connections = ConnectionManager::enumConnectionObjects();
$expected['datasource'] = 'Test2OtherSource'; $expected['datasource'] = 'Test2OtherSource';
$this->assertEqual($expected, $connections['connection5']); $this->assertEqual($expected, $connections['connection5']);
ConnectionManager::drop('connection5');
ConnectionManager::create('connection6', array('datasource' => 'Test2OtherSource')); ConnectionManager::create('connection6', array('datasource' => 'Test2OtherSource'));
$connections = ConnectionManager::enumConnectionObjects(); $connections = ConnectionManager::enumConnectionObjects();
$this->assertEqual($expected, $connections['connection6']); $this->assertEqual($expected, $connections['connection6']);
ConnectionManager::drop('connection6');
ConnectionManager::create('connection7', array('datasource' => 'TestPlugin.TestOtherSource')); ConnectionManager::create('connection7', array('datasource' => 'TestPlugin.TestOtherSource'));
$connections = ConnectionManager::enumConnectionObjects(); $connections = ConnectionManager::enumConnectionObjects();
$expected['datasource'] = 'TestPlugin.TestOtherSource'; $expected['datasource'] = 'TestPlugin.TestOtherSource';
$this->assertEqual($expected, $connections['connection7']); $this->assertEqual($expected, $connections['connection7']);
ConnectionManager::drop('connection7');
ConnectionManager::create('connection8', array('datasource' => 'TestPlugin.TestOtherSource')); ConnectionManager::create('connection8', array('datasource' => 'TestPlugin.TestOtherSource'));
$connections = ConnectionManager::enumConnectionObjects(); $connections = ConnectionManager::enumConnectionObjects();
$this->assertEqual($expected, $connections['connection8']); $this->assertEqual($expected, $connections['connection8']);
ConnectionManager::drop('connection8');
} }
/** /**

2
lib/Cake/Test/test_app/Plugin/TestPlugin/Model/Datasource/Database/DboDummy.php
View file

@ -1,5 +1,5 @@
<?php <?php
App::uses('DboSource', 'Model/Datasource');
class DboDummy extends DboSource { class DboDummy extends DboSource {
function connect() { function connect() {
return true; return true;