Changeset 4902

Show
Ignore:
Timestamp:
09/09/08 18:18:42 (10 months ago)
Author:
jasoneisen
Message:

Updating test case for #1131

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/1.0/tests/Ticket/1131TestCase.php

    r4900 r4902  
    5151        $role->save(); 
    5252        $this->role_one = $role->id; 
     53        $role->free(); 
    5354         
    5455        $role = new Ticket_1131_Role(); 
    … …  
    5657        $role->save(); 
    5758        $this->role_two = $role->id; 
     59        $role->free(); 
    5860         
    5961        $group = new Ticket_1131_Group(); 
    … …  
    6769        $user->name = 'jwage'; 
    6870        $user->save(); 
    69          
    70         $role->free(); 
     71 
    7172        $group->free(); 
    7273        $user->free(); 
    7374    } 
    7475 
    75     public function testOriginalTicket() 
     76    public function testTicket() 
    7677    { 
    7778        $user = Doctrine_Query::create() 
    … …  
    8384    } 
    8485     
    85     public function testOriginalTicketWithJoins() 
    86     { 
    87         $user = Doctrine_Query::create() 
    88             ->from('Ticket_1131_User u') 
    89             ->leftJoin('u.Group g') 
    90             ->where('u.id = ?')->fetchOne(array(1)); 
    91  
    92         $this->assertEqual($user->Group->id, 1); 
    93         $this->assertFalse($user->get('group_id') instanceof Doctrine_Record); 
    94     } 
    95      
    96     public function testOverloading() 
     86    public function testTicketWithOverloadingAndTwoQueries() 
    9787    { 
    9888        $orig = Doctrine_Manager::getInstance()->getAttribute('auto_accessor_override'); 
    … …  
    10393            ->where('u.id = ?')->fetchOne(array(1)); 
    10494         
    105         $this->assertEqual($user->group_id, 1); 
    106         $this->assertEqual($user->get('group_id'), 1); 
    107         $this->assertFalse($user->get('group_id') instanceof Doctrine_Record); 
    108          
    109         $this->assertEqual($user->role_id, 2); 
    110         $this->assertEqual($user->get('role_id'), 2); 
    111         $this->assertFalse($user->get('role_id') instanceof Doctrine_Record); 
    112          
    113         $this->assertEqual($user->Group->id, 1); 
    114         $this->assertEqual($user->get('Group')->get('id'), 1); 
    115          
    116         $this->assertEqual($user->Role->id, 2); 
    117         $this->assertEqual($user->get('Role')->get('id'), 2); 
    118          
    119         Doctrine_Manager::getInstance()->setAttribute('auto_accessor_override', $orig); 
    120     } 
    121      
    122     public function testOverloadingWithJoins() 
    123     { 
    124         $orig = Doctrine_Manager::getInstance()->getAttribute('auto_accessor_override'); 
    125         Doctrine_Manager::getInstance()->setAttribute('auto_accessor_override', true); 
    126          
    12795        $user = Doctrine_Query::create() 
    12896            ->from('Ticket_1131_UserWithOverloading u') 
    … …  
    13199            ->addWhere('u.id = ?')->fetchOne(array(1)); 
    132100         
    133         $this->assertEqual($user->group_id, 1); 
    134         $this->assertEqual($user->get('group_id'), 1); 
    135         $this->assertFalse($user->get('group_id') instanceof Doctrine_Record); 
    136          
    137         $this->assertEqual($user->role_id, 1); 
    138         $this->assertEqual($user->get('role_id'), 1); 
    139         $this->assertFalse($user->get('role_id') instanceof Doctrine_Record); 
    140          
    141         $this->assertEqual($user->Group->id, 1); 
    142         $this->assertEqual($user->get('Group')->get('id'), 1); 
    143          
    144101        $this->assertEqual($user->Role->id, 1); 
    145         $this->assertEqual($user->get('Role')->get('id'), 1); 
     102        $this->assertFalse($user->role_id instanceof Doctrine_Record); 
    146103         
    147104        Doctrine_Manager::getInstance()->setAttribute('auto_accessor_override', $orig);