Changeset 150

Timestamp:

02/13/07 11:21:57 (1 year ago)

Author:

mrook

Message:

Change classnames, update defaults.properties

Files:

• trunk/classes/phing/tasks/defaults.properties (modified) (1 diff)
• trunk/classes/phing/tasks/ext/phpunit/PHPUnitReportTask.php (moved) (moved from trunk/classes/phing/tasks/ext/phpunit/PHPUnit2ReportTask.php) (1 diff)
• trunk/classes/phing/tasks/ext/phpunit/PHPUnitTask.php (moved) (moved from trunk/classes/phing/tasks/ext/phpunit/PHPUnit2Task.php) (8 diffs)
• trunk/classes/phing/tasks/ext/phpunit/PHPUnitTestRunner.php (moved) (moved from trunk/classes/phing/tasks/ext/phpunit/PHPUnit2TestRunner.php)

trunk/classes/phing/tasks/defaults.properties

@@ -64 +64 @@
-svnexport=phing.tasks.ext.svn.SvnExportTask
-svnupdate=phing.tasks.ext.svn.SvnUpdateTask
-
-
-
-
+
+
+
+
+
+
-coverage-setup=phing.tasks.ext.coverage.CoverageSetupTask
-coverage-merger=phing.tasks.ext.coverage.CoverageMergerTask

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

@@ -37 +37 @@
- * @since 2.1.0
- */
-2
+
-{
-        private $format = "noframes";

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

@@ -27 +27 @@
-
-/**
-
+/3
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
@@ -35 +35 @@
- * @since 2.1.0
- */
-2
+
-{
-        private $batchtests = array();
@@ -85 +85 @@
-                
-                // other dependencies that should only be loaded when class is actually used.
-2
+
-                require_once 'phing/tasks/ext/phpunit/BatchTest.php';
-                require_once 'phing/tasks/ext/phpunit/FormatterElement.php';
@@ -93 +93 @@
-                if (PHPUnitUtil::$installedVersion == 3)
-                {
-
-
+
+
+
+
-                        PHPUnit_Util_Filter::addFileToFilter('phing/Task.php', 'PHING');
-                        PHPUnit_Util_Filter::addFileToFilter('phing/Target.php', 'PHING');
@@ -103 +105 @@
-                else
-                {
-2
-2
+
+
-                        PHPUnit2_Util_Filter::addFileToFilter('phing/Task.php');
-                        PHPUnit2_Util_Filter::addFileToFilter('phing/Target.php');
@@ -231 +233 @@
-        private function execute($suite)
-        {
-2
+
-                
-                $runner->setCodecoverage($this->codecoverage);
@@ -246 +248 @@
-                $retcode = $runner->getRetCode();
-                
-2
+
-                    if ($this->errorproperty) {
-                                $this->project->setNewProperty($this->errorproperty, true);
@@ -253 +255 @@
-                            $this->testfailed = true;
-                        }
-2
+
-                        if ($this->failureproperty) {
-                                $this->project->setNewProperty($this->failureproperty, true);