From 68147808f625abb05923ff9779072445940faeee Mon Sep 17 00:00:00 2001 From: jwage Date: Wed, 18 Feb 2009 07:59:11 +0000 Subject: [PATCH] [2.0] Cleaning up tests and removing some unused files to remove any confusion --- tests/Doctrine/Tests/AllTests.php | 5 - .../Common/ClassLoaderTest/ClassA.class.php | 1 + .../Common/ClassLoaderTest/ClassB.class.php | 1 + .../Tests/Common/Collections/AllTests.php | 3 - .../Common/Collections/CollectionTest.php | 6 - .../Tests/Common/EventManagerTest.php | 16 +- tests/Doctrine/Tests/DBAL/AllTests.php | 6 - tests/Doctrine/Tests/DBAL/Ticket/AllTests.php | 33 ---- tests/Doctrine/Tests/DBAL/Ticket/Test1.php | 13 -- .../Tests/Mocks/ClassMetadataMock.php | 6 +- tests/Doctrine/Tests/Mocks/ConnectionMock.php | 6 +- .../Tests/Mocks/DatabasePlatformMock.php | 7 +- .../Tests/Mocks/DriverConnectionMock.php | 3 +- tests/Doctrine/Tests/Mocks/DriverMock.php | 3 +- .../Tests/Mocks/EntityManagerMock.php | 3 +- .../Tests/Mocks/EntityPersisterMock.php | 6 +- .../Tests/Mocks/IdentityIdGeneratorMock.php | 8 +- .../Tests/Mocks/MetadataDriverMock.php | 19 +- .../Tests/Mocks/SchemaManagerMock.php | 15 +- tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php | 17 +- .../Doctrine/Tests/Models/CMS/CmsAddress.php | 15 +- .../Tests/Models/Company/CompanyEmployee.php | 64 +++--- .../Tests/Models/Company/CompanyManager.php | 20 +- tests/Doctrine/Tests/ORM/AllTests.php | 2 +- .../Tests/ORM/Associations/AllTests.php | 2 +- .../Tests/ORM/Associations/CascadeTest.php | 74 ------- .../ORM/Associations/OneToOneMappingTest.php | 9 +- .../Tests/ORM/CommitOrderCalculatorTest.php | 3 +- .../Tests/ORM/Entity/AccessorTest.php | 87 --------- tests/Doctrine/Tests/ORM/Entity/AllTests.php | 1 - .../Doctrine/Tests/ORM/EntityManagerTest.php | 6 +- .../Tests/ORM/EntityPersisterTest.php | 11 +- tests/Doctrine/Tests/ORM/Export/AllTests.php | 10 +- .../Tests/ORM/Export/ClassExporterTest.php | 40 +--- .../Tests/ORM/Functional/AllTests.php | 2 - .../Tests/ORM/Functional/BasicCRUDTest.php | 18 +- .../Tests/ORM/Functional/Ticket/1Test.php | 10 - .../Tests/ORM/Functional/Ticket/AllTests.php | 30 --- .../Doctrine/Tests/ORM/Hydration/AllTests.php | 2 +- .../Tests/ORM/Hydration/ArrayHydratorTest.php | 11 +- .../Tests/ORM/Hydration/HydrationTest.php | 8 +- .../ORM/Hydration/ObjectHydratorTest.php | 41 ++-- .../ORM/Hydration/ScalarHydratorTest.php | 8 +- .../Hydration/SingleScalarHydratorTest.php | 9 +- tests/Doctrine/Tests/ORM/Mapping/AllTests.php | 2 +- .../ORM/Mapping/ClassMetadataFactoryTest.php | 42 ++-- .../Tests/ORM/Mapping/ClassMetadataTest.php | 3 +- .../Tests/ORM/Performance/AllTests.php | 30 --- tests/Doctrine/Tests/ORM/Query/AllTests.php | 15 +- .../ORM/Query/LanguageRecognitionTest.php | 184 +++++++----------- .../ORM/Query/SelectSqlGenerationTest.php | 38 +--- tests/Doctrine/Tests/ORM/Ticket/1Test.php | 10 - tests/Doctrine/Tests/ORM/Ticket/AllTests.php | 30 --- 53 files changed, 234 insertions(+), 780 deletions(-) delete mode 100644 tests/Doctrine/Tests/DBAL/Ticket/AllTests.php delete mode 100644 tests/Doctrine/Tests/DBAL/Ticket/Test1.php delete mode 100644 tests/Doctrine/Tests/ORM/Associations/CascadeTest.php delete mode 100644 tests/Doctrine/Tests/ORM/Entity/AccessorTest.php delete mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/1Test.php delete mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/AllTests.php delete mode 100644 tests/Doctrine/Tests/ORM/Performance/AllTests.php delete mode 100644 tests/Doctrine/Tests/ORM/Ticket/1Test.php delete mode 100644 tests/Doctrine/Tests/ORM/Ticket/AllTests.php diff --git a/tests/Doctrine/Tests/AllTests.php b/tests/Doctrine/Tests/AllTests.php index c94ab4650..c326c7dd6 100644 --- a/tests/Doctrine/Tests/AllTests.php +++ b/tests/Doctrine/Tests/AllTests.php @@ -12,11 +12,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) { require_once __DIR__ . '/TestInit.php'; -// Suites -#require_once 'Common/AllTests.php'; -#require_once 'Dbal/AllTests.php'; -#require_once 'Orm/AllTests.php'; - class AllTests { public static function main() diff --git a/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassA.class.php b/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassA.class.php index 43811074c..f1b499017 100644 --- a/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassA.class.php +++ b/tests/Doctrine/Tests/Common/ClassLoaderTest/ClassA.class.php @@ -1,4 +1,5 @@ _eventManager = new EventManager; $this->_preFooInvoked = false; $this->_postFooInvoked = false; @@ -56,7 +48,6 @@ class EventManagerTest extends \Doctrine\Tests\DoctrineTestCase $this->assertFalse($this->_postFooInvoked); } - /* Listener methods */ public function preFoo(EventArgs $e) @@ -68,5 +59,4 @@ class EventManagerTest extends \Doctrine\Tests\DoctrineTestCase { $this->_postFooInvoked = true; } -} - +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/DBAL/AllTests.php b/tests/Doctrine/Tests/DBAL/AllTests.php index 479bb7159..032ead8dc 100644 --- a/tests/Doctrine/Tests/DBAL/AllTests.php +++ b/tests/Doctrine/Tests/DBAL/AllTests.php @@ -11,10 +11,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) { require_once __DIR__ . '/../TestInit.php'; -// Suites -#require_once 'Dbal/Component/AllTests.php'; -#require_once 'Dbal/Ticket/AllTests.php'; - class AllTests { public static function main() @@ -27,8 +23,6 @@ class AllTests $suite = new \Doctrine\Tests\DbalTestSuite('Doctrine DBAL'); $suite->addTestSuite('Doctrine\Tests\DBAL\Platforms\AbstractPlatformTest'); - - $suite->addTest(Ticket\AllTests::suite()); return $suite; } diff --git a/tests/Doctrine/Tests/DBAL/Ticket/AllTests.php b/tests/Doctrine/Tests/DBAL/Ticket/AllTests.php deleted file mode 100644 index 3d64d890c..000000000 --- a/tests/Doctrine/Tests/DBAL/Ticket/AllTests.php +++ /dev/null @@ -1,33 +0,0 @@ -addTestSuite('Doctrine\Tests\DBAL\Ticket\Test1'); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'Ticket_AllTests::main') { - AllTests::main(); -} \ No newline at end of file diff --git a/tests/Doctrine/Tests/DBAL/Ticket/Test1.php b/tests/Doctrine/Tests/DBAL/Ticket/Test1.php deleted file mode 100644 index c2b40fbe6..000000000 --- a/tests/Doctrine/Tests/DBAL/Ticket/Test1.php +++ /dev/null @@ -1,13 +0,0 @@ -assertEquals(0, 0); - } -} \ No newline at end of file diff --git a/tests/Doctrine/Tests/Mocks/ClassMetadataMock.php b/tests/Doctrine/Tests/Mocks/ClassMetadataMock.php index 4d63ff9fd..39c53646d 100644 --- a/tests/Doctrine/Tests/Mocks/ClassMetadataMock.php +++ b/tests/Doctrine/Tests/Mocks/ClassMetadataMock.php @@ -6,9 +6,9 @@ class ClassMetadataMock extends \Doctrine\ORM\Mapping\ClassMetadata { /* Mock API */ - public function setIdGeneratorType($type) { + public function setIdGeneratorType($type) + { $this->_generatorType = $type; } -} - +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/Mocks/ConnectionMock.php b/tests/Doctrine/Tests/Mocks/ConnectionMock.php index 67c5f4b26..7bcc42c10 100644 --- a/tests/Doctrine/Tests/Mocks/ConnectionMock.php +++ b/tests/Doctrine/Tests/Mocks/ConnectionMock.php @@ -8,7 +8,8 @@ class ConnectionMock extends \Doctrine\DBAL\Connection private $_lastInsertId = 0; private $_inserts = array(); - public function __construct(array $params, $driver, $config = null, $eventManager = null) { + public function __construct(array $params, $driver, $config = null, $eventManager = null) + { parent::__construct($params, $driver, $config, $eventManager); $this->_platformMock = new DatabasePlatformMock(); $this->_platform = $this->_platformMock; @@ -71,5 +72,4 @@ class ConnectionMock extends \Doctrine\DBAL\Connection $this->_inserts = array(); $this->_lastInsertId = 0; } -} - +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/Mocks/DatabasePlatformMock.php b/tests/Doctrine/Tests/Mocks/DatabasePlatformMock.php index b8c036fb4..5aa1ff525 100644 --- a/tests/Doctrine/Tests/Mocks/DatabasePlatformMock.php +++ b/tests/Doctrine/Tests/Mocks/DatabasePlatformMock.php @@ -19,7 +19,8 @@ class DatabasePlatformMock extends \Doctrine\DBAL\Platforms\AbstractPlatform /** * @override */ - public function prefersIdentityColumns() { + public function prefersIdentityColumns() + { return $this->_prefersIdentityColumns; } @@ -50,6 +51,4 @@ class DatabasePlatformMock extends \Doctrine\DBAL\Platforms\AbstractPlatform { $this->_prefersIdentityColumns = (bool)$bool; } - -} - +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/Mocks/DriverConnectionMock.php b/tests/Doctrine/Tests/Mocks/DriverConnectionMock.php index 58a03beee..be6df9935 100644 --- a/tests/Doctrine/Tests/Mocks/DriverConnectionMock.php +++ b/tests/Doctrine/Tests/Mocks/DriverConnectionMock.php @@ -14,5 +14,4 @@ class DriverConnectionMock implements \Doctrine\DBAL\Driver\Connection public function rollBack() {} public function errorCode() {} public function errorInfo() {} -} - +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/Mocks/DriverMock.php b/tests/Doctrine/Tests/Mocks/DriverMock.php index 77df38fc7..379b77b39 100644 --- a/tests/Doctrine/Tests/Mocks/DriverMock.php +++ b/tests/Doctrine/Tests/Mocks/DriverMock.php @@ -48,5 +48,4 @@ class DriverMock implements \Doctrine\DBAL\Driver { $this->_platformMock = $platform; } -} - +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/Mocks/EntityManagerMock.php b/tests/Doctrine/Tests/Mocks/EntityManagerMock.php index a2bb13598..3ab2dcdcf 100644 --- a/tests/Doctrine/Tests/Mocks/EntityManagerMock.php +++ b/tests/Doctrine/Tests/Mocks/EntityManagerMock.php @@ -86,5 +86,4 @@ class EntityManagerMock extends \Doctrine\ORM\EntityManager return parent::getIdGenerator($className); } -} - +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php index 1ba6ac9a7..09f0dd486 100644 --- a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php +++ b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php @@ -28,7 +28,8 @@ class EntityPersisterMock extends \Doctrine\ORM\Persisters\StandardEntityPersist return null; } - public function setMockIdGeneratorType($genType) { + public function setMockIdGeneratorType($genType) + { $this->_mockIdGeneratorType = $genType; } @@ -64,5 +65,4 @@ class EntityPersisterMock extends \Doctrine\ORM\Persisters\StandardEntityPersist $this->_updates = array(); $this->_deletes = array(); } -} - +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/Mocks/IdentityIdGeneratorMock.php b/tests/Doctrine/Tests/Mocks/IdentityIdGeneratorMock.php index e0ed9357d..0c5696b48 100644 --- a/tests/Doctrine/Tests/Mocks/IdentityIdGeneratorMock.php +++ b/tests/Doctrine/Tests/Mocks/IdentityIdGeneratorMock.php @@ -2,11 +2,6 @@ namespace Doctrine\Tests\Mocks; -/** - * Description of Doctrine_IdentityIdGeneratorMock - * - * @author robo - */ class IdentityIdGeneratorMock extends \Doctrine\ORM\Id\IdentityGenerator { private $_mockPostInsertId; @@ -14,5 +9,4 @@ class IdentityIdGeneratorMock extends \Doctrine\ORM\Id\IdentityGenerator public function setMockPostInsertId($id) { $this->_mockPostInsertId = $id; } -} - +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/Mocks/MetadataDriverMock.php b/tests/Doctrine/Tests/Mocks/MetadataDriverMock.php index ba0a7ce2f..bedda6d40 100644 --- a/tests/Doctrine/Tests/Mocks/MetadataDriverMock.php +++ b/tests/Doctrine/Tests/Mocks/MetadataDriverMock.php @@ -1,23 +1,16 @@ $entity * @override */ - public function getEntityChangeSet($entity) { + public function getEntityChangeSet($entity) + { $oid = spl_object_hash($entity); return isset($this->_mockDataChangeSets[$oid]) ? $this->_mockDataChangeSets[$oid] : parent::getEntityChangeSet($entity); @@ -44,7 +41,8 @@ class UnitOfWorkMock extends \Doctrine\ORM\UnitOfWork { $this->_persisterMock[$entityName] = $persister; } - public function setDataChangeSet($entity, array $mockChangeSet) { + public function setDataChangeSet($entity, array $mockChangeSet) + { $this->_mockDataChangeSets[spl_object_hash($entity)] = $mockChangeSet; } @@ -57,5 +55,4 @@ class UnitOfWorkMock extends \Doctrine\ORM\UnitOfWork { { $this->_originalEntityData[spl_object_hash($entity)] = $originalData; } -} - +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/Models/CMS/CmsAddress.php b/tests/Doctrine/Tests/Models/CMS/CmsAddress.php index 5d7a7763e..726d79da0 100644 --- a/tests/Doctrine/Tests/Models/CMS/CmsAddress.php +++ b/tests/Doctrine/Tests/Models/CMS/CmsAddress.php @@ -1,15 +1,11 @@ setInheritanceType('joined', array( - 'discriminatorColumn' => 'dtype', - 'discriminatorMap' => array( - 'emp' => 'CompanyEmployee', - 'man' => 'CompanyManager') - )); - // register subclasses - $mapping->setSubclasses(array('CompanyManager')); - - $mapping->mapField(array( - 'fieldName' => 'id', - 'type' => 'integer', - 'length' => 4, - 'id' => true, - 'idGenerator' => 'auto' - )); - $mapping->mapField(array( - 'fieldName' => 'salary', - 'type' => 'double' - )); - //TODO: make department an entity - $mapping->mapField(array( - 'fieldName' => 'department', - 'type' => 'string' - )); - } - -} + /** + * @DoctrineId + * @DoctrineColumn(type="integer") + * @DoctrineIdGenerator("auto") + */ + public $id; -?> \ No newline at end of file + /** + * @DoctrineColumn(type="double") + */ + public $salary; + + /** + * @DoctrineColumn(type="varchar", length=255) + */ + public $department; +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/Models/Company/CompanyManager.php b/tests/Doctrine/Tests/Models/Company/CompanyManager.php index 5e0c8a231..3514d95f6 100644 --- a/tests/Doctrine/Tests/Models/Company/CompanyManager.php +++ b/tests/Doctrine/Tests/Models/Company/CompanyManager.php @@ -1,14 +1,14 @@ mapColumn(array( - 'fieldName' => 'title', - 'type' => 'string' - )); - } -} - -?> \ No newline at end of file + /* + * @DoctrineColumn(type="varchar", length="255") + */ + public $title; +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/AllTests.php b/tests/Doctrine/Tests/ORM/AllTests.php index 83866aa5a..ee9561c3a 100644 --- a/tests/Doctrine/Tests/ORM/AllTests.php +++ b/tests/Doctrine/Tests/ORM/AllTests.php @@ -47,4 +47,4 @@ class AllTests if (PHPUnit_MAIN_METHOD == 'Orm_AllTests::main') { AllTests::main(); -} +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Associations/AllTests.php b/tests/Doctrine/Tests/ORM/Associations/AllTests.php index 048e4ad18..9f443976d 100644 --- a/tests/Doctrine/Tests/ORM/Associations/AllTests.php +++ b/tests/Doctrine/Tests/ORM/Associations/AllTests.php @@ -27,4 +27,4 @@ class AllTests if (PHPUnit_MAIN_METHOD == 'Orm_Associations_AllTests::main') { AllTests::main(); -} +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Associations/CascadeTest.php b/tests/Doctrine/Tests/ORM/Associations/CascadeTest.php deleted file mode 100644 index ffd4d9065..000000000 --- a/tests/Doctrine/Tests/ORM/Associations/CascadeTest.php +++ /dev/null @@ -1,74 +0,0 @@ -cascade($entity, $container); - } - - -} - -abstract class Cascade -{ - public function cascade(Doctrine_Entity $record, array &$container) - { - if ($this->shouldCascadeTo($record)) { - $container[$record->getOid()] = $record; - } - - foreach ($record->getTable()->getRelations() as $relation) { - if ($this->doCascade($relation)) { - $this->prepareCascade($record, $relation); - $relatedObjects = $record->get($relation->getAlias()); - if ($relatedObjects instanceof Doctrine_Record && $this->shouldCascadeTo($relatedObjects) - && ! isset($container[$relatedObjects->getOid()])) { - $this->cascade($relatedObjects, $container); - } else if ($relatedObjects instanceof Doctrine_Collection && count($relatedObjects) > 0) { - foreach ($relatedObjects as $object) { - if ( ! isset($container[$object->getOid()])) { - $this->cascade($object, $container); - } - } - } - } - } - } -} - -class DeleteCascade extends Cascade -{ - public function doCascade($relation) - { - return $relation->isCascadeDelete(); - } - - public function prepareCascade($record, $relation) - { - $fieldName = $relation->getAlias(); - // if it's a xToOne relation and the related object is already loaded - // we don't need to refresh, else we need to. - if ( ! ($relation->getType() == Doctrine_Relation::ONE && isset($record->$fieldName))) { - $record->refreshRelated($relation->getAlias()); - } - } - - public function shouldCascadeTo(Doctrine_Entity $entity) - { - //TODO: also ignore removed Entities. incorporate that in exists() with a new - // state? (DELETED?) - return ! $entity->exists(); - } -} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Associations/OneToOneMappingTest.php b/tests/Doctrine/Tests/ORM/Associations/OneToOneMappingTest.php index 085bf82b8..cff61dfa9 100644 --- a/tests/Doctrine/Tests/ORM/Associations/OneToOneMappingTest.php +++ b/tests/Doctrine/Tests/ORM/Associations/OneToOneMappingTest.php @@ -3,7 +3,7 @@ namespace Doctrine\Tests\ORM\Associations; require_once __DIR__ . '/../../TestInit.php'; - + class OneToOneMappingTest extends \Doctrine\Tests\OrmTestCase { public function testCorrectOneToOneBidirectionalMapping() @@ -23,8 +23,7 @@ class OneToOneMappingTest extends \Doctrine\Tests\OrmTestCase $this->assertEquals('Person', $oneToOneMapping->getSourceEntityName()); $this->assertEquals('address', $oneToOneMapping->getSourceFieldName()); $this->assertTrue($oneToOneMapping->isOwningSide()); - - + $inverseSideMapping = array( 'fieldName' => 'person', 'sourceEntity' => 'Address', @@ -37,7 +36,5 @@ class OneToOneMappingTest extends \Doctrine\Tests\OrmTestCase $this->assertEquals('Address', $oneToOneMapping->getSourceEntityName()); $this->assertEquals('Person', $oneToOneMapping->getTargetEntityName()); $this->assertTrue($oneToOneMapping->isInverseSide()); - } - -} +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php b/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php index d05998faa..5593fc889 100644 --- a/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php +++ b/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php @@ -48,6 +48,5 @@ class CommitOrderCalculatorTest extends \Doctrine\Tests\OrmTestCase // There is only 1 valid ordering for this constellation $correctOrder = array("node5", "node1", "node2", "node3", "node4"); $this->assertSame($correctOrder, $sorted); - } -} +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Entity/AccessorTest.php b/tests/Doctrine/Tests/ORM/Entity/AccessorTest.php deleted file mode 100644 index 971e13573..000000000 --- a/tests/Doctrine/Tests/ORM/Entity/AccessorTest.php +++ /dev/null @@ -1,87 +0,0 @@ -username = 'romanb'; - $this->assertEquals('romanb?!', $entity1->username); - - $entity2 = new MagicAccessorMutatorTestEntity(); - $entity2->username = 'romanb'; - $this->assertEquals('romanb?!', $entity1->username); - } -} - - -/* Local test classes */ - -class CustomAccessorMutatorTestEntity extends Doctrine_Common_VirtualPropertyObject -{ - static function construct() { - Doctrine_Common_VirtualPropertySystem::register(__CLASS__, 'id', 'int'); - Doctrine_Common_VirtualPropertySystem::register(__CLASS__, - 'username', 'string', 'getUsernameCustom', 'setUsernameCustom'); - } - - public static function initMetadata($mapping) - { - $mapping->mapField(array( - 'fieldName' => 'id', - 'type' => 'integer', - 'length' => 4, - 'id' => true - )); - $mapping->mapField(array( - 'fieldName' => 'username', - 'type' => 'string', - 'length' => 50 - )); - } - - public function getUsernameCustom() - { - return $this->_get('username') . "!"; - } - - public function setUsernameCustom($username) - { - $this->_set('username', $username . "?"); - } -} - -class MagicAccessorMutatorTestEntity extends Doctrine_Common_VirtualPropertyObject -{ - static function construct() { - Doctrine_Common_VirtualPropertySystem::register(__CLASS__, 'id', 'int'); - Doctrine_Common_VirtualPropertySystem::register(__CLASS__, 'username', 'string'); - } - - public static function initMetadata($mapping) - { - $mapping->mapField(array( - 'fieldName' => 'id', - 'type' => 'integer', - 'length' => 4, - 'id' => true - )); - $mapping->mapField(array( - 'fieldName' => 'username', - 'type' => 'string', - 'length' => 50 - )); - } - - public function getUsername() - { - return $this->_get('username') . "!"; - } - - public function setUsername($username) - { - $this->_set('username', $username . "?"); - } -} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Entity/AllTests.php b/tests/Doctrine/Tests/ORM/Entity/AllTests.php index bda60599e..3de6ee880 100644 --- a/tests/Doctrine/Tests/ORM/Entity/AllTests.php +++ b/tests/Doctrine/Tests/ORM/Entity/AllTests.php @@ -20,7 +20,6 @@ class AllTests { $suite = new \Doctrine\Tests\DoctrineTestSuite('Doctrine Orm Entity Tests'); - //$suite->addTestSuite('Orm_Entity_AccessorTest'); $suite->addTestSuite('Doctrine\Tests\ORM\Entity\ConstructorTest'); return $suite; diff --git a/tests/Doctrine/Tests/ORM/EntityManagerTest.php b/tests/Doctrine/Tests/ORM/EntityManagerTest.php index b41915ebd..9c59615d9 100644 --- a/tests/Doctrine/Tests/ORM/EntityManagerTest.php +++ b/tests/Doctrine/Tests/ORM/EntityManagerTest.php @@ -4,14 +4,12 @@ namespace Doctrine\Tests\ORM; require_once __DIR__ . '/../TestInit.php'; -/** - * EntityManager tests. - */ class EntityManagerTest extends \Doctrine\Tests\OrmTestCase { private $_em; - function setUp() { + function setUp() + { parent::setUp(); $this->_em = $this->_getTestEntityManager(); } diff --git a/tests/Doctrine/Tests/ORM/EntityPersisterTest.php b/tests/Doctrine/Tests/ORM/EntityPersisterTest.php index e9f6b10de..f6328c249 100644 --- a/tests/Doctrine/Tests/ORM/EntityPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/EntityPersisterTest.php @@ -12,9 +12,6 @@ use Doctrine\Tests\Models\Forum\ForumAvatar; require_once __DIR__ . '/../TestInit.php'; -/** - * EntityPersister tests. - */ class EntityPersisterTest extends \Doctrine\Tests\OrmTestCase { private $_connMock; @@ -22,7 +19,8 @@ class EntityPersisterTest extends \Doctrine\Tests\OrmTestCase private $_idGenMock; private $_uowMock; - protected function setUp() { + protected function setUp() + { parent::setUp(); $this->_connMock = new ConnectionMock(array(), new \Doctrine\Tests\Mocks\DriverMock()); $this->_emMock = EntityManagerMock::create($this->_connMock); @@ -32,7 +30,8 @@ class EntityPersisterTest extends \Doctrine\Tests\OrmTestCase $this->_emMock->setIdGenerator('Doctrine\Tests\Models\Forum\ForumUser', $this->_idGenMock); } - public function testSimpleInsert() { + public function testSimpleInsert() + { $userPersister = new \Doctrine\ORM\Persisters\StandardEntityPersister( $this->_emMock, $this->_emMock->getClassMetadata("Doctrine\Tests\Models\Forum\ForumUser")); $avatarPersister = new \Doctrine\ORM\Persisters\StandardEntityPersister( @@ -46,7 +45,6 @@ class EntityPersisterTest extends \Doctrine\Tests\OrmTestCase 'username' => array('', 'romanb'), 'avatar' => array('', $user->avatar))); - //insert $avatarPersister->insert($user->avatar); $inserts = $this->_connMock->getInserts(); @@ -76,5 +74,4 @@ class EntityPersisterTest extends \Doctrine\Tests\OrmTestCase $this->assertTrue(isset($inserts['forum_users'][0]['dtype'])); $this->assertEquals('user', $inserts['forum_users'][0]['dtype']); } - } \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Export/AllTests.php b/tests/Doctrine/Tests/ORM/Export/AllTests.php index 479ffcf33..1aa66c202 100644 --- a/tests/Doctrine/Tests/ORM/Export/AllTests.php +++ b/tests/Doctrine/Tests/ORM/Export/AllTests.php @@ -10,14 +10,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) { require_once __DIR__ . '/../../TestInit.php'; -#require_once 'IdentifierRecognitionTest.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';*/ - class AllTests { public static function main() @@ -37,4 +29,4 @@ class AllTests if (PHPUnit_MAIN_METHOD == 'Orm_Export_AllTests::main') { AllTests::main(); -} +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Export/ClassExporterTest.php b/tests/Doctrine/Tests/ORM/Export/ClassExporterTest.php index 8a9d7a48f..3d1c7035d 100644 --- a/tests/Doctrine/Tests/ORM/Export/ClassExporterTest.php +++ b/tests/Doctrine/Tests/ORM/Export/ClassExporterTest.php @@ -1,23 +1,4 @@ . - */ namespace Doctrine\Tests\ORM\Export; @@ -25,37 +6,24 @@ use Doctrine\ORM\Export\ClassExporter; require_once __DIR__ . '/../../TestInit.php'; -/** - * Test case for testing the ddl class exporter - * - * @package Doctrine - * @subpackage Query - * @author Jonathan H. Wage - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link http://www.doctrine-project.org - * @since 2.0 - * @version $Revision$ - */ class ClassExporterTest extends \Doctrine\Tests\OrmTestCase { - public function testTest() + public function testGetExportClassesSql() { - // DDL is platform dependant. We can inject the platform to test into the driver mock. $driver = new \Doctrine\Tests\Mocks\DriverMock; $conn = new \Doctrine\Tests\Mocks\ConnectionMock(array(), $driver); - //$conn->setDatabasePlatform(new \Doctrine\DBAL\Platforms\SqlitePlatform()); $conn->setDatabasePlatform(new \Doctrine\DBAL\Platforms\MySqlPlatform()); $em = $this->_getTestEntityManager($conn); $classes = array( + $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'), $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'), - $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber') + $em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'), ); $exporter = new ClassExporter($em); $sql = $exporter->getExportClassesSql($classes); - print_r($sql); - + $this->assertEquals(count($sql), 8); } } \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Functional/AllTests.php b/tests/Doctrine/Tests/ORM/Functional/AllTests.php index 712b5f43b..d5ab54a9c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/AllTests.php +++ b/tests/Doctrine/Tests/ORM/Functional/AllTests.php @@ -21,8 +21,6 @@ class AllTests $suite->addTestSuite('Doctrine\Tests\ORM\Functional\BasicCRUDTest'); - //$suite->addTest(Orm_Functional_Ticket_AllTests::suite()); - return $suite; } } diff --git a/tests/Doctrine/Tests/ORM/Functional/BasicCRUDTest.php b/tests/Doctrine/Tests/ORM/Functional/BasicCRUDTest.php index 680b8c3a2..7f3013dd0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/BasicCRUDTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/BasicCRUDTest.php @@ -10,14 +10,10 @@ use Doctrine\Tests\Models\CMS\CmsGroup; require_once __DIR__ . '/../../TestInit.php'; -/** - * Description of BasicCRUDTest - * - * @author robo - */ -class BasicCRUDTest extends \Doctrine\Tests\OrmFunctionalTestCase { - - public function testBasicUnitsOfWorkWithOneToManyAssociation() { +class BasicCRUDTest extends \Doctrine\Tests\OrmFunctionalTestCase +{ + public function testBasicUnitsOfWorkWithOneToManyAssociation() + { $em = $this->_em; $exporter = new ClassExporter($this->_em); @@ -73,7 +69,8 @@ class BasicCRUDTest extends \Doctrine\Tests\OrmFunctionalTestCase { $this->assertFalse($em->getUnitOfWork()->isRegisteredRemoved($ph2)); } - public function testOneToManyAssociationModification() { + public function testOneToManyAssociationModification() + { $user = new CmsUser; $user->name = 'Roman'; $user->username = 'romanb'; @@ -191,5 +188,4 @@ class BasicCRUDTest extends \Doctrine\Tests\OrmFunctionalTestCase { array())->fetchColumn(); $this->assertEquals(0, $count); } -} - +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/1Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/1Test.php deleted file mode 100644 index 0dcea441b..000000000 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/1Test.php +++ /dev/null @@ -1,10 +0,0 @@ -assertEquals(0, 0); - } -} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/AllTests.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/AllTests.php deleted file mode 100644 index 6225d58a5..000000000 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/AllTests.php +++ /dev/null @@ -1,30 +0,0 @@ -addTestSuite('Orm_Functional_Ticket_1Test'); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'Orm_Functional_Ticket_AllTests::main') { - Ticket_AllTests::main(); -} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Hydration/AllTests.php b/tests/Doctrine/Tests/ORM/Hydration/AllTests.php index d2863938f..be065cfab 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/AllTests.php +++ b/tests/Doctrine/Tests/ORM/Hydration/AllTests.php @@ -31,4 +31,4 @@ class AllTests if (PHPUnit_MAIN_METHOD == 'Orm_Hydration_AllTests::main') { AllTests::main(); -} +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php index bc01180be..98a1abd54 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php @@ -6,11 +6,6 @@ use Doctrine\Tests\Mocks\HydratorMockStatement; require_once __DIR__ . '/../../TestInit.php'; -/** - * Description of ArrayHydratorTest - * - * @author robo - */ class ArrayHydratorTest extends HydrationTest { /** @@ -663,7 +658,8 @@ class ArrayHydratorTest extends HydrationTest $this->assertEquals(1, count($result[1]['boards'])); } - public function testResultIteration() { + public function testResultIteration() + { // Faked query components $queryComponents = array( 'u' => array( @@ -712,5 +708,4 @@ class ArrayHydratorTest extends HydrationTest ++$rowNum; } } -} - +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Hydration/HydrationTest.php b/tests/Doctrine/Tests/ORM/Hydration/HydrationTest.php index eb7f09e0b..520b979d3 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/HydrationTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/HydrationTest.php @@ -4,11 +4,6 @@ namespace Doctrine\Tests\ORM\Hydration; require_once __DIR__ . '/../../TestInit.php'; -/** - * Description of HydrationTest - * - * @author robo - */ class HydrationTest extends \Doctrine\Tests\OrmTestCase { protected $_em; @@ -28,5 +23,4 @@ class HydrationTest extends \Doctrine\Tests\OrmTestCase $parserResult->setMixedQuery($isMixedQuery); return $parserResult; } -} - +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php index c10c1f749..aa571b078 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php @@ -6,11 +6,6 @@ use Doctrine\Tests\Mocks\HydratorMockStatement; require_once __DIR__ . '/../../TestInit.php'; -/** - * Description of ObjectHydratorTest - * - * @author robo - */ class ObjectHydratorTest extends HydrationTest { /** @@ -669,7 +664,8 @@ class ObjectHydratorTest extends HydrationTest } - public function testResultIteration() { + public function testResultIteration() + { // Faked query components $queryComponents = array( 'u' => array( @@ -728,7 +724,7 @@ class ObjectHydratorTest extends HydrationTest * * @dataProvider hydrationModeProvider */ - /*public function testNewHydrationMixedQueryFetchJoinPerformance() + public function testNewHydrationMixedQueryFetchJoinPerformance() { // Faked query components $queryComponents = array( @@ -738,20 +734,20 @@ class ObjectHydratorTest extends HydrationTest 'relation' => null, 'map' => null, 'agg' => array('0' => 'nameUpper') - ), + ), 'p' => array( - 'metadata' => $this->_em->getClassMetadata('CmsPhonenumber'), + 'metadata' => $this->_em->getClassMetadata('\Doctrine\Tests\Models\CMS\CmsPhonenumber'), 'parent' => 'u', 'relation' => $this->_em->getClassMetadata('\Doctrine\Tests\Models\CMS\CmsUser')->getAssociationMapping('phonenumbers'), 'map' => null - ) - ); + ) + ); // Faked table alias map $tableAliasMap = array( 'u' => 'u', 'p' => 'p' - ); + ); // Faked result set $resultSet = array( @@ -761,21 +757,22 @@ class ObjectHydratorTest extends HydrationTest 'u__status' => 'developer', 'u__0' => 'ROMANB', 'p__phonenumber' => '42', - ), + ), array( 'u__id' => '1', 'u__status' => 'developer', 'u__0' => 'ROMANB', 'p__phonenumber' => '43', - ), + ), array( 'u__id' => '2', 'u__status' => 'developer', 'u__0' => 'JWAGE', 'p__phonenumber' => '91' - ) - ); - for ($i=4; $i<300; $i++) { + ) + ); + + for ($i = 4; $i < 300; $i++) { $resultSet[] = array( 'u__id' => $i, 'u__status' => 'developer', @@ -784,12 +781,10 @@ class ObjectHydratorTest extends HydrationTest ); } - $stmt = new Doctrine_HydratorMockStatement($resultSet); - $hydrator = new Doctrine_ORM_Internal_Hydration_ObjectHydrator($this->_em); + $stmt = new HydratorMockStatement($resultSet); + $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); $result = $hydrator->hydrateAll($stmt, $this->_createParserResult( $queryComponents, $tableAliasMap, true)); - - }*/ -} - + } +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php index b2e08b4de..3011ca362 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php @@ -6,11 +6,6 @@ use Doctrine\Tests\Mocks\HydratorMockStatement; require_once __DIR__ . '/../../TestInit.php'; -/** - * Description of ScalarHydratorTest - * - * @author robo - */ class ScalarHydratorTest extends HydrationTest { /** @@ -59,5 +54,4 @@ class ScalarHydratorTest extends HydrationTest $this->assertEquals('jwage', $result[1]['u_name']); $this->assertEquals(2, $result[1]['u_id']); } -} - +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php index ea657e4cf..da141d7ce 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php @@ -6,11 +6,6 @@ use Doctrine\Tests\Mocks\HydratorMockStatement; require_once __DIR__ . '/../../TestInit.php'; -/** - * Description of SingleScalarHydratorTest - * - * @author robo - */ class SingleScalarHydratorTest extends HydrationTest { /** Result set provider for the HYDRATE_SINGLE_SCALAR tests */ @@ -91,7 +86,5 @@ class SingleScalarHydratorTest extends HydrationTest $this->fail(); } catch (\Doctrine\ORM\Internal\Hydration\HydrationException $ex) {} } - } -} - +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Mapping/AllTests.php b/tests/Doctrine/Tests/ORM/Mapping/AllTests.php index dadf9646b..a6616af11 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AllTests.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AllTests.php @@ -28,4 +28,4 @@ class AllTests if (PHPUnit_MAIN_METHOD == 'Orm_Mapping_AllTests::main') { AllTests::main(); -} +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php index e2205008a..febcbbb5f 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php @@ -1,8 +1,4 @@ assertEquals('table', $cm1->getIdGeneratorType()); } - public function testGetMetadataForClassInHierarchy() { + public function testGetMetadataForClassInHierarchy() + { $mockPlatform = new DatabasePlatformMock(); $mockPlatform->setPrefersIdentityColumns(true); $mockDriver = new MetadataDriverMock(); @@ -120,29 +114,39 @@ class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase { } /* Test subject class with overriden factory method for mocking purposes */ -class ClassMetadataFactoryTestSubject extends \Doctrine\ORM\Mapping\ClassMetadataFactory { +class ClassMetadataFactoryTestSubject extends \Doctrine\ORM\Mapping\ClassMetadataFactory +{ private $_mockMetadata = array(); private $_requestedClasses = array(); + /** @override */ - protected function _newClassMetadataInstance($className) { + protected function _newClassMetadataInstance($className) + { $this->_requestedClasses[] = $className; if ( ! isset($this->_mockMetadata[$className])) { throw new InvalidArgumentException("No mock metadata found for class $className."); } return $this->_mockMetadata[$className]; } - public function setMetadataForClass($className, $metadata) { + + public function setMetadataForClass($className, $metadata) + { $this->_mockMetadata[$className] = $metadata; } - public function getRequestedClasses() { return $this->_requestedClasses; } + + public function getRequestedClasses() + { + return $this->_requestedClasses; + } } /* Test classes */ -class TestEntity1 { +class TestEntity1 +{ protected $name; protected $other; } -class TestEntity2 extends TestEntity1 {} -class TestEntity3 extends TestEntity2 {} +class TestEntity2 extends TestEntity1 {} +class TestEntity3 extends TestEntity2 {} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php index e6329f719..7e7e51968 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php @@ -8,7 +8,8 @@ require_once __DIR__ . '/../../TestInit.php'; class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase { - public function testClassMetadataInstanceSerialization() { + public function testClassMetadataInstanceSerialization() + { $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); // Test initial state diff --git a/tests/Doctrine/Tests/ORM/Performance/AllTests.php b/tests/Doctrine/Tests/ORM/Performance/AllTests.php deleted file mode 100644 index ddf689d21..000000000 --- a/tests/Doctrine/Tests/ORM/Performance/AllTests.php +++ /dev/null @@ -1,30 +0,0 @@ -addTestSuite('Orm_Performance_xxxTest'); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'Orm_Performance_AllTests::main') { - Orm_Performance_AllTests::main(); -} diff --git a/tests/Doctrine/Tests/ORM/Query/AllTests.php b/tests/Doctrine/Tests/ORM/Query/AllTests.php index e2826da99..344310a5e 100644 --- a/tests/Doctrine/Tests/ORM/Query/AllTests.php +++ b/tests/Doctrine/Tests/ORM/Query/AllTests.php @@ -2,22 +2,12 @@ namespace Doctrine\Tests\ORM\Query; - - if (!defined('PHPUnit_MAIN_METHOD')) { define('PHPUnit_MAIN_METHOD', 'Orm_Query_AllTests::main'); } require_once __DIR__ . '/../../TestInit.php'; -#require_once 'IdentifierRecognitionTest.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';*/ - class AllTests { public static function main() @@ -31,8 +21,9 @@ class AllTests $suite->addTestSuite('Doctrine\Tests\ORM\Query\IdentifierRecognitionTest'); $suite->addTestSuite('Doctrine\Tests\ORM\Query\SelectSqlGenerationTest'); + /* - $suite->addTestSuite('Orm_Query_LanguageRecognitionTest'); + $suite->addTestSuite('Doctrine\Tests\ORM\Query\LanguageRecognitionTest'); $suite->addTestSuite('Orm_Query_ScannerTest'); $suite->addTestSuite('Orm_Query_DqlGenerationTest'); $suite->addTestSuite('Orm_Query_DeleteSqlGenerationTest'); @@ -44,4 +35,4 @@ class AllTests if (PHPUnit_MAIN_METHOD == 'Orm_Query_AllTests::main') { AllTests::main(); -} +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php b/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php index 1ad41acd3..f783353c4 100644 --- a/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php +++ b/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php @@ -1,43 +1,17 @@ . - */ -require_once 'lib/DoctrineTestInit.php'; -/** - * Test case for testing the saving and referencing of query identifiers. - * - * @package Doctrine - * @subpackage Query - * @author Guilherme Blanco - * @author Janne Vanhala - * @author Konsta Vesterinen - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link http://www.phpdoctrine.org - * @since 2.0 - * @version $Revision$ - * @todo 1) [romanb] We might want to split the SQL generation tests into multiple - * testcases later since we'll have a lot of them and we might want to have special SQL - * generation tests for some dbms specific SQL syntaxes. - */ -class Orm_Query_LanguageRecognitionTest extends Doctrine_OrmTestCase +require_once __DIR__ . '/../../TestInit.php'; + +class LanguageRecognitionTest extends \Doctrine\Tests\OrmTestCase { + private $_em; + + protected function setUp() + { + $this->_em = $this->_getTestEntityManager(); + } + public function assertValidDql($dql, $debug = false) { try { @@ -78,147 +52,134 @@ class Orm_Query_LanguageRecognitionTest extends Doctrine_OrmTestCase public function testPlainFromClauseWithoutAlias() { - $this->assertValidDql('SELECT * FROM CmsUser'); + $this->assertValidDql('SELECT * FROM Doctrine\Tests\Models\CMS\CmsUser'); - $this->assertValidDql('SELECT id FROM CmsUser'); + $this->assertValidDql('SELECT id FROM Doctrine\Tests\Models\CMS\CmsUser'); } public function testPlainFromClauseWithAlias() { - $this->assertValidDql('SELECT u.id FROM CmsUser u'); + $this->assertValidDql('SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u'); } public function testSelectSingleComponentWithAsterisk() { - $this->assertValidDql('SELECT u.* FROM CmsUser u'); + $this->assertValidDql('SELECT u.* FROM Doctrine\Tests\Models\CMS\CmsUser u'); } public function testInvalidSelectSingleComponentWithAsterisk() { - $this->assertInvalidDql('SELECT p.* FROM CmsUser u'); + $this->assertInvalidDql('SELECT p.* FROM Doctrine\Tests\Models\CMS\CmsUser u'); } public function testSelectSingleComponentWithMultipleColumns() { - $this->assertValidDql('SELECT u.name, u.username FROM CmsUser u'); + $this->assertValidDql('SELECT u.name, u.username FROM Doctrine\Tests\Models\CMS\CmsUser u'); } public function testSelectMultipleComponentsWithAsterisk() { - $this->assertValidDql('SELECT u.*, p.* FROM CmsUser u, u.phonenumbers p'); + $this->assertValidDql('SELECT u.*, p.* FROM Doctrine\Tests\Models\CMS\CmsUser u, u.phonenumbers p'); } public function testSelectDistinctIsSupported() { - $this->assertValidDql('SELECT DISTINCT u.name FROM CmsUser u'); + $this->assertValidDql('SELECT DISTINCT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u'); } public function testAggregateFunctionInSelect() { - $this->assertValidDql('SELECT COUNT(u.id) FROM CmsUser u'); + $this->assertValidDql('SELECT COUNT(u.id) FROM Doctrine\Tests\Models\CMS\CmsUser u'); } public function testAggregateFunctionWithDistinctInSelect() { - $this->assertValidDql('SELECT COUNT(DISTINCT u.name) FROM CmsUser u'); + $this->assertValidDql('SELECT COUNT(DISTINCT u.name) FROM Doctrine\Tests\Models\CMS\CmsUser u'); } public function testFunctionalExpressionsSupportedInWherePart() { - $this->assertValidDql("SELECT u.name FROM CmsUser u WHERE TRIM(u.name) = 'someone'"); + $this->assertValidDql("SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE TRIM(u.name) = 'someone'"); } public function testArithmeticExpressionsSupportedInWherePart() { - $this->assertValidDql('SELECT u.* FROM CmsUser u WHERE ((u.id + 5000) * u.id + 3) < 10000000'); + $this->assertValidDql('SELECT u.* FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE ((u.id + 5000) * u.id + 3) < 10000000'); } public function testInExpressionSupportedInWherePart() { - $this->assertValidDql('SELECT * FROM CmsUser WHERE CmsUser.id IN (1, 2)'); + $this->assertValidDql('SELECT * FROM Doctrine\Tests\Models\CMS\CmsUser WHERE CmsUser.id IN (1, 2)'); } public function testNotInExpressionSupportedInWherePart() { - $this->assertValidDql('SELECT * FROM CmsUser WHERE CmsUser.id NOT IN (1)'); + $this->assertValidDql('SELECT * FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id NOT IN (1)'); } public function testExistsExpressionSupportedInWherePart() { - $this->assertValidDql('SELECT u.* FROM CmsUser u WHERE EXISTS (SELECT p.user_id FROM CmsPhonenumber p WHERE p.user_id = u.id)'); + $this->assertValidDql('SELECT u.* FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE EXISTS (SELECT p.user_id FROM Doctrine\Tests\Models\CMS\CmsPhonenumber p WHERE p.user_id = u.id)'); } public function testNotExistsExpressionSupportedInWherePart() { - $this->assertValidDql('SELECT u.* FROM CmsUser u WHERE NOT EXISTS (SELECT p.user_id FROM CmsPhonenumber p WHERE p.user_id = u.id)'); + $this->assertValidDql('SELECT u.* FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE NOT EXISTS (SELECT p.user_id FROM Doctrine\Tests\Models\CMS\CmsPhonenumber p WHERE p.user_id = u.id)'); } public function testLiteralValueAsInOperatorOperandIsSupported() { - $this->assertValidDql('SELECT u.id FROM CmsUser u WHERE 1 IN (1, 2)'); + $this->assertValidDql('SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE 1 IN (1, 2)'); } public function testUpdateWorksWithOneColumn() { - $this->assertValidDql("UPDATE CmsUser u SET u.name = 'someone'"); + $this->assertValidDql("UPDATE Doctrine\Tests\Models\CMS\CmsUser u SET u.name = 'someone'"); } public function testUpdateWorksWithMultipleColumns() { - $this->assertValidDql("UPDATE CmsUser u SET u.name = 'someone', u.username = 'some'"); + $this->assertValidDql("UPDATE Doctrine\Tests\Models\CMS\CmsUser u SET u.name = 'someone', u.username = 'some'"); } public function testUpdateSupportsConditions() { - $this->assertValidDql("UPDATE CmsUser u SET u.name = 'someone' WHERE u.id = 5"); + $this->assertValidDql("UPDATE Doctrine\Tests\Models\CMS\CmsUser u SET u.name = 'someone' WHERE u.id = 5"); } public function testDeleteAll() { - $this->assertValidDql('DELETE FROM CmsUser'); + $this->assertValidDql('DELETE FROM Doctrine\Tests\Models\CMS\CmsUser'); } public function testDeleteWithCondition() { - $this->assertValidDql('DELETE FROM CmsUser WHERE id = 3'); + $this->assertValidDql('DELETE FROM Doctrine\Tests\Models\CMS\CmsUser WHERE id = 3'); } -/* - public function testDeleteWithLimit() - { - // LIMIT is not supported in DELETE - $this->assertValidDql('DELETE FROM CmsUser LIMIT 20'); - } - - public function testDeleteWithLimitAndOffset() - { - // LIMIT and OFFSET are not supported in DELETE - $this->assertValidDql('DELETE FROM CmsUser LIMIT 10 OFFSET 20'); - } -*/ public function testAdditionExpression() { - $this->assertValidDql('SELECT u.*, (u.id + u.id) addition FROM CmsUser u'); + $this->assertValidDql('SELECT u.*, (u.id + u.id) addition FROM Doctrine\Tests\Models\CMS\CmsUser u'); } public function testSubtractionExpression() { - $this->assertValidDql('SELECT u.*, (u.id - u.id) subtraction FROM CmsUser u'); + $this->assertValidDql('SELECT u.*, (u.id - u.id) subtraction FROM Doctrine\Tests\Models\CMS\CmsUser u'); } public function testDivisionExpression() { - $this->assertValidDql('SELECT u.*, (u.id/u.id) division FROM CmsUser u'); + $this->assertValidDql('SELECT u.*, (u.id/u.id) division FROM Doctrine\Tests\Models\CMS\CmsUser u'); } public function testMultiplicationExpression() { - $this->assertValidDql('SELECT u.*, (u.id * u.id) multiplication FROM CmsUser u'); + $this->assertValidDql('SELECT u.*, (u.id * u.id) multiplication FROM Doctrine\Tests\Models\CMS\CmsUser u'); } public function testNegationExpression() { - $this->assertValidDql('SELECT u.*, -u.id negation FROM CmsUser u'); + $this->assertValidDql('SELECT u.*, -u.id negation FROM Doctrine\Tests\Models\CMS\CmsUser u'); } public function testExpressionWithPrecedingPlusSign() @@ -228,78 +189,78 @@ class Orm_Query_LanguageRecognitionTest extends Doctrine_OrmTestCase public function testAggregateFunctionInHavingClause() { - $this->assertValidDql('SELECT u.name FROM CmsUser u LEFT JOIN u.phonenumbers p HAVING COUNT(p.phonenumber) > 2'); - $this->assertValidDql("SELECT u.name FROM CmsUser u LEFT JOIN u.phonenumbers p HAVING MAX(u.name) = 'zYne'"); + $this->assertValidDql('SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u LEFT JOIN u.phonenumbers p HAVING COUNT(p.phonenumber) > 2'); + $this->assertValidDql("SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u LEFT JOIN u.phonenumbers p HAVING MAX(u.name) = 'zYne'"); } public function testMultipleAggregateFunctionsInHavingClause() { - $this->assertValidDql("SELECT u.name FROM CmsUser u LEFT JOIN u.phonenumbers p HAVING MAX(u.name) = 'zYne'"); + $this->assertValidDql("SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u LEFT JOIN u.phonenumbers p HAVING MAX(u.name) = 'zYne'"); } public function testLeftJoin() { - $this->assertValidDql('SELECT u.*, p.* FROM CmsUser u LEFT JOIN u.phonenumbers p'); + $this->assertValidDql('SELECT u.*, p.* FROM Doctrine\Tests\Models\CMS\CmsUser u LEFT JOIN u.phonenumbers p'); } public function testJoin() { - $this->assertValidDql('SELECT u.* FROM CmsUser u JOIN u.phonenumbers'); + $this->assertValidDql('SELECT u.* FROM Doctrine\Tests\Models\CMS\CmsUser u JOIN u.phonenumbers'); } public function testInnerJoin() { - $this->assertValidDql('SELECT u.*, u.phonenumbers.* FROM CmsUser u INNER JOIN u.phonenumbers'); + $this->assertValidDql('SELECT u.*, u.phonenumbers.* FROM Doctrine\Tests\Models\CMS\CmsUser u INNER JOIN u.phonenumbers'); } public function testMultipleLeftJoin() { - $this->assertValidDql('SELECT u.articles.*, u.phonenumbers.* FROM CmsUser u LEFT JOIN u.articles LEFT JOIN u.phonenumbers'); + $this->assertValidDql('SELECT u.articles.*, u.phonenumbers.* FROM Doctrine\Tests\Models\CMS\CmsUser u LEFT JOIN u.articles LEFT JOIN u.phonenumbers'); } public function testMultipleInnerJoin() { - $this->assertValidDql('SELECT u.name FROM CmsUser u INNER JOIN u.articles INNER JOIN u.phonenumbers'); + $this->assertValidDql('SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u INNER JOIN u.articles INNER JOIN u.phonenumbers'); } public function testMultipleInnerJoin2() { - $this->assertValidDql('SELECT u.name FROM CmsUser u INNER JOIN u.articles, u.phonenumbers'); + $this->assertValidDql('SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u INNER JOIN u.articles, u.phonenumbers'); } public function testMixingOfJoins() { - $this->assertValidDql('SELECT u.name, a.topic, p.phonenumber FROM CmsUser u INNER JOIN u.articles a LEFT JOIN u.phonenumbers p'); + $this->assertValidDql('SELECT u.name, a.topic, p.phonenumber FROM Doctrine\Tests\Models\CMS\CmsUser u INNER JOIN u.articles a LEFT JOIN u.phonenumbers p'); } public function testMixingOfJoins2() { - $this->assertInvalidDql('SELECT u.name, u.articles.topic, c.text FROM CmsUser u INNER JOIN u.articles.comments c'); + $this->assertInvalidDql('SELECT u.name, u.articles.topic, c.text FROM Doctrine\Tests\Models\CMS\CmsUser u INNER JOIN u.articles.comments c'); } public function testOrderBySingleColumn() { - $this->assertValidDql('SELECT u.name FROM CmsUser u ORDER BY u.name'); + $this->assertValidDql('SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u ORDER BY u.name'); } public function testOrderBySingleColumnAscending() { - $this->assertValidDql('SELECT u.name FROM CmsUser u ORDER BY u.name ASC'); + $this->assertValidDql('SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u ORDER BY u.name ASC'); } public function testOrderBySingleColumnDescending() { - $this->assertValidDql('SELECT u.name FROM CmsUser u ORDER BY u.name DESC'); + $this->assertValidDql('SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u ORDER BY u.name DESC'); } public function testOrderByMultipleColumns() { - $this->assertValidDql('SELECT u.name, u.username FROM CmsUser u ORDER BY u.username DESC, u.name DESC'); + $this->assertValidDql('SELECT u.name, u.username FROM Doctrine\Tests\Models\CMS\CmsUser u ORDER BY u.username DESC, u.name DESC'); } public function testOrderByWithFunctionExpression() { - $this->assertValidDql('SELECT u.name FROM CmsUser u ORDER BY COALESCE(u.id, u.name) DESC'); + $this->assertValidDql('SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u ORDER BY COALESCE(u.id, u.name) DESC'); } /* public function testSubselectInInExpression() @@ -315,12 +276,12 @@ class Orm_Query_LanguageRecognitionTest extends Doctrine_OrmTestCase */ public function testPositionalInputParameter() { - $this->assertValidDql('SELECT * FROM CmsUser u WHERE u.id = ?'); + $this->assertValidDql('SELECT * FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = ?'); } public function testNamedInputParameter() { - $this->assertValidDql('SELECT * FROM CmsUser u WHERE u.id = :id'); + $this->assertValidDql('SELECT * FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :id'); } /* public function testCustomJoinsAndWithKeywordSupported() @@ -332,32 +293,32 @@ class Orm_Query_LanguageRecognitionTest extends Doctrine_OrmTestCase public function testJoinConditionsSupported() { - $this->assertValidDql("SELECT u.name, p.* FROM CmsUser u LEFT JOIN u.phonenumbers p ON p.phonenumber = '123 123'"); + $this->assertValidDql("SELECT u.name, p.* FROM Doctrine\Tests\Models\CMS\CmsUser u LEFT JOIN u.phonenumbers p ON p.phonenumber = '123 123'"); } public function testIndexByClauseWithOneComponent() { - $this->assertValidDql('SELECT * FROM CmsUser u INDEX BY id'); + $this->assertValidDql('SELECT * FROM Doctrine\Tests\Models\CMS\CmsUser u INDEX BY id'); } public function testIndexBySupportsJoins() { - $this->assertValidDql('SELECT u.*, u.articles.* FROM CmsUser u LEFT JOIN u.articles INDEX BY id'); // INDEX BY is now referring to articles + $this->assertValidDql('SELECT u.*, u.articles.* FROM Doctrine\Tests\Models\CMS\CmsUser u LEFT JOIN u.articles INDEX BY id'); // INDEX BY is now referring to articles } public function testIndexBySupportsJoins2() { - $this->assertValidDql('SELECT u.*, p.* FROM CmsUser u INDEX BY id LEFT JOIN u.phonenumbers p INDEX BY phonenumber'); + $this->assertValidDql('SELECT u.*, p.* FROM Doctrine\Tests\Models\CMS\CmsUser u INDEX BY id LEFT JOIN u.phonenumbers p INDEX BY phonenumber'); } public function testBetweenExpressionSupported() { - $this->assertValidDql("SELECT * FROM CmsUser u WHERE u.name BETWEEN 'jepso' AND 'zYne'"); + $this->assertValidDql("SELECT * FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name BETWEEN 'jepso' AND 'zYne'"); } public function testNotBetweenExpressionSupported() { - $this->assertValidDql("SELECT * FROM CmsUser u WHERE u.name NOT BETWEEN 'jepso' AND 'zYne'"); + $this->assertValidDql("SELECT * FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name NOT BETWEEN 'jepso' AND 'zYne'"); } /* public function testAllExpressionWithCorrelatedSubquery() @@ -380,17 +341,17 @@ class Orm_Query_LanguageRecognitionTest extends Doctrine_OrmTestCase */ public function testLikeExpression() { - $this->assertValidDql("SELECT u.id FROM CmsUser u WHERE u.name LIKE 'z%'"); + $this->assertValidDql("SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name LIKE 'z%'"); } public function testNotLikeExpression() { - $this->assertValidDql("SELECT u.id FROM CmsUser u WHERE u.name NOT LIKE 'z%'"); + $this->assertValidDql("SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name NOT LIKE 'z%'"); } public function testLikeExpressionWithCustomEscapeCharacter() { - $this->assertValidDql("SELECT u.id FROM CmsUser u WHERE u.name LIKE 'z|%' ESCAPE '|'"); + $this->assertValidDql("SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name LIKE 'z|%' ESCAPE '|'"); } /** @@ -403,7 +364,7 @@ class Orm_Query_LanguageRecognitionTest extends Doctrine_OrmTestCase */ public function testImplicitJoinWithCartesianProductAndConditionInWhere() { - $this->assertValidDql("SELECT u.*, a.* FROM CmsUser u, CmsArticle a WHERE u.name = a.topic"); + $this->assertValidDql("SELECT u.*, a.* FROM Doctrine\Tests\Models\CMS\CmsUser u, CmsArticle a WHERE u.name = a.topic"); } public function testImplicitJoinInWhereOnSingleValuedAssociationPathExpression() @@ -416,24 +377,23 @@ class Orm_Query_LanguageRecognitionTest extends Doctrine_OrmTestCase public function testImplicitJoinInWhereOnCollectionValuedPathExpression() { // This should be forbidden, because articles is a collection - $this->assertInvalidDql("SELECT u.* FROM CmsUser u WHERE u.articles.title = ?"); + $this->assertInvalidDql("SELECT u.* FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.articles.title = ?"); } public function testInvalidSyntaxIsRejected() { $this->assertInvalidDql("FOOBAR CmsUser"); - $this->assertInvalidDql("DELETE FROM CmsUser.articles"); - $this->assertInvalidDql("DELETE FROM CmsUser cu WHERE cu.articles.id > ?"); - $this->assertInvalidDql("SELECT user FROM CmsUser user"); + $this->assertInvalidDql("DELETE FROM Doctrine\Tests\Models\CMS\CmsUser.articles"); + $this->assertInvalidDql("DELETE FROM Doctrine\Tests\Models\CMS\CmsUser cu WHERE cu.articles.id > ?"); + $this->assertInvalidDql("SELECT user FROM Doctrine\Tests\Models\CMS\CmsUser user"); // Error message here is: Relation 'comments' does not exist in component 'CmsUser' // This means it is intepreted as: // SELECT u.* FROM CmsUser u JOIN u.articles JOIN u.comments // This seems wrong. "JOIN u.articles.comments" should not be allowed. - $this->assertInvalidDql("SELECT u.* FROM CmsUser u JOIN u.articles.comments"); + $this->assertInvalidDql("SELECT u.* FROM Doctrine\Tests\Models\CMS\CmsUser u JOIN u.articles.comments"); // Currently UNDEFINED OFFSET error //$this->assertInvalidDql("SELECT * FROM CmsUser.articles.comments"); } - -} +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php index 0cd7591ee..8428cabaf 100644 --- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php @@ -1,49 +1,15 @@ . - */ namespace Doctrine\Tests\ORM\Query; require_once __DIR__ . '/../../TestInit.php'; -/** - * Test case for testing the saving and referencing of query identifiers. - * - * @package Doctrine - * @subpackage Query - * @author Guilherme Blanco - * @author Janne Vanhala - * @author Konsta Vesterinen - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @link http://www.phpdoctrine.org - * @since 2.0 - * @version $Revision$ - * @todo 1) [romanb] We might want to split the SQL generation tests into multiple - * testcases later since we'll have a lot of them and we might want to have special SQL - * generation tests for some dbms specific SQL syntaxes. - */ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase { private $_em; - protected function setUp() { + protected function setUp() + { $this->_em = $this->_getTestEntityManager(); } diff --git a/tests/Doctrine/Tests/ORM/Ticket/1Test.php b/tests/Doctrine/Tests/ORM/Ticket/1Test.php deleted file mode 100644 index ed5fe3c2b..000000000 --- a/tests/Doctrine/Tests/ORM/Ticket/1Test.php +++ /dev/null @@ -1,10 +0,0 @@ -assertEquals(0, 0); - } -} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Ticket/AllTests.php b/tests/Doctrine/Tests/ORM/Ticket/AllTests.php deleted file mode 100644 index 40b26961c..000000000 --- a/tests/Doctrine/Tests/ORM/Ticket/AllTests.php +++ /dev/null @@ -1,30 +0,0 @@ -addTestSuite('Orm_Ticket_1Test'); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'Ticket_AllTests::main') { - Ticket_AllTests::main(); -} \ No newline at end of file