Changeset 4964 for trunk/tests/Orm

Show
Ignore:
Timestamp:
09/13/08 13:40:17 (4 months ago)
Author:
romanb
Message:

more cleanups. introducing ClassLoader?.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/tests/Orm/Hydration/BasicHydrationTest.php

    r4944 r4964  
    1717    { 
    1818        return array( 
    19           array('hydrationMode' => Doctrine::HYDRATE_RECORD), 
    20           array('hydrationMode' => Doctrine::HYDRATE_ARRAY), 
    21           array('hydrationMode' => Doctrine::HYDRATE_SCALAR) 
     19          array('hydrationMode' => Doctrine_Query::HYDRATE_OBJECT), 
     20          array('hydrationMode' => Doctrine_Query::HYDRATE_ARRAY), 
     21          array('hydrationMode' => Doctrine_Query::HYDRATE_SCALAR) 
    2222        ); 
    2323    } 
    … …  
    7777                $stmt, $queryComponents, $tableAliasMap, $hydrationMode)); 
    7878         
    79         if ($hydrationMode == Doctrine::HYDRATE_ARRAY || $hydrationMode == Doctrine::HYDRATE_RECORD) { 
     79        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_Query::HYDRATE_OBJECT) { 
    8080            $this->assertEquals(2, count($result)); 
    8181            $this->assertEquals(1, $result[0]['id']); 
    … …  
    8585        } 
    8686           
    87         if ($hydrationMode == Doctrine::HYDRATE_RECORD) { 
     87        if ($hydrationMode == Doctrine_Query::HYDRATE_OBJECT) { 
    8888            $this->assertTrue($result instanceof Doctrine_ORM_Collection); 
    8989            $this->assertTrue($result[0] instanceof Doctrine_ORM_Entity); 
    9090            $this->assertTrue($result[1] instanceof Doctrine_ORM_Entity); 
    91         } else if ($hydrationMode == Doctrine::HYDRATE_ARRAY) { 
     91        } else if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) { 
    9292            $this->assertTrue(is_array($result)); 
    93         } else if ($hydrationMode == Doctrine::HYDRATE_SCALAR) { 
     93        } else if ($hydrationMode == Doctrine_Query::HYDRATE_SCALAR) { 
    9494            $this->assertTrue(is_array($result)); 
    9595            $this->assertEquals(2, count($result)); 
    … …  
    164164                $stmt, $queryComponents, $tableAliasMap, $hydrationMode, true)); 
    165165                 
    166         if ($hydrationMode == Doctrine::HYDRATE_ARRAY) { 
     166        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) { 
    167167            //var_dump($result); 
    168168        } 
    169169         
    170         if ($hydrationMode == Doctrine::HYDRATE_ARRAY || $hydrationMode == Doctrine::HYDRATE_RECORD) { 
     170        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_Query::HYDRATE_OBJECT) { 
    171171            $this->assertEquals(2, count($result)); 
    172172            $this->assertTrue(is_array($result)); 
    … …  
    186186        } 
    187187         
    188         if ($hydrationMode == Doctrine::HYDRATE_RECORD) { 
     188        if ($hydrationMode == Doctrine_Query::HYDRATE_OBJECT) { 
    189189            $this->assertTrue($result[0][0] instanceof Doctrine_ORM_Entity); 
    190190            $this->assertTrue($result[0][0]['phonenumbers'] instanceof Doctrine_ORM_Collection); 
    … …  
    193193            $this->assertTrue($result[1][0] instanceof Doctrine_ORM_Entity); 
    194194            $this->assertTrue($result[1][0]['phonenumbers'] instanceof Doctrine_ORM_Collection); 
    195         } else if ($hydrationMode == Doctrine::HYDRATE_SCALAR) { 
     195        } else if ($hydrationMode == Doctrine_Query::HYDRATE_SCALAR) { 
    196196            $this->assertTrue(is_array($result)); 
    197197            $this->assertEquals(3, count($result)); 
    … …  
    261261        //var_dump($result); 
    262262         
    263         if ($hydrationMode == Doctrine::HYDRATE_ARRAY || $hydrationMode == Doctrine::HYDRATE_RECORD) { 
     263        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_Query::HYDRATE_OBJECT) { 
    264264            $this->assertEquals(2, count($result)); 
    265265            $this->assertTrue(is_array($result)); 
    … …  
    273273        } 
    274274         
    275         if ($hydrationMode == Doctrine::HYDRATE_RECORD) { 
     275        if ($hydrationMode == Doctrine_Query::HYDRATE_OBJECT) { 
    276276            $this->assertTrue($result[0][0] instanceof Doctrine_ORM_Entity); 
    277277            $this->assertTrue($result[1][0] instanceof Doctrine_ORM_Entity); 
    278         } else if ($hydrationMode == Doctrine::HYDRATE_SCALAR) { 
     278        } else if ($hydrationMode == Doctrine_Query::HYDRATE_SCALAR) { 
    279279            $this->assertEquals(2, count($result)); 
    280280             
    … …  
    356356        } 
    357357         
    358         if ($hydrationMode == Doctrine::HYDRATE_ARRAY || $hydrationMode == Doctrine::HYDRATE_RECORD) { 
     358        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_Query::HYDRATE_OBJECT) { 
    359359            $this->assertEquals(2, count($result)); 
    360360            $this->assertTrue(is_array($result)); 
    … …  
    377377        } 
    378378 
    379         if ($hydrationMode == Doctrine::HYDRATE_RECORD) { 
     379        if ($hydrationMode == Doctrine_Query::HYDRATE_OBJECT) { 
    380380            $this->assertTrue($result[0]['1'] instanceof Doctrine_ORM_Entity); 
    381381            $this->assertTrue($result[1]['2'] instanceof Doctrine_ORM_Entity); 
    382382            $this->assertTrue($result[0]['1']['phonenumbers'] instanceof Doctrine_ORM_Collection); 
    383383            $this->assertEquals(2, count($result[0]['1']['phonenumbers'])); 
    384         } else if ($hydrationMode == Doctrine::HYDRATE_SCALAR) { 
     384        } else if ($hydrationMode == Doctrine_Query::HYDRATE_SCALAR) { 
    385385            // NOTE: Indexing has no effect with HYDRATE_SCALAR 
    386386            //... asserts to come 
    … …  
    492492        $result = $hydrator->hydrateResultSet($this->_createParserResult( 
    493493                $stmt, $queryComponents, $tableAliasMap, $hydrationMode, true)); 
    494         if ($hydrationMode == Doctrine::HYDRATE_ARRAY) { 
     494        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) { 
    495495            //var_dump($result); 
    496496        } 
    497497         
    498         if ($hydrationMode == Doctrine::HYDRATE_ARRAY || $hydrationMode == Doctrine::HYDRATE_RECORD) { 
     498        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_Query::HYDRATE_OBJECT) { 
    499499            $this->assertEquals(2, count($result)); 
    500500            $this->assertTrue(is_array($result)); 
    … …  
    521521        } 
    522522         
    523         if ($hydrationMode == Doctrine::HYDRATE_RECORD) { 
     523        if ($hydrationMode == Doctrine_Query::HYDRATE_OBJECT) { 
    524524            $this->assertTrue($result[0][0] instanceof Doctrine_ORM_Entity); 
    525525            $this->assertTrue($result[0][0]['phonenumbers'] instanceof Doctrine_ORM_Collection); 
    … …  
    534534            $this->assertTrue($result[1][0]['articles'][0] instanceof Doctrine_ORM_Entity); 
    535535            $this->assertTrue($result[1][0]['articles'][1] instanceof Doctrine_ORM_Entity); 
    536         } else if ($hydrationMode == Doctrine::HYDRATE_SCALAR) { 
     536        } else if ($hydrationMode == Doctrine_Query::HYDRATE_SCALAR) { 
    537537            //... 
    538538            $this->assertEquals(6, count($result)); 
    … …  
    667667        $result = $hydrator->hydrateResultSet($this->_createParserResult( 
    668668                $stmt, $queryComponents, $tableAliasMap, $hydrationMode, true)); 
    669         if ($hydrationMode == Doctrine::HYDRATE_ARRAY) { 
     669        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) { 
    670670            //var_dump($result); 
    671671        } 
    672672         
    673         if ($hydrationMode == Doctrine::HYDRATE_ARRAY || $hydrationMode == Doctrine::HYDRATE_RECORD) { 
     673        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_Query::HYDRATE_OBJECT) { 
    674674            $this->assertEquals(2, count($result)); 
    675675            $this->assertTrue(is_array($result)); 
    … …  
    705705        } 
    706706 
    707         if ($hydrationMode == Doctrine::HYDRATE_RECORD) { 
     707        if ($hydrationMode == Doctrine_Query::HYDRATE_OBJECT) { 
    708708            $this->assertTrue($result[0][0] instanceof Doctrine_ORM_Entity); 
    709709            $this->assertTrue($result[1][0] instanceof Doctrine_ORM_Entity); 
    … …  
    730730            $this->assertTrue($result[1][0]['articles'][1]['comments'] instanceof Doctrine_ORM_Collection); 
    731731            $this->assertEquals(0, count($result[1][0]['articles'][1]['comments'])); 
    732         } else if ($hydrationMode == Doctrine::HYDRATE_SCALAR) { 
     732        } else if ($hydrationMode == Doctrine_Query::HYDRATE_SCALAR) { 
    733733            //... 
    734         } else if ($hydrationMode == Doctrine::HYDRATE_ARRAY) { 
     734        } else if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) { 
    735735            //... 
    736736             
    … …  
    832832        $result = $hydrator->hydrateResultSet($this->_createParserResult( 
    833833                $stmt, $queryComponents, $tableAliasMap, $hydrationMode)); 
    834         if ($hydrationMode == Doctrine::HYDRATE_ARRAY) { 
     834        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) { 
    835835            //var_dump($result); 
    836836        } 
    837837         
    838         if ($hydrationMode == Doctrine::HYDRATE_ARRAY || $hydrationMode == Doctrine::HYDRATE_RECORD) { 
     838        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_Query::HYDRATE_OBJECT) { 
    839839            $this->assertEquals(2, count($result)); 
    840840            $this->assertTrue(isset($result[0]['boards'])); 
    … …  
    844844        } 
    845845         
    846         if ($hydrationMode == Doctrine::HYDRATE_ARRAY) { 
     846        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) { 
    847847            $this->assertTrue(is_array($result)); 
    848848            $this->assertTrue(is_array($result[0])); 
    849849            $this->assertTrue(is_array($result[1])); 
    850         } else if ($hydrationMode == Doctrine::HYDRATE_RECORD) { 
     850        } else if ($hydrationMode == Doctrine_Query::HYDRATE_OBJECT) { 
    851851            $this->assertTrue($result instanceof Doctrine_ORM_Collection); 
    852852            $this->assertTrue($result[0] instanceof Doctrine_ORM_Entity); 
    853853            $this->assertTrue($result[1] instanceof Doctrine_ORM_Entity); 
    854         } else if ($hydrationMode == Doctrine::HYDRATE_SCALAR) { 
     854        } else if ($hydrationMode == Doctrine_Query::HYDRATE_SCALAR) { 
    855855            //... 
    856856        } 
    … …  
    923923        if ($name == 'result1') { 
    924924            $result = $hydrator->hydrateResultSet($this->_createParserResult( 
    925                 $stmt, $queryComponents, $tableAliasMap, Doctrine::HYDRATE_SINGLE_SCALAR)); 
     925                $stmt, $queryComponents, $tableAliasMap, Doctrine_Query::HYDRATE_SINGLE_SCALAR)); 
    926926            $this->assertEquals('romanb', $result); 
    927927        } else if ($name == 'result2') { 
    928928            $result = $hydrator->hydrateResultSet($this->_createParserResult( 
    929                 $stmt, $queryComponents, $tableAliasMap, Doctrine::HYDRATE_SINGLE_SCALAR)); 
     929                $stmt, $queryComponents, $tableAliasMap, Doctrine_Query::HYDRATE_SINGLE_SCALAR)); 
    930930            $this->assertEquals(1, $result); 
    931931        } else if ($name == 'result3' || $name == 'result4') { 
    932932            try { 
    933933                $result = $hydrator->hydrateResultSet($this->_createParserResult( 
    934                     $stmt, $queryComponents, $tableAliasMap, Doctrine::HYDRATE_SINGLE_SCALAR)); 
     934                    $stmt, $queryComponents, $tableAliasMap, Doctrine_Query::HYDRATE_SINGLE_SCALAR)); 
    935935                $this->fail(); 
    936936            } catch (Doctrine_ORM_Exceptions_HydrationException $ex) {}