Changeset 4523 for trunk/tests/Orm

Timestamp:

06/15/08 16:56:28 (7 months ago)

Author:

romanb

Message:

Added getters to AST. Removed Production::call. Added visitor support to AST. (guilherme: dont shoot me yet :-). visitor support doesnt hurt even if we do not use it for SQL generation). Lots of other things.

Location:

trunk/tests/Orm

Files:

• AllTests.php (modified) (3 diffs)
• Component/CollectionTest.php (modified) (1 diff)
• Entity/AccessorTestCase.php (modified) (2 diffs)
• EntityManagerFactoryTest.php (modified) (1 diff)
• Hydration/BasicHydrationTest.php (modified) (20 diffs)
• Query/DeleteSqlGenerationTest.php (modified) (2 diffs)
• Query/DqlGenerationTest.php (modified) (1 diff)
• Query/IdentifierRecognitionTest.php (modified) (5 diffs)
• Query/LanguageRecognitionTest.php (modified) (3 diffs)
• Query/SelectSqlGenerationTest.php (modified) (2 diffs)
• Query/UpdateSqlGenerationTest.php (modified) (2 diffs)
• UnitOfWorkTestCase.php (deleted)

trunk/tests/Orm/AllTests.php

@@ -11 +11 @@
 require_once 'Orm/Hydration/AllTests.php';
 require_once 'Orm/Ticket/AllTests.php';
+require_once 'Orm/Entity/AllTests.php';
 
 // Tests
-require_once 'Orm/UnitOfWorkTestCase.php';
+require_once 'Orm/UnitOfWorkTest.php';
 require_once 'Orm/EntityManagerFactoryTest.php';
 
@@ -27 +28 @@
         $suite = new Doctrine_OrmTestSuite('Doctrine Orm');
 
-        $suite->addTestSuite('Orm_UnitOfWorkTestCase');
+        $suite->addTestSuite('Orm_UnitOfWorkTest');
         $suite->addTestSuite('Orm_EntityManagerFactoryTest');
         //$suite->addTestSuite('Orm_ConfigurableTestCase');
@@ -34 +35 @@
         $suite->addTest(Orm_Query_AllTests::suite());
         $suite->addTest(Orm_Hydration_AllTests::suite());
+        $suite->addTest(Orm_Entity_AllTests::suite());
         $suite->addTest(Orm_Ticket_AllTests::suite());
 

trunk/tests/Orm/Component/CollectionTest.php

@@ -28 +28 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        www.phpdoctrine.org
- * @since       1.0
+ * @since       2.0
  * @version     $Revision: 3754 $
  */

trunk/tests/Orm/Entity/AccessorTestCase.php

@@ -30 +30 @@
     public function getUsernameCustom()
     {
-        return $this->rawGetField('username') . "!";
+        return $this->_rawGetField('username') . "!";
     }
     
     public function setUsernameCustom($username)
     {
-        $this->rawSetField('username', $username . "?");
+        $this->_rawSetField('username', $username . "?");
     }
 }
@@ -48 +48 @@
     public function getUsername()
     {
-        return $this->rawGetField('username') . "!";
+        return $this->_rawGetField('username') . "!";
     }
     
     public function setUsername($username)
     {
-        $this->rawSetField('username', $username . "?");
+        $this->_rawSetField('username', $username . "?");
     } 
 }

trunk/tests/Orm/EntityManagerFactoryTest.php

@@ -9 +9 @@
 class Orm_EntityManagerFactoryTest extends Doctrine_OrmTestCase
 {
-    private $_emf;
     private $_mockOptions = array('driver' => 'mock', 'user' => '', 'password' => '');
-    
-    protected function setUp() {
-        parent::setUp();
-        $this->_emf = $this->sharedFixture['emf'];
-    }
     
     protected function tearDown() {

trunk/tests/Orm/Hydration/BasicHydrationTest.php

@@ -46 +46 @@
         $queryComponents = array(
             'u' => array(
-                'table' => $this->_em->getClassMetadata('CmsUser'),
-                'mapper' => $this->_em->getEntityPersister('CmsUser'),
+                'metadata' => $this->_em->getClassMetadata('CmsUser'),
                 'parent' => null,
                 'relation' => null,
@@ -116 +115 @@
         $queryComponents = array(
             'u' => array(
-                'table' => $this->_em->getClassMetadata('CmsUser'),
-                'mapper' => $this->_em->getEntityPersister('CmsUser'),
+                'metadata' => $this->_em->getClassMetadata('CmsUser'),
                 'parent' => null,
                 'relation' => null,
@@ -124 +122 @@
                 ),
             'p' => array(
-                'table' => $this->_em->getClassMetadata('CmsPhonenumber'),
-                'mapper' => $this->_em->getEntityPersister('CmsPhonenumber'),
+                'metadata' => $this->_em->getClassMetadata('CmsPhonenumber'),
                 'parent' => 'u',
                 'relation' => $this->_em->getClassMetadata('CmsUser')->getRelation('phonenumbers'),
@@ -199 +196 @@
             $this->assertTrue(is_array($result));
             $this->assertEquals(3, count($result));
-
             $this->assertEquals(1, $result[0]['u_id']);
             $this->assertEquals('developer', $result[0]['u_status']);
@@ -223 +219 @@
         $queryComponents = array(
             'u' => array(
-                'table' => $this->_em->getClassMetadata('CmsUser'),
-                'mapper' => $this->_em->getEntityPersister('CmsUser'),
+                'metadata' => $this->_em->getClassMetadata('CmsUser'),
                 'parent' => null,
                 'relation' => null,
@@ -230 +225 @@
                 ),
             'p' => array(
-                'table' => $this->_em->getClassMetadata('CmsPhonenumber'),
-                'mapper' => $this->_em->getEntityPersister('CmsPhonenumber'),
+                'metadata' => $this->_em->getClassMetadata('CmsPhonenumber'),
                 'parent' => 'u',
                 'relation' => $this->_em->getClassMetadata('CmsUser')->getRelation('phonenumbers'),
@@ -309 +303 @@
         $queryComponents = array(
             'u' => array(
-                'table' => $this->_em->getClassMetadata('CmsUser'),
-                'mapper' => $this->_em->getEntityPersister('CmsUser'),
+                'metadata' => $this->_em->getClassMetadata('CmsUser'),
                 'parent' => null,
                 'relation' => null,
@@ -317 +310 @@
                 ),
             'p' => array(
-                'table' => $this->_em->getClassMetadata('CmsPhonenumber'),
-                'mapper' => $this->_em->getEntityPersister('CmsPhonenumber'),
+                'metadata' => $this->_em->getClassMetadata('CmsPhonenumber'),
                 'parent' => 'u',
                 'relation' => $this->_em->getClassMetadata('CmsUser')->getRelation('phonenumbers'),
@@ -415 +407 @@
         $queryComponents = array(
             'u' => array(
-                'table' => $this->_em->getClassMetadata('CmsUser'),
-                'mapper' => $this->_em->getEntityPersister('CmsUser'),
+                'metadata' => $this->_em->getClassMetadata('CmsUser'),
                 'parent' => null,
                 'relation' => null,
@@ -423 +414 @@
                 ),
             'p' => array(
-                'table' => $this->_em->getClassMetadata('CmsPhonenumber'),
-                'mapper' => $this->_em->getEntityPersister('CmsPhonenumber'),
+                'metadata' => $this->_em->getClassMetadata('CmsPhonenumber'),
                 'parent' => 'u',
                 'relation' => $this->_em->getClassMetadata('CmsUser')->getRelation('phonenumbers'),
@@ -430 +420 @@
                 ),
             'a' => array(
-                'table' => $this->_em->getClassMetadata('CmsArticle'),
-                'mapper' => $this->_em->getEntityPersister('CmsArticle'),
+                'metadata' => $this->_em->getClassMetadata('CmsArticle'),
                 'parent' => 'u',
                 'relation' => $this->_em->getClassMetadata('CmsUser')->getRelation('articles'),
@@ -574 +563 @@
         $queryComponents = array(
             'u' => array(
-                'table' => $this->_em->getClassMetadata('CmsUser'),
-                'mapper' => $this->_em->getEntityPersister('CmsUser'),
+                'metadata' => $this->_em->getClassMetadata('CmsUser'),
                 'parent' => null,
                 'relation' => null,
@@ -582 +570 @@
                 ),
             'p' => array(
-                'table' => $this->_em->getClassMetadata('CmsPhonenumber'),
-                'mapper' => $this->_em->getEntityPersister('CmsPhonenumber'),
+                'metadata' => $this->_em->getClassMetadata('CmsPhonenumber'),
                 'parent' => 'u',
                 'relation' => $this->_em->getClassMetadata('CmsUser')->getRelation('phonenumbers'),
@@ -589 +576 @@
                 ),
             'a' => array(
-                'table' => $this->_em->getClassMetadata('CmsArticle'),
-                'mapper' => $this->_em->getEntityPersister('CmsArticle'),
+                'metadata' => $this->_em->getClassMetadata('CmsArticle'),
                 'parent' => 'u',
                 'relation' => $this->_em->getClassMetadata('CmsUser')->getRelation('articles'),
@@ -596 +582 @@
                 ),
             'c' => array(
-                'table' => $this->_em->getClassMetadata('CmsComment'),
-                'mapper' => $this->_em->getEntityPersister('CmsComment'),
+                'metadata' => $this->_em->getClassMetadata('CmsComment'),
                 'parent' => 'a',
                 'relation' => $this->_em->getClassMetadata('CmsArticle')->getRelation('comments'),
@@ -714 +699 @@
     
             $this->assertTrue(isset($result[0][0]['articles'][0]['comments']));
-            $this->assertFalse(isset($result[0][0]['articles'][1]['comments']));
-            $this->assertFalse(isset($result[1][0]['articles'][0]['comments']));
-            $this->assertFalse(isset($result[1][0]['articles'][1]['comments']));
+            // empty collections/arrays
+            $this->assertTrue(isset($result[0][0]['articles'][1]['comments']));
+            $this->assertTrue(isset($result[1][0]['articles'][0]['comments']));
+            $this->assertTrue(isset($result[1][0]['articles'][1]['comments']));
         }
 
@@ -737 +723 @@
             $this->assertTrue($result[0][0]['articles'][0]['comments'] instanceof Doctrine_Collection);
             $this->assertTrue($result[0][0]['articles'][0]['comments'][0] instanceof Doctrine_Entity);
+            // empty comment collections
+            $this->assertTrue($result[0][0]['articles'][1]['comments'] instanceof Doctrine_Collection);
+            $this->assertEquals(0, count($result[0][0]['articles'][1]['comments']));
+            $this->assertTrue($result[1][0]['articles'][0]['comments'] instanceof Doctrine_Collection);
+            $this->assertEquals(0, count($result[1][0]['articles'][0]['comments']));
+            $this->assertTrue($result[1][0]['articles'][1]['comments'] instanceof Doctrine_Collection);
+            $this->assertEquals(0, count($result[1][0]['articles'][1]['comments']));
         } else if ($hydrationMode == Doctrine::HYDRATE_SCALAR) {
             //...
+        } else if ($hydrationMode == Doctrine::HYDRATE_ARRAY) {
+            //...
+            
+            // empty comment collections
+            $this->assertTrue(is_array($result[0][0]['articles'][1]['comments']));
+            $this->assertEquals(0, count($result[0][0]['articles'][1]['comments']));
+            $this->assertTrue(is_array($result[1][0]['articles'][0]['comments']));
+            $this->assertEquals(0, count($result[1][0]['articles'][0]['comments']));
+            $this->assertTrue(is_array($result[1][0]['articles'][1]['comments']));
+            $this->assertEquals(0, count($result[1][0]['articles'][1]['comments']));
         }
     }
@@ -769 +772 @@
         $queryComponents = array(
             'c' => array(
-                'table' => $this->_em->getClassMetadata('ForumCategory'),
-                'mapper' => $this->_em->getEntityPersister('ForumCategory'),
+                'metadata' => $this->_em->getClassMetadata('ForumCategory'),
                 'parent' => null,
                 'relation' => null,
@@ -776 +778 @@
                 ),
             'b' => array(
-                'table' => $this->_em->getClassMetadata('ForumBoard'),
-                'mapper' => $this->_em->getEntityPersister('ForumBoard'),
+                'metadata' => $this->_em->getClassMetadata('ForumBoard'),
                 'parent' => 'c',
                 'relation' => $this->_em->getClassMetadata('ForumCategory')->getRelation('boards'),
@@ -905 +906 @@
         $queryComponents = array(
             'u' => array(
-                'table' => $this->_em->getClassMetadata('CmsUser'),
-                'mapper' => $this->_em->getEntityPersister('CmsUser'),
+                'metadata' => $this->_em->getClassMetadata('CmsUser'),
                 'parent' => null,
                 'relation' => null,

trunk/tests/Orm/Query/DeleteSqlGenerationTest.php

@@ -30 +30 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        http://www.phpdoctrine.org
- * @since       1.0
+ * @since       2.0
  * @version     $Revision$
  * @todo        1) [romanb] We  might want to split the SQL generation tests into multiple
@@ -41 +41 @@
     {
         try {
-            $entityManager = $this->sharedFixture['em'];
+            $entityManager = $this->_em;
             $query = $entityManager->createQuery($dqlToBeTested);
 

trunk/tests/Orm/Query/DqlGenerationTest.php

@@ -37 +37 @@
     protected function createQuery()
     {
-        $entityManager = $this->sharedFixture['em'];
+        $entityManager = $this->_em;
         return $entityManager->createQuery();
     }

trunk/tests/Orm/Query/IdentifierRecognitionTest.php

@@ -32 +32 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        http://www.phpdoctrine.org
- * @since       1.0
+ * @since       2.0
  * @version     $Revision$
  */
@@ -40 +40 @@
     public function testSingleAliasDeclarationIsSupported()
     {
-        $entityManager = $this->sharedFixture['em'];
+        $entityManager = $this->_em;
         $query = $entityManager->createQuery('SELECT u.* FROM CmsUser u');
         $parserResult = $query->parse();
@@ -55 +55 @@
     public function testSingleAliasDeclarationWithIndexByIsSupported()
     {
-        $entityManager = $this->sharedFixture['em'];
+        $entityManager = $this->_em;
         $query = $entityManager->createQuery('SELECT u.* FROM CmsUser u INDEX BY id');
         $parserResult = $query->parse();
@@ -70 +70 @@
     public function testQueryParserSupportsMultipleAliasDeclarations()
     {
-        $entityManager = $this->sharedFixture['em'];
+        $entityManager = $this->_em;
         $query = $entityManager->createQuery('SELECT u.* FROM CmsUser u INDEX BY id LEFT JOIN u.phonenumbers p');
         $parserResult = $query->parse();
@@ -94 +94 @@
     public function testQueryParserSupportsMultipleAliasDeclarationsWithIndexBy()
     {
-        $entityManager = $this->sharedFixture['em'];
+        $entityManager = $this->_em;
         $query = $entityManager->createQuery('SELECT u.* FROM CmsUser u INDEX BY id LEFT JOIN u.articles a INNER JOIN u.phonenumbers pn INDEX BY phonenumber');
         $parserResult = $query->parse();

trunk/tests/Orm/Query/LanguageRecognitionTest.php

@@ -31 +31 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        http://www.phpdoctrine.org
- * @since       1.0
+ * @since       2.0
  * @version     $Revision$
  * @todo        1) [romanb] We  might want to split the SQL generation tests into multiple
@@ -42 +42 @@
     {
         try {
-            $entityManager = $this->sharedFixture['em'];
+            $entityManager = $this->_em;
             $query = $entityManager->createQuery($dql);
             $parserResult = $query->parse();
@@ -53 +53 @@
     {
         try {
-            $entityManager = $this->sharedFixture['em'];
+            $entityManager = $this->_em;
             $query = $entityManager->createQuery($dql);
             $query->setDql($dql);

trunk/tests/Orm/Query/SelectSqlGenerationTest.php

@@ -30 +30 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        http://www.phpdoctrine.org
- * @since       1.0
+ * @since       2.0
  * @version     $Revision$
  * @todo        1) [romanb] We  might want to split the SQL generation tests into multiple
@@ -41 +41 @@
     {
         try {
-            $entityManager = $this->sharedFixture['em'];
+            $entityManager = $this->_em;
             $query = $entityManager->createQuery($dqlToBeTested);
             //echo print_r($query->parse()->getQueryFields(), true) . "\n";

trunk/tests/Orm/Query/UpdateSqlGenerationTest.php

@@ -30 +30 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        http://www.phpdoctrine.org
- * @since       1.0
+ * @since       2.0
  * @version     $Revision$
  * @todo        1) [romanb] We  might want to split the SQL generation tests into multiple
@@ -41 +41 @@
     {
         try {
-            $entityManager = $this->sharedFixture['em'];
+            $entityManager = $this->_em;
             $query = $entityManager->createQuery($dqlToBeTested);