From 838768d21f83ab6ce74c0dd5102e3f2001641b99 Mon Sep 17 00:00:00 2001 From: romanb Date: Fri, 10 Jul 2009 07:38:42 +0000 Subject: [PATCH] [2.0] Small comments/todos on QueryBuilderTest. --- lib/Doctrine/ORM/QueryBuilder.php | 6 +++--- tests/Doctrine/Tests/ORM/QueryBuilderTest.php | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/Doctrine/ORM/QueryBuilder.php b/lib/Doctrine/ORM/QueryBuilder.php index 4e790360a..4a394c4e3 100644 --- a/lib/Doctrine/ORM/QueryBuilder.php +++ b/lib/Doctrine/ORM/QueryBuilder.php @@ -24,8 +24,8 @@ namespace Doctrine\ORM; use Doctrine\ORM\Query\Expr; /** - * This class is responsible for building DQL query strings via a object oriented - * PHP interface + * This class is responsible for building DQL query strings via an object oriented + * PHP interface. * * TODO: I don't like the API of using the Expr::*() syntax inside of the QueryBuilder * methods. What can we do to allow them to do it more fluently with the QueryBuilder. @@ -33,7 +33,7 @@ use Doctrine\ORM\Query\Expr; * @author Jonathan H. Wage * @author Roman Borschel * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link http://www.phpdoctrine.org + * @link http://www.doctrine-project.org * @since 2.0 * @version $Revision$ */ diff --git a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php index 96f69e914..03a8a78a1 100644 --- a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php +++ b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php @@ -36,6 +36,8 @@ require_once __DIR__ . '/../TestInit.php'; * @link http://www.phpdoctrine.org * @since 2.0 * @version $Revision$ + * @todo Remove QueryBuilder::create. Use constructor in tests instead. Users will use + * $em->createQueryBuilder(). */ class QueryBuilderTest extends \Doctrine\Tests\OrmTestCase { @@ -50,7 +52,9 @@ class QueryBuilderTest extends \Doctrine\Tests\OrmTestCase { $dql = $qb->getDql(); $q = $qb->getQuery(); - + + //FIXME: QueryBuilder tests should not test the Parser or SQL building, so + // this block should probably be removed. try { $q->getSql(); } catch (\Exception $e) { @@ -58,6 +62,7 @@ class QueryBuilderTest extends \Doctrine\Tests\OrmTestCase echo $e->getTraceAsString(); $this->fail($e->getMessage()); } + //-- $this->assertEquals($expectedDql, $dql); }