From 3d736d32b4bcdc9693407f2be18116c1f1248889 Mon Sep 17 00:00:00 2001 From: zYne Date: Thu, 5 Jul 2007 23:25:36 +0000 Subject: [PATCH] --- tests/Relation/ParserTestCase.php | 2 +- tests/TableTestCase.php | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/Relation/ParserTestCase.php b/tests/Relation/ParserTestCase.php index 3849a17cf..f899e4536 100644 --- a/tests/Relation/ParserTestCase.php +++ b/tests/Relation/ParserTestCase.php @@ -190,7 +190,7 @@ class Doctrine_Relation_Parser_TestCase extends Doctrine_UnitTestCase $r->bind('Entity', $p); $rel = $r->getRelation('Entity'); - $this->assertTrue($rel instanceof Doctrine_Relation_Association_Self); + $this->assertTrue($rel instanceof Doctrine_Relation_Nest); $rel = $r->getRelation('EntityReference'); $this->assertTrue($rel instanceof Doctrine_Relation_ForeignKey); diff --git a/tests/TableTestCase.php b/tests/TableTestCase.php index 6f63a8ac7..acf3ea03a 100644 --- a/tests/TableTestCase.php +++ b/tests/TableTestCase.php @@ -36,7 +36,7 @@ class Doctrine_Table_TestCase extends Doctrine_UnitTestCase public function prepareTables() { $this->tables[] = 'FieldNameTest'; - parent::prepareTables(); + parent::prepareTables(); } public function testFieldConversion() @@ -104,23 +104,23 @@ class Doctrine_Table_TestCase extends Doctrine_UnitTestCase $this->assertTrue($fk->getForeign() == $fk->getTable()->getIdentifier()); - $fk = $this->objTable->getRelation("Phonenumber"); + $fk = $this->objTable->getRelation('Phonenumber'); $this->assertTrue($fk instanceof Doctrine_Relation_ForeignKey); $this->assertTrue($fk->getTable() instanceof Doctrine_Table); - $this->assertTrue($fk->getType() == Doctrine_Relation::MANY_COMPOSITE); + $this->assertTrue($fk->getType() == Doctrine_Relation::MANY); $this->assertTrue($fk->getLocal() == $this->objTable->getIdentifier()); - $this->assertTrue($fk->getForeign() == "entity_id"); + $this->assertTrue($fk->getForeign() == 'entity_id'); } public function testGetComponentName() { - $this->assertTrue($this->objTable->getComponentName() == "User"); + $this->assertTrue($this->objTable->getComponentName() == 'User'); } public function testGetTableName() { - $this->assertTrue($this->objTable->tableName == "entity"); + $this->assertTrue($this->objTable->tableName == 'entity'); } public function testGetConnection() @@ -135,8 +135,8 @@ class Doctrine_Table_TestCase extends Doctrine_UnitTestCase public function testSetSequenceName() { - $this->objTable->sequenceName = "test-seq"; - $this->assertEqual($this->objTable->sequenceName, "test-seq"); + $this->objTable->sequenceName = 'test-seq'; + $this->assertEqual($this->objTable->sequenceName, 'test-seq'); $this->objTable->sequenceName = null; }