RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 06:46:03 +03:00
Code Issues Projects Releases Wiki Activity

changes on the new test suite.

Browse Source
This commit is contained in:
romanb 2008-02-10 15:45:30 +00:00
parent 939a2bd638
commit e929180cc9
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Orm/Component/TestTest.php
View File

@ -5,7 +5,7 @@ class Orm_Component_TestTest extends Doctrine_OrmTestCase
{
protected function setUp()
{
$this->loadFixture('forum', 'common_users');
$this->loadFixture('forum', 'common', 'users');
}
public function testTest()

0
tests/fixtures/forum/common_users.php → tests/fixtures/forum/common/users.php vendored
View File

16
tests/lib/Doctrine_OrmTestCase.php
View File

@ -12,7 +12,6 @@ class Doctrine_OrmTestCase extends Doctrine_TestCase
/**
* All loaded fixtures during test execution. Common fixture cache.
* Shared across all test cases.
*/
private static $_fixtures = array();
@ -32,14 +31,17 @@ class Doctrine_OrmTestCase extends Doctrine_TestCase
* (forum, cms or ecommerce).
* @param string $name The name of the fixture to load from the specified package.
*/
protected function loadFixture($package, $name)
protected function loadFixture($package, $scenario, $name)
{
$uniqueName = $package . '/' . $name;
$uniqueName = $package . '/' . $scenario . '/' . $name;
if ( ! isset(self::$_fixtures[$uniqueName])) {
// load fixture file
$fixtureFile = 'fixtures' . DIRECTORY_SEPARATOR . $package . DIRECTORY_SEPARATOR
. $name . '.php';
$fixtureFile = 'fixtures'
. DIRECTORY_SEPARATOR . $package
. DIRECTORY_SEPARATOR . $scenario
. DIRECTORY_SEPARATOR . $name
. '.php';
require $fixtureFile;
self::$_fixtures[$uniqueName] = $fixture;
@ -76,10 +78,10 @@ class Doctrine_OrmTestCase extends Doctrine_TestCase
* (forum, cms or ecommerce).
* @param array $names The names of the fixtures to load from the specified package.
*/
protected function loadFixtures($package, array $names)
protected function loadFixtures($package, $scenario, array $names)
{
foreach ($names as $name) {
$this->loadFixture($package, $name);
$this->loadFixture($package, $scenario, $name);
}
}