Changeset 4789 for trunk/tests/Orm

Timestamp:

08/22/08 10:05:14 (5 months ago)

Author:

romanb

Message:

refactorings. made basic one-one, one-many joins work.

Location:

trunk/tests/Orm

Files:

• EntityPersisterTest.php (modified) (3 diffs)
• Query/SelectSqlGenerationTest.php (modified) (1 diff)
• UnitOfWorkTest.php (modified) (1 diff)

trunk/tests/Orm/EntityPersisterTest.php

@@ -12 +12 @@
     private $_connMock;
     private $_emMock;
+    private $_seqManagerMock;
     
     protected function setUp() {
@@ -17 +18 @@
         $this->_connMock = new Doctrine_ConnectionMock(array());
         $this->_emMock = new Doctrine_EntityManagerMock($this->_connMock);
+        $this->_seqManagerMock = new Doctrine_SequenceMock($this->_connMock);
+        
         $this->_connMock->setDatabasePlatform(new Doctrine_DatabasePlatformMock());
+        $this->_connMock->setSequenceManager($this->_seqManagerMock);
         
         $this->_persister = new Doctrine_EntityPersister_Standard(
@@ -23 +27 @@
     }
     
-    public function testTest() {
+    public function testInsert() {
         $user = new ForumUser();
         $user->username = "romanb";
-        
         $user->avatar = new ForumAvatar();
         
+        $this->_seqManagerMock->autoinc(); //fake identity column autoinc
+        $this->_persister->insert($user->avatar);
+        $inserts = $this->_connMock->getInserts();
+        //check
+        $this->assertEquals(1, count($inserts));
+        $this->assertEquals(0, $user->avatar->id);
+        $this->assertTrue(isset($inserts['forum_avatar']));
+        $this->assertEquals(1, count($inserts['forum_avatar']));
+        $this->assertTrue(empty($inserts['forum_avatar'][0]));
+        
+        $this->_seqManagerMock->autoinc(); //fake identity column autoinc
         $this->_persister->insert($user);
-        
         $inserts = $this->_connMock->getInserts();
-        //var_dump($inserts);
+        //check
+        $this->assertEquals(2, count($inserts));
+        $this->assertEquals(1, $user->id);
         $this->assertTrue(isset($inserts['forum_user']));
         $this->assertEquals(1, count($inserts['forum_user']));
-        $this->assertEquals(1, count($inserts['forum_user'][0]));
+        $this->assertEquals(3, count($inserts['forum_user'][0]));
+        //username column
         $this->assertTrue(isset($inserts['forum_user'][0]['username']));
         $this->assertEquals('romanb', $inserts['forum_user'][0]['username']);
+        //avatar_id join column
+        $this->assertTrue(isset($inserts['forum_user'][0]['avatar_id']));
+        $this->assertEquals(0, $inserts['forum_user'][0]['avatar_id']);
+        //dtype discriminator column
+        $this->assertTrue(isset($inserts['forum_user'][0]['dtype']));
+        $this->assertEquals('user', $inserts['forum_user'][0]['dtype']);
     }
     

trunk/tests/Orm/Query/SelectSqlGenerationTest.php

@@ -173 +173 @@
         $this->assertSqlGeneration(
             'SELECT u.id, a.id FROM CmsUser u LEFT JOIN u.articles a',
-            'SELECT cu.id AS cu__id, ca.id AS ca__id FROM cms_user cu LEFT JOIN cms_article ca ON ca.user_id = cu.id WHERE 1 = 1'
+            'SELECT cu.id AS cu__id, ca.id AS ca__id FROM cms_user cu LEFT JOIN cms_article ca ON cu.id = ca.user_id WHERE 1 = 1'
         );
     }

trunk/tests/Orm/UnitOfWorkTest.php

@@ -127 +127 @@
     }
     
+    public function testCommitOrder()
+    {
+        $avatar = new ForumAvatar();
+        $this->_user->avatar = $avatar;
+        $this->_unitOfWork->save($this->_user); // save cascaded to avatar
+        
+        $this->assertEquals(2, count($this->_persisterMock->getInserts())); // insert forced
+        $this->assertEquals(0, count($this->_persisterMock->getUpdates()));
+        $this->assertEquals(0, count($this->_persisterMock->getDeletes()));
+        // verify order of inserts()s
+        $inserts = $this->_persisterMock->getInserts();
+        $this->assertSame($avatar, $inserts[0]);
+        $this->assertSame($this->_user, $inserts[1]);
+        
+        //...
+    }
+    
     public function testSavingSingleEntityWithSequenceIdGeneratorSchedulesInsert()
     {