Ticket #420: PHPUnitTask.php.2.patch

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

@@ -65 +65 @@
         {
             throw new BuildException("PHPUnitTask requires PHP version >= 5.0.3", $this->getLocation());
         }
-        
+
         /**
          * Determine PHPUnit version number
          */
@@ -77 +77 @@
         {
             throw new BuildException("PHPUnitTask requires PHPUnit version >= 3.2.0", $this->getLocation());
         }
-            
+
         /**
          * Other dependencies that should only be loaded when class is actually used.
          */
@@ -92 +92 @@
 
         require_once 'PHPUnit/Framework.php';
         require_once 'PHPUnit/Util/Filter.php';
-            
+
         // point PHPUnit_MAIN_METHOD define to non-existing method
         if (!defined('PHPUnit_MAIN_METHOD'))
         {
             define('PHPUnit_MAIN_METHOD', 'PHPUnitTask::undefined');
         }
-        
+
         $path = realpath($pwd . '/../../../');
         PHPUnit_Util_Filter::addDirectoryToFilter($path);
     }
-    
+
     /**
      * Sets the name of a bootstrap file that is run before
      * executing the tests
@@ -113 +113 @@
     {
         $this->bootstrap = $bootstrap;
     }
-    
+
     function setErrorproperty($value)
     {
         $this->errorproperty = $value;
     }
-    
+
     function setFailureproperty($value)
     {
         $this->failureproperty = $value;
     }
-    
+
     function setIncompleteproperty($value)
     {
         $this->incompleteproperty = $value;
     }
-    
+
     function setSkippedproperty($value)
     {
         $this->skippedproperty = $value;
     }
-    
+
     function setHaltonerror($value)
     {
         $this->haltonerror = $value;
@@ -158 +158 @@
     {
         $this->printsummary = $printsummary;
     }
-    
+
     function setCodecoverage($codecoverage)
     {
         $this->codecoverage = $codecoverage;
@@ -184 +184 @@
     {
         $token = ' ,;';
         $this->excludeGroups = array();
-        $tok = strtok($groups, $token);
+        $tok = strtok($excludeGroups, $token);
         while ($tok !== false) {
             $this->excludeGroups[] = $tok;
             $tok = strtok($token);
@@ -214 +214 @@
         }
 
         $tests = array();
-        
+
         if ($this->printsummary)
         {
             $fe = new FormatterElement();
@@ -222 +222 @@
             $fe->setUseFile(false);
             $this->formatters[] = $fe;
         }
-        
+
         if ($this->bootstrap)
         {
             require_once $this->bootstrap;
         }
-        
+
         foreach ($this->formatters as $fe)
         {
             $formatter = $fe->getFormatter();
@@ -236 +236 @@
             if ($fe->getUseFile())
             {
                 $destFile = new PhingFile($fe->getToDir(), $fe->getOutfile());
-                
+
                 $writer = new FileWriter($destFile->getAbsolutePath());
 
                 $formatter->setOutput($writer);
@@ -248 +248 @@
 
             $formatter->startTestRun();
         }
-        
+
         foreach ($this->batchtests as $batchtest)
         {
             $this->execute($batchtest->getTestSuite());
-        }           
-        
+        }
+
         foreach ($this->formatters as $fe)
         {
             $formatter = $fe->getFormatter();
             $formatter->endTestRun();
         }
-        
+
         if ($this->testfailed)
         {
             throw new BuildException($this->testfailuremessage);
@@ -272 +272 @@
     private function execute($suite)
     {
         $runner = new PHPUnitTestRunner($this->project, $this->groups, $this->excludeGroups);
-        
+
         $runner->setCodecoverage($this->codecoverage);
         $runner->setUseCustomErrorHandler($this->usecustomerrorhandler);
 
@@ -280 +280 @@
         {
             $formatter = $fe->getFormatter();
 
-            $runner->addFormatter($formatter);      
+            $runner->addFormatter($formatter);
         }
-        
+
         $runner->run($suite);
 
         $retcode = $runner->getRetCode();
-        
+
         if ($retcode == PHPUnitTestRunner::ERRORS) {
             if ($this->errorproperty) {
                 $this->project->setNewProperty($this->errorproperty, true);
@@ -299 +299 @@
             if ($this->failureproperty) {
                 $this->project->setNewProperty($this->failureproperty, true);
             }
-            
+
             if ($this->haltonfailure) {
                 $this->testfailed = true;
                 $this->testfailuremessage = $runner->getLastFailureMessage();
@@ -308 +308 @@
             if ($this->incompleteproperty) {
                 $this->project->setNewProperty($this->incompleteproperty, true);
             }
-            
+
             if ($this->haltonincomplete) {
                 $this->testfailed = true;
                 $this->testfailuremessage = $runner->getLastFailureMessage();
@@ -317 +317 @@
             if ($this->skippedproperty) {
                 $this->project->setNewProperty($this->skippedproperty, true);
             }
-            
+
             if ($this->haltonskipped) {
                 $this->testfailed = true;
                 $this->testfailuremessage = $runner->getLastFailureMessage();