Changeset 349

Timestamp:

02/01/08 16:01:24 (6 months ago)

Author:

hans

Message:

Added some debug logging to BatchTest and also added a require_once for the PHPUnit_Framework class. The reason for this latter addition is that I was getting strange "silent death" PHP errors due to a cyclic requirement in PHPUnit/Framework.php and PHPUnit/Framework/TestListener.php; adding this require() seems to have fixed the issue -- and shouldn't hurt anything.

Files:

• branches/2.3/classes/phing/tasks/ext/phpunit/BatchTest.php (modified) (1 diff)
• branches/2.3/classes/phing/tasks/ext/phpunit/PHPUnitTask.php (modified) (2 diffs)

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

@@ -167 +167 @@
-                        $definedClasses = PHPUnitUtil::getDefinedClasses($filename, $this->classpath);
-                        
+                        foreach($definedClasses as $definedClass) {
+                                $this->project->log("(PHPUnit) Adding $definedClass (from $filename) to tests.", Project::MSG_DEBUG);
+                        }
+                        
-                        $declaredClasses = array_merge($declaredClasses, $definedClasses);
-                }

branches/2.3/classes/phing/tasks/ext/phpunit/PHPUnitTask.php

@@ -107 +107 @@
-                if (PHPUnitUtil::$installedVersion == 3)
-                {
+                        require_once 'PHPUnit/Framework.php';
-                        require_once 'PHPUnit/Util/Filter.php';
-                        
@@ -124 +125 @@
-                else
-                {
+                        require_once 'PHPUnit2/Framework.php';
-                        require_once 'PHPUnit2/Util/Filter.php';
-