Permalink
Browse files

Fix bad merge and failing test.

  • Loading branch information...
1 parent d63d51e commit ab5bfdccfd1cf4dc5ff115a09a83fd40ff48cc74 @markstory markstory committed Dec 12, 2011
Showing with 18 additions and 3 deletions.
  1. +18 −3 lib/Cake/Test/Case/Utility/ClassRegistryTest.php
@@ -122,6 +122,20 @@ class RegisterCategory extends ClassRegisterModel {
*/
public $name = 'RegisterCategory';
}
+ /**
+ * RegisterPrefixedDs class
+ *
+ * @package Cake.Test.Case.Utility
+ */
+class RegisterPrefixedDs extends ClassRegisterModel {
+
+/**
+ * useDbConfig property
+ *
+ * @var string 'doesnotexist'
+ */
+ public $useDbConfig = 'doesnotexist';
+}
/**
* Abstract class for testing ClassRegistry.
@@ -291,17 +305,18 @@ public function testPluginAppModel() {
*
*/
public function testPrefixedTestDatasource() {
+ ClassRegistry::config(array('testing' => true));
$Model = ClassRegistry::init('RegisterPrefixedDs');
- $this->assertEqual($Model->useDbConfig, 'test');
+ $this->assertEquals('test', $Model->useDbConfig);
ClassRegistry::removeObject('RegisterPrefixedDs');
$testConfig = ConnectionManager::getDataSource('test')->config;
ConnectionManager::create('test_doesnotexist', $testConfig);
$Model = ClassRegistry::init('RegisterArticle');
- $this->assertEqual($Model->useDbConfig, 'test');
+ $this->assertEquals('test', $Model->useDbConfig);
$Model = ClassRegistry::init('RegisterPrefixedDs');
- $this->assertEqual($Model->useDbConfig, 'test_doesnotexist');
+ $this->assertEquals('test_doesnotexist', $Model->useDbConfig);
}
/**

0 comments on commit ab5bfdc

Please sign in to comment.