From e929180cc939219915e076c5e6c53b3de12756ff Mon Sep 17 00:00:00 2001
From: romanb <romanb@625475ce-881a-0410-a577-b389adb331d8>
Date: Sun, 10 Feb 2008 15:45:30 +0000
Subject: [PATCH] changes on the new test suite.

---
 tests/Orm/Component/TestTest.php                 |  2 +-
 .../forum/{common_users.php => common/users.php} |  0
 tests/lib/Doctrine_OrmTestCase.php               | 16 +++++++++-------
 3 files changed, 10 insertions(+), 8 deletions(-)
 rename tests/fixtures/forum/{common_users.php => common/users.php} (100%)

diff --git a/tests/Orm/Component/TestTest.php b/tests/Orm/Component/TestTest.php
index 10a0821b5..19e666e41 100644
--- a/tests/Orm/Component/TestTest.php
+++ b/tests/Orm/Component/TestTest.php
@@ -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()
diff --git a/tests/fixtures/forum/common_users.php b/tests/fixtures/forum/common/users.php
similarity index 100%
rename from tests/fixtures/forum/common_users.php
rename to tests/fixtures/forum/common/users.php
diff --git a/tests/lib/Doctrine_OrmTestCase.php b/tests/lib/Doctrine_OrmTestCase.php
index b13503462..b623ee31b 100644
--- a/tests/lib/Doctrine_OrmTestCase.php
+++ b/tests/lib/Doctrine_OrmTestCase.php
@@ -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);
         }
     }