From fa7574b2bab57ab7adf7b071de70d63ee8a39de4 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sat, 18 Jun 2011 22:49:25 +0200
Subject: [PATCH] Removed AllTests files and Suites

---
 tests/Doctrine/Tests/AllTests.php             | 33 --------
 .../Tests/DbalFunctionalTestSuite.php         | 19 -----
 tests/Doctrine/Tests/DbalTestSuite.php        | 10 ---
 tests/Doctrine/Tests/DoctrineTestSuite.php    | 11 ---
 tests/Doctrine/Tests/ORM/AllTests.php         | 41 ----------
 tests/Doctrine/Tests/ORM/Entity/AllTests.php  | 31 --------
 .../Tests/ORM/Functional/AllTests.php         | 75 -------------------
 .../Tests/ORM/Functional/Locking/AllTests.php | 31 --------
 .../ORM/Functional/SchemaTool/AllTests.php    | 33 --------
 .../Tests/ORM/Functional/Ticket/AllTests.php  | 34 ---------
 .../Doctrine/Tests/ORM/Hydration/AllTests.php | 36 ---------
 tests/Doctrine/Tests/ORM/Id/AllTests.php      | 31 --------
 tests/Doctrine/Tests/ORM/Mapping/AllTests.php | 39 ----------
 .../Tests/ORM/Performance/AllTests.php        | 32 --------
 tests/Doctrine/Tests/ORM/Proxy/AllTests.php   | 30 --------
 tests/Doctrine/Tests/ORM/Query/AllTests.php   | 37 ---------
 tests/Doctrine/Tests/ORM/Tools/AllTests.php   | 40 ----------
 .../Doctrine/Tests/OrmFunctionalTestSuite.php | 15 ----
 tests/Doctrine/Tests/OrmTestSuite.php         | 10 ---
 19 files changed, 588 deletions(-)
 delete mode 100644 tests/Doctrine/Tests/AllTests.php
 delete mode 100644 tests/Doctrine/Tests/DbalFunctionalTestSuite.php
 delete mode 100644 tests/Doctrine/Tests/DbalTestSuite.php
 delete mode 100644 tests/Doctrine/Tests/DoctrineTestSuite.php
 delete mode 100644 tests/Doctrine/Tests/ORM/AllTests.php
 delete mode 100644 tests/Doctrine/Tests/ORM/Entity/AllTests.php
 delete mode 100644 tests/Doctrine/Tests/ORM/Functional/AllTests.php
 delete mode 100644 tests/Doctrine/Tests/ORM/Functional/Locking/AllTests.php
 delete mode 100644 tests/Doctrine/Tests/ORM/Functional/SchemaTool/AllTests.php
 delete mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/AllTests.php
 delete mode 100644 tests/Doctrine/Tests/ORM/Hydration/AllTests.php
 delete mode 100644 tests/Doctrine/Tests/ORM/Id/AllTests.php
 delete mode 100644 tests/Doctrine/Tests/ORM/Mapping/AllTests.php
 delete mode 100644 tests/Doctrine/Tests/ORM/Performance/AllTests.php
 delete mode 100644 tests/Doctrine/Tests/ORM/Proxy/AllTests.php
 delete mode 100644 tests/Doctrine/Tests/ORM/Query/AllTests.php
 delete mode 100644 tests/Doctrine/Tests/ORM/Tools/AllTests.php
 delete mode 100644 tests/Doctrine/Tests/OrmFunctionalTestSuite.php
 delete mode 100644 tests/Doctrine/Tests/OrmTestSuite.php

diff --git a/tests/Doctrine/Tests/AllTests.php b/tests/Doctrine/Tests/AllTests.php
deleted file mode 100644
index 032366d04..000000000
--- a/tests/Doctrine/Tests/AllTests.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Doctrine\Tests;
-
-use Doctrine\Tests\Common;
-use Doctrine\Tests\ORM;
-use Doctrine\Tests\DBAL;
-
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'AllTests::main');
-}
-
-require_once __DIR__ . '/TestInit.php';
-
-class AllTests
-{
-    public static function main()
-    {
-        \PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
-
-    public static function suite()
-    {
-        $suite = new DoctrineTestSuite('Doctrine Tests');
-        $suite->addTest(ORM\AllTests::suite());
-
-        return $suite;
-    }
-}
-
-if (PHPUnit_MAIN_METHOD == 'AllTests::main') {
-    AllTests::main();
-}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/DbalFunctionalTestSuite.php b/tests/Doctrine/Tests/DbalFunctionalTestSuite.php
deleted file mode 100644
index e6c78cbd8..000000000
--- a/tests/Doctrine/Tests/DbalFunctionalTestSuite.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Doctrine\Tests;
-
-class DbalFunctionalTestSuite extends DbalTestSuite
-{
-    protected function setUp()
-    {
-        if ( ! isset($this->sharedFixture['conn'])) {
-            $this->sharedFixture['conn'] = TestUtil::getConnection();
-        }
-    }
-    
-    protected function tearDown()
-    {
-        $this->sharedFixture['conn']->close();
-        $this->sharedFixture = null;
-    }
-}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/DbalTestSuite.php b/tests/Doctrine/Tests/DbalTestSuite.php
deleted file mode 100644
index 4f9cc4ef3..000000000
--- a/tests/Doctrine/Tests/DbalTestSuite.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Doctrine\Tests;
-
-/**
- * The outermost test suite for all dbal related testcases & suites.
- */
-class DbalTestSuite extends DoctrineTestSuite
-{  
-}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/DoctrineTestSuite.php b/tests/Doctrine/Tests/DoctrineTestSuite.php
deleted file mode 100644
index 49e36a722..000000000
--- a/tests/Doctrine/Tests/DoctrineTestSuite.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace Doctrine\Tests;
-
-/**
- * Doctrine's basic test suite implementation. Provides functionality needed by all
- * test suites.
- */
-class DoctrineTestSuite extends \PHPUnit_Framework_TestSuite
-{ 
-}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/AllTests.php b/tests/Doctrine/Tests/ORM/AllTests.php
deleted file mode 100644
index fd7c25d7f..000000000
--- a/tests/Doctrine/Tests/ORM/AllTests.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\ORM;
-
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Orm_AllTests::main');
-}
-
-require_once __DIR__ . '/../TestInit.php';
-
-class AllTests
-{
-    public static function main()
-    {
-        \PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
-
-    public static function suite()
-    {
-        $suite = new \Doctrine\Tests\OrmTestSuite('Doctrine Orm');
-
-        $suite->addTestSuite('Doctrine\Tests\ORM\UnitOfWorkTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\EntityManagerTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\CommitOrderCalculatorTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\QueryBuilderTest');
-        $suite->addTest(Query\AllTests::suite());
-        $suite->addTest(Hydration\AllTests::suite());
-        $suite->addTest(Entity\AllTests::suite());
-        $suite->addTest(Mapping\AllTests::suite());
-        $suite->addTest(Functional\AllTests::suite());
-        $suite->addTest(Id\AllTests::suite());
-        $suite->addTest(Proxy\AllTests::suite());
-        $suite->addTest(Tools\AllTests::suite());
-
-        return $suite;
-    }
-}
-
-if (PHPUnit_MAIN_METHOD == 'Orm_AllTests::main') {
-    AllTests::main();
-}
diff --git a/tests/Doctrine/Tests/ORM/Entity/AllTests.php b/tests/Doctrine/Tests/ORM/Entity/AllTests.php
deleted file mode 100644
index 3de6ee880..000000000
--- a/tests/Doctrine/Tests/ORM/Entity/AllTests.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\ORM\Entity;
-
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Orm_Entity_AllTests::main');
-}
-
-require_once __DIR__ . '/../../TestInit.php';
-
-
-class AllTests
-{
-    public static function main()
-    {
-        \PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
-
-    public static function suite()
-    {
-        $suite = new \Doctrine\Tests\DoctrineTestSuite('Doctrine Orm Entity Tests');
-
-        $suite->addTestSuite('Doctrine\Tests\ORM\Entity\ConstructorTest');
-        
-        return $suite;
-    }
-}
-
-if (PHPUnit_MAIN_METHOD == 'Orm_Entity_AllTests::main') {
-    AllTests::main();
-}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/Functional/AllTests.php b/tests/Doctrine/Tests/ORM/Functional/AllTests.php
deleted file mode 100644
index 4dd2b0644..000000000
--- a/tests/Doctrine/Tests/ORM/Functional/AllTests.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\ORM\Functional;
-
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Orm_Functional_AllTests::main');
-}
-
-require_once __DIR__ . '/../../TestInit.php';
-
-class AllTests
-{
-    public static function main()
-    {
-        \PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
-
-    public static function suite()
-    {
-        $suite = new \Doctrine\Tests\OrmFunctionalTestSuite('Doctrine Orm Functional');
-
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\BasicFunctionalTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\DefaultValuesTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\TypeTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\AdvancedAssociationTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\NativeQueryTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\SingleTableInheritanceTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ClassTableInheritanceTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ClassTableInheritanceTest2');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\DetachedEntityTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\QueryCacheTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ResultCacheTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\QueryTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\QueryDqlFunctionTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\AdvancedDqlQueryTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\OneToOneUnidirectionalAssociationTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\OneToOneBidirectionalAssociationTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\OneToOneEagerLoadingTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\OneToManyBidirectionalAssociationTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\OneToManyUnidirectionalAssociationTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ManyToManyBasicAssociationTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ManyToManyUnidirectionalAssociationTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ManyToManyBidirectionalAssociationTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\OneToOneSelfReferentialAssociationTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\OneToManySelfReferentialAssociationTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ManyToManySelfReferentialAssociationTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\OrderedCollectionTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\OrderedJoinedTableInheritanceCollectionTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\IndexByAssociationTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\CompositePrimaryKeyTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ReferenceProxyTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\LifecycleCallbackTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\StandardEntityPersisterTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\CustomTreeWalkersTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\MappedSuperclassTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\EntityRepositoryTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\IdentityMapTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\DatabaseDriverTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\PostgreSQLIdentityStrategyTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ExtraLazyCollectionTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ClearEventTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ReadOnlyTest');
-        
-        $suite->addTest(Locking\AllTests::suite());
-        $suite->addTest(Ticket\AllTests::suite());
-        $suite->addTest(SchemaTool\AllTests::suite());
-
-        
-        return $suite;
-    }
-}
-
-if (PHPUnit_MAIN_METHOD == 'Orm_Functional_AllTests::main') {
-    AllTests::main();
-}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/AllTests.php b/tests/Doctrine/Tests/ORM/Functional/Locking/AllTests.php
deleted file mode 100644
index be725f0b0..000000000
--- a/tests/Doctrine/Tests/ORM/Functional/Locking/AllTests.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\ORM\Functional\Locking;
-
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Orm_Functional_Locking_AllTests::main');
-}
-
-require_once __DIR__ . '/../../../TestInit.php';
-
-class AllTests
-{
-    public static function main()
-    {
-        \PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
-
-    public static function suite()
-    {
-        $suite = new \Doctrine\Tests\DoctrineTestSuite('Doctrine Orm Functional Locking');
-
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\Locking\OptimisticTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\Locking\LockTest');
-
-        return $suite;
-    }
-}
-
-if (PHPUnit_MAIN_METHOD == 'Orm_Functional_Locking_AllTests::main') {
-    AllTests::main();
-}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/AllTests.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/AllTests.php
deleted file mode 100644
index d9479b98a..000000000
--- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/AllTests.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\ORM\Functional\SchemaTool;
-
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Orm_Functional_Tools_AllTests::main');
-}
-
-require_once __DIR__ . '/../../../TestInit.php';
-
-class AllTests
-{
-    public static function main()
-    {
-        \PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
-
-    public static function suite()
-    {
-        $suite = new \Doctrine\Tests\DoctrineTestSuite('Doctrine Orm Functional Tools');
-
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\SchemaTool\CompanySchemaTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\SchemaTool\MySqlSchemaToolTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\SchemaTool\PostgreSqlSchemaToolTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\SchemaTool\DDC214Test');
-
-        return $suite;
-    }
-}
-
-if (PHPUnit_MAIN_METHOD == 'Orm_Functional_Tools_AllTests::main') {
-    AllTests::main();
-}
\ 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 5820a273f..000000000
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/AllTests.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\ORM\Functional\Ticket;
-
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Orm_Functional_Ticket_AllTests::main');
-}
-
-require_once __DIR__ . '/../../../TestInit.php';
-
-class AllTests
-{
-    public static function main()
-    {
-        \PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
-
-    public static function suite()
-    {
-        $suite = new \Doctrine\Tests\OrmFunctionalTestSuite('Doctrine Orm Ticket Tests');
-
-        $tests = glob(__DIR__ . '/*Test.php');
-        foreach ($tests as $test) {
-            $info = pathinfo($test);
-            $suite->addTestSuite('Doctrine\Tests\ORM\Functional\Ticket\\' . $info['filename']);
-        }
-
-        return $suite;
-    }
-}
-
-if (PHPUnit_MAIN_METHOD == 'Orm_Functional_Ticket_AllTests::main') {
-    AllTests::main();
-}
diff --git a/tests/Doctrine/Tests/ORM/Hydration/AllTests.php b/tests/Doctrine/Tests/ORM/Hydration/AllTests.php
deleted file mode 100644
index d2ecafec3..000000000
--- a/tests/Doctrine/Tests/ORM/Hydration/AllTests.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\ORM\Hydration;
-
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Orm_Hydration_AllTests::main');
-}
-
-require_once __DIR__ . '/../../TestInit.php';
-
-
-class AllTests
-{
-    public static function main()
-    {
-        \PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
-
-    public static function suite()
-    {
-        $suite = new \Doctrine\Tests\DoctrineTestSuite('Doctrine Orm Hydration');
-
-        $suite->addTestSuite('Doctrine\Tests\ORM\Hydration\ObjectHydratorTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Hydration\ArrayHydratorTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Hydration\ScalarHydratorTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Hydration\SingleScalarHydratorTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Hydration\ResultSetMappingTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Hydration\CustomHydratorTest');
-
-        return $suite;
-    }
-}
-
-if (PHPUnit_MAIN_METHOD == 'Orm_Hydration_AllTests::main') {
-    AllTests::main();
-}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/Id/AllTests.php b/tests/Doctrine/Tests/ORM/Id/AllTests.php
deleted file mode 100644
index 87201d915..000000000
--- a/tests/Doctrine/Tests/ORM/Id/AllTests.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\ORM\Id;
-
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Orm_Id_AllTests::main');
-}
-
-require_once __DIR__ . '/../../TestInit.php';
-
-class AllTests
-{
-    public static function main()
-    {
-        \PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
-
-    public static function suite()
-    {
-        $suite = new \Doctrine\Tests\DoctrineTestSuite('Doctrine Orm Id');
-
-        $suite->addTestSuite('Doctrine\Tests\ORM\Id\SequenceGeneratorTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Id\AssignedGeneratorTest');
-
-        return $suite;
-    }
-}
-
-if (PHPUnit_MAIN_METHOD == 'Orm_Id_AllTests::main') {
-    AllTests::main();
-}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/Mapping/AllTests.php b/tests/Doctrine/Tests/ORM/Mapping/AllTests.php
deleted file mode 100644
index 30a8ead5b..000000000
--- a/tests/Doctrine/Tests/ORM/Mapping/AllTests.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\ORM\Mapping;
-
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Orm_Mapping_AllTests::main');
-}
-
-require_once __DIR__ . '/../../TestInit.php';
-
-class AllTests
-{
-    public static function main()
-    {
-        \PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
-
-    public static function suite()
-    {
-        $suite = new \Doctrine\Tests\DoctrineTestSuite('Doctrine Orm Mapping');
-
-        $suite->addTestSuite('Doctrine\Tests\ORM\Mapping\ClassMetadataTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Mapping\XmlMappingDriverTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Mapping\YamlMappingDriverTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Mapping\AnnotationDriverTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Mapping\PHPMappingDriverTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Mapping\StaticPHPMappingDriverTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Mapping\ClassMetadataFactoryTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Mapping\ClassMetadataLoadEventTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Mapping\BasicInheritanceMappingTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Mapping\DriverChainTest');
-
-        return $suite;
-    }
-}
-
-if (PHPUnit_MAIN_METHOD == 'Orm_Mapping_AllTests::main') {
-    AllTests::main();
-}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/Performance/AllTests.php b/tests/Doctrine/Tests/ORM/Performance/AllTests.php
deleted file mode 100644
index b4a993bb2..000000000
--- a/tests/Doctrine/Tests/ORM/Performance/AllTests.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\ORM\Performance;
-
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Orm_Performance_AllTests::main');
-}
-
-require_once __DIR__ . '/../../TestInit.php';
-
-
-class AllTests
-{
-    public static function main()
-    {
-        \PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
-
-    public static function suite()
-    {
-        $suite = new \Doctrine\Tests\DoctrineTestSuite('Doctrine Orm Performance');
-
-        $suite->addTestSuite('Doctrine\Tests\ORM\Performance\HydrationPerformanceTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Performance\InsertPerformanceTest');
-
-        return $suite;
-    }
-}
-
-if (PHPUnit_MAIN_METHOD == 'Orm_Performance_AllTests::main') {
-    AllTests::main();
-}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/Proxy/AllTests.php b/tests/Doctrine/Tests/ORM/Proxy/AllTests.php
deleted file mode 100644
index aeaff5848..000000000
--- a/tests/Doctrine/Tests/ORM/Proxy/AllTests.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\ORM\Proxy;
-
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Orm_Proxy_AllTests::main');
-}
-
-require_once __DIR__ . '/../../TestInit.php';
-
-class AllTests
-{
-    public static function main()
-    {
-        \PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
-
-    public static function suite()
-    {
-        $suite = new \Doctrine\Tests\DoctrineTestSuite('Doctrine Orm Proxy');
-
-        $suite->addTestSuite('Doctrine\Tests\ORM\Proxy\ProxyClassGeneratorTest');
-
-        return $suite;
-    }
-}
-
-if (PHPUnit_MAIN_METHOD == 'Orm_Proxy_AllTests::main') {
-    AllTests::main();
-}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/Query/AllTests.php b/tests/Doctrine/Tests/ORM/Query/AllTests.php
deleted file mode 100644
index 0d94856f9..000000000
--- a/tests/Doctrine/Tests/ORM/Query/AllTests.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\ORM\Query;
-
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Orm_Query_AllTests::main');
-}
-
-require_once __DIR__ . '/../../TestInit.php';
-
-class AllTests
-{
-    public static function main()
-    {
-        \PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
-
-    public static function suite()
-    {
-        $suite = new \Doctrine\Tests\DoctrineTestSuite('Doctrine Orm Query');
-
-        $suite->addTestSuite('Doctrine\Tests\ORM\Query\SelectSqlGenerationTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Query\LanguageRecognitionTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Query\LexerTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Query\DeleteSqlGenerationTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Query\UpdateSqlGenerationTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Query\ExprTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Query\ParserResultTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Query\QueryTest');
-
-        return $suite;
-    }
-}
-
-if (PHPUnit_MAIN_METHOD == 'Orm_Query_AllTests::main') {
-    AllTests::main();
-}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/Tools/AllTests.php b/tests/Doctrine/Tests/ORM/Tools/AllTests.php
deleted file mode 100644
index 4364b5ec6..000000000
--- a/tests/Doctrine/Tests/ORM/Tools/AllTests.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\ORM\Tools;
-
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Orm_Tools_AllTests::main');
-}
-
-require_once __DIR__ . '/../../TestInit.php';
-
-
-class AllTests
-{
-    public static function main()
-    {
-        \PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
-
-    public static function suite()
-    {
-        $suite = new \Doctrine\Tests\DoctrineTestSuite('Doctrine Orm Tools');
-
-        $suite->addTestSuite('Doctrine\Tests\ORM\Tools\Export\YamlClassMetadataExporterTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Tools\Export\XmlClassMetadataExporterTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Tools\Export\PhpClassMetadataExporterTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Tools\Export\AnnotationClassMetadataExporterTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Tools\ConvertDoctrine1SchemaTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Tools\SchemaToolTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Tools\EntityGeneratorTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Tools\SchemaValidatorTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Tools\Console\Command\ConvertDoctrine1SchemaCommandTest');
-        $suite->addTestSuite('Doctrine\Tests\ORM\Tools\SetupTest');
-
-        return $suite;
-    }
-}
-
-if (PHPUnit_MAIN_METHOD == 'Orm_Tools_AllTests::main') {
-    AllTests::main();
-}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/OrmFunctionalTestSuite.php b/tests/Doctrine/Tests/OrmFunctionalTestSuite.php
deleted file mode 100644
index 8d4b8b058..000000000
--- a/tests/Doctrine/Tests/OrmFunctionalTestSuite.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Doctrine\Tests;
-
-/**
- * The outermost test suite for all orm related testcases & suites.
- *
- * Currently the orm suite uses a normal connection object.
- * Upon separation of the DBAL and ORM package this suite should just use a orm
- * connection/session/manager instance as the shared fixture.
- */
-class OrmFunctionalTestSuite extends OrmTestSuite
-{
-
-}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/OrmTestSuite.php b/tests/Doctrine/Tests/OrmTestSuite.php
deleted file mode 100644
index b387b71dc..000000000
--- a/tests/Doctrine/Tests/OrmTestSuite.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Doctrine\Tests;
-
-/**
- * The outermost test suite for all orm related testcases & suites.
- */
-class OrmTestSuite extends DoctrineTestSuite
-{
-}
\ No newline at end of file