Changeset 4328 for trunk/tests/Orm

Timestamp:

05/01/08 10:41:47 (8 months ago)

Author:

romanb

Message:

Merged all identity maps into one in the unitofwork. identity map now properly works with hierarchies.

Files:

• trunk/tests/Orm/UnitOfWorkTestCase.php (modified) (2 diffs)

trunk/tests/Orm/UnitOfWorkTestCase.php

@@ -8 +8 @@
     
     protected function setUp() {
+        parent::setUp();
         $this->_user = new ForumUser();
         $this->_unitOfWork = $this->sharedFixture['connection']->unitOfWork;
@@ -16 +17 @@
     }
     
-    public function testTransientEntityIsManaged()
+    public function testRegisterNew()
     {
-        $this->assertTrue($this->_unitOfWork->isManaged($this->_user));
-        $this->assertSame($this->_user, $this->_unitOfWork->getByOid($this->_user->getOid()));
+        $this->_unitOfWork->registerNew($this->_user);
+        $this->assertFalse($this->_unitOfWork->contains($this->_user));
+        $this->assertTrue($this->_unitOfWork->isRegisteredNew($this->_user));
+        $this->assertFalse($this->_unitOfWork->isRegisteredDirty($this->_user));
+        $this->assertFalse($this->_unitOfWork->isRegisteredRemoved($this->_user));
     }
     
-    public function testDetachSingleEntity()
+    public function testRegisterDirty()
     {
-        $this->assertTrue($this->_unitOfWork->detach($this->_user));
-        try {
-            $this->_unitOfWork->getByOid($this->_user->getOid());
-            $this->fail("Entity is still managed after is has been detached.");
-        } catch (Doctrine_Connection_Exception $ex) {}
-    }
-    
-    public function testDetachAllEntities()
-    {
-        $this->assertEquals(1, $this->_unitOfWork->detachAll());
-        try {
-            $this->_unitOfWork->getByOid($this->_user->getOid());
-            $this->fail("Entity is still managed after all entities have been detached.");
-        } catch (Doctrine_Connection_Exception $ex) {}
+        $this->_user->username = 'romanb';
+        $this->_user->id = 1;
+        $this->assertEquals(Doctrine_Record::STATE_TDIRTY, $this->_user->state());
+        $this->assertFalse($this->_unitOfWork->contains($this->_user));
+        $this->_unitOfWork->registerDirty($this->_user);
+        $this->assertTrue($this->_unitOfWork->isRegisteredDirty($this->_user));
+        $this->assertFalse($this->_unitOfWork->isRegisteredNew($this->_user));
+        $this->assertFalse($this->_unitOfWork->isRegisteredRemoved($this->_user));
+        
     }