Show
Ignore:
Timestamp:
05/13/08 22:20:34 (8 months ago)
Author:
romanb
Message:

Doctrine_Record renamed. Hydration refactored. Other refactorings.

Location:
trunk/tests_old/Relation
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/tests_old/Relation/AccessTestCase.php

    r4219 r4364  
    8282        $coll = $this->connection->query("FROM File_Owner.Data_File WHERE File_Owner.name = 'owner1'"); 
    8383        $this->assertTrue(count($coll) == 1); 
    84         $this->assertTrue($coll[0] instanceof Doctrine_Record); 
     84        $this->assertTrue($coll[0] instanceof Doctrine_Entity); 
    8585 
    8686        $this->assertEqual($coll[0]->id, 1); 

  • trunk/tests_old/Relation/NestTestCase.php

    r4338 r4364  
    4949        $this->assertTrue($e->Entity[1] instanceof Entity); 
    5050 
    51         $this->assertEqual($e->Entity[0]->state(), Doctrine_Record::STATE_TCLEAN); 
    52         $this->assertEqual($e->Entity[1]->state(), Doctrine_Record::STATE_TCLEAN); 
     51        $this->assertEqual($e->Entity[0]->state(), Doctrine_Entity::STATE_TCLEAN); 
     52        $this->assertEqual($e->Entity[1]->state(), Doctrine_Entity::STATE_TCLEAN); 
    5353         
    5454        $e->Entity[0]->name = 'Friend 1'; 
    … …  
    7070        $this->assertEqual($e->Entity[1]->Entity[1]->name, 'Friend 2 2'); 
    7171 
    72         $this->assertEqual($e->Entity[0]->state(), Doctrine_Record::STATE_TDIRTY); 
    73         $this->assertEqual($e->Entity[1]->state(), Doctrine_Record::STATE_TDIRTY); 
     72        $this->assertEqual($e->Entity[0]->state(), Doctrine_Entity::STATE_TDIRTY); 
     73        $this->assertEqual($e->Entity[1]->state(), Doctrine_Entity::STATE_TDIRTY); 
    7474 
    7575        $count = count($this->conn); 
    … …  
    8484 
    8585        $e = $this->conn->queryOne('FROM Entity e LEFT JOIN e.Entity e2 LEFT JOIN e2.Entity e3 WHERE e.id = 1 ORDER BY e.name, e2.name, e3.name'); 
    86         $this->assertEqual($e->state(), Doctrine_Record::STATE_CLEAN); 
     86        $this->assertEqual($e->state(), Doctrine_Entity::STATE_CLEAN); 
    8787 
    8888        $this->assertTrue($e->Entity[0] instanceof Entity); 
    … …  
    100100        $this->assertEqual($e->Entity[1]->Entity[2]->name, 'Friend 2 2'); 
    101101 
    102         $this->assertEqual($e->Entity[0]->state(), Doctrine_Record::STATE_CLEAN); 
    103         $this->assertEqual($e->Entity[1]->state(), Doctrine_Record::STATE_CLEAN); 
     102        $this->assertEqual($e->Entity[0]->state(), Doctrine_Entity::STATE_CLEAN); 
     103        $this->assertEqual($e->Entity[1]->state(), Doctrine_Entity::STATE_CLEAN); 
    104104 
    105105        $this->assertTrue(is_numeric($e->id)); 
    … …  
    136136        $this->assertEqual($e->Entity[1]->Entity[1]->name, "Friend 2 1"); 
    137137 
    138         $this->assertEqual($e->Entity[0]->state(), Doctrine_Record::STATE_CLEAN); 
    139         $this->assertEqual($e->Entity[1]->state(), Doctrine_Record::STATE_CLEAN); 
     138        $this->assertEqual($e->Entity[0]->state(), Doctrine_Entity::STATE_CLEAN); 
     139        $this->assertEqual($e->Entity[1]->state(), Doctrine_Entity::STATE_CLEAN); 
    140140         
    141141        $coll = $this->connection->query("FROM Entity WHERE Entity.name = 'Friend 1'"); 
    142142        $this->assertEqual($coll->count(), 1); 
    143         $this->assertEqual($coll[0]->state(), Doctrine_Record::STATE_CLEAN); 
     143        $this->assertEqual($coll[0]->state(), Doctrine_Entity::STATE_CLEAN); 
    144144         
    145145        $this->assertEqual($coll[0]->name, "Friend 1");