Changeset 61a14c5

Timestamp:

11/01/11 15:12:20 (7 months ago)

Author:

mrook

Branches:

master

Children:

a81c6c9

Parents:

d401315

git-author:

Michiel Rook <mrook@…> (11/01/11 15:12:20)

git-committer:

Michiel Rook <mrook@…> (11/01/11 15:12:20)

Message:

Refactoring

Location:

classes/phing/tasks/ext/phpunit

Files:

• BatchTest.php (modified) (3 diffs)
• PHPUnitTask.php (modified) (2 diffs)

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

@@ -166 +166 @@
      * @return array an array of tests.
      */
-    public function elements()
+    protected function elements()
     {
         $filenames = $this->getFilenames();
@@ -191 +191 @@
      * Returns a testsuite containing all the tests in this batch
      *
+     * @deprecated
      * @return PHPUnit_Framework_TestSuite
      */
@@ -206 +207 @@
         return $suite;
     }
+    
+    /**
+     * Add the tests in this batchtest to a test suite
+     * @param PHPUnit_Framework_TestSuite $suite
+     */
+    public function addToTestSuite(PHPUnit_Framework_TestSuite $suite)
+    {
+        foreach ($this->elements() as $element) {
+            $suite->addTestSuite(new ReflectionClass($element));
+        }
+    }
+    
 }

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

@@ -242 +242 @@
         }
         
-        foreach ($this->formatters as $fe)
-        {
-            $formatter = $fe->getFormatter();
-
-            if ($fe->getUseFile())
-            {
-                $destFile = new PhingFile($fe->getToDir(), $fe->getOutfile());
-                
-                $writer = new FileWriter($destFile->getAbsolutePath());
-
-                $formatter->setOutput($writer);
-            }
-            else
-            {
-                $formatter->setOutput($this->getDefaultOutput());
-            }
-
-            $formatter->startTestRun();
-        }
-        
         $suite = new PHPUnit_Framework_TestSuite('AllTests');
         
         foreach ($this->batchtests as $batchtest)
         {
-            $elements = $batchtest->elements();
-            
-            foreach ($elements as $element) {
-                $suite->addTestSuite(new ReflectionClass($element));
-            }
-            
-            //$suite->addTestSuite($batchtest->getTestSuite());
+            $batchtest->addToTestSuite($suite);
         }
         
         $this->execute($suite);
-        
-        foreach ($this->formatters as $fe)
-        {
-            $formatter = $fe->getFormatter();
-            $formatter->endTestRun();
-        }
         
         if ($this->testfailed)
@@ -323 +291 @@
             $formatter = $fe->getFormatter();
 
+            if ($fe->getUseFile())
+            {
+                $destFile = new PhingFile($fe->getToDir(), $fe->getOutfile());
+                
+                $writer = new FileWriter($destFile->getAbsolutePath());
+
+                $formatter->setOutput($writer);
+            }
+            else
+            {
+                $formatter->setOutput($this->getDefaultOutput());
+            }
+
             $runner->addFormatter($formatter);
+
+            $formatter->startTestRun();
         }
         
         $runner->run($suite);
 
+        foreach ($this->formatters as $fe)
+        {
+            $formatter = $fe->getFormatter();
+            $formatter->endTestRun();
+        }
+        
         $retcode = $runner->getRetCode();