Changeset 4364 for trunk/tests_old/Record

Timestamp:

05/13/08 22:20:34 (8 months ago)

Author:

romanb

Message:

Doctrine_Record renamed. Hydration refactored. Other refactorings.

Location:

trunk/tests_old/Record

Files:

• FilterTestCase.php (modified) (2 diffs)
• HookTestCase.php (modified) (1 diff)
• InheritanceTestCase.php (modified) (2 diffs)
• StateTestCase.php (modified) (11 diffs)

trunk/tests_old/Record/FilterTestCase.php

@@ -85 +85 @@
     }
 }
-class CompositeRecord extends Doctrine_Record
+class CompositeRecord extends Doctrine_Entity
 {
     public static function initMetadata($class)
@@ -95 +95 @@
     }
 }
-class RelatedCompositeRecord extends Doctrine_Record
+class RelatedCompositeRecord extends Doctrine_Entity
 {
     public static function initMetadata($class)

trunk/tests_old/Record/HookTestCase.php

@@ -91 +91 @@
 
         $this->assertEqual($r->deleted, null);
-        $this->assertEqual($r->state(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($r->state(), Doctrine_Entity::STATE_CLEAN);
 
         try {
             $r->delete();
-            $this->assertEqual($r->state(), Doctrine_Record::STATE_CLEAN);
+            $this->assertEqual($r->state(), Doctrine_Entity::STATE_CLEAN);
             $this->assertEqual($r->deleted, true);
         } catch(Doctrine_Exception $e) {

trunk/tests_old/Record/InheritanceTestCase.php

@@ -5 +5 @@
  *
  * This test case demonstrates the use of inheritance involving subclasses of
- * Doctrine_Record.  This type of inheritance is heavily used in sfDoctrine,
+ * Doctrine_Entity.  This type of inheritance is heavily used in sfDoctrine,
  * and as new inheritance-related features get added to Doctrine it seems to
  * be an area where subtle breakage can sneak in.
@@ -50 +50 @@
         $this->assertTrue($record instanceof PluginSymfonyRecord);
         $this->assertTrue($record instanceof BaseSymfonyRecord);
-        $this->assertTrue($record instanceof Doctrine_Record);
+        $this->assertTrue($record instanceof Doctrine_Entity);
 
         // does it have the expected data?

trunk/tests_old/Record/StateTestCase.php

@@ -91 +91 @@
             $this->pass();
         }
-        $this->assertEqual($user->state(), Doctrine_Record::STATE_TCLEAN);
+        $this->assertEqual($user->state(), Doctrine_Entity::STATE_TCLEAN);
         try {
             $user->state('some unknown state');
             $this->fail();
-        } catch(Doctrine_Record_State_Exception $e) {
+        } catch(Doctrine_Entity_State_Exception $e) {
             $this->pass();
         }
-        $this->assertEqual($user->state(), Doctrine_Record::STATE_TCLEAN);
+        $this->assertEqual($user->state(), Doctrine_Entity::STATE_TCLEAN);
     }
 
@@ -105 +105 @@
         $user = new User();
 
-        $user->state(Doctrine_Record::STATE_DIRTY);
-
-        $this->assertEqual($user->state(), Doctrine_Record::STATE_DIRTY);
+        $user->state(Doctrine_Entity::STATE_DIRTY);
+
+        $this->assertEqual($user->state(), Doctrine_Entity::STATE_DIRTY);
         
         $user->state('dirty');
 
-        $this->assertEqual($user->state(), Doctrine_Record::STATE_DIRTY);
+        $this->assertEqual($user->state(), Doctrine_Entity::STATE_DIRTY);
     }
 
@@ -118 +118 @@
         $user = new User();
 
-        $user->state(Doctrine_Record::STATE_CLEAN);
-
-        $this->assertEqual($user->state(), Doctrine_Record::STATE_CLEAN);
+        $user->state(Doctrine_Entity::STATE_CLEAN);
+
+        $this->assertEqual($user->state(), Doctrine_Entity::STATE_CLEAN);
         
         $user->state('clean');
 
-        $this->assertEqual($user->state(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($user->state(), Doctrine_Entity::STATE_CLEAN);
     }
 
@@ -131 +131 @@
         $user = new User();
 
-        $user->state(Doctrine_Record::STATE_TCLEAN);
-
-        $this->assertEqual($user->state(), Doctrine_Record::STATE_TCLEAN);
+        $user->state(Doctrine_Entity::STATE_TCLEAN);
+
+        $this->assertEqual($user->state(), Doctrine_Entity::STATE_TCLEAN);
         
         $user->state('tclean');
 
-        $this->assertEqual($user->state(), Doctrine_Record::STATE_TCLEAN);
+        $this->assertEqual($user->state(), Doctrine_Entity::STATE_TCLEAN);
     }
 
@@ -144 +144 @@
         $user = new User();
 
-        $user->state(Doctrine_Record::STATE_TDIRTY);
-
-        $this->assertEqual($user->state(), Doctrine_Record::STATE_TDIRTY);
+        $user->state(Doctrine_Entity::STATE_TDIRTY);
+
+        $this->assertEqual($user->state(), Doctrine_Entity::STATE_TDIRTY);
         
         $user->state('tdirty');
 
-        $this->assertEqual($user->state(), Doctrine_Record::STATE_TDIRTY);
+        $this->assertEqual($user->state(), Doctrine_Entity::STATE_TDIRTY);
     }
 
@@ -157 +157 @@
         $user = new User();
 
-        $user->state(Doctrine_Record::STATE_PROXY);
-
-        $this->assertEqual($user->state(), Doctrine_Record::STATE_PROXY);
+        $user->state(Doctrine_Entity::STATE_PROXY);
+
+        $this->assertEqual($user->state(), Doctrine_Entity::STATE_PROXY);
         
         $user->state('proxy');
 
-        $this->assertEqual($user->state(), Doctrine_Record::STATE_PROXY);
+        $this->assertEqual($user->state(), Doctrine_Entity::STATE_PROXY);
     }
 
@@ -177 +177 @@
         $user = $this->connection->queryOne("SELECT u.name FROM User u WHERE u.name = 'someuser'");
         
-        $this->assertEqual($user->state(), Doctrine_Record::STATE_PROXY);
+        $this->assertEqual($user->state(), Doctrine_Entity::STATE_PROXY);
         
         $user2 = $this->connection->queryOne("FROM User u WHERE u.name = 'someuser'");     
@@ -209 +209 @@
         // to make sure it is saved correctly
         $user1 = $this->connection->queryOne("FROM User u WHERE u.name = '" . UNAME . "'");
-        $this->assertEqual($user1->state(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($user1->state(), Doctrine_Entity::STATE_CLEAN);
         $this->assertEqual($user1->name,UNAME) ;
         $this->assertEqual($user1->password,UPWD1) ;
@@ -223 +223 @@
         
         // the object should be in state proxy with only 'name' fetched ...
-        $this->assertEqual($user2->state(), Doctrine_Record::STATE_PROXY);
+        $this->assertEqual($user2->state(), Doctrine_Entity::STATE_PROXY);
         $this->assertEqual($user2->name,UNAME) ;
         $this->assertEqual($user2->password,null) ;
@@ -232 +232 @@
         
         // now it should be dirty (but may be PDIRTY ... ?)
-        $this->assertEqual($user2->state(),Doctrine_Record::STATE_DIRTY) ;
+        $this->assertEqual($user2->state(),Doctrine_Entity::STATE_DIRTY) ;
         $this->assertEqual($user2->name,UNAME) ;
         $this->assertEqual($user2->password,UPWD2) ;
@@ -241 +241 @@
 
         // the logic would suggest the object to go back to PROXY mode (becausse $user2->loginname is null aka not sync with DB)
-        $boolState = ($user2->loginname == null) && ($user2->state() === Doctrine_Record::STATE_PROXY) ;
+        $boolState = ($user2->loginname == null) && ($user2->state() === Doctrine_Entity::STATE_PROXY) ;
         // this one will currently fail 
         $this->assertTrue($boolState) ;
         // this will also currently fail (becausse it currently goes back to STATE_CLEAN, which shouldnt be the case)
-        //$this->assertEqual($user2->state(), Doctrine_Record::STATE_PROXY);
+        //$this->assertEqual($user2->state(), Doctrine_Entity::STATE_PROXY);
         $this->assertEqual($user2->name,UNAME) ;
         $this->assertEqual($user2->password,UPWD2) ;