Changeset 2f5dd85

Timestamp:

01/20/12 21:56:12 (4 months ago)

Author:

Bryan Davis <bpd@…>

Branches:

master

Children:

4870cff

Parents:

f3e60a4

git-author:

Bryan Davis <bpd@…> (01/20/12 21:56:12)

git-committer:

Bryan Davis <bpd@…> (01/20/12 21:56:12)

Message:

Allow PHPUnit_Framework_TestSuite subclasses.

PHPUnit expects PHPUnit_Framework_TestSuite subclasses to be added to an
existing test suite as real objects rather than as ReflectionClass
wrappers. This small change BatchTest checks the type of each test
before passing it on to PHPUnit and skips the reflection wrapper if the
class is of the correct type.

File:

• classes/phing/tasks/ext/phpunit/BatchTest.php (modified) (2 diffs)

classes/phing/tasks/ext/phpunit/BatchTest.php

@@ -200 +200 @@
         foreach ($this->elements() as $test)
         {
-            $testClass = new ReflectionClass($test);
+            $testClass = new $test();
+            if (!($testClass instanceof PHPUnit_Framework_TestSuite))
+            {
+              $testClass = new ReflectionClass($test);
+            }
             
             $suite->addTestSuite($testClass);
@@ -215 +219 @@
     {
         foreach ($this->elements() as $element) {
-            $suite->addTestSuite(new ReflectionClass($element));
+            $testClass = new $element();
+            if (!($testClass instanceof PHPUnit_Framework_TestSuite))
+            {
+                $testClass = new ReflectionClass($element);
+            }
+            $suite->addTestSuite($testClass);
         }
     }