Remove AllTests approach to PHPUnit and work with a phpunit.xml.dist …

…from the top level of the repository.
mrtorrent · Jun 18, 2011 · 983dd1d · 983dd1d
1 parent 8e8a2c0
commit 983dd1d
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 207 deletions.
diff --git a/tests/dbproperties.xml.dev → phpunit.xml.dist b/tests/dbproperties.xml.dev → phpunit.xml.dist
@@ -8,18 +8,30 @@
         2) Edit the file and fill in your settings (database name, type, username, etc.)
            Just change the "value"s, not the names of the var elements.
         3) To run the tests against the database type the following from within the
-           tests/ folder: phpunit --configuration <filename> ...
-           Example: phpunit --configuration mysqlconf.xml AllTests
+           tests/ folder: phpunit -c <filename> ...
+           Example: phpunit -c mysqlconf.xml
 -->
-<phpunit>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="./tests/Doctrine/Tests/TestInit.php"
+>
   <php>
     <!-- "Real" test database -->
+    <!-- Uncomment, otherwise SQLite runs
     <var name="db_type" value="pdo_mysql"/>
     <var name="db_host" value="localhost" />
     <var name="db_username" value="root" />
     <var name="db_password" value="" />
     <var name="db_name" value="doctrine_tests" />
     <var name="db_port" value="3306"/>
+    -->
     <!--<var name="db_event_subscribers" value="Doctrine\DBAL\Event\Listeners\OracleSessionInit">-->
 
     <!-- Database for temporary connections (i.e. to drop/create the main database) -->
@@ -30,4 +42,10 @@
     <var name="tmpdb_name" value="doctrine_tests_tmp" />
     <var name="tmpdb_port" value="3306"/>
   </php>
+
+    <testsuites>
+        <testsuite name="Doctrine DBAL Test Suite">
+            <directory>./tests/Doctrine/Tests/DBAL</directory>
+        </testsuite>
+    </testsuites>
 </phpunit>
diff --git a/tests/Doctrine/Tests/AllTests.php b/tests/Doctrine/Tests/AllTests.php
diff --git a/tests/Doctrine/Tests/DBAL/AllTests.php b/tests/Doctrine/Tests/DBAL/AllTests.php
diff --git a/tests/Doctrine/Tests/DBAL/Functional/AllTests.php b/tests/Doctrine/Tests/DBAL/Functional/AllTests.php
diff --git a/tests/Doctrine/Tests/DbalFunctionalTestSuite.php b/tests/Doctrine/Tests/DbalFunctionalTestSuite.php
diff --git a/tests/Doctrine/Tests/DbalTestSuite.php b/tests/Doctrine/Tests/DbalTestSuite.php
diff --git a/tests/Doctrine/Tests/DoctrineTestSuite.php b/tests/Doctrine/Tests/DoctrineTestSuite.php
diff --git a/tests/Doctrine/Tests/TestInit.php b/tests/Doctrine/Tests/TestInit.php
@@ -11,14 +11,12 @@
 $classLoader = new \Doctrine\Common\ClassLoader('Doctrine\Common', __DIR__ . '/../../../lib/vendor/doctrine-common/lib');
 $classLoader->register();
 
-$classLoader = new \Doctrine\Common\ClassLoader('Doctrine');
+$classLoader = new \Doctrine\Common\ClassLoader('Doctrine\DBAL', __DIR__ . '/../../../lib');
+$classLoader->register();
+
+$classLoader = new \Doctrine\Common\ClassLoader('Doctrine\Tests', __DIR__ . '/../../');
 $classLoader->register();
 
 $classLoader = new \Doctrine\Common\ClassLoader('Symfony', __DIR__ . "/../../../lib/vendor");
 $classLoader->register();
 
-set_include_path(
-    __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'lib'
-    . PATH_SEPARATOR .
-    get_include_path() 
-);