Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

updating multidb tests to use ConnectionManager

  • Loading branch information...
commit d77f9aacdeb3fd760428b0de8378960a638b3239 1 parent a88ca54
@rchavik rchavik authored
Showing with 6 additions and 6 deletions.
  1. +6 −6 lib/Cake/Test/Case/Model/ModelIntegrationTest.php
View
12 lib/Cake/Test/Case/Model/ModelIntegrationTest.php
@@ -281,9 +281,9 @@ function testFindWithJoinsOption() {
* or one connection will step on the other.
*/
public function testCrossDatabaseJoins() {
- $config = new DATABASE_CONFIG();
+ $config = ConnectionManager::enumConnectionObjects();
- $skip = (!isset($config->test) || !isset($config->test2));
+ $skip = (!isset($config['test']) || !isset($config['test2']));
if ($skip) {
$this->markTestSkipped('Primary and secondary test databases not configured, skipping cross-database
join tests. To run theses tests defined $test and $test2 in your database configuration.'
@@ -2234,9 +2234,9 @@ public function testHasMethod() {
*/
public function testMultischemaFixture() {
- $config = new DATABASE_CONFIG();
+ $config = ConnectionManager::enumConnectionObjects();
$this->skipIf($this->db instanceof Sqlite, 'This test is not compatible with Sqlite.');
- $this->skipIf(!isset($config->test) || !isset($config->test2),
+ $this->skipIf(!isset($config['test']) || !isset($config['test2']),
'Primary and secondary test databases not configured, skipping cross-database join tests. To run these tests define $test and $test2 in your database configuration.'
);
@@ -2264,10 +2264,10 @@ public function testMultischemaFixture() {
*/
public function testMultischemaFixtureWithThreeDatabases() {
- $config = new DATABASE_CONFIG();
+ $config = ConnectionManager::enumConnectionObjects();
$this->skipIf($this->db instanceof Sqlite, 'This test is not compatible with Sqlite.');
$this->skipIf(
- !isset($config->test) || !isset($config->test2) || !isset($config->test_database_three),
+ !isset($config['test']) || !isset($config['test2']) || !isset($config['test_database_three']),
'Primary, secondary, and tertiary test databases not configured, skipping test. To run this test define $test, $test2, and $test_database_three in your database configuration.'
);
Please sign in to comment.
Something went wrong with that request. Please try again.