From 99de12d7ac6bb403d54aa5333c4d061e7325d1d2 Mon Sep 17 00:00:00 2001
From: romanb <romanb@625475ce-881a-0410-a577-b389adb331d8>
Date: Sun, 10 Feb 2008 15:16:24 +0000
Subject: [PATCH] changes on the new test suite.
---
tests/Orm/Component/TestTest.php | 2 +-
tests/fixtures/dbal/dummy.php | 16 ----------------
tests/fixtures/forum/common_users.php | 14 ++++++++++++++
tests/lib/Doctrine_OrmTestCase.php | 4 ++--
4 files changed, 17 insertions(+), 19 deletions(-)
delete mode 100644 tests/fixtures/dbal/dummy.php
create mode 100644 tests/fixtures/forum/common_users.php
diff --git a/tests/Orm/Component/TestTest.php b/tests/Orm/Component/TestTest.php
index 4682ef351..10a0821b5 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', 'someusers');
+ $this->loadFixture('forum', 'common_users');
}
public function testTest()
diff --git a/tests/fixtures/dbal/dummy.php b/tests/fixtures/dbal/dummy.php
deleted file mode 100644
index 7b937bd18..000000000
--- a/tests/fixtures/dbal/dummy.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-$fixture = array(
- 'tableName' => 'dummy',
- 'rows' => array(
- array(
- 'column1' => 'value1',
- 'column2' => 'value2',
- 'column3' => 'value3'
- ),
- array(
- 'column1' => 'value4',
- 'column2' => 'value5',
- 'column3' => 'value6'
- )
- )
-);
\ No newline at end of file
diff --git a/tests/fixtures/forum/common_users.php b/tests/fixtures/forum/common_users.php
new file mode 100644
index 000000000..6d071f401
--- /dev/null
+++ b/tests/fixtures/forum/common_users.php
@@ -0,0 +1,14 @@
+<?php
+$fixture = array(
+ 'model' => 'ForumUser',
+ 'rows' => array(
+ array(
+ 'id' => 1,
+ 'username' => 'romanb'
+ ),
+ array(
+ 'id' => 2,
+ 'username' => 'jwage'
+ )
+ )
+);
\ No newline at end of file
diff --git a/tests/lib/Doctrine_OrmTestCase.php b/tests/lib/Doctrine_OrmTestCase.php
index 4e663e2f6..2386de491 100644
--- a/tests/lib/Doctrine_OrmTestCase.php
+++ b/tests/lib/Doctrine_OrmTestCase.php
@@ -15,8 +15,8 @@ class Doctrine_OrmTestCase extends Doctrine_TestCase
if ( ! isset(self::$_fixtures[$uniqueName])) {
// load fixture file
- $fixtureFile = 'fixtures' . DIRECTORY_SEPARATOR . 'orm' . DIRECTORY_SEPARATOR
- . $package . DIRECTORY_SEPARATOR . $name . '.php';
+ $fixtureFile = 'fixtures' . DIRECTORY_SEPARATOR . $package . DIRECTORY_SEPARATOR
+ . $name . '.php';
require $fixtureFile;
self::$_fixtures[$uniqueName] = $fixture;