From 81b394cd02ae79f4bde759d036947a30d6d5b427 Mon Sep 17 00:00:00 2001
From: romanb <romanb@625475ce-881a-0410-a577-b389adb331d8>
Date: Mon, 11 Feb 2008 22:33:12 +0000
Subject: [PATCH] more experiments with the new testsuite.

---
 tests/Orm/Component/TestTest.php      | 2 +-
 tests/fixtures/forum/common/users.php | 6 ++++--
 tests/models/forum/ForumUser.php      | 8 ++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/tests/Orm/Component/TestTest.php b/tests/Orm/Component/TestTest.php
index 18c236d36..dfd810ddd 100644
--- a/tests/Orm/Component/TestTest.php
+++ b/tests/Orm/Component/TestTest.php
@@ -6,7 +6,7 @@ class Orm_Component_TestTest extends Doctrine_OrmTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->loadFixture('forum', 'common', 'users');
+        $this->loadFixtures('forum', 'common', array('users', 'admins'));
     }
     
     public function testTest()
diff --git a/tests/fixtures/forum/common/users.php b/tests/fixtures/forum/common/users.php
index 6d071f401..c908bed23 100644
--- a/tests/fixtures/forum/common/users.php
+++ b/tests/fixtures/forum/common/users.php
@@ -4,11 +4,13 @@ $fixture = array(
     'rows' => array(
         array(
             'id' => 1,
-            'username' => 'romanb'
+            'username' => 'romanb',
+            'dtype' => 'admin'
         ),
         array(
             'id' => 2,
-            'username' => 'jwage'
+            'username' => 'jwage',
+            'dtype' => 'user'
         )
     )
 );
\ No newline at end of file
diff --git a/tests/models/forum/ForumUser.php b/tests/models/forum/ForumUser.php
index e8e130eb4..bd2ec6216 100644
--- a/tests/models/forum/ForumUser.php
+++ b/tests/models/forum/ForumUser.php
@@ -8,15 +8,19 @@ class ForumUser extends Doctrine_Record
         $class->setInheritanceType(Doctrine::INHERITANCETYPE_JOINED, array(
                 'discriminatorColumn' => 'dtype',
                 'discriminatorMap' => array(
-                        1 => 'ForumUser',
-                        2 => 'ForumAdministrator')
+                        'user' => 'ForumUser',
+                        'admin' => 'ForumAdministrator')
                 ));
         $class->setSubclasses(array('ForumAdministrator'));
         
+        // the discriminator column
+        $class->addMappedColumn('dtype', 'string', 50);
+        
         // property mapping
         $class->addMappedColumn('id', 'integer', 4, array(
                 'primary' => true,
                 'autoincrement' => true));
         $class->addMappedColumn('username', 'string', 50);
+        
     }
 }
\ No newline at end of file