Merge pull request #20 from Seldaek/tests

Optimized boilerplate of unit tests of doctrine-common
doctrine · May 5, 2011 · d2241e9 · d2241e9
2 parents f45c34a + 9639d5c
commit d2241e9
Show file tree

Hide file tree

Showing 20 changed files with 32 additions and 203 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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"
+>
+    <testsuites>
+        <testsuite name="Doctrine Common Test Suite">
+            <directory>./tests/Doctrine/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./lib/Doctrine/</directory>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/tests/Doctrine/Tests/AllTests.php b/tests/Doctrine/Tests/AllTests.php
diff --git a/tests/Doctrine/Tests/Common/AllTests.php b/tests/Doctrine/Tests/Common/AllTests.php
diff --git a/tests/Doctrine/Tests/Common/Annotations/AllTests.php b/tests/Doctrine/Tests/Common/Annotations/AllTests.php
diff --git a/tests/Doctrine/Tests/Common/Annotations/AnnotationReaderTest.php b/tests/Doctrine/Tests/Common/Annotations/AnnotationReaderTest.php
@@ -4,8 +4,6 @@
 
 use ReflectionClass, Doctrine\Common\Annotations\AnnotationReader;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class AnnotationReaderTest extends \Doctrine\Tests\DoctrineTestCase
 {
     public function testAnnotations()

diff --git a/tests/Doctrine/Tests/Common/Annotations/LexerTest.php b/tests/Doctrine/Tests/Common/Annotations/LexerTest.php
@@ -4,8 +4,6 @@
 
 use Doctrine\Common\Annotations\Lexer;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class LexerTest extends \Doctrine\Tests\DoctrineTestCase
 {
     public function testMarkerAnnotation()

diff --git a/tests/Doctrine/Tests/Common/Annotations/ParserTest.php b/tests/Doctrine/Tests/Common/Annotations/ParserTest.php
@@ -4,8 +4,6 @@
 
 use Doctrine\Common\Annotations\Parser;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class ParserTest extends \Doctrine\Tests\DoctrineTestCase
 {
     public function testBasicAnnotations()

diff --git a/tests/Doctrine/Tests/Common/Cache/AllTests.php b/tests/Doctrine/Tests/Common/Cache/AllTests.php
diff --git a/tests/Doctrine/Tests/Common/Cache/ApcCacheTest.php b/tests/Doctrine/Tests/Common/Cache/ApcCacheTest.php
@@ -4,8 +4,6 @@
 
 use Doctrine\Common\Cache\ApcCache;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class ApcCacheTest extends CacheTest
 {
     public function setUp()

diff --git a/tests/Doctrine/Tests/Common/Cache/ArrayCacheTest.php b/tests/Doctrine/Tests/Common/Cache/ArrayCacheTest.php
@@ -4,8 +4,6 @@
 
 use Doctrine\Common\Cache\ArrayCache;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class ArrayCacheTest extends CacheTest
 {
     protected function _getCacheDriver()

diff --git a/tests/Doctrine/Tests/Common/Cache/CacheTest.php b/tests/Doctrine/Tests/Common/Cache/CacheTest.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\Common\Cache;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 abstract class CacheTest extends \Doctrine\Tests\DoctrineTestCase
 {
     public function testBasics()

diff --git a/tests/Doctrine/Tests/Common/Cache/MemcacheCacheTest.php b/tests/Doctrine/Tests/Common/Cache/MemcacheCacheTest.php
@@ -4,8 +4,6 @@
 
 use Doctrine\Common\Cache\MemcacheCache;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class MemcacheCacheTest extends CacheTest
 {
     private $_memcache;

diff --git a/tests/Doctrine/Tests/Common/Cache/XcacheCacheTest.php b/tests/Doctrine/Tests/Common/Cache/XcacheCacheTest.php
@@ -4,8 +4,6 @@
 
 use Doctrine\Common\Cache\XcacheCache;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class XcacheCacheTest extends CacheTest
 {
     public function setUp()

diff --git a/tests/Doctrine/Tests/Common/ClassLoaderTest.php b/tests/Doctrine/Tests/Common/ClassLoaderTest.php
@@ -4,8 +4,6 @@
 
 use Doctrine\Common\ClassLoader;
 
-require_once __DIR__ . '/../TestInit.php';
-
 class ClassLoaderTest extends \Doctrine\Tests\DoctrineTestCase
 {
     public function testClassLoader()

diff --git a/tests/Doctrine/Tests/Common/Collections/AllTests.php b/tests/Doctrine/Tests/Common/Collections/AllTests.php
diff --git a/tests/Doctrine/Tests/Common/Collections/CollectionTest.php b/tests/Doctrine/Tests/Common/Collections/CollectionTest.php
@@ -4,8 +4,6 @@
 
 use Doctrine\Tests;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class CollectionTest extends \Doctrine\Tests\DoctrineTestCase
 {
     /**

diff --git a/tests/Doctrine/Tests/Common/EventManagerTest.php b/tests/Doctrine/Tests/Common/EventManagerTest.php
@@ -5,8 +5,6 @@
 use Doctrine\Common\EventManager;
 use Doctrine\Common\EventArgs;
 
-require_once __DIR__ . '/../TestInit.php';
-
 class EventManagerTest extends \Doctrine\Tests\DoctrineTestCase
 {
     /* Some pseudo events */

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
@@ -14,7 +14,9 @@
 $classLoader->register();
 
 set_include_path(
-    __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'lib'
+    __DIR__ . '/../../../lib'
+    . PATH_SEPARATOR .
+    __DIR__ . '/../..'
     . PATH_SEPARATOR .
     get_include_path()
 );
diff --git a/tests/README.markdown b/tests/README.markdown
@@ -1,8 +1,10 @@
 # Running the Doctrine 2 Testsuite
 
-## Setting up a PHPUnit Configuration XML
+## Running tests
 
-..
+Execute PHPUnit in the root folder of your doctrine-common clone.
+
+    phpunit
 
 ## Testing Lock-Support