Doctrine

Timestamp:

03/19/08 01:29:12 (16 months ago)

Author:

jwage

Message:

Updated tests. Cleaned up some stuff. Uncommented tests and added failing test cases to fix.

Location:

branches/0.10/tests

Files:

• BatchIteratorTestCase.php (modified) (3 diffs)
• Cache/QuerySqliteTestCase.php (moved) (moved from branches/0.10/tests/CacheQuerySqliteTestCase.php) (1 diff)
• CollectionTestCase.php (modified) (11 diffs)
• ConfigurableTestCase.php (modified) (12 diffs)
• Export/ReporterTestCase.php (deleted)
• ImportTestCase.php (modified) (1 diff)
• Jwage (deleted)
• JwageTestCase.php (deleted)
• Migration/MysqlTestCase.php (deleted)
• PessimisticLockingTestCase.php (modified) (1 diff)
• PluginTestCase.php (modified) (1 diff)
• Record/CascadingDeleteTestCase.php (moved) (moved from branches/0.10/tests/CascadingDeleteTestCase.php) (1 diff)
• Record/SaveBlankRecordTestCase.php (modified) (1 diff)
• Relation/AccessTestCase.php (modified) (3 diffs)
• Relation/ManyToManyTestCase.php (modified) (6 diffs)
• run.php (modified) (14 diffs)
• Ticket/741TestCase.php (modified) (1 diff)
• Ticket/749TestCase.php (modified) (5 diffs)

branches/0.10/tests/BatchIteratorTestCase.php

@@ -33 +33 @@
 class Doctrine_BatchIterator_TestCase extends Doctrine_UnitTestCase {
     public function prepareTables() {
-        $this->tables = array("Entity", "User", "Group", "Address", "Email", "Phonenumber");
+        $this->tables = array("EntityAddress", "Entity", "User", "Group", "Address", "Email", "Phonenumber");
         parent::prepareTables();
     }
@@ -69 +69 @@
         $user->save();
         
-        $user = $user->getTable()->find($user->obtainIdentifier());
+        $user = $user->getTable()->find($user->id);
         $this->assertEqual($user->name, "tester");
         $this->assertEqual($user->Address[0]->address, "street 1");
         $this->assertEqual($user->Address[1]->address, "street 2");
         
-        $user = $user->getTable()->find($user->obtainIdentifier());
+        $user = $user->getTable()->find($user->id);
         $a = array();
         foreach($user->Address as $address) {
@@ -84 +84 @@
         $user = $graph->query("FROM User");
     }
-
 }

branches/0.10/tests/Cache/QuerySqliteTestCase.php

@@ -1 +1 @@
 <?php
-require_once("UnitTestCase.php");
-
 class Doctrine_Cache_Query_SqliteTestCase extends Doctrine_UnitTestCase {
     public function setUp() {

branches/0.10/tests/CollectionTestCase.php

@@ -33 +33 @@
 class Doctrine_Collection_TestCase extends Doctrine_UnitTestCase 
 {
-    /**
     public function testLoadRelatedForAssociation() 
     {
@@ -70 +69 @@
         $this->assertEqual($coll->count(), 8);
 
-        $count = $this->dbh->count();
+        $count = $this->connection->count();
 
         $coll->loadRelated('Group');
-        $this->assertEqual(($count + 1), $this->dbh->count());
+        $this->assertEqual(($count + 1), $this->connection->count());
         $this->assertEqual($coll[0]->Group->count(), 2);
-        $this->assertEqual(($count + 1), $this->dbh->count());
+        $this->assertEqual(($count + 1), $this->connection->count());
         $this->assertEqual($coll[1]->Group->count(), 1);
 
-        $this->assertEqual(($count + 1), $this->dbh->count());
+        $this->assertEqual(($count + 1), $this->connection->count());
 
         $this->assertEqual($coll[2]->Group->count(), 3);
 
-        $this->assertEqual(($count + 1), $this->dbh->count());
+        $this->assertEqual(($count + 1), $this->connection->count());
         $this->assertEqual($coll[5]->Group->count(), 3);
 
-        $this->assertEqual(($count + 1), $this->dbh->count());
+        $this->assertEqual(($count + 1), $this->connection->count());
 
         $this->connection->clear();
@@ -117 +116 @@
         $resources = $this->connection->query('FROM Resource');
 
-        $count = $this->dbh->count();
+        $count = $this->connection->count();
         $resources->loadRelated('Type');
 
-        $this->assertEqual(($count + 1), $this->dbh->count());
+        $this->assertEqual(($count + 1), $this->connection->count());
         $this->assertEqual($resources[0]->name, 'resource 1');
         $this->assertEqual($resource[0]->Type[0]->type, 'type 1');
         $this->assertEqual($resource[0]->Type[1]->type, 'type 2');
-        $this->assertEqual(($count + 1), $this->dbh->count());
+        $this->assertEqual(($count + 1), $this->connection->count());
 
         $this->assertEqual($resource[1]->name, 'resource 2');
         $this->assertEqual($resource[1]->Type[0]->type, 'type 3');
         $this->assertEqual($resource[1]->Type[1]->type, 'type 4');
-        $this->assertEqual(($count + 1), $this->dbh->count());
-    }
-         */
+        $this->assertEqual(($count + 1), $this->connection->count());
+    }
+    
     public function testAdd() 
     {
@@ -148 +147 @@
     }
 
-
     public function testLoadRelated() 
     {
-        $coll = $this->connection->query('FROM User(id)');
+        $coll = $this->connection->query('FROM User u');
 
         $q = $coll->loadRelated();
@@ -157 +155 @@
         $this->assertTrue($q instanceof Doctrine_Query);
         
-        $q->addFrom('User.Group');
+        $q->addFrom('User.Group g');
 
         $coll2 = $q->execute($coll->getPrimaryKeys());
         $this->assertEqual($coll2->count(), $coll->count());
 
-        $count = $this->dbh->count();
+        $count = $this->connection->count();
         $coll[0]->Group[0];
-        $this->assertEqual($count, $this->dbh->count());
+        $this->assertEqual($count, $this->connection->count());
     }
     public function testLoadRelatedForLocalKeyRelation() 
@@ -172 +170 @@
         $this->assertEqual($coll->count(), 8);
         
-        $count = $this->dbh->count();
+        $count = $this->connection->count();
         $coll->loadRelated('Email');
 
-        $this->assertEqual(($count + 1), $this->dbh->count());
+        $this->assertEqual(($count + 1), $this->connection->count());
 
         $this->assertEqual($coll[0]->Email->address, 'zYne@example.com');
 
-        $this->assertEqual(($count + 1), $this->dbh->count());
+        $this->assertEqual(($count + 1), $this->connection->count());
 
         $this->assertEqual($coll[2]->Email->address, 'caine@example.com');
@@ -187 +185 @@
         $this->assertEqual($coll[4]->Email->address, 'stallone@example.com');
 
-        $this->assertEqual(($count + 1), $this->dbh->count());
+        $this->assertEqual(($count + 1), $this->connection->count());
 
         $this->connection->clear();
@@ -196 +194 @@
         $this->assertEqual($coll->count(), 8);
         
-        $count = $this->dbh->count();
+        $count = $this->connection->count();
         $coll->loadRelated("Phonenumber");
 
-        $this->assertEqual(($count + 1), $this->dbh->count());
+        $this->assertEqual(($count + 1), $this->connection->count());
 
         $this->assertEqual($coll[0]->Phonenumber[0]->phonenumber, "123 123");
 
-        $this->assertEqual(($count + 1), $this->dbh->count());
+        $this->assertEqual(($count + 1), $this->connection->count());
 
         $coll[0]->Phonenumber[1]->phonenumber;
 
-        $this->assertEqual(($count + 1), $this->dbh->count());
+        $this->assertEqual(($count + 1), $this->connection->count());
 
         $this->assertEqual($coll[4]->Phonenumber[0]->phonenumber, "111 555 333");
@@ -220 +218 @@
         $this->assertEqual($coll[6]["Phonenumber"][2]->phonenumber, "123 456");
         
-        $this->assertEqual(($count + 1), $this->dbh->count());
+        $this->assertEqual(($count + 1), $this->connection->count());
         
         $this->connection->clear();
@@ -233 +231 @@
     public function testExpand() 
     {
-        $users = $this->connection->query("FROM User.Phonenumber WHERE User.Phonenumber.phonenumber LIKE '%123%'");
-
-        $this->assertTrue($users instanceof Doctrine_Collection_Batch);
+        $users = $this->connection->query("FROM User.Phonenumber WHERE User.Phonenumber.phonenumber");
+        
+        $this->assertTrue($users instanceof Doctrine_Collection);
         $this->assertTrue($users[1] instanceof User);
-        $this->assertTrue($users[1]->Phonenumber instanceof Doctrine_Collection_Lazy);
+        $this->assertTrue($users[1]->Phonenumber instanceof Doctrine_Collection);
         $data = $users[1]->Phonenumber->getData();
         
         $coll = $users[1]->Phonenumber;
 
-        $this->assertEqual(count($data), 1);
+        $this->assertEqual(count($data), 3);
 
         foreach($coll as $record) {
@@ -253 +251 @@
 
         $this->assertEqual($coll[2]->state(), Doctrine_Record::STATE_PROXY);
-
-
 
         $coll->setKeyColumn('id');

branches/0.10/tests/ConfigurableTestCase.php

@@ -1 +1 @@
 <?php
-require_once("UnitTestCase.php");
-
 class Doctrine_Configurable_TestCase extends Doctrine_UnitTestCase {
     public function prepareTables() { }
@@ -15 +13 @@
     }
     public function testSetIndexNameFormatAttribute() {
+        $original = $this->manager->getAttribute(Doctrine::ATTR_IDXNAME_FORMAT);
         $this->manager->setAttribute(Doctrine::ATTR_IDXNAME_FORMAT, '%_index');
 
         $this->assertEqual($this->manager->getAttribute(Doctrine::ATTR_IDXNAME_FORMAT), '%_index');
+        $this->manager->setAttribute(Doctrine::ATTR_IDXNAME_FORMAT, $original);
     }
     public function testSetSequenceNameFormatAttribute() {
+        $original = $this->manager->getAttribute(Doctrine::ATTR_SEQNAME_FORMAT);
         $this->manager->setAttribute(Doctrine::ATTR_SEQNAME_FORMAT, '%_sequence');
 
         $this->assertEqual($this->manager->getAttribute(Doctrine::ATTR_SEQNAME_FORMAT), '%_sequence');
+        $this->manager->setAttribute(Doctrine::ATTR_SEQNAME_FORMAT, $original);
     }
     public function testExceptionIsThrownWhenSettingIndexNameFormatAttributeAtTableLevel() {
@@ -41 +43 @@
     }
     public function testSettingFieldCaseIsSuccesfulWithZero() {
+        $original = $this->connection->getAttribute(Doctrine::ATTR_FIELD_CASE);
         try {
             $this->connection->setAttribute(Doctrine::ATTR_FIELD_CASE, 0);
@@ -47 +50 @@
             $this->fail();
         }
+        $this->connection->setAttribute(Doctrine::ATTR_FIELD_CASE, $original);
     }
     public function testSettingFieldCaseIsSuccesfulWithCaseConstants() {
+        $original = $this->connection->getAttribute(Doctrine::ATTR_FIELD_CASE);
         try {
             $this->connection->setAttribute(Doctrine::ATTR_FIELD_CASE, CASE_LOWER);
@@ -55 +60 @@
             $this->fail();
         }
+        $this->connection->setAttribute(Doctrine::ATTR_FIELD_CASE, $original);
     }
     public function testSettingFieldCaseIsSuccesfulWithCaseConstants2() {
+        $original = $this->connection->getAttribute(Doctrine::ATTR_FIELD_CASE);
         try {
             $this->connection->setAttribute(Doctrine::ATTR_FIELD_CASE, CASE_UPPER);
@@ -63 +70 @@
             $this->fail();
         }
+        $this->connection->setAttribute(Doctrine::ATTR_FIELD_CASE, $original);
     }
     public function testExceptionIsThrownWhenSettingFieldCaseToNotZeroOneOrTwo() {
@@ -87 +95 @@
 
         $this->assertEqual($this->manager->getAttribute(Doctrine::ATTR_QUOTE_IDENTIFIER), true);
-                $this->manager->setAttribute(Doctrine::ATTR_QUOTE_IDENTIFIER, false);
+        $this->manager->setAttribute(Doctrine::ATTR_QUOTE_IDENTIFIER, false);
     }
     public function testDefaultSequenceColumnNameAttributeValueIsId() {
@@ -93 +101 @@
     }
     public function testSequenceColumnNameAttributeAcceptsStrings() {
+        $original = $this->manager->getAttribute(Doctrine::ATTR_SEQCOL_NAME);
         $this->manager->setAttribute(Doctrine::ATTR_SEQCOL_NAME, 'sequence');
 
         $this->assertEqual($this->manager->getAttribute(Doctrine::ATTR_SEQCOL_NAME), 'sequence');
+        $this->manager->setAttribute(Doctrine::ATTR_SEQCOL_NAME, $original);
     }
     public function testValidatorAttributeAcceptsBooleans() {
-        $this->manager->setAttribute(Doctrine::ATTR_VLD, true);
+        $this->manager->setAttribute(Doctrine::ATTR_VALIDATE, true);
         
-        $this->assertEqual($this->manager->getAttribute(Doctrine::ATTR_VLD), true);
-    }
-    public function testAutoLengthValidationAttributeAcceptsBooleans() {
-        $this->manager->setAttribute(Doctrine::ATTR_AUTO_LENGTH_VLD, true);
-        
-        $this->assertEqual($this->manager->getAttribute(Doctrine::ATTR_AUTO_LENGTH_VLD), true);
-    }
-    public function testAutoTypeValidationAttributeAcceptsBooleans() {
-        $this->manager->setAttribute(Doctrine::ATTR_AUTO_TYPE_VLD, true);
-        
-        $this->assertEqual($this->manager->getAttribute(Doctrine::ATTR_AUTO_TYPE_VLD), true);
+        $this->assertEqual($this->manager->getAttribute(Doctrine::ATTR_VALIDATE), true);
+        $this->manager->setAttribute(Doctrine::ATTR_VALIDATE, false);
     }
     public function testDefaultPortabilityAttributeValueIsAll() {
@@ -120 +121 @@
         $this->assertEqual($this->manager->getAttribute(Doctrine::ATTR_PORTABILITY), 
                            Doctrine::PORTABILITY_RTRIM | Doctrine::PORTABILITY_FIX_CASE);
+        $this->manager->setAttribute(Doctrine::ATTR_PORTABILITY, Doctrine::PORTABILITY_ALL);
     }
     public function testDefaultListenerIsDoctrineEventListener() {
@@ -125 +127 @@
     }
     public function testListenerAttributeAcceptsEventListenerObjects() {
-        $this->manager->setAttribute(Doctrine::ATTR_LISTENER, new Doctrine_EventListener_Debugger());
+        $original = $this->manager->getAttribute(Doctrine::ATTR_LISTENER);
+        $this->manager->setAttribute(Doctrine::ATTR_LISTENER, new Doctrine_EventListener());
 
-        $this->assertTrue($this->manager->getAttribute(Doctrine::ATTR_LISTENER) instanceof Doctrine_EventListener_Debugger);
+        $this->assertTrue($this->manager->getAttribute(Doctrine::ATTR_LISTENER) instanceof Doctrine_EventListener);
+        $this->manager->setAttribute(Doctrine::ATTR_LISTENER, $original);
     }
     public function testCollectionKeyAttributeAcceptsValidColumnName() {
+        $original = $this->connection->getTable('User')->getAttribute(Doctrine::ATTR_COLL_KEY);
         try {
             $this->connection->getTable('User')->setAttribute(Doctrine::ATTR_COLL_KEY, 'name');
@@ -137 +142 @@
             $this->fail();
         }
+        $this->connection->getTable('User')->setAttribute(Doctrine::ATTR_COLL_KEY, $original);
     }
     public function testSettingInvalidColumnNameToCollectionKeyAttributeThrowsException() {
@@ -156 +162 @@
         }
     }
-    public function testSetAttribute() {
-        $table = $this->connection->getTable("User");
-        /**
-        $this->manager->setAttribute(Doctrine::ATTR_CACHE_TTL,100);
-        $this->assertEqual($this->manager->getAttribute(Doctrine::ATTR_CACHE_TTL),100);
-
-        $this->manager->setAttribute(Doctrine::ATTR_CACHE_SIZE,1);
-        $this->assertEqual($this->manager->getAttribute(Doctrine::ATTR_CACHE_SIZE),1);
-
-        $this->manager->setAttribute(Doctrine::ATTR_CACHE_DIR,"%ROOT%".DIRECTORY_SEPARATOR."cache");
-        $this->assertEqual($this->manager->getAttribute(Doctrine::ATTR_CACHE_DIR),$this->manager->getRoot().DIRECTORY_SEPARATOR."cache");
-        */
-        $this->manager->setAttribute(Doctrine::ATTR_FETCHMODE,Doctrine::FETCH_LAZY);
-        $this->assertEqual($this->manager->getAttribute(Doctrine::ATTR_FETCHMODE),Doctrine::FETCH_LAZY);
-
-        $this->manager->setAttribute(Doctrine::ATTR_BATCH_SIZE, 5);
-        $this->assertEqual($this->manager->getAttribute(Doctrine::ATTR_BATCH_SIZE),5);
-
-        $this->manager->setAttribute(Doctrine::ATTR_LOCKMODE, Doctrine::LOCK_PESSIMISTIC);
-        $this->assertEqual($this->manager->getAttribute(Doctrine::ATTR_LOCKMODE), Doctrine::LOCK_PESSIMISTIC);
-
-        // test invalid arguments
-        /**
-        try {
-            $this->manager->setAttribute(Doctrine::ATTR_CACHE_TTL,-12);
-        } catch(Exception $e) {
-            $this->assertTrue($e instanceof Exception);
-        }
-        try {
-            $this->manager->setAttribute(Doctrine::ATTR_CACHE_SIZE,-12);
-        } catch(Exception $e) {
-            $this->assertTrue($e instanceof Exception);
-        }
-        try {
-            $this->manager->setAttribute(Doctrine::ATTR_BATCH_SIZE,-12);
-        } catch(Exception $e) {
-            $this->assertTrue($e instanceof Exception);
-        }
-        */
-        try {
-            $this->connection->beginTransaction();
-            $this->manager->setAttribute(Doctrine::ATTR_LOCKMODE, Doctrine::LOCK_OPTIMISTIC);
-        } catch(Exception $e) {
-            $this->assertTrue($e instanceof Exception);
-            $this->connection->commit();
-        }
-
-        try {
-            $this->connection->beginTransaction();
-            $this->connection->setAttribute(Doctrine::ATTR_LOCKMODE, Doctrine::LOCK_PESSIMISTIC);
-        } catch(Exception $e) {
-            $this->assertTrue($e instanceof Exception);
-            $this->connection->commit();
-        }
-
-    }
     public function testGetAttributes() {
         $this->assertTrue(is_array($this->manager->getAttributes()));

branches/0.10/tests/ImportTestCase.php

@@ -46 +46 @@
         $this->conn = Doctrine_Manager::connection($this->dbh);
 
-        $this->conn->import->import('Import/_files');
+        $this->conn->import->importSchema('Import/_files');
         
         $this->assertTrue(file_exists('Import/_files/ImportTestUser.php'));
+        $this->assertTrue(file_exists('Import/_files/generated/BaseImportTestUser.php'));
     }
 }

branches/0.10/tests/PessimisticLockingTestCase.php

@@ -47 +47 @@
         $entry1->topic  = 'I love donuts!';
         $entry1->save();
+    }
+    
+    public function prepareTables()
+    {
+        $this->tables = array('Forum_Entry', 'Entity', 'Phonenumber', 'Email', 'Groupuser');
+        parent::prepareTables();
     }
 

branches/0.10/tests/PluginTestCase.php

@@ -98 +98 @@
     public function setUp()
     {
-          $options = array('fields' => array('title', 'content'));
+        $options = array('fields' => array('title', 'content'));
         $auditLog = new Doctrine_Template_Versionable($options);
         $search = new Doctrine_Template_Searchable($options);
-          $slug = new Doctrine_Template_Sluggable($options);
+        $slug = new Doctrine_Template_Sluggable($options);
         $i18n = new Doctrine_Template_I18n($options);
-
 
         $i18n->addChild($auditLog)

branches/0.10/tests/Record/CascadingDeleteTestCase.php

@@ -31 +31 @@
  * @version     $Revision$
  */
-class Doctrine_CascadingDelete_TestCase extends Doctrine_UnitTestCase 
+class Doctrine_Record_CascadingDelete_TestCase extends Doctrine_UnitTestCase 
 {
     public function prepareData()
     { }
     public function prepareTables()
-    { }
+    {
+      $this->tables = array('ForeignKeyTest');
+      parent::prepareTables();
+    }
     public function testCascadingDeleteEmulation()
     {

branches/0.10/tests/Record/SaveBlankRecordTestCase.php

@@ -45 +45 @@
     public function testSaveBlankRecord()
     {
-        $user = new User();
+        $user = new MyUser();
         $user->state('TDIRTY');
         $user->save();
         
-        $this->assertTrue(isset($user['id']));
+        $this->assertTrue(isset($user['id']) && $user['id']);
     }
     
     public function testSaveBlankRecord2()
     {
-        $myUserGroup = new MyUserGroup();
-        $myUserGroup->state('TDIRTY');
-        $myUserGroup->save();
+        $group = new MyUserGroup();
+        $group->state('TDIRTY');
+        $group->save();
         
-        $this->assertTrue(isset($user['id']));
+        $this->assertTrue(isset($group['id']) && $group['id']);
     }
 }

branches/0.10/tests/Relation/AccessTestCase.php

@@ -71 +71 @@
 
     public function prepareTables() {
-        $this->tables += array("MyUser",
+        $this->tables = array("Data_File", "File_Owner","MyUser",
             "MyOneThing",
             "MyUserOneThing",
@@ -161 +161 @@
         }
 
-        $query = "FROM MyUser,
-            MyUser.MyOneThing,
-            MyUser.MyOneThing.MyUserOneThing,
-            MyUser.MyOtherThing,
-            MyUser.MyOtherThing.MyUserOtherThing";
+        $query = "FROM MyUser a1,
+            a1.MyOneThing a2,
+            a2.MyUserOneThing a3,
+            a1.MyOtherThing a4,
+            a4.MyUserOtherThing a5";
         $users = $this->connection->query($query);
         foreach($users as $u) {
@@ -187 +187 @@
         }
 
-        $query = "FROM MyUser,
-            MyUser.MyOtherThing,
-            MyUser.MyOtherThing.MyUserOtherThing,
-            MyUser.MyOneThing,
-            MyUser.MyOneThing.MyUserOneThing";
+        $query = "FROM MyUser a1,
+            a1.MyOtherThing a2,
+            a2.MyUserOtherThing a3,
+            a1.MyOneThing a4,
+            a4.MyUserOneThing a5";
         $users = $this->connection->query($query);
         foreach($users as $u) {

branches/0.10/tests/Relation/ManyToManyTestCase.php

@@ -4 +4 @@
     public function prepareData() { }
     public function prepareTables() {
+        $this->tables = array('JC1', 'JC2', 'JC3', 'RTC1', 'RTC2', 'M2MTest', 'M2MTest2');
         parent::prepareTables();
     }
@@ -33 +34 @@
         try {
             $rel = $component->getTable()->getRelation('M2MTest2');
-            $this->pass();
-        } catch(Doctrine_Exception $e) {
-            $this->fail();
-        }
-        $this->assertEqual($rel->getForeign(), 'oid');
-        try {
-            $rel = $component->getTable()->getRelation('RTC4');
             $this->pass();
         } catch(Doctrine_Exception $e) {
@@ -125 +119 @@
         $component->name = '2';
         
-        $count = $this->dbh->count();
-
-        $component->save();
-
-        $this->assertEqual($this->dbh->count(), ($count + 5));
+        $count = $this->connection->count();
+
+        $component->save();
+
+        $this->assertEqual($this->connection->count(), ($count + 5));
         
         $this->assertEqual($component->RTC1->count(), 2);
@@ -142 +136 @@
         $component->RTC2[1]->name = '2';
 
-        $count = $this->dbh->count();
-
-        $component->save();
-
-        $this->assertEqual($this->dbh->count(), ($count + 4));
+        $count = $this->connection->count();
+
+        $component->save();
+
+        $this->assertEqual($this->connection->count(), ($count + 4));
 
         $this->assertEqual($component->RTC2->count(), 2);
@@ -163 +157 @@
         $component->name = '2';
         
-        $count = $this->dbh->count();
-
-        $component->save();
-
-        $this->assertEqual($this->dbh->count(), ($count + 5));
+        $count = $this->connection->count();
+
+        $component->save();
+
+        $this->assertEqual($this->connection->count(), ($count + 5));
         
         $this->assertEqual($component->RTC2->count(), 2);
@@ -180 +174 @@
         $component->RTC1[1]->name = '2';
 
-        $count = $this->dbh->count();
-
-        $component->save();
-
-        $this->assertEqual($this->dbh->count(), ($count + 4));
+        $count = $this->connection->count();
+
+        $component->save();
+
+        $this->assertEqual($this->connection->count(), ($count + 3));
         
         $this->assertEqual($component->RTC1->count(), 2);

branches/0.10/tests/run.php

@@ -2 +2 @@
 error_reporting(E_ALL | E_STRICT);
 ini_set('max_execution_time', 900);
-ini_set("date.timezone", "GMT+0");
+ini_set('date.timezone', 'GMT+0');
 
 require_once(dirname(__FILE__) . '/DoctrineTest.php');
@@ -10 +10 @@
 
 $test = new DoctrineTest();
-//TICKET test cases
-$tickets = new GroupTest('Tickets tests', 'tickets');
+
+// Ticket Tests
+// If you write a ticket testcase add it to the bottom of the list, with the ticket number in it
+$tickets = new GroupTest('Tickets Tests', 'tickets');
 $tickets->addTestCase(new Doctrine_Ticket_Njero_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_381_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_424B_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_424C_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_428_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_438_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_480_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_486_TestCase());
-$tickets->addTestCase(new Doctrine_Ticket_587_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_565_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_576_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_583_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_587_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_626B_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_626C_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_626D_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_638_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_642_TestCase());
-//If you write a ticket testcase add it here like shown above!
 $tickets->addTestCase(new Doctrine_Ticket_438_TestCase());
-$tickets->addTestCase(new Doctrine_Ticket_638_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_673_TestCase());
-$tickets->addTestCase(new Doctrine_Ticket_626D_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_697_TestCase());
+
 // Only uncomment the following ticket if you want to check free() performance!
 //$tickets->addTestCase(new Doctrine_Ticket_710_TestCase());
+
 $tickets->addTestCase(new Doctrine_Ticket_736_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_741_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_749_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_786_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_876_TestCase());
 $test->addTestCase($tickets);
 
-// Connection drivers (not yet fully tested)
-$driver = new GroupTest("Driver tests", 'driver');
+// Connection Tests (not yet fully tested)
+$driver = new GroupTest('Driver Tests', 'driver');
 $driver->addTestCase(new Doctrine_Connection_Pgsql_TestCase());
 $driver->addTestCase(new Doctrine_Connection_Oracle_TestCase());
@@ -46 +56 @@
 $test->addTestCase($driver);
 
-// Transaction module (FULLY TESTED)
-$transaction = new GroupTest("Transaction tests", 'transaction');
+// Transaction Tests (FULLY TESTED)
+$transaction = new GroupTest('Transaction Tests', 'transaction');
 $transaction->addTestCase(new Doctrine_Transaction_TestCase());
 $transaction->addTestCase(new Doctrine_Transaction_Firebird_TestCase());
@@ -58 +68 @@
 $test->addTestCase($transaction);
 
-// DataDict module (FULLY TESTED)
-$data_dict = new GroupTest('DataDict tests', 'data_dict');
+// DataDict Tests (FULLY TESTED)
+$data_dict = new GroupTest('DataDict Tests', 'data_dict');
 $data_dict->addTestCase(new Doctrine_DataDict_TestCase());
 $data_dict->addTestCase(new Doctrine_DataDict_Firebird_TestCase());
@@ -70 +80 @@
 $test->addTestCase($data_dict);
 
-// Sequence module (not yet fully tested)
-$sequence = new GroupTest('Sequence tests','sequence');
+// Sequence Tests (not yet fully tested)
+$sequence = new GroupTest('Sequence Tests', 'sequence');
 $sequence->addTestCase(new Doctrine_Sequence_TestCase());
 $sequence->addTestCase(new Doctrine_Sequence_Firebird_TestCase());
@@ -82 +92 @@
 $test->addTestCase($sequence);
 
-// Export module (not yet fully tested)
-$export = new GroupTest('Export tests','export');
-//$export->addTestCase(new Doctrine_Export_Reporter_TestCase());
+// Export Tests (not yet fully tested)
+$export = new GroupTest('Export Tests', 'export');
 $export->addTestCase(new Doctrine_Export_Firebird_TestCase());
 $export->addTestCase(new Doctrine_Export_Informix_TestCase());
@@ -97 +106 @@
 $test->addTestCase($export);
 
-//$test->addTestCase(new Doctrine_CascadingDelete_TestCase());
-
-// Import module (not yet fully tested)
-$import = new GroupTest('Import tests','import');
-//$import->addTestCase(new Doctrine_Import_TestCase());
+// Import Tests (not yet fully tested)
+$import = new GroupTest('Import Tests', 'import');
+$import->addTestCase(new Doctrine_Import_TestCase());
 $import->addTestCase(new Doctrine_Import_Firebird_TestCase());
 $import->addTestCase(new Doctrine_Import_Informix_TestCase());
@@ -113 +120 @@
 $test->addTestCase($import);
 
-// Expression module (not yet fully tested)
-$expression = new GroupTest('Expression tests','expression');
+// Expression Tests (not yet fully tested)
+$expression = new GroupTest('Expression Tests', 'expression');
 $expression->addTestCase(new Doctrine_Expression_TestCase());
 $expression->addTestCase(new Doctrine_Expression_Driver_TestCase());
@@ -126 +133 @@
 $test->addTestCase($expression);
 
-// Core
-$core = new GroupTest('Core tests: Access, Configurable, Manager, Connection, Table, UnitOfWork, Collection, Hydrate, Tokenizer','core');
+// Core Tests
+$core = new GroupTest('Core Test', 'core');
 $core->addTestCase(new Doctrine_Base_TestCase());
 $core->addTestCase(new Doctrine_Access_TestCase());
-//$core->addTestCase(new Doctrine_Configurable_TestCase());
+$core->addTestCase(new Doctrine_Configurable_TestCase());
 $core->addTestCase(new Doctrine_Manager_TestCase());
 $core->addTestCase(new Doctrine_Connection_TestCase());
 $core->addTestCase(new Doctrine_Table_TestCase());
 $core->addTestCase(new Doctrine_UnitOfWork_TestCase());
-//$core->addTestCase(new Doctrine_Collection_TestCase());
+$core->addTestCase(new Doctrine_Collection_TestCase());
 $core->addTestCase(new Doctrine_Collection_Snapshot_TestCase());
 $core->addTestCase(new Doctrine_Hydrate_FetchMode_TestCase());
 $core->addTestCase(new Doctrine_Tokenizer_TestCase());
-//$core->addTestCase(new Doctrine_Collection_Offset_TestCase());
-//$core->addTestCase(new Doctrine_BatchIterator_TestCase());
+$core->addTestCase(new Doctrine_Collection_Offset_TestCase());
+$core->addTestCase(new Doctrine_BatchIterator_TestCase());
 $core->addTestCase(new Doctrine_Hydrate_TestCase());
 $test->addTestCase($core);
 
-// Relation handling
-$relation = new GroupTest('Relation tests: includes TreeStructure','relation');
+// Relation Tests
+$relation = new GroupTest('Relation Tests', 'relation');
 $relation->addTestCase(new Doctrine_TreeStructure_TestCase());
 $relation->addTestCase(new Doctrine_Relation_TestCase());
-//$relation->addTestCase(new Doctrine_Relation_Access_TestCase());
-//$relation->addTestCase(new Doctrine_Relation_ManyToMany_TestCase());
+$relation->addTestCase(new Doctrine_Relation_Access_TestCase());
+$relation->addTestCase(new Doctrine_Relation_ManyToMany_TestCase());
 $relation->addTestCase(new Doctrine_Relation_ManyToMany2_TestCase());
 $relation->addTestCase(new Doctrine_Relation_OneToMany_TestCase());
@@ -157 +164 @@
 $test->addTestCase($relation);
 
-// Datatypes
-$data_types = new GroupTest('DataTypes tests: Enum and Boolean','data_types');
+// Data Types Tests
+$data_types = new GroupTest('Data Types Tests', 'data_types');
 $data_types->addTestCase(new Doctrine_DataType_Enum_TestCase());
 $data_types->addTestCase(new Doctrine_DataType_Boolean_TestCase());
 $test->addTestCase($data_types);
 
-// Utility components
-$plugins = new GroupTest('Plugin tests: View, Validator, Hook','plugins');
-//$utility->addTestCase(new Doctrine_PessimisticLocking_TestCase());
-//$plugins->addTestCase(new Doctrine_Plugin_TestCase());
-$plugins->addTestCase(new Doctrine_View_TestCase());
-$plugins->addTestCase(new Doctrine_AuditLog_TestCase());
-$plugins->addTestCase(new Doctrine_Validator_TestCase());
-$plugins->addTestCase(new Doctrine_Validator_Future_TestCase());
-$plugins->addTestCase(new Doctrine_Validator_Past_TestCase());
-$plugins->addTestCase(new Doctrine_Hook_TestCase());
-$plugins->addTestCase(new Doctrine_I18n_TestCase());
-$test->addTestCase($plugins);
-
-// Db component
-$db = new GroupTest('Db tests: Db and Profiler','db');
+// Behaviors Testing
+$behaviors = new GroupTest('Behaviors Tests', 'behaviors');
+//$behaviors->addTestCase(new Doctrine_Plugin_TestCase());
+$behaviors->addTestCase(new Doctrine_View_TestCase());
+$behaviors->addTestCase(new Doctrine_AuditLog_TestCase());
+$behaviors->addTestCase(new Doctrine_Validator_TestCase());
+$behaviors->addTestCase(new Doctrine_Validator_Future_TestCase());
+$behaviors->addTestCase(new Doctrine_Validator_Past_TestCase());
+$behaviors->addTestCase(new Doctrine_Hook_TestCase());
+$behaviors->addTestCase(new Doctrine_I18n_TestCase());
+$test->addTestCase($behaviors);
+
+// Db Tests
+$db = new GroupTest('Db Tests', 'db');
 $db->addTestCase(new Doctrine_Db_TestCase());
 $db->addTestCase(new Doctrine_Connection_Profiler_TestCase());
 $test->addTestCase($db);
 
-// Eventlisteners
-$event_listener = new GroupTest('EventListener tests','event_listener');
+// Event Listener Tests
+$event_listener = new GroupTest('EventListener Tests','event_listener');
 $event_listener->addTestCase(new Doctrine_EventListener_TestCase());
 $event_listener->addTestCase(new Doctrine_EventListener_Chain_TestCase());
 $test->addTestCase($event_listener);
 
-// Query tests
-$query_tests = new GroupTest('Query tests','query_test');
+// Query Tests
+$query_tests = new GroupTest('Query Tests','query');
 $query_tests->addTestCase(new Doctrine_Query_Condition_TestCase());
 $query_tests->addTestCase(new Doctrine_Query_MultiJoin_TestCase());
@@ -200 +206 @@
 $query_tests->addTestCase(new Doctrine_Query_Check_TestCase());
 $query_tests->addTestCase(new Doctrine_Query_Limit_TestCase());
-//$query_tests->addTestCase(new Doctrine_Query_IdentifierQuoting_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_IdentifierQuoting_TestCase());
 $query_tests->addTestCase(new Doctrine_Query_Update_TestCase());
 $query_tests->addTestCase(new Doctrine_Query_Delete_TestCase());
@@ -208 +214 @@
 $query_tests->addTestCase(new Doctrine_Query_Subquery_TestCase());
 $query_tests->addTestCase(new Doctrine_Query_Driver_TestCase());
-$query_tests->addTestCase(new Doctrine_Record_Hook_TestCase());
 $query_tests->addTestCase(new Doctrine_Query_AggregateValue_TestCase());
 $query_tests->addTestCase(new Doctrine_Query_Where_TestCase());
@@ -223 +228 @@
 $test->addTestCase($query_tests);
 
-// Record
-$record = new GroupTest('Record tests','record');
+// Record Tests
+$record = new GroupTest('Record Tests', 'record');
+$record->addTestCase(new Doctrine_Record_Hook_TestCase());
+$record->addTestCase(new Doctrine_Record_CascadingDelete_TestCase());
 $record->addTestCase(new Doctrine_Record_Filter_TestCase());
 $record->addTestCase(new Doctrine_Record_TestCase());
 $record->addTestCase(new Doctrine_Record_State_TestCase());
 $record->addTestCase(new Doctrine_Record_SerializeUnserialize_TestCase());
-// This test used to segfault php because of infinite recursion in Connection/UnitOfWork
 $record->addTestCase(new Doctrine_Record_Lock_TestCase());
 $record->addTestCase(new Doctrine_Record_ZeroValues_TestCase());
-//$record->addTestCase(new Doctrine_Record_SaveBlankRecord_TestCase());
+$record->addTestCase(new Doctrine_Record_SaveBlankRecord_TestCase());
 $record->addTestCase(new Doctrine_Record_Inheritance_TestCase());
 $record->addTestCase(new Doctrine_Record_Synchronize_TestCase());
 $test->addTestCase($record);
 
-$test->addTestCase(new Doctrine_CustomPrimaryKey_TestCase());
-$test->addTestCase(new Doctrine_CustomResultSetOrder_TestCase());
-
-$test->addTestCase(new Doctrine_CtiColumnAggregation_TestCase());
-$test->addTestCase(new Doctrine_ColumnAggregationInheritance_TestCase());
-$test->addTestCase(new Doctrine_ClassTableInheritance_TestCase());
-$test->addTestCase(new Doctrine_ColumnAlias_TestCase());
-
-
-$test->addTestCase(new Doctrine_RawSql_TestCase());
-
-$test->addTestCase(new Doctrine_NewCore_TestCase());
-
-$test->addTestCase(new Doctrine_Template_TestCase());
-$test->addTestCase(new Doctrine_NestedSet_SingleRoot_TestCase());
-
-// Search tests
-$search = new GroupTest('Search tests','search');
+// Inheritance Tests
+$inheritance = new GroupTest('Inheritance Tests', 'inheritance');
+$inheritance->addTestCase(new Doctrine_CtiColumnAggregation_TestCase());
+$inheritance->addTestCase(new Doctrine_ColumnAggregationInheritance_TestCase());
+$inheritance->addTestCase(new Doctrine_ClassTableInheritance_TestCase());
+$inheritance->addTestCase(new Doctrine_Query_ApplyInheritance_TestCase());
+$test->addTestCase($inheritance);
+
+// Search Tests
+$search = new GroupTest('Search Tests', 'search');
 $search->addTestCase(new Doctrine_Search_TestCase());
 $search->addTestCase(new Doctrine_Search_Query_TestCase());
 $search->addTestCase(new Doctrine_Search_File_TestCase());
-
 $test->addTestCase($search);
 
-// Cache tests
-$cache = new GroupTest('Cache tests','cache');
+// Cache Tests
+$cache = new GroupTest('Cache Tests', 'cache');
 $cache->addTestCase(new Doctrine_Query_Cache_TestCase());
 $cache->addTestCase(new Doctrine_Cache_Apc_TestCase());
-//$cache->addTestCase(new Doctrine_Cache_Memcache_TestCase());
-//$cache->addTestCase(new Doctrine_Cache_Sqlite_TestCase());
-//$cache->addTestCase(new Doctrine_Cache_Query_SqliteTestCase());
-//$cache->addTestCase(new Doctrine_Cache_FileTestCase());
-//$cache->addTestCase(new Doctrine_Cache_SqliteTestCase());
+$cache->addTestCase(new Doctrine_Cache_Memcache_TestCase());
+$cache->addTestCase(new Doctrine_Cache_Sqlite_TestCase());
+$cache->addTestCase(new Doctrine_Cache_Query_Sqlite_TestCase());
+$cache->addTestCase(new Doctrine_Cache_FileTestCase());
+$cache->addTestCase(new Doctrine_Cache_SqliteTestCase());
 //$cache->addTestCase(new Doctrine_Cache_TestCase());
 $test->addTestCase($cache);
 
 // Migration Tests
-$migration = new GroupTest('Migration tests','migration');
+$migration = new GroupTest('Migration Tests', 'migration');
 $migration->addTestCase(new Doctrine_Migration_TestCase());
-//$migration->addTestCase(new Doctrine_Migration_Mysql_TestCase());
 $test->addTestCase($migration);
 
-$test->addTestCase(new Doctrine_Query_ApplyInheritance_TestCase());
-
-$parser = new GroupTest('Parser tests', 'parser');
+// File Parser Tests
+$parser = new GroupTest('Parser Tests', 'parser');
 $parser->addTestCase(new Doctrine_Parser_TestCase());
 $test->addTestCase($parser);
 
+// Data Fixtures Tests
 $data = new GroupTest('Data exporting/importing fixtures', 'data_fixtures');
 $data->addTestCase(new Doctrine_Data_Import_TestCase());
@@ -290 +286 @@
 $test->addTestCase($data);
 
-$jwage = new GroupTest('Jwage', 'jwage');
-$jwage->addTestCase(new Doctrine_Jwage_TestCase());
-$test->addTestCase($jwage);
+// Unsorted Tests. These need to be sorted and placed in the appropriate group
+$unsorted = new GroupTest('Unsorted Tests', 'unsorted');
+$unsorted->addTestCase(new Doctrine_CustomPrimaryKey_TestCase());
+$unsorted->addTestCase(new Doctrine_CustomResultSetOrder_TestCase());
+$unsorted->addTestCase(new Doctrine_ColumnAlias_TestCase());
+//$unsorted->addTestCase(new Doctrine_RawSql_TestCase());
+$unsorted->addTestCase(new Doctrine_NewCore_TestCase());
+$unsorted->addTestCase(new Doctrine_Template_TestCase());
+$unsorted->addTestCase(new Doctrine_NestedSet_SingleRoot_TestCase());
+$unsorted->addTestCase(new Doctrine_PessimisticLocking_TestCase());
+$test->addTestCase($unsorted);
 
 $test->run();
 
-echo memory_get_peak_usage() / 1024 . "\n";
+echo "\nMemory Usage: " . memory_get_peak_usage() / 1024 . "\n";

branches/0.10/tests/Ticket/741TestCase.php

@@ -27 +27 @@
 
 }
-
-
 
 class Parent741 extends Doctrine_Record

branches/0.10/tests/Ticket/749TestCase.php

@@ -46 +46 @@
     public function testSelectDataFromSubclassAsCollection()
     {
-        $records = Doctrine_Query::create()->query('
-            FROM Record749 r ORDER BY r.title                                           
-        ', array());
+        $records = Doctrine_Query::create()->query('FROM Record749 r ORDER BY r.title', array());
         
         $this->verifyRecords($records);
@@ -55 +53 @@
     public function testSelectDataFromParentClassAsCollection()
     {
-        $records = Doctrine_Query::create()->query('
-            FROM Parent749 p ORDER BY p.title                                           
-        ', array());
+        $records = Doctrine_Query::create()->query('FROM Parent749 p ORDER BY p.title', array());
         
         $this->verifyRecords($records);
@@ -79 +75 @@
                 $this->assertEqual($record['Related']['content'], $expected['content']);
             } catch (Exception $e) {
-                $this->fail('Caught exception when trying to get related content.');
+                $this->fail('Caught exception when trying to get related content: ' . $e->getMessage());
             }
         }        
@@ -99 +95 @@
     $this->hasColumn('type', 'integer', 11, array ());
 
-    $this->option('subclasses', array('Record749'));
+    $this->setSubclasses(array('Record749' => array('type' => 1)));
   }
 
@@ -120 +116 @@
     $this->hasOne('RelatedRecord749 as Related', array('local' => 'id',
                                                     'foreign' => 'record_id'));
-
-    $this->setInheritanceMap(array('type' => '1'));
   }
 }