Changeset 592

Timestamp:

10/04/09 23:37:22 (11 months ago)

Author:

mrook

Message:

Refs #363 - make Phing compatible with PHPUnit 3.4

Location:

trunk

Files:

• classes/phing/tasks/ext/phpunit/PHPUnitTestRunner.php (modified) (3 diffs)
• classes/phing/tasks/ext/phpunit/formatter/XMLPHPUnitResultFormatter.php (modified) (3 diffs)
• pear/BuildPhingPEARPackageTask.php (modified) (1 diff)
• test/classes/phing/regression/PhpUnit34Test.php (added)
• test/etc/regression/363 (added)
• test/etc/regression/363/HelloWorld.php (added)
• test/etc/regression/363/HelloWorldTest.php (added)
• test/etc/regression/363/build.xml (added)

trunk/classes/phing/tasks/ext/phpunit/PHPUnitTestRunner.php

@@ -20 +20 @@
  */
 
-require_once 'PHPUnit/Framework/TestSuite.php';
 require_once 'PHPUnit/Util/ErrorHandler.php';
 require_once 'PHPUnit/Util/Filter.php';
@@ -34 +33 @@
  * @since 2.1.0
  */
-class PHPUnitTestRunner extends PHPUnit_Runner_BaseTestRunner
+class PHPUnitTestRunner extends PHPUnit_Runner_BaseTestRunner implements PHPUnit_Framework_TestListener
 {
     const SUCCESS = 0;
@@ -231 +230 @@
         throw new BuildException($message);
     }
+
+    /**
+     * A test suite started.
+     *
+     * @param  PHPUnit_Framework_TestSuite $suite
+     * @since  Method available since Release 2.2.0
+     */
+    public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+    }
+
+    /**
+     * A test suite ended.
+     *
+     * @param  PHPUnit_Framework_TestSuite $suite
+     * @since  Method available since Release 2.2.0
+     */
+    public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+    }
+
+    /**
+     * A test started.
+     *
+     * @param  PHPUnit_Framework_Test $test
+     */
+    public function startTest(PHPUnit_Framework_Test $test)
+    {
+    }
+
+    /**
+     * A test ended.
+     *
+     * @param  PHPUnit_Framework_Test $test
+     * @param  float                  $time
+     */
+    public function endTest(PHPUnit_Framework_Test $test, $time)
+    {
+    }
 }
 

trunk/classes/phing/tasks/ext/phpunit/formatter/XMLPHPUnitResultFormatter.php

@@ -20 +20 @@
  */
 
-require_once 'PHPUnit/Util/Log/XML.php';
+require_once 'PHPUnit/Util/Log/JUnit.php';
 
 require_once 'phing/tasks/ext/phpunit/formatter/PHPUnitResultFormatter.php';
@@ -35 +35 @@
 {
     /**
-     * @var PHPUnit_Util_Log_XML
+     * @var PHPUnit_Util_Log_JUnit
      */
     private $logger = NULL;
@@ -41 +41 @@
     function __construct()
     {
-        $this->logger = new PHPUnit_Util_Log_XML(null, true);
+        $this->logger = new PHPUnit_Util_Log_JUnit(null, true);
         $this->logger->setWriteDocument(false);
     }

trunk/pear/BuildPhingPEARPackageTask.php

@@ -199 +199 @@
             $package->addPackageDepWithChannel( 'optional', 'phingdocs', 'pear.phing.info', $this->version);
             $package->addPackageDepWithChannel( 'optional', 'VersionControl_SVN', 'pear.php.net', '0.3.2');
-            $package->addPackageDepWithChannel( 'optional', 'PHPUnit', 'pear.phpunit.de', '3.2.0');
+            $package->addPackageDepWithChannel( 'optional', 'PHPUnit', 'pear.phpunit.de', '3.4.0');
             $package->addPackageDepWithChannel( 'optional', 'PhpDocumentor', 'pear.php.net', '1.4.0');
             $package->addPackageDepWithChannel( 'optional', 'Xdebug', 'pecl.php.net', '2.0.5');