Changeset 4944 for trunk/tests/Orm

Timestamp:

09/12/08 13:34:46 (4 months ago)

Author:

romanb

Message:

moved Collection

Location:

trunk/tests/Orm

Files:

• Component/CollectionTest.php (modified) (4 diffs)
• Hydration/BasicHydrationTest.php (modified) (7 diffs)

trunk/tests/Orm/Component/CollectionTest.php

@@ -42 +42 @@
         parent::setUp();
         
-        $this->coll = new Doctrine_Collection('ForumUser');
+        $this->coll = new Doctrine_ORM_Collection('ForumUser');
 
         //we create a CmsUser with username as key column and add a user to it
-        $cmsColl = new Doctrine_Collection('CmsUser', 'username');
+        $cmsColl = new Doctrine_ORM_Collection('CmsUser', 'username');
         $user = new CmsUser();
         $user->username ='test';
@@ -68 +68 @@
     public function shouldUseSpecifiedKeyColumn()
     {
-        $coll = new Doctrine_Collection('ForumUser', 'id');
+        $coll = new Doctrine_ORM_Collection('ForumUser', 'id');
         $this->assertEquals('id', $coll->getKeyField());
     }
@@ -81 +81 @@
     public function shouldThrowExceptionIfNonValidFieldSetAsKey()
     {
-        $coll = new Doctrine_Collection('ForumUser', 'xxNonValidFieldxx');
+        $coll = new Doctrine_ORM_Collection('ForumUser', 'xxNonValidFieldxx');
     }
 
@@ -100 +100 @@
         $serialized = serialize($this->coll);
         $coll = unserialize($serialized);
-        $this->assertEquals('Doctrine_Collection', get_class($coll));
+        $this->assertEquals('Doctrine_ORM_Collection', get_class($coll));
     }
 

trunk/tests/Orm/Hydration/BasicHydrationTest.php

@@ -86 +86 @@
           
         if ($hydrationMode == Doctrine::HYDRATE_RECORD) {
-            $this->assertTrue($result instanceof Doctrine_Collection);
+            $this->assertTrue($result instanceof Doctrine_ORM_Collection);
             $this->assertTrue($result[0] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[1] instanceof Doctrine_ORM_Entity);
@@ -188 +188 @@
         if ($hydrationMode == Doctrine::HYDRATE_RECORD) {
             $this->assertTrue($result[0][0] instanceof Doctrine_ORM_Entity);
-            $this->assertTrue($result[0][0]['phonenumbers'] instanceof Doctrine_Collection);
+            $this->assertTrue($result[0][0]['phonenumbers'] instanceof Doctrine_ORM_Collection);
             $this->assertTrue($result[0][0]['phonenumbers'][0] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[0][0]['phonenumbers'][1] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[1][0] instanceof Doctrine_ORM_Entity);
-            $this->assertTrue($result[1][0]['phonenumbers'] instanceof Doctrine_Collection);
+            $this->assertTrue($result[1][0]['phonenumbers'] instanceof Doctrine_ORM_Collection);
         } else if ($hydrationMode == Doctrine::HYDRATE_SCALAR) {
             $this->assertTrue(is_array($result));
@@ -380 +380 @@
             $this->assertTrue($result[0]['1'] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[1]['2'] instanceof Doctrine_ORM_Entity);
-            $this->assertTrue($result[0]['1']['phonenumbers'] instanceof Doctrine_Collection);
+            $this->assertTrue($result[0]['1']['phonenumbers'] instanceof Doctrine_ORM_Collection);
             $this->assertEquals(2, count($result[0]['1']['phonenumbers']));
         } else if ($hydrationMode == Doctrine::HYDRATE_SCALAR) {
@@ -523 +523 @@
         if ($hydrationMode == Doctrine::HYDRATE_RECORD) {
             $this->assertTrue($result[0][0] instanceof Doctrine_ORM_Entity);
-            $this->assertTrue($result[0][0]['phonenumbers'] instanceof Doctrine_Collection);
+            $this->assertTrue($result[0][0]['phonenumbers'] instanceof Doctrine_ORM_Collection);
             $this->assertTrue($result[0][0]['phonenumbers'][0] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[0][0]['phonenumbers'][1] instanceof Doctrine_ORM_Entity);
-            $this->assertTrue($result[0][0]['articles'] instanceof Doctrine_Collection);
+            $this->assertTrue($result[0][0]['articles'] instanceof Doctrine_ORM_Collection);
             $this->assertTrue($result[0][0]['articles'][0] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[0][0]['articles'][1] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[1][0] instanceof Doctrine_ORM_Entity);
-            $this->assertTrue($result[1][0]['phonenumbers'] instanceof Doctrine_Collection);
+            $this->assertTrue($result[1][0]['phonenumbers'] instanceof Doctrine_ORM_Collection);
             $this->assertTrue($result[1][0]['phonenumbers'][0] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[1][0]['articles'][0] instanceof Doctrine_ORM_Entity);
@@ -709 +709 @@
             $this->assertTrue($result[1][0] instanceof Doctrine_ORM_Entity);
             // phonenumbers
-            $this->assertTrue($result[0][0]['phonenumbers'] instanceof Doctrine_Collection);
+            $this->assertTrue($result[0][0]['phonenumbers'] instanceof Doctrine_ORM_Collection);
             $this->assertTrue($result[0][0]['phonenumbers'][0] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[0][0]['phonenumbers'][1] instanceof Doctrine_ORM_Entity);
-            $this->assertTrue($result[1][0]['phonenumbers'] instanceof Doctrine_Collection);
+            $this->assertTrue($result[1][0]['phonenumbers'] instanceof Doctrine_ORM_Collection);
             $this->assertTrue($result[1][0]['phonenumbers'][0] instanceof Doctrine_ORM_Entity);
             // articles
-            $this->assertTrue($result[0][0]['articles'] instanceof Doctrine_Collection);
+            $this->assertTrue($result[0][0]['articles'] instanceof Doctrine_ORM_Collection);
             $this->assertTrue($result[0][0]['articles'][0] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[0][0]['articles'][1] instanceof Doctrine_ORM_Entity);
@@ -721 +721 @@
             $this->assertTrue($result[1][0]['articles'][1] instanceof Doctrine_ORM_Entity);
             // article comments
-            $this->assertTrue($result[0][0]['articles'][0]['comments'] instanceof Doctrine_Collection);
+            $this->assertTrue($result[0][0]['articles'][0]['comments'] instanceof Doctrine_ORM_Collection);
             $this->assertTrue($result[0][0]['articles'][0]['comments'][0] instanceof Doctrine_ORM_Entity);
             // empty comment collections
-            $this->assertTrue($result[0][0]['articles'][1]['comments'] instanceof Doctrine_Collection);
+            $this->assertTrue($result[0][0]['articles'][1]['comments'] instanceof Doctrine_ORM_Collection);
             $this->assertEquals(0, count($result[0][0]['articles'][1]['comments']));
-            $this->assertTrue($result[1][0]['articles'][0]['comments'] instanceof Doctrine_Collection);
+            $this->assertTrue($result[1][0]['articles'][0]['comments'] instanceof Doctrine_ORM_Collection);
             $this->assertEquals(0, count($result[1][0]['articles'][0]['comments']));
-            $this->assertTrue($result[1][0]['articles'][1]['comments'] instanceof Doctrine_Collection);
+            $this->assertTrue($result[1][0]['articles'][1]['comments'] instanceof Doctrine_ORM_Collection);
             $this->assertEquals(0, count($result[1][0]['articles'][1]['comments']));
         } else if ($hydrationMode == Doctrine::HYDRATE_SCALAR) {
@@ -849 +849 @@
             $this->assertTrue(is_array($result[1]));
         } else if ($hydrationMode == Doctrine::HYDRATE_RECORD) {
-            $this->assertTrue($result instanceof Doctrine_Collection);
+            $this->assertTrue($result instanceof Doctrine_ORM_Collection);
             $this->assertTrue($result[0] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[1] instanceof Doctrine_ORM_Entity);