Browse Source

Fixing failing tests caused by path/object cache issues.

mark_story 14 years ago
parent
commit
85d9b1af8d

+ 4 - 3
lib/Cake/Test/Case/Model/ConnectionManagerTest.php

@@ -32,6 +32,7 @@ class ConnectionManagerTest extends CakeTestCase {
  * @return void
  */
 	public function tearDown() {
+		parent::tearDown();
 		CakePlugin::unload();
 	}
 /**
@@ -89,7 +90,7 @@ class ConnectionManagerTest extends CakeTestCase {
 	public function testGetPluginDataSource() {
 		App::build(array(
 			'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
-		));
+		), App::RESET);
 		CakePlugin::load('TestPlugin');
 		$name = 'test_source';
 		$config = array('datasource' => 'TestPlugin.TestSource');
@@ -110,7 +111,7 @@ class ConnectionManagerTest extends CakeTestCase {
 	public function testGetPluginDataSourceAndPluginDriver() {
 		App::build(array(
 			'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
-		));
+		), App::RESET);
 		CakePlugin::load('TestPlugin');
 		$name = 'test_plugin_source_and_driver';
 		$config = array('datasource' => 'TestPlugin.Database/TestDriver');
@@ -274,7 +275,7 @@ class ConnectionManagerTest extends CakeTestCase {
 			'Model/Datasource' => array(
 				CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS
 			)
-		));
+		), App::RESET);
 		CakePlugin::loadAll();
 		$expected = array(
 		    'datasource' => 'Test2Source'

+ 1 - 1
lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php

@@ -124,7 +124,7 @@ class ControllerTestCaseTest extends CakeTestCase {
 			'Controller' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Controller' . DS),
 			'Model' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS),
 			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
-		));
+		), App::RESET);
 		CakePlugin::loadAll();
 		$this->Case = $this->getMockForAbstractClass('ControllerTestCase');
 		Router::reload();

+ 2 - 1
lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php

@@ -27,9 +27,10 @@ class HtmlCoverageReportTest extends CakeTestCase {
  * @return void
  */
 	public function setUp() {
+		parent::setUp();
 		App::build(array(
 			'plugins' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
-		));
+		), App::RESET);
 		CakePlugin::loadAll();
 		$reporter = new CakeBaseReporter();
 		$reporter->params = array('app' => false, 'plugin' => false, 'group' => false);