updating multidb tests to use ConnectionManager

cakephp · Dec 13, 2011 · d77f9aa · d77f9aa
1 parent a88ca54
commit d77f9aa
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/lib/Cake/Test/Case/Model/ModelIntegrationTest.php b/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.'
 			);