Changeset 3701 for trunk/tests/Relation

Timestamp:

02/03/08 21:29:57 (11 months ago)

Author:

romanb

Message:

Merged r3518:r3700 from branch to trunk. Branch to be deleted, soon. Development continues in trunk.

Location:

trunk/tests/Relation

Files:

• OneToManyTestCase.php (modified) (3 diffs)
• ParserTestCase.php (modified) (13 diffs)

trunk/tests/Relation/OneToManyTestCase.php

@@ -43 +43 @@
     public function testRelationParsing()
     {
-        $table = $this->conn->getTable('Entity');
+        $table = $this->conn->getClassMetadata('Entity');
 
         $rel = $table->getRelation('Phonenumber');
@@ -56 +56 @@
     public function testRelationParsing2()
     {
-        $table = $this->conn->getTable('Phonenumber');
+        $table = $this->conn->getClassMetadata('Phonenumber');
 
         $rel = $table->getRelation('Entity');
@@ -65 +65 @@
     public function testRelationParsing3()
     {
-        $table = $this->conn->getTable('Policy');
+        $table = $this->conn->getClassMetadata('Policy');
 
         $rel = $table->getRelation('PolicyAssets');

trunk/tests/Relation/ParserTestCase.php

@@ -35 +35 @@
     public function testPendingRelations()
     {
-        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+        $r = new Doctrine_Relation_Parser($this->conn->getClassMetadata('User'));
         
         $p = array('type' => Doctrine_Relation::ONE, 
@@ -50 +50 @@
     public function testBindThrowsExceptionIfTypeNotSet()
     {
-        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+        $r = new Doctrine_Relation_Parser($this->conn->getClassMetadata('User'));
 
         $p = array('local' => 'email_id');
@@ -62 +62 @@
     public function testRelationParserSupportsLocalColumnGuessing()
     {
-        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+        $r = new Doctrine_Relation_Parser($this->conn->getClassMetadata('User'));
 
         $d = $r->completeDefinition(array('class'   => 'Phonenumber',
@@ -72 +72 @@
     public function testRelationParserSupportsLocalColumnGuessing2()
     {
-        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+        $r = new Doctrine_Relation_Parser($this->conn->getClassMetadata('User'));
 
         $d = $r->completeDefinition(array('class'   => 'Email',
@@ -82 +82 @@
     public function testRelationParserSupportsForeignColumnGuessing()
     {
-        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+        $r = new Doctrine_Relation_Parser($this->conn->getClassMetadata('User'));
 
         $d = $r->completeDefinition(array('class' => 'Phonenumber',
@@ -92 +92 @@
     public function testRelationParserSupportsForeignColumnGuessing2()
     {
-        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+        $r = new Doctrine_Relation_Parser($this->conn->getClassMetadata('User'));
 
         $d = $r->completeDefinition(array('class' => 'Email',
@@ -102 +102 @@
     public function testRelationParserSupportsGuessingOfBothColumns()
     {
-        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+        $r = new Doctrine_Relation_Parser($this->conn->getClassMetadata('User'));
 
         $d = $r->completeDefinition(array('class' => 'Email',
@@ -113 +113 @@
     public function testRelationParserSupportsGuessingOfBothColumns2()
     {
-        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+        $r = new Doctrine_Relation_Parser($this->conn->getClassMetadata('User'));
 
         $d = $r->completeDefinition(array('class' => 'Phonenumber',
@@ -139 +139 @@
                                                'type'     => Doctrine_Relation::MANY,
                                                'foreign'  => 'group_id',
-                                               'refClass' => 'GroupUser'));
+                                               'refClass' => 'Groupuser'));
 
         $this->assertEqual($d['local'], 'user_id');
@@ -146 +146 @@
     public function testGetRelationReturnsForeignKeyObjectForOneToOneRelation()
     {
-        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+        $r = new Doctrine_Relation_Parser($this->conn->getClassMetadata('User'));
         $p = array('type' => Doctrine_Relation::ONE, 
                    'local' => 'email_id');
@@ -156 +156 @@
         $this->assertTrue($rel instanceof Doctrine_Relation_LocalKey);
     }
+    
     public function testGetRelationReturnsForeignKeyObjectForOneToManyRelation()
     {
-        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+        $r = new Doctrine_Relation_Parser($this->conn->getClassMetadata('User'));
         $p = array('type' => Doctrine_Relation::MANY);
 
@@ -167 +168 @@
         $this->assertTrue($rel instanceof Doctrine_Relation_ForeignKey);
     }
+    
     public function testGetRelationReturnsForeignKeyObjectForManytToManyRelation()
     {
-        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
-        $p = array('type' => Doctrine_Relation::MANY, 'refClass' => 'GroupUser',
-                'refRelationName' => 'UserGroupuser',
-                'refReverseRelationName' => 'GroupGroupuser');
+        $r = new Doctrine_Relation_Parser($this->conn->getClassMetadata('User'));
+        $p = array('type' => Doctrine_Relation::MANY, 'refClass' => 'Groupuser');
 
         $r->bind('Group', $p);
@@ -179 +179 @@
         
         $this->assertTrue($rel instanceof Doctrine_Relation_Association);
-        $rel = $r->getRelation('UserGroupuser');
+        $rel = $r->getRelation('Groupuser');
         $this->assertTrue($rel instanceof Doctrine_Relation_ForeignKey);
     }
     public function testGetRelationReturnsForeignKeyObjectForNestRelation()
     {
-        $r = new Doctrine_Relation_Parser($this->conn->getTable('Entity'));
+        $r = new Doctrine_Relation_Parser($this->conn->getClassMetadata('Entity'));
         $p = array('type' => Doctrine_Relation::MANY,
                    'refClass' => 'EntityReference',