Show
Ignore:
Timestamp:
02/23/08 22:04:39 (11 months ago)
Author:
romanb
Message:

validator refactorings and others

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/tests_old/Metadata/FactoryTestCase.php

    r3811 r3890  
    2626        $this->assertTrue($userClass instanceof Doctrine_ClassMetadata); 
    2727        $this->assertEqual('cti_user', $userClass->getTableName()); 
    28         $this->assertEqual(4, count($userClass->getFields())); 
    29         $this->assertIdentical(array(), $userClass->getOption('parents')); 
     28        $this->assertEqual(4, count($userClass->getMappedColumns())); 
     29        $this->assertIdentical(array(), $userClass->getParentClasses()); 
    3030        $this->assertEqual('type', $userClass->getInheritanceOption('discriminatorColumn')); 
    3131        $this->assertIdentical(array( 
     
    3838        $managerClass = $this->conn->getMetadata('Metadata_Manager'); 
    3939        $this->assertTrue($managerClass instanceof Doctrine_ClassMetadata); 
    40         $this->assertIdentical(array('Metadata_User'), $managerClass->getOption('parents')); 
     40        $this->assertIdentical(array('Metadata_User'), $managerClass->getParentClasses()); 
    4141        $this->assertEqual('cti_manager', $managerClass->getTableName()); 
    42         $this->assertEqual(5, count($managerClass->getFields())); 
     42        $this->assertEqual(5, count($managerClass->getMappedColumns())); 
    4343        $this->assertEqual('type', $managerClass->getInheritanceOption('discriminatorColumn')); 
    4444        $this->assertIdentical(array( 
     
    5151        $suManagerClass = $this->conn->getMetadata('Metadata_SuperManager'); 
    5252        $this->assertTrue($suManagerClass instanceof Doctrine_ClassMetadata); 
    53         $this->assertIdentical(array('Metadata_Manager', 'Metadata_User'), $suManagerClass->getOption('parents')); 
     53        $this->assertIdentical(array('Metadata_Manager', 'Metadata_User'), $suManagerClass->getParentClasses()); 
    5454        $this->assertEqual('cti_supermanager', $suManagerClass->getTableName()); 
    55         $this->assertEqual(6, count($suManagerClass->getFields())); 
     55        $this->assertEqual(6, count($suManagerClass->getMappedColumns())); 
    5656        $this->assertEqual('type', $suManagerClass->getInheritanceOption('discriminatorColumn')); 
    5757        $this->assertIdentical(array( 
     
    6666    public function testExportableFormatOfClassInClassTableInheritanceHierarchy() 
    6767    { 
    68         $userClass = $this->conn->getMetadata('Metadata_User'); 
     68        $userClass = $this->conn->getClassMetadata('Metadata_User'); 
    6969        $userClassExportableFormat = $userClass->getExportableFormat(); 
    7070        $this->assertEqual(4, count($userClassExportableFormat['columns'])); 
     
    7676        $this->assertTrue(isset($userClassExportableFormat['columns']['type'])); 
    7777         
    78         $managerClass = $this->conn->getMetadata('Metadata_Manager'); 
     78        $managerClass = $this->conn->getClassMetadata('Metadata_Manager'); 
    7979        $managerClassExportableFormat = $managerClass->getExportableFormat(); 
    8080        $this->assertEqual(2, count($managerClassExportableFormat['columns'])); 
     
    8383        $this->assertFalse(isset($managerClassExportableFormat['columns']['cti_id']['autoincrement'])); 
    8484         
    85         $customerClass = $this->conn->getMetadata('Metadata_Customer'); 
     85        $customerClass = $this->conn->getClassMetadata('Metadata_Customer'); 
    8686        $customerClassExportableFormat = $customerClass->getExportableFormat(); 
    8787        $this->assertEqual(2, count($customerClassExportableFormat['columns'])); 
     
    9090        $this->assertFalse(isset($customerClassExportableFormat['columns']['cti_id']['autoincrement'])); 
    9191         
    92         $superManagerClass = $this->conn->getMetadata('Metadata_SuperManager'); 
     92        $superManagerClass = $this->conn->getClassMetadata('Metadata_SuperManager'); 
    9393        $superManagerClassExportableFormat = $superManagerClass->getExportableFormat(); 
    9494        $this->assertEqual(2, count($superManagerClassExportableFormat['columns'])); 
     
    100100    public function testMetadataSetupOnSingleTableInheritanceHierarchy() 
    101101    {         
    102         $userClass = $this->conn->getMetadata('Metadata_STI_User'); 
     102        $userClass = $this->conn->getClassMetadata('Metadata_STI_User'); 
    103103        $this->assertTrue($userClass instanceof Doctrine_ClassMetadata); 
    104104        $this->assertEqual('cti_user', $userClass->getTableName()); 
    105         $this->assertEqual(4, count($userClass->getFields())); 
    106         $this->assertIdentical(array(), $userClass->getOption('parents')); 
     105        $this->assertEqual(4, count($userClass->getMappedColumns())); 
     106        $this->assertIdentical(array(), $userClass->getParentClasses()); 
    107107        $this->assertEqual('type', $userClass->getInheritanceOption('discriminatorColumn')); 
    108108        $this->assertIdentical(array( 
     
    112112              4 => 'CTI_SuperManager'), $userClass->getInheritanceOption('discriminatorMap')); 
    113113         
    114         $managerClass = $this->conn->getMetadata('Metadata_STI_Manager'); 
     114        $managerClass = $this->conn->getClassMetadata('Metadata_STI_Manager'); 
    115115        $this->assertTrue($managerClass instanceof Doctrine_ClassMetadata); 
    116         $this->assertIdentical(array('Metadata_STI_User'), $managerClass->getOption('parents')); 
     116        $this->assertIdentical(array('Metadata_STI_User'), $managerClass->getParentClasses()); 
    117117        $this->assertEqual('cti_user', $managerClass->getTableName()); 
    118         $this->assertEqual(5, count($managerClass->getFields())); 
     118        $this->assertEqual(5, count($managerClass->getMappedColumns())); 
    119119        $this->assertEqual('type', $managerClass->getInheritanceOption('discriminatorColumn')); 
    120120        $this->assertIdentical(array( 
     
    125125         
    126126         
    127         $suManagerClass = $this->conn->getMetadata('Metadata_STI_SuperManager'); 
     127        $suManagerClass = $this->conn->getClassMetadata('Metadata_STI_SuperManager'); 
    128128        $this->assertTrue($suManagerClass instanceof Doctrine_ClassMetadata); 
    129         $this->assertIdentical(array('Metadata_STI_Manager', 'Metadata_STI_User'), $suManagerClass->getOption('parents')); 
     129        $this->assertIdentical(array('Metadata_STI_Manager', 'Metadata_STI_User'), $suManagerClass->getParentClasses()); 
    130130        $this->assertEqual('cti_user', $suManagerClass->getTableName()); 
    131         $this->assertEqual(6, count($suManagerClass->getFields())); 
     131        $this->assertEqual(6, count($suManagerClass->getMappedColumns())); 
    132132        $this->assertEqual('type', $suManagerClass->getInheritanceOption('discriminatorColumn')); 
    133133        $this->assertIdentical(array(