Fixing and testing for CakeTestCase::loadFixtures()

cakephp · May 8, 2010 · 4d3a6e8 · 4d3a6e8
1 parent 2b5cd26
commit 4d3a6e8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/cake/tests/cases/libs/cake_test_case.test.php b/cake/tests/cases/libs/cake_test_case.test.php
@@ -130,6 +130,23 @@ function testLoadFixtures() {
 		$this->assertEquals(0, $result->failureCount());
 	}
 
+/**
+ * testLoadFixturesOnDemand
+ *
+ * @access public
+ * @return void
+ */
+	function testLoadFixturesOnDemand() {
+		$test = new FixturizedTestCase('testFixtureLoadOnDemand');
+		$test->autoFixtures = false;
+		$manager = $this->getMock('CakeFixtureManager');
+		$manager->fixturize($test);
+		$test->sharedFixture = $manager;
+		$manager->expects($this->once())->method('loadSingle');
+		$result = $test->run();
+		$this->assertEquals(0, $result->errorCount());
+	}
+
 /**
  * testSkipIf
  *

diff --git a/cake/tests/fixtures/fixturized_test_case.php b/cake/tests/fixtures/fixturized_test_case.php
@@ -6,13 +6,14 @@
  * @subpackage    cake.tests.fixtures
  */
 class FixturizedTestCase extends CakeTestCase {
-
-	public $name = 'FixturizedTestCase';
+
 	public $fixtures = array('core.category');
 
 	public function testFixturePresent() {
 		$this->assertType('CakeFixtureManager', $this->sharedFixture);
-		//debug($this->sharedFixture);
 	}
-
+
+	public function testFixtureLoadOnDemand() {
+		$this->loadFixtures('Category');
+	}
 }
diff --git a/cake/tests/lib/cake_test_case.php b/cake/tests/lib/cake_test_case.php
@@ -195,9 +195,7 @@ function loadFixtures() {
 		}
 		$args = func_get_args();
 		foreach ($args as $class) {
-			if (!empty($this->sharedFixture)) {
-				$this->sharedFixture->unload($this); 
-			}
+			$this->sharedFixture->loadSingle($class); 
 		}
 	}