Changeset 4470 for trunk/tests/Orm

Show
Ignore:
Timestamp:
06/05/08 20:01:58 (7 months ago)
Author:
romanb
Message:

Refactorings and initial commit/draft of new event handling / configuration / bootstrapping. Still need to remove all the static EntityManagerFactory::getManager lookup calls from the Production classes. The production classes need to have access to the EntityManager? of the Query that constructed the Parser. It should be injected into the Parser during construction.

Location:
trunk/tests/Orm
Files:
1 added
1 removed
8 modified

Legend:

Unmodified
Added
Removed

  • trunk/tests/Orm/AllTests.php

    r4422 r4470  
    1414// Tests 
    1515require_once 'Orm/UnitOfWorkTestCase.php'; 
     16require_once 'Orm/EntityManagerFactoryTest.php'; 
    1617 
    1718class Orm_AllTests 
    … …  
    2728 
    2829        $suite->addTestSuite('Orm_UnitOfWorkTestCase'); 
     30        $suite->addTestSuite('Orm_EntityManagerFactoryTest'); 
    2931        //$suite->addTestSuite('Orm_ConfigurableTestCase'); 
    3032         

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

    r4456 r4470  
    77  
    88class Orm_Hydration_BasicHydrationTest extends Doctrine_OrmTestCase 
    9 { 
    10     private $_em; 
    11      
     9{     
    1210    protected function setUp() 
    1311    { 
    1412        parent::setUp(); 
    15         $this->_em = new Doctrine_EntityManager(new Doctrine_Connection_Mock()); 
    1613    } 
    1714     

  • trunk/tests/Orm/Query/DeleteSqlGenerationTest.php

    r4452 r4470  
    4141    { 
    4242        try { 
    43             $entityManager = Doctrine_EntityManager::getManager(); 
     43            $entityManager = $this->sharedFixture['em']; 
    4444            $query = $entityManager->createQuery($dqlToBeTested); 
    4545 

  • trunk/tests/Orm/Query/DqlGenerationTest.php

    r4452 r4470  
    3737    protected function createQuery() 
    3838    { 
    39         $entityManager = Doctrine_EntityManager::getManager(); 
     39        $entityManager = $this->sharedFixture['em']; 
    4040        return $entityManager->createQuery(); 
    4141    } 

  • trunk/tests/Orm/Query/IdentifierRecognitionTest.php

    r4452 r4470  
    4040    public function testSingleAliasDeclarationIsSupported() 
    4141    { 
    42         $entityManager = Doctrine_EntityManager::getManager(); 
     42        $entityManager = $this->sharedFixture['em']; 
    4343        $query = $entityManager->createQuery('SELECT u.* FROM CmsUser u'); 
    4444        $parserResult = $query->parse(); 
    … …  
    5555    public function testSingleAliasDeclarationWithIndexByIsSupported() 
    5656    { 
    57         $entityManager = Doctrine_EntityManager::getManager(); 
     57        $entityManager = $this->sharedFixture['em']; 
    5858        $query = $entityManager->createQuery('SELECT u.* FROM CmsUser u INDEX BY id'); 
    5959        $parserResult = $query->parse(); 
    … …  
    7070    public function testQueryParserSupportsMultipleAliasDeclarations() 
    7171    { 
    72         $entityManager = Doctrine_EntityManager::getManager(); 
     72        $entityManager = $this->sharedFixture['em']; 
    7373        $query = $entityManager->createQuery('SELECT u.* FROM CmsUser u INDEX BY id LEFT JOIN u.phonenumbers p'); 
    7474        $parserResult = $query->parse(); 
    … …  
    9494    public function testQueryParserSupportsMultipleAliasDeclarationsWithIndexBy() 
    9595    { 
    96         $entityManager = Doctrine_EntityManager::getManager(); 
     96        $entityManager = $this->sharedFixture['em']; 
    9797        $query = $entityManager->createQuery('SELECT u.* FROM CmsUser u INDEX BY id LEFT JOIN u.articles a INNER JOIN u.phonenumbers pn INDEX BY phonenumber'); 
    9898        $parserResult = $query->parse(); 

  • trunk/tests/Orm/Query/LanguageRecognitionTest.php

    r4455 r4470  
    4242    { 
    4343        try { 
    44             $entityManager = Doctrine_EntityManager::getManager(); 
     44            $entityManager = $this->sharedFixture['em']; 
    4545            $query = $entityManager->createQuery($dql); 
    4646            $parserResult = $query->parse(); 
    … …  
    5353    { 
    5454        try { 
    55             $entityManager = Doctrine_EntityManager::getManager(); 
     55            $entityManager = $this->sharedFixture['em']; 
    5656            $query = $entityManager->createQuery($dql); 
    5757            $query->setDql($dql); 

  • trunk/tests/Orm/Query/SelectSqlGenerationTest.php

    r4466 r4470  
    4141    { 
    4242        try { 
    43             $entityManager = Doctrine_EntityManager::getManager(); 
     43            $entityManager = $this->sharedFixture['em']; 
    4444            $query = $entityManager->createQuery($dqlToBeTested); 
    4545            //echo print_r($query->parse()->getQueryFields(), true) . "\n"; 

  • trunk/tests/Orm/Query/UpdateSqlGenerationTest.php

    r4452 r4470  
    4141    { 
    4242        try { 
    43             $entityManager = Doctrine_EntityManager::getManager(); 
     43            $entityManager = $this->sharedFixture['em']; 
    4444            $query = $entityManager->createQuery($dqlToBeTested); 
    4545