From 833172824294fe0d822dbc4fe66c0d8cb50c9ed7 Mon Sep 17 00:00:00 2001 From: gnat Date: Wed, 19 Sep 2007 21:41:45 +0000 Subject: [PATCH] updated the test to not break other tests. --- models/gnatEmail.php | 10 ++++++++++ models/gnatUser.php | 4 ++-- tests/Relation/OneToOneTestCase.php | 14 +++++++------- 3 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 models/gnatEmail.php diff --git a/models/gnatEmail.php b/models/gnatEmail.php new file mode 100644 index 000000000..209ef6fd3 --- /dev/null +++ b/models/gnatEmail.php @@ -0,0 +1,10 @@ +hasColumn('address', 'string', 150); + } + + +} diff --git a/models/gnatUser.php b/models/gnatUser.php index ef8f66530..5fb1c662f 100644 --- a/models/gnatUser.php +++ b/models/gnatUser.php @@ -7,13 +7,13 @@ class gnatUser extends Doctrine_Record public function setTableDefinition() { $this->hasColumn('name', 'string', 150); - $this->hasColumn('email_id', 'integer', 10, array ( 'unique' => true,)); + $this->hasColumn('foreign_id', 'integer', 10, array ( 'unique' => true,)); } public function setUp() { parent::setUp(); - $this->ownsOne('Email', array('local'=>'email_id','foreign'=>'id','onDelete'=>'CASCADE')); + $this->ownsOne('gnatEmail as Email', array('local'=>'foreign_id','foreign'=>'id','onDelete'=>'CASCADE')); } } diff --git a/tests/Relation/OneToOneTestCase.php b/tests/Relation/OneToOneTestCase.php index fef74f449..d4ac63122 100644 --- a/tests/Relation/OneToOneTestCase.php +++ b/tests/Relation/OneToOneTestCase.php @@ -36,7 +36,7 @@ class Doctrine_Relation_OneToOne_TestCase extends Doctrine_UnitTestCase { } public function prepareTables() { - $this->tables = array('gnatUser','Email','Entity','Record_City', 'Record_Country', 'SelfRefTest'); + $this->tables = array('gnatUser','gnatEmail','Email','Entity','Record_City', 'Record_Country', 'SelfRefTest'); parent::prepareTables(); } @@ -90,14 +90,14 @@ class Doctrine_Relation_OneToOne_TestCase extends Doctrine_UnitTestCase { $user = new gnatUser(); $user->name = "test"; - $email = new Email(); - $email->address = "test@test.com"; + $email = new gnatEmail(); + $email->address = "test3@test.com"; $user->Email = $email; $user->save(); - $this->assertTrue($user->Email instanceOf Email); - $this->assertTrue($user->email_id != 0); - $this->assertTrue($user->email_id != null); - $this->assertTrue($user->email_id == $user->Email->id); + $this->assertTrue($user->Email instanceOf gnatEmail); + $this->assertTrue($user->foreign_id != 0); + $this->assertTrue($user->foreign_id != null); + $this->assertTrue($user->foreign_id == $user->Email->id); } }