Changeset 4971 for trunk/tests/Orm

Timestamp:

09/23/08 03:45:02 (4 months ago)

Author:

guilhermeblanco

Message:

[2.0] Moved Doctrine_Query to definite namespace Doctrine_ORM_Query.
Fixed paths that were referring wrong namespace resolution.
Implemented more Parser and AST classes: JoinVariableDeclaration? and Join.
Fixed wrong semantical checks of IndexBy? grammar rule. They should be in IdentificationVariableDeclaration? and JoinVariableDeclaration?.

Location:

trunk/tests/Orm

Files:

• Hydration/BasicHydrationTest.php (modified) (20 diffs)
• Query/AllTests.php (modified) (1 diff)

trunk/tests/Orm/Hydration/BasicHydrationTest.php

@@ -17 +17 @@
     {
         return array(
-          array('hydrationMode' => Doctrine_Query::HYDRATE_OBJECT),
-          array('hydrationMode' => Doctrine_Query::HYDRATE_ARRAY),
-          array('hydrationMode' => Doctrine_Query::HYDRATE_SCALAR)
+          array('hydrationMode' => Doctrine_ORM_Query::HYDRATE_OBJECT),
+          array('hydrationMode' => Doctrine_ORM_Query::HYDRATE_ARRAY),
+          array('hydrationMode' => Doctrine_ORM_Query::HYDRATE_SCALAR)
         );
     }
@@ -27 +27 @@
             $hydrationMode, $isMixedQuery = false)
     {
-        $parserResult = new Doctrine_Query_ParserResultDummy();
+        $parserResult = new Doctrine_ORM_Query_ParserResultDummy();
         $parserResult->setDatabaseStatement($stmt);
         $parserResult->setHydrationMode($hydrationMode);
@@ -77 +77 @@
                 $stmt, $queryComponents, $tableAliasMap, $hydrationMode));
         
-        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_Query::HYDRATE_OBJECT) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
             $this->assertEquals(2, count($result));
             $this->assertEquals(1, $result[0]['id']);
@@ -85 +85 @@
         }
           
-        if ($hydrationMode == Doctrine_Query::HYDRATE_OBJECT) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
             $this->assertTrue($result instanceof Doctrine_ORM_Collection);
             $this->assertTrue($result[0] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[1] instanceof Doctrine_ORM_Entity);
-        } else if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) {
+        } else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
             $this->assertTrue(is_array($result));
-        } else if ($hydrationMode == Doctrine_Query::HYDRATE_SCALAR) {
+        } else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_SCALAR) {
             $this->assertTrue(is_array($result));
             $this->assertEquals(2, count($result));
@@ -164 +164 @@
                 $stmt, $queryComponents, $tableAliasMap, $hydrationMode, true));
                 
-        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
             //var_dump($result);
         }
         
-        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_Query::HYDRATE_OBJECT) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
             $this->assertEquals(2, count($result));
             $this->assertTrue(is_array($result));
@@ -186 +186 @@
         }
         
-        if ($hydrationMode == Doctrine_Query::HYDRATE_OBJECT) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
             $this->assertTrue($result[0][0] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[0][0]['phonenumbers'] instanceof Doctrine_ORM_Collection);
@@ -193 +193 @@
             $this->assertTrue($result[1][0] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[1][0]['phonenumbers'] instanceof Doctrine_ORM_Collection);
-        } else if ($hydrationMode == Doctrine_Query::HYDRATE_SCALAR) {
+        } else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_SCALAR) {
             $this->assertTrue(is_array($result));
             $this->assertEquals(3, count($result));
@@ -261 +261 @@
         //var_dump($result);
         
-        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_Query::HYDRATE_OBJECT) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
             $this->assertEquals(2, count($result));
             $this->assertTrue(is_array($result));
@@ -273 +273 @@
         }
         
-        if ($hydrationMode == Doctrine_Query::HYDRATE_OBJECT) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
             $this->assertTrue($result[0][0] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[1][0] instanceof Doctrine_ORM_Entity);
-        } else if ($hydrationMode == Doctrine_Query::HYDRATE_SCALAR) {
+        } else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_SCALAR) {
             $this->assertEquals(2, count($result));
             
@@ -356 +356 @@
         }
         
-        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_Query::HYDRATE_OBJECT) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
             $this->assertEquals(2, count($result));
             $this->assertTrue(is_array($result));
@@ -377 +377 @@
         }
 
-        if ($hydrationMode == Doctrine_Query::HYDRATE_OBJECT) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
             $this->assertTrue($result[0]['1'] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[1]['2'] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[0]['1']['phonenumbers'] instanceof Doctrine_ORM_Collection);
             $this->assertEquals(2, count($result[0]['1']['phonenumbers']));
-        } else if ($hydrationMode == Doctrine_Query::HYDRATE_SCALAR) {
+        } else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_SCALAR) {
             // NOTE: Indexing has no effect with HYDRATE_SCALAR
             //... asserts to come
@@ -492 +492 @@
         $result = $hydrator->hydrateResultSet($this->_createParserResult(
                 $stmt, $queryComponents, $tableAliasMap, $hydrationMode, true));
-        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
             //var_dump($result);
         }
         
-        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_Query::HYDRATE_OBJECT) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
             $this->assertEquals(2, count($result));
             $this->assertTrue(is_array($result));
@@ -521 +521 @@
         }
         
-        if ($hydrationMode == Doctrine_Query::HYDRATE_OBJECT) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
             $this->assertTrue($result[0][0] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[0][0]['phonenumbers'] instanceof Doctrine_ORM_Collection);
@@ -534 +534 @@
             $this->assertTrue($result[1][0]['articles'][0] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[1][0]['articles'][1] instanceof Doctrine_ORM_Entity);
-        } else if ($hydrationMode == Doctrine_Query::HYDRATE_SCALAR) {
+        } else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_SCALAR) {
             //...
             $this->assertEquals(6, count($result));
@@ -667 +667 @@
         $result = $hydrator->hydrateResultSet($this->_createParserResult(
                 $stmt, $queryComponents, $tableAliasMap, $hydrationMode, true));
-        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
             //var_dump($result);
         }
         
-        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_Query::HYDRATE_OBJECT) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
             $this->assertEquals(2, count($result));
             $this->assertTrue(is_array($result));
@@ -705 +705 @@
         }
 
-        if ($hydrationMode == Doctrine_Query::HYDRATE_OBJECT) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
             $this->assertTrue($result[0][0] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[1][0] instanceof Doctrine_ORM_Entity);
@@ -730 +730 @@
             $this->assertTrue($result[1][0]['articles'][1]['comments'] instanceof Doctrine_ORM_Collection);
             $this->assertEquals(0, count($result[1][0]['articles'][1]['comments']));
-        } else if ($hydrationMode == Doctrine_Query::HYDRATE_SCALAR) {
+        } else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_SCALAR) {
             //...
-        } else if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) {
+        } else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
             //...
             
@@ -832 +832 @@
         $result = $hydrator->hydrateResultSet($this->_createParserResult(
                 $stmt, $queryComponents, $tableAliasMap, $hydrationMode));
-        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
             //var_dump($result);
         }
         
-        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_Query::HYDRATE_OBJECT) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
             $this->assertEquals(2, count($result));
             $this->assertTrue(isset($result[0]['boards']));
@@ -844 +844 @@
         }
         
-        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
             $this->assertTrue(is_array($result));
             $this->assertTrue(is_array($result[0]));
             $this->assertTrue(is_array($result[1]));
-        } else if ($hydrationMode == Doctrine_Query::HYDRATE_OBJECT) {
+        } else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
             $this->assertTrue($result instanceof Doctrine_ORM_Collection);
             $this->assertTrue($result[0] instanceof Doctrine_ORM_Entity);
             $this->assertTrue($result[1] instanceof Doctrine_ORM_Entity);
-        } else if ($hydrationMode == Doctrine_Query::HYDRATE_SCALAR) {
+        } else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_SCALAR) {
             //...
         }
@@ -923 +923 @@
         if ($name == 'result1') {
             $result = $hydrator->hydrateResultSet($this->_createParserResult(
-                $stmt, $queryComponents, $tableAliasMap, Doctrine_Query::HYDRATE_SINGLE_SCALAR));
+                $stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_SINGLE_SCALAR));
             $this->assertEquals('romanb', $result);
         } else if ($name == 'result2') {
             $result = $hydrator->hydrateResultSet($this->_createParserResult(
-                $stmt, $queryComponents, $tableAliasMap, Doctrine_Query::HYDRATE_SINGLE_SCALAR));
+                $stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_SINGLE_SCALAR));
             $this->assertEquals(1, $result);
         } else if ($name == 'result3' || $name == 'result4') {
             try {
                 $result = $hydrator->hydrateResultSet($this->_createParserResult(
-                    $stmt, $queryComponents, $tableAliasMap, Doctrine_Query::HYDRATE_SINGLE_SCALAR));
+                    $stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_SINGLE_SCALAR));
                 $this->fail();
             } catch (Doctrine_ORM_Exceptions_HydrationException $ex) {}

trunk/tests/Orm/Query/AllTests.php

@@ -7 +7 @@
 
 require_once 'IdentifierRecognitionTest.php';
-require_once 'ScannerTest.php';
+/*require_once 'ScannerTest.php';
 require_once 'DqlGenerationTest.php';
 require_once 'DeleteSqlGenerationTest.php';
 require_once 'UpdateSqlGenerationTest.php';
 require_once 'SelectSqlGenerationTest.php';
-require_once 'LanguageRecognitionTest.php';
+require_once 'LanguageRecognitionTest.php';*/
 
 class Orm_Query_AllTests