Author: jasoneisen
Date: 2008-09-09 19:18:42 +0100 (Tue, 09 Sep 2008)
New Revision: 4902
Modified:
branches/1.0/tests/Ticket/1131TestCase.php
Log:
Updating test case for #1131
Modified: branches/1.0/tests/Ticket/1131TestCase.php
===================================================================
--- branches/1.0/tests/Ticket/1131TestCase.php 2008-09-09 17:14:51 UTC (rev
4901)
+++ branches/1.0/tests/Ticket/1131TestCase.php 2008-09-09 18:18:42 UTC (rev
4902)
@@ -50,11 +50,13 @@
$role->name = 'Role One';
$role->save();
$this->role_one = $role->id;
+ $role->free();
$role = new Ticket_1131_Role();
$role->name = 'Role Two';
$role->save();
$this->role_two = $role->id;
+ $role->free();
$group = new Ticket_1131_Group();
$group->role_id = $this->role_one;
@@ -66,13 +68,12 @@
$user->role_id = $this->role_two;
$user->name = 'jwage';
$user->save();
-
- $role->free();
+
$group->free();
$user->free();
}
- public function testOriginalTicket()
+ public function testTicket()
{
$user = Doctrine_Query::create()
->from('Ticket_1131_User u')
@@ -82,19 +83,8 @@
$this->assertFalse($user->get('group_id') instanceof Doctrine_Record);
}
- public function testOriginalTicketWithJoins()
+ public function testTicketWithOverloadingAndTwoQueries()
{
- $user = Doctrine_Query::create()
- ->from('Ticket_1131_User u')
- ->leftJoin('u.Group g')
- ->where('u.id = ?')->fetchOne(array(1));
-
- $this->assertEqual($user->Group->id, 1);
- $this->assertFalse($user->get('group_id') instanceof Doctrine_Record);
- }
-
- public function testOverloading()
- {
$orig =
Doctrine_Manager::getInstance()->getAttribute('auto_accessor_override');
Doctrine_Manager::getInstance()->setAttribute('auto_accessor_override', true);
@@ -102,47 +92,14 @@
->from('Ticket_1131_User u')
->where('u.id = ?')->fetchOne(array(1));
- $this->assertEqual($user->group_id, 1);
- $this->assertEqual($user->get('group_id'), 1);
- $this->assertFalse($user->get('group_id') instanceof Doctrine_Record);
-
- $this->assertEqual($user->role_id, 2);
- $this->assertEqual($user->get('role_id'), 2);
- $this->assertFalse($user->get('role_id') instanceof Doctrine_Record);
-
- $this->assertEqual($user->Group->id, 1);
- $this->assertEqual($user->get('Group')->get('id'), 1);
-
- $this->assertEqual($user->Role->id, 2);
- $this->assertEqual($user->get('Role')->get('id'), 2);
-
-
Doctrine_Manager::getInstance()->setAttribute('auto_accessor_override', $orig);
- }
-
- public function testOverloadingWithJoins()
- {
- $orig =
Doctrine_Manager::getInstance()->getAttribute('auto_accessor_override');
-
Doctrine_Manager::getInstance()->setAttribute('auto_accessor_override', true);
-
$user = Doctrine_Query::create()
->from('Ticket_1131_UserWithOverloading u')
->leftJoin('u.Group g')
->leftJoin('u.Role r')
->addWhere('u.id = ?')->fetchOne(array(1));
- $this->assertEqual($user->group_id, 1);
- $this->assertEqual($user->get('group_id'), 1);
- $this->assertFalse($user->get('group_id') instanceof Doctrine_Record);
-
- $this->assertEqual($user->role_id, 1);
- $this->assertEqual($user->get('role_id'), 1);
- $this->assertFalse($user->get('role_id') instanceof Doctrine_Record);
-
- $this->assertEqual($user->Group->id, 1);
- $this->assertEqual($user->get('Group')->get('id'), 1);
-
$this->assertEqual($user->Role->id, 1);
- $this->assertEqual($user->get('Role')->get('id'), 1);
+ $this->assertFalse($user->role_id instanceof Doctrine_Record);
Doctrine_Manager::getInstance()->setAttribute('auto_accessor_override', $orig);
}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"doctrine-svn" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.co.uk/group/doctrine-svn?hl=en-GB
-~----------~----~----~----~------~----~------~--~---
