Changeset 4699 for trunk/tests/Orm

Timestamp:

07/20/08 21:13:24 (6 months ago)

Author:

romanb

Message:

Checkin of occasional work from the past weeks.

Location:

trunk/tests/Orm

Files:

• Associations (added)
• Associations/CascadeTest.php (added)
• Associations/OneToOneMappingTest.php (added)
• Component/CollectionTest.php (modified) (3 diffs)
• Entity/AccessorTest.php (modified) (2 diffs)
• Entity/ConstructorTest.php (modified) (1 diff)
• UnitOfWorkTest.php (modified) (4 diffs)

trunk/tests/Orm/Component/CollectionTest.php

@@ -107 +107 @@
      * @test 
      */
-    public function shouldSetKeyColumnWhenAddingNewRowAsArray()
+    /*public function shouldSetKeyColumnWhenAddingNewRowAsArray()
     {
         $this->assertTrue(isset($this->cmsColl['test']));
         $this->assertEquals($this->cmsUser,  $this->cmsColl['test']);
-    }
+    }*/
 
 
@@ -117 +117 @@
      * @test
      */
-    public function shouldSerializeAndUnserializeCollectionWithData()
+    /*public function shouldSerializeAndUnserializeCollectionWithData()
     {
         $serialized = serialize($this->cmsColl);
@@ -127 +127 @@
         $this->assertTrue($user instanceOf CmsUser);
         $this->assertEquals('test', $user['username']);
-    }
+    }*/
 
 }

trunk/tests/Orm/Entity/AccessorTest.php

@@ -23 +23 @@
 class CustomAccessorMutatorTestEntity extends Doctrine_Entity
 {
-    public static function initMetadata($class) 
+    public static function initMetadata($mapping) 
     {
-        $class->mapColumn('id', 'integer', 4, array('primary'));
-        $class->mapColumn('username', 'string', 50, array(
-                'accessor' => 'getUsernameCustom',
-                'mutator' => 'setUsernameCustom'));
+        $mapping->mapField(array(
+            'fieldName' => 'id',
+            'type' => 'integer',
+            'length' => 4,
+            'id' => true
+        ));
+        $mapping->mapField(array(
+            'fieldName' => 'username',
+            'type' => 'string',
+            'length' => 50,
+            'accessor' => 'getUsernameCustom',
+            'mutator' => 'setUsernameCustom'
+        ));
     }
     
@@ -44 +53 @@
 class MagicAccessorMutatorTestEntity extends Doctrine_Entity
 {
-    public static function initMetadata($class) 
+    public static function initMetadata($mapping) 
     {
-        $class->mapColumn('id', 'integer', 4, array('primary'));
-        $class->mapColumn('username', 'string', 50, array());
+        $mapping->mapField(array(
+            'fieldName' => 'id',
+            'type' => 'integer',
+            'length' => 4,
+            'id' => true
+        ));
+        $mapping->mapField(array(
+            'fieldName' => 'username',
+            'type' => 'string',
+            'length' => 50
+        ));
     }
     

trunk/tests/Orm/Entity/ConstructorTest.php

@@ -23 +23 @@
     
     /* The mapping definition */
-    public static function initMetadata($class) 
+    public static function initMetadata($mapping) 
     {
-        $class->mapColumn('id', 'integer', 4, array('primary'));
-        $class->mapColumn('username', 'string', 50, array());
+        $mapping->mapField(array(
+            'fieldName' => 'id',
+            'type' => 'integer',
+            'length' => 4,
+            'id' => true
+        ));
+        $mapping->mapField(array(
+            'fieldName' => 'username',
+            'type' => 'string',
+            'length' => 50
+        ));
     }
 }

trunk/tests/Orm/UnitOfWorkTest.php

@@ -1 +1 @@
 <?php
 require_once 'lib/DoctrineTestInit.php';
- 
+require_once 'lib/mocks/Doctrine_EntityManagerMock.php';
+require_once 'lib/mocks/Doctrine_ConnectionMock.php';
+
+/**
+ * UnitOfWork tests.
+ * These tests run without a database through mocking the
+ * persister/connection/sequence used by the UnitOfWork.
+ */
 class Orm_UnitOfWorkTest extends Doctrine_OrmTestCase
 {
@@ -7 +14 @@
     private $_user;
     
+    // Mocks
+    
+    // Provides a sequence mock to the UnitOfWork
+    private $_connectionMock;
+    // The sequence mock
+    private $_sequenceMock;
+    // The persister mock used by the UnitOfWork
+    private $_persisterMock;
+    // The EntityManager mock that provides the mock persister
+    private $_emMock;
+    
     protected function setUp() {
         parent::setUp();
+        
         $this->_user = new ForumUser();
-        $this->_unitOfWork = new Doctrine_Connection_UnitOfWork($this->_em);
+        $this->_user->id = 1;
+        $this->_user->username = 'romanb';
+
+        $this->_connectionMock = new Doctrine_ConnectionMock(array());
+        $this->_sequenceMock = $this->_connectionMock->getSequenceModule();
+        $this->_emMock = new Doctrine_EntityManagerMock($this->_connectionMock);
+        $this->_persisterMock = $this->_emMock->getEntityPersister("ForumUser");
+        $this->_unitOfWork = $this->_emMock->getUnitOfWork();
     }
     
@@ -17 +43 @@
     }
     
+    /* Basic registration tests */
+    
     public function testRegisterNew()
     {
-        $this->_user->username = 'romanb';
-        $this->_user->id = 1;
         // registerNew() is normally called in save()/persist()
         $this->_unitOfWork->registerNew($this->_user);
         $this->assertTrue($this->_unitOfWork->isRegisteredNew($this->_user));
-        $this->assertTrue($this->_unitOfWork->contains($this->_user));
+        $this->assertTrue($this->_unitOfWork->isInIdentityMap($this->_user));
         $this->assertFalse($this->_unitOfWork->isRegisteredDirty($this->_user));
         $this->assertFalse($this->_unitOfWork->isRegisteredRemoved($this->_user));
     }
     
+    /*public function testRegisterNewPerf() {
+        $s = microtime(true);
+
+        for ($i=1; $i<40000; $i++) {
+            $user = new ForumUser();
+            $user->id = $i;
+            $this->_unitOfWork->registerNew($user);
+        }
+        $e = microtime(true);
+        
+        echo $e - $s . " seconds" . PHP_EOL;
+    }*/
+    
     public function testRegisterDirty()
     {
-        $this->_user->username = 'romanb';
-        $this->_user->id = 1;
-        $this->assertEquals(Doctrine_Entity::STATE_TDIRTY, $this->_user->_state());
-        $this->assertFalse($this->_unitOfWork->contains($this->_user));
+        $this->assertEquals(Doctrine_Entity::STATE_NEW, $this->_user->_state());
+        $this->assertFalse($this->_unitOfWork->isInIdentityMap($this->_user));
         $this->_unitOfWork->registerDirty($this->_user);
         $this->assertTrue($this->_unitOfWork->isRegisteredDirty($this->_user));
@@ -41 +78 @@
     }
     
-    public function testRegisterRemovedOnTransientEntityIsIgnored()
+    public function testRegisterRemovedOnNewEntityIsIgnored()
     {
-        $this->_user->username = 'romanb';
-        $this->_user->id = 1;
         $this->assertFalse($this->_unitOfWork->isRegisteredRemoved($this->_user));
-        $this->_unitOfWork->registerRemoved($this->_user);
+        $this->_unitOfWork->registerDeleted($this->_user);
         $this->assertFalse($this->_unitOfWork->isRegisteredRemoved($this->_user));        
     }
     
-    /*public function testSavedEntityHasIdentityAndIsManaged()
+    
+    /* Operational tests */
+    
+    public function testSavingSingleEntityWithIdentityColumnForcesInsert()
     {
-        $this->_user->username = 'romanb';
-        $this->_user->save();
-        $this->assertTrue($this->_unitOfWork->hasIdentity($this->_user));
-        $this->assertTrue($this->_unitOfWork->isManaged($this->_user));
-    }*/
+        $this->assertEquals(Doctrine_Entity::STATE_NEW, $this->_user->_state());
+        
+        $this->_unitOfWork->save($this->_user);
+        
+        $this->assertEquals(1, count($this->_persisterMock->getInserts())); // insert forced
+        $this->assertEquals(0, count($this->_persisterMock->getUpdates()));
+        $this->assertEquals(0, count($this->_persisterMock->getDeletes()));
+        
+        $this->assertTrue($this->_unitOfWork->isInIdentityMap($this->_user));
+        $this->assertEquals(Doctrine_Entity::STATE_MANAGED, $this->_user->_state());
+        
+        // should no longer be scheduled for insert
+        $this->assertFalse($this->_unitOfWork->isRegisteredNew($this->_user));        
+        // should have an id
+        $this->assertTrue(is_numeric($this->_user->id));
+        
+        // Now lets check whether a subsequence commit() does anything
+        
+        $this->_persisterMock->reset();
+        
+        $this->_unitOfWork->commit(); // shouldnt do anything
+        
+        // verify that nothing happened
+        $this->assertEquals(0, count($this->_persisterMock->getInserts()));
+        $this->assertEquals(0, count($this->_persisterMock->getUpdates()));
+        $this->assertEquals(0, count($this->_persisterMock->getDeletes()));
+    }
+    
+    public function testSavingSingleEntityWithSequenceIdGeneratorSchedulesInsert()
+    {
+        //...
+    }
+    
+    public function testSavingSingleEntityWithTableIdGeneratorSchedulesInsert()
+    {
+        //...
+    }
+    
+    public function testSavingSingleEntityWithSingleNaturalIdForcesInsert()
+    {
+        //...
+    }
+    
+    public function testSavingSingleEntityWithCompositeIdForcesInsert()
+    {
+        //...
+    }
+    
+    public function testSavingEntityGraphWithIdentityColumnsForcesInserts()
+    {
+        //...
+    }
+    
+    public function testSavingEntityGraphWithSequencesDelaysInserts()
+    {
+        //...
+    }
+    
+    public function testSavingEntityGraphWithNaturalIdsForcesInserts()
+    {
+        //...
+    }
+    
+    public function testSavingEntityGraphWithMixedIdGenerationStrategies()
+    {
+        //...
+    }
+    
 }