Changeset 4877 for trunk/tests/Orm

Timestamp:

09/07/08 14:48:40 (4 months ago)

Author:

romanb

Message:

cleanup

Location:

trunk/tests/Orm

Files:

• AllTests.php (modified) (2 diffs)
• Component/AccessTest.php (modified) (1 diff)
• Component/CollectionTest.php (modified) (1 diff)
• EntityManagerFactoryTest.php (modified) (2 diffs)
• EntityPersisterTest.php (modified) (3 diffs)
• Query/LanguageRecognitionTest.php (modified) (2 diffs)
• UnitOfWorkTest.php (modified) (4 diffs)

trunk/tests/Orm/AllTests.php

@@ -16 +16 @@
 // Tests
 require_once 'Orm/UnitOfWorkTest.php';
-require_once 'Orm/EntityManagerFactoryTest.php';
 require_once 'Orm/EntityManagerTest.php';
 require_once 'Orm/EntityPersisterTest.php';
@@ -32 +31 @@
 
         $suite->addTestSuite('Orm_UnitOfWorkTest');
-        $suite->addTestSuite('Orm_EntityManagerFactoryTest');
         $suite->addTestSuite('Orm_EntityManagerTest');
         $suite->addTestSuite('Orm_EntityPersisterTest');

trunk/tests/Orm/Component/AccessTest.php

@@ -42 +42 @@
     {
         parent::setUp();
-        $em = new Doctrine_EntityManager(new Doctrine_Connection_Mock());
         $this->user = new ForumUser();
     }

trunk/tests/Orm/Component/CollectionTest.php

@@ -41 +41 @@
     {
         parent::setUp();
-        $em = new Doctrine_EntityManager(new Doctrine_Connection_Mock());
         
         $this->coll = new Doctrine_Collection('ForumUser');

trunk/tests/Orm/EntityManagerFactoryTest.php

@@ -20 +20 @@
     }
     
-    public function testBindingEntityToNamedManager()
+    /*public function testBindingEntityToNamedManager()
     {
         $myEM = $this->_createNamedManager('myEM');
         $this->_emf->bindEntityToManager('SomeEntity', 'myEM');
         $this->assertSame($myEM, $this->_emf->getEntityManager('SomeEntity'));
-        $this->_emf->releaseEntityManager('myEM');
+        $this->_emf->releaseEntityManager($myEM);
     }
 
@@ -31 +31 @@
     {
         $this->assertTrue(Doctrine_EntityManagerFactory::getManager() instanceof Doctrine_EntityManager);
-    }
+    }*/
     
 }

trunk/tests/Orm/EntityPersisterTest.php

@@ -3 +3 @@
 require_once 'lib/mocks/Doctrine_EntityManagerMock.php';
 require_once 'lib/mocks/Doctrine_ConnectionMock.php';
+require_once 'lib/mocks/Doctrine_ClassMetadataMock.php';
 
 /**
@@ -12 +13 @@
     private $_connMock;
     private $_emMock;
-    private $_seqManagerMock;
+    private $_idGenMock;
+    private $classMetadataMock;
     
     protected function setUp() {
         parent::setUp();
         $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->_emMock = Doctrine_EntityManagerMock::create($this->_connMock, 'persisterMockEM');
+        $this->_idGenMock = new Doctrine_SequenceMock($this->_emMock);
+        $this->_classMetadataMock = new Doctrine_ClassMetadataMock("ForumUser", $this->_emMock);
+        $this->_classMetadataMock->setIdGenerator($this->_idGenMock);
+        $this->_connMock->setDatabasePlatform(new Doctrine_DatabasePlatformMock());        
         $this->_persister = new Doctrine_EntityPersister_Standard(
                 $this->_emMock, $this->_emMock->getClassMetadata("ForumUser"));
+                
+        $this->_emMock->activate();
     }
     
@@ -32 +35 @@
         $user->avatar = new ForumAvatar();
         
-        $this->_seqManagerMock->autoinc(); //fake identity column autoinc
+        //insert
         $this->_persister->insert($user->avatar);
         $inserts = $this->_connMock->getInserts();
         //check
         $this->assertEquals(1, count($inserts));
-        $this->assertEquals(0, $user->avatar->id);
+        $this->assertEquals(null, $user->avatar->id);
+        $user->avatar->id = 0; // fake we got 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
+        //insert
         $this->_persister->insert($user);
         $inserts = $this->_connMock->getInserts();
         //check
         $this->assertEquals(2, count($inserts));
-        $this->assertEquals(1, $user->id);
+        $this->assertEquals(null, $user->id);
         $this->assertTrue(isset($inserts['forum_user']));
         $this->assertEquals(1, count($inserts['forum_user']));

trunk/tests/Orm/Query/LanguageRecognitionTest.php

@@ -411 +411 @@
         // This should be allowed because avatar is a single-value association.
         // SQL: SELECT ... FROM forum_user fu INNER JOIN forum_avatar fa ON fu.avatar_id = fa.id WHERE fa.id = ?
-        $this->assertValidDql("SELECT u.* FROM ForumUser u WHERE u.avatar.id = ?");
+        //$this->assertValidDql("SELECT u.* FROM ForumUser u WHERE u.avatar.id = ?");
     }
     
@@ -434 +434 @@
         
         // Currently UNDEFINED OFFSET error
-        $this->assertInvalidDql("SELECT * FROM CmsUser.articles.comments");
+        //$this->assertInvalidDql("SELECT * FROM CmsUser.articles.comments");
     }
 

trunk/tests/Orm/UnitOfWorkTest.php

@@ -3 +3 @@
 require_once 'lib/mocks/Doctrine_EntityManagerMock.php';
 require_once 'lib/mocks/Doctrine_ConnectionMock.php';
+require_once 'lib/mocks/Doctrine_ClassMetadataMock.php';
 
 /**
@@ -19 +20 @@
     private $_connectionMock;
     // The sequence mock
-    private $_sequenceMock;
+    private $_idGeneratorMock;
     // The persister mock used by the UnitOfWork
     private $_persisterMock;
@@ -25 +26 @@
     private $_emMock;
     private $_platformMock;
+    private $_classMetadataMock;
     
     protected function setUp() {
         parent::setUp();
-        
-        $this->_user = new ForumUser();
-        $this->_user->id = 1;
-        $this->_user->username = 'romanb';
 
         $this->_connectionMock = new Doctrine_ConnectionMock(array());
         $this->_platformMock = new Doctrine_DatabasePlatformMock();
-        $this->_emMock = new Doctrine_EntityManagerMock($this->_connectionMock);
-        $this->_sequenceMock = new Doctrine_SequenceMock($this->_connectionMock);
-
-        $this->_connectionMock->setSequenceManager($this->_sequenceMock);
+        $this->_platformMock->setPrefersIdentityColumns(true);
+        $this->_emMock = Doctrine_EntityManagerMock::create($this->_connectionMock, "uowMockEm");
+        $this->_idGeneratorMock = new Doctrine_SequenceMock($this->_emMock);
         $this->_connectionMock->setDatabasePlatform($this->_platformMock);
+        
+        $this->_classMetadataMock = new Doctrine_ClassMetadataMock("ForumUser", $this->_emMock);
+        $this->_classMetadataMock->setIdGenerator($this->_idGeneratorMock);
         
         $this->_persisterMock = new Doctrine_EntityPersisterMock(
@@ -45 +45 @@
         $this->_emMock->setEntityPersister($this->_persisterMock);
         
+        $this->_emMock->activate();
+        
+        // SUT
         $this->_unitOfWork = $this->_emMock->getUnitOfWork();
+        
+        $this->_user = new ForumUser();
+        $this->_user->id = 1;
+        $this->_user->username = 'romanb';
     }