Changeset 4930 for trunk/tests/Orm

Timestamp:

09/12/08 11:40:23 (4 months ago)

Author:

romanb

Message:

moved Entity

Location:

trunk/tests/Orm

Files:

• Entity/AccessorTest.php (modified) (2 diffs)
• Entity/ConstructorTest.php (modified) (1 diff)
• Hydration/BasicHydrationTest.php (modified) (7 diffs)
• UnitOfWorkTest.php (modified) (3 diffs)

trunk/tests/Orm/Entity/AccessorTest.php

@@ -19 +19 @@
 /* Local test classes */
 
-class CustomAccessorMutatorTestEntity extends Doctrine_Entity
+class CustomAccessorMutatorTestEntity extends Doctrine_ORM_Entity
 {
     public static function initMetadata($mapping) 
@@ -49 +49 @@
 }
 
-class MagicAccessorMutatorTestEntity extends Doctrine_Entity
+class MagicAccessorMutatorTestEntity extends Doctrine_ORM_Entity
 {
     public static function initMetadata($mapping) 

trunk/tests/Orm/Entity/ConstructorTest.php

@@ -12 +12 @@
 }
 
-class ConstructorTestEntity1 extends Doctrine_Entity
+class ConstructorTestEntity1 extends Doctrine_ORM_Entity
 {
     public function __construct($username = null)

trunk/tests/Orm/Hydration/BasicHydrationTest.php

@@ -87 +87 @@
         if ($hydrationMode == Doctrine::HYDRATE_RECORD) {
             $this->assertTrue($result instanceof Doctrine_Collection);
-            $this->assertTrue($result[0] instanceof Doctrine_Entity);
-            $this->assertTrue($result[1] instanceof Doctrine_Entity);
+            $this->assertTrue($result[0] instanceof Doctrine_ORM_Entity);
+            $this->assertTrue($result[1] instanceof Doctrine_ORM_Entity);
         } else if ($hydrationMode == Doctrine::HYDRATE_ARRAY) {
             $this->assertTrue(is_array($result));
@@ -187 +187 @@
         
         if ($hydrationMode == Doctrine::HYDRATE_RECORD) {
-            $this->assertTrue($result[0][0] instanceof Doctrine_Entity);
+            $this->assertTrue($result[0][0] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[0][0]['phonenumbers'] instanceof Doctrine_Collection);
-            $this->assertTrue($result[0][0]['phonenumbers'][0] instanceof Doctrine_Entity);
-            $this->assertTrue($result[0][0]['phonenumbers'][1] instanceof Doctrine_Entity);
-            $this->assertTrue($result[1][0] instanceof Doctrine_Entity);
+            $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);
         } else if ($hydrationMode == Doctrine::HYDRATE_SCALAR) {
@@ -274 +274 @@
         
         if ($hydrationMode == Doctrine::HYDRATE_RECORD) {
-            $this->assertTrue($result[0][0] instanceof Doctrine_Entity);
-            $this->assertTrue($result[1][0] instanceof Doctrine_Entity);
+            $this->assertTrue($result[0][0] instanceof Doctrine_ORM_Entity);
+            $this->assertTrue($result[1][0] instanceof Doctrine_ORM_Entity);
         } else if ($hydrationMode == Doctrine::HYDRATE_SCALAR) {
             $this->assertEquals(2, count($result));
@@ -378 +378 @@
 
         if ($hydrationMode == Doctrine::HYDRATE_RECORD) {
-            $this->assertTrue($result[0]['1'] instanceof Doctrine_Entity);
-            $this->assertTrue($result[1]['2'] instanceof Doctrine_Entity);
+            $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->assertEquals(2, count($result[0]['1']['phonenumbers']));
@@ -522 +522 @@
         
         if ($hydrationMode == Doctrine::HYDRATE_RECORD) {
-            $this->assertTrue($result[0][0] instanceof Doctrine_Entity);
+            $this->assertTrue($result[0][0] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[0][0]['phonenumbers'] instanceof Doctrine_Collection);
-            $this->assertTrue($result[0][0]['phonenumbers'][0] instanceof Doctrine_Entity);
-            $this->assertTrue($result[0][0]['phonenumbers'][1] instanceof Doctrine_Entity);
+            $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'][0] instanceof Doctrine_Entity);
-            $this->assertTrue($result[0][0]['articles'][1] instanceof Doctrine_Entity);
-            $this->assertTrue($result[1][0] instanceof Doctrine_Entity);
+            $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'][0] instanceof Doctrine_Entity);
-            $this->assertTrue($result[1][0]['articles'][0] instanceof Doctrine_Entity);
-            $this->assertTrue($result[1][0]['articles'][1] instanceof Doctrine_Entity);
+            $this->assertTrue($result[1][0]['phonenumbers'][0] instanceof Doctrine_ORM_Entity);
+            $this->assertTrue($result[1][0]['articles'][0] instanceof Doctrine_ORM_Entity);
+            $this->assertTrue($result[1][0]['articles'][1] instanceof Doctrine_ORM_Entity);
         } else if ($hydrationMode == Doctrine::HYDRATE_SCALAR) {
             //...
@@ -706 +706 @@
 
         if ($hydrationMode == Doctrine::HYDRATE_RECORD) {
-            $this->assertTrue($result[0][0] instanceof Doctrine_Entity);
-            $this->assertTrue($result[1][0] instanceof Doctrine_Entity);
+            $this->assertTrue($result[0][0] instanceof Doctrine_ORM_Entity);
+            $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'][0] instanceof Doctrine_Entity);
-            $this->assertTrue($result[0][0]['phonenumbers'][1] instanceof Doctrine_Entity);
+            $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'][0] instanceof Doctrine_Entity);
+            $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'][0] instanceof Doctrine_Entity);
-            $this->assertTrue($result[0][0]['articles'][1] instanceof Doctrine_Entity);
-            $this->assertTrue($result[1][0]['articles'][0] instanceof Doctrine_Entity);
-            $this->assertTrue($result[1][0]['articles'][1] instanceof Doctrine_Entity);
+            $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]['articles'][0] instanceof Doctrine_ORM_Entity);
+            $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'][0] instanceof Doctrine_Entity);
+            $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);
@@ -850 +850 @@
         } else if ($hydrationMode == Doctrine::HYDRATE_RECORD) {
             $this->assertTrue($result instanceof Doctrine_Collection);
-            $this->assertTrue($result[0] instanceof Doctrine_Entity);
-            $this->assertTrue($result[1] instanceof Doctrine_Entity);
+            $this->assertTrue($result[0] instanceof Doctrine_ORM_Entity);
+            $this->assertTrue($result[1] instanceof Doctrine_ORM_Entity);
         } else if ($hydrationMode == Doctrine::HYDRATE_SCALAR) {
             //...

trunk/tests/Orm/UnitOfWorkTest.php

@@ -86 +86 @@
     public function testRegisterDirty()
     {
-        $this->assertEquals(Doctrine_Entity::STATE_NEW, $this->_user->_state());
+        $this->assertEquals(Doctrine_ORM_Entity::STATE_NEW, $this->_user->_state());
         $this->assertFalse($this->_unitOfWork->isInIdentityMap($this->_user));
         $this->_unitOfWork->registerDirty($this->_user);
@@ -106 +106 @@
     public function testSavingSingleEntityWithIdentityColumnForcesInsert()
     {
-        $this->assertEquals(Doctrine_Entity::STATE_NEW, $this->_user->_state());
+        $this->assertEquals(Doctrine_ORM_Entity::STATE_NEW, $this->_user->_state());
         
         $this->_unitOfWork->save($this->_user);
@@ -115 +115 @@
         
         $this->assertTrue($this->_unitOfWork->isInIdentityMap($this->_user));
-        $this->assertEquals(Doctrine_Entity::STATE_MANAGED, $this->_user->_state());
+        $this->assertEquals(Doctrine_ORM_Entity::STATE_MANAGED, $this->_user->_state());
         
         // should no longer be scheduled for insert