Changeset 4364 for trunk/tests_old

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
Files:
217 modified

Legend:

Unmodified
Added
Removed

  • trunk/tests_old/CacheFileTestCase.php

    r2359 r4364  
    1212 
    1313        $record = $this->cache->fetch(4); 
    14         $this->assertTrue($record instanceof Doctrine_Record); 
     14        $this->assertTrue($record instanceof Doctrine_Entity); 
    1515        $this->assertTrue($record->obtainIdentifier() == $this->old->obtainIdentifier()); 
    1616         

  • trunk/tests_old/CacheSqliteTestCase.php

    r2359 r4364  
    2222 
    2323        $record = $this->cache->fetch(4); 
    24         $this->assertTrue($record instanceof Doctrine_Record); 
     24        $this->assertTrue($record instanceof Doctrine_Entity); 
    2525 
    2626        foreach($this->old as $name => $value) { 
    … …  
    3737        $this->assertEqual(gettype($array), "array"); 
    3838        $this->assertEqual(count($array), 1); 
    39         $this->assertTrue($array[0] instanceof Doctrine_Record); 
     39        $this->assertTrue($array[0] instanceof Doctrine_Entity); 
    4040    } 
    4141    public function testDeleteMultiple() { 
    … …  
    5353    public function testDelete() { 
    5454        $this->cache->store($this->objTable->find(5)); 
    55         $this->assertTrue($this->cache->fetch(5) instanceof Doctrine_Record); 
     55        $this->assertTrue($this->cache->fetch(5) instanceof Doctrine_Entity); 
    5656 
    5757        $this->assertEqual($this->cache->delete(5),true); 

  • trunk/tests_old/ClassTableInheritanceTestCase.php

    r4338 r4364  
    226226    } 
    227227} 
    228 class CTITestParent1 extends Doctrine_Record 
     228class CTITestParent1 extends Doctrine_Entity 
    229229{ 
    230230    public function setTableDefinition() 
    … …  
    266266} 
    267267 
    268 class CTITestOneToManyRelated extends Doctrine_Record 
     268class CTITestOneToManyRelated extends Doctrine_Entity 
    269269{ 
    270270    public function setTableDefinition() 

  • trunk/tests_old/CollectionOffsetTestCase.php

    r3894 r4364  
    99        $users[5]; 
    1010 
    11         $this->assertEqual($users[5]->getState(), Doctrine_Record::STATE_CLEAN); 
     11        $this->assertEqual($users[5]->getState(), Doctrine_Entity::STATE_CLEAN); 
    1212        $users[5]; 
    1313 
    … …  
    1616        $users = $this->connection->query("FROM User-o"); 
    1717        $this->assertEqual(count($users), 3); 
    18         $this->assertEqual($users[0]->getState(), Doctrine_Record::STATE_CLEAN); 
    19         $this->assertEqual($users[1]->getState(), Doctrine_Record::STATE_CLEAN); 
    20         $this->assertEqual($users[2]->getState(), Doctrine_Record::STATE_CLEAN); 
     18        $this->assertEqual($users[0]->getState(), Doctrine_Entity::STATE_CLEAN); 
     19        $this->assertEqual($users[1]->getState(), Doctrine_Entity::STATE_CLEAN); 
     20        $this->assertEqual($users[2]->getState(), Doctrine_Entity::STATE_CLEAN); 
    2121        // indexes 0,1,2 in use 
    2222 
    … …  
    2929        $this->assertTrue($users->contains(7)); 
    3030 
    31         $this->assertEqual($users[6]->getState(), Doctrine_Record::STATE_CLEAN); 
    32         $this->assertEqual($users[7]->getState(), Doctrine_Record::STATE_CLEAN); 
     31        $this->assertEqual($users[6]->getState(), Doctrine_Entity::STATE_CLEAN); 
     32        $this->assertEqual($users[7]->getState(), Doctrine_Entity::STATE_CLEAN); 
    3333 
    3434 
    3535        $users[5]; 
    3636        $this->assertEqual(count($users), 8); 
    37         $this->assertEqual($users[3]->getState(), Doctrine_Record::STATE_CLEAN); 
    38         $this->assertEqual($users[4]->getState(), Doctrine_Record::STATE_CLEAN); 
    39         $this->assertEqual($users[5]->getState(), Doctrine_Record::STATE_CLEAN); 
     37        $this->assertEqual($users[3]->getState(), Doctrine_Entity::STATE_CLEAN); 
     38        $this->assertEqual($users[4]->getState(), Doctrine_Entity::STATE_CLEAN); 
     39        $this->assertEqual($users[5]->getState(), Doctrine_Entity::STATE_CLEAN); 
    4040 
    4141 
    … …  
    6262        } 
    6363        $this->assertEqual($coll->count(), 8); 
    64         $this->assertEqual($coll[3]->getState(), Doctrine_Record::STATE_CLEAN); 
    65         $this->assertEqual($coll[6]->getState(), Doctrine_Record::STATE_CLEAN); 
     64        $this->assertEqual($coll[3]->getState(), Doctrine_Entity::STATE_CLEAN); 
     65        $this->assertEqual($coll[6]->getState(), Doctrine_Entity::STATE_CLEAN); 
    6666 
    6767        $this->connection->setAttribute(Doctrine::ATTR_COLL_LIMIT, 3); 
    … …  
    7272        } 
    7373        $this->assertEqual($coll->count(), 8); 
    74         $this->assertEqual($coll[3]->getState(), Doctrine_Record::STATE_CLEAN); 
    75         $this->assertEqual($coll[6]->getState(), Doctrine_Record::STATE_CLEAN); 
     74        $this->assertEqual($coll[3]->getState(), Doctrine_Entity::STATE_CLEAN); 
     75        $this->assertEqual($coll[6]->getState(), Doctrine_Entity::STATE_CLEAN); 
    7676    } 
    7777} 

  • trunk/tests_old/CollectionTestCase.php

    r4101 r4364  
    252252        $this->assertEqual(count($coll), 3); 
    253253 
    254         $this->assertEqual($coll[2]->state(), Doctrine_Record::STATE_PROXY); 
     254        $this->assertEqual($coll[2]->state(), Doctrine_Entity::STATE_PROXY); 
    255255 
    256256 
    … …  
    288288        $this->assertEqual($users->count(), 8); 
    289289         
    290         $this->assertEqual($users[0]->state(), Doctrine_Record::STATE_TCLEAN);  
    291         $this->assertEqual($users[4]->state(), Doctrine_Record::STATE_CLEAN); 
     290        $this->assertEqual($users[0]->state(), Doctrine_Entity::STATE_TCLEAN);  
     291        $this->assertEqual($users[4]->state(), Doctrine_Entity::STATE_CLEAN); 
    292292    } 
    293293    public function testFetchCollectionWithNameAsIndex()  
    … …  
    300300        $this->assertEqual($users->count(), 8); 
    301301         
    302         $this->assertEqual($users[0]->state(), Doctrine_Record::STATE_TCLEAN);  
    303         $this->assertEqual($users['zYne']->state(), Doctrine_Record::STATE_CLEAN); 
     302        $this->assertEqual($users[0]->state(), Doctrine_Entity::STATE_TCLEAN);  
     303        $this->assertEqual($users['zYne']->state(), Doctrine_Entity::STATE_CLEAN); 
    304304    } 
    305305    public function testFetchMultipleCollections()  
    … …  
    318318        $this->assertEqual($users->count(), 8); 
    319319 
    320         $this->assertEqual($users[0]->state(), Doctrine_Record::STATE_TCLEAN); 
    321         $this->assertEqual($users[2]->state(), Doctrine_Record::STATE_TCLEAN); 
    322         $this->assertEqual($users[3]->state(), Doctrine_Record::STATE_TCLEAN); 
    323         $this->assertEqual($users[4]->state(), Doctrine_Record::STATE_CLEAN); 
     320        $this->assertEqual($users[0]->state(), Doctrine_Entity::STATE_TCLEAN); 
     321        $this->assertEqual($users[2]->state(), Doctrine_Entity::STATE_TCLEAN); 
     322        $this->assertEqual($users[3]->state(), Doctrine_Entity::STATE_TCLEAN); 
     323        $this->assertEqual($users[4]->state(), Doctrine_Entity::STATE_CLEAN); 
    324324        $this->assertEqual($users[4]->name, 'zYne'); 
    325325 
    326326        $this->assertEqual($users[4]->Phonenumber[0]->exists(), false); 
    327         $this->assertEqual($users[4]->Phonenumber[0]->state(), Doctrine_Record::STATE_TDIRTY); 
     327        $this->assertEqual($users[4]->Phonenumber[0]->state(), Doctrine_Entity::STATE_TDIRTY); 
    328328        $this->assertEqual($users[4]->Phonenumber[1]->exists(), false); 
    329         $this->assertEqual($users[4]->Phonenumber[2]->state(), Doctrine_Record::STATE_CLEAN); 
     329        $this->assertEqual($users[4]->Phonenumber[2]->state(), Doctrine_Entity::STATE_CLEAN); 
    330330    } 
    331331 

  • trunk/tests_old/ConnectionTestCase.php

    r3882 r4364  
    154154        //$user = $this->connection->create('User'); 
    155155        //$this->connection->unitOfWork->delete($user); 
    156         //$this->assertEqual($user->state(),Doctrine_Record::STATE_TCLEAN); 
     156        //$this->assertEqual($user->state(),Doctrine_Entity::STATE_TCLEAN); 
    157157    } 
    158158 

  • trunk/tests_old/CtiColumnAggregationTestCase.php

    r3882 r4364  
    3535 
    3636} 
    37 abstract class CTICAAbstractBase extends Doctrine_Record 
     37abstract class CTICAAbstractBase extends Doctrine_Entity 
    3838{ } 
    3939class CTICATestParent1 extends CTICAAbstractBase 
    … …  
    8686} 
    8787 
    88 class CTICATestOneToManyRelated extends Doctrine_Record 
     88class CTICATestOneToManyRelated extends Doctrine_Entity 
    8989{ 
    9090    public function setTableDefinition() 

  • trunk/tests_old/CustomPrimaryKeyTestCase.php

    r4338 r4364  
    4545    { 
    4646        $c = new CustomPK(); 
    47         $this->assertTrue($c instanceof Doctrine_Record); 
     47        $this->assertTrue($c instanceof Doctrine_Entity); 
    4848 
    4949        $c->name = 'custom pk test'; 

  • trunk/tests_old/DataType/BooleanTestCase.php

    r4338 r4364  
    4343 
    4444        $this->assertIdentical($test->is_working, false); 
    45         $this->assertEqual($test->state(), Doctrine_Record::STATE_TDIRTY); 
     45        $this->assertEqual($test->state(), Doctrine_Entity::STATE_TDIRTY); 
    4646        $test->save(); 
    4747 
    … …  
    9999 
    100100        $this->assertIdentical($this->is_working, null); 
    101         $this->assertEqual($test->state(), Doctrine_Record::STATE_TDIRTY); 
     101        $this->assertEqual($test->state(), Doctrine_Entity::STATE_TDIRTY); 
    102102        $test->save(); 
    103103 
    … …