Author: guilhermeblanco
Date: 2008-09-13 07:34:47 +0100 (Sat, 13 Sep 2008)
New Revision: 4960
Modified:
trunk/tests/Orm/Query/IdentifierRecognitionTest.php
trunk/tests/lib/Doctrine_OrmTestCase.php
trunk/tests/lib/mocks/Doctrine_DriverMock.php
Log:
Small changes to get Query tests running again.
Fixed wrong DQL in IdentifierRecognitionTest.php
Modified: trunk/tests/Orm/Query/IdentifierRecognitionTest.php
===================================================================
--- trunk/tests/Orm/Query/IdentifierRecognitionTest.php 2008-09-12 20:57:55 UTC
(rev 4959)
+++ trunk/tests/Orm/Query/IdentifierRecognitionTest.php 2008-09-13 06:34:47 UTC
(rev 4960)
@@ -70,7 +70,7 @@
public function testQueryParserSupportsMultipleAliasDeclarations()
{
$entityManager = $this->_em;
- $query = $entityManager->createQuery('SELECT u.* FROM CmsUser u INDEX
BY id LEFT JOIN u.phonenumbers p');
+ $query = $entityManager->createQuery('SELECT u.* FROM CmsUser u INDEX
BY u.id LEFT JOIN u.phonenumbers p');
$parserResult = $query->parse();
$decl = $parserResult->getQueryComponent('u');
@@ -94,7 +94,7 @@
public function
testQueryParserSupportsMultipleAliasDeclarationsWithIndexBy()
{
$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');
+ $query = $entityManager->createQuery('SELECT u.* FROM CmsUser u INDEX
BY u.id LEFT JOIN u.articles a INNER JOIN u.phonenumbers pn INDEX BY
pn.phonenumber');
$parserResult = $query->parse();
$decl = $parserResult->getQueryComponent('u');
Modified: trunk/tests/lib/Doctrine_OrmTestCase.php
===================================================================
--- trunk/tests/lib/Doctrine_OrmTestCase.php 2008-09-12 20:57:55 UTC (rev
4959)
+++ trunk/tests/lib/Doctrine_OrmTestCase.php 2008-09-13 06:34:47 UTC (rev
4960)
@@ -1,6 +1,7 @@
<?php
require_once 'lib/mocks/Doctrine_DriverMock.php';
+require_once 'lib/mocks/Doctrine_ConnectionMock.php';
/**
* Base testcase class for all orm testcases.
@@ -10,13 +11,13 @@
{
protected $_em;
protected $_emf;
-
+
protected function setUp() {
if (isset($this->sharedFixture['em'])) {
$this->_em = $this->sharedFixture['em'];
- } else {
- $config = new Doctrine_Configuration();
- $eventManager = new Doctrine_EventManager();
+ } else {
+ $config = new Doctrine_Common_Configuration();
+ $eventManager = new Doctrine_Common_EventManager();
$connectionOptions = array(
'driverClass' => 'Doctrine_DriverMock',
'wrapperClass' => 'Doctrine_ConnectionMock',
Modified: trunk/tests/lib/mocks/Doctrine_DriverMock.php
===================================================================
--- trunk/tests/lib/mocks/Doctrine_DriverMock.php 2008-09-12 20:57:55 UTC
(rev 4959)
+++ trunk/tests/lib/mocks/Doctrine_DriverMock.php 2008-09-13 06:34:47 UTC
(rev 4960)
@@ -1,6 +1,11 @@
<?php
+
require_once 'lib/mocks/Doctrine_DriverConnectionMock.php';
+require_once 'lib/mocks/Doctrine_DatabasePlatformMock.php';
+// THIS FILE DOES NOT EXIST YET!!!!
+//require_once 'lib/mocks/Doctrine_SchemaManagerMock.php';
+
class Doctrine_DriverMock implements Doctrine_DBAL_Driver
{
public function connect(array $params, $username = null, $password = null,
array $driverOptions = array())
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"doctrine-svn" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.co.uk/group/doctrine-svn?hl=en-GB
-~----------~----~----~----~------~----~------~--~---
