Changeset a81c6c9

Timestamp:

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

Author:

mrook

Branches:

master

Children:

4e6f553

Parents:

61a14c5

git-author:

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

git-committer:

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

Message:

Refs #812 - Grab whitelist from coverage database

Location:

classes/phing/tasks/ext

Files:

• coverage/CoverageMerger.php (modified) (3 diffs)
• coverage/CoverageSetupTask.php (modified) (2 diffs)
• phpunit/PHPUnitTestRunner.php (modified) (1 diff)

classes/phing/tasks/ext/coverage/CoverageMerger.php

@@ -73 +73 @@
         return $coverageMerged;
     }
-
-    static function merge($project, $codeCoverageInformation)
+    
+    /**
+     * @param  Project $project
+     * @return Properties
+     * @throws BuildException
+     */
+    protected static function _getDatabase($project)
     {
         $coverageDatabase = $project->getProperty('coverage.database');
@@ -86 +91 @@
         $props = new Properties();
         $props->load($database);
+        
+        return $props;
+    }
+    
+    public static function getWhiteList($project)
+    {
+        $whitelist = array();
+        $props = self::_getDatabase($project);
+        
+        foreach ($props->getProperties() as $property) {
+            $data = unserialize($property);
+            $whitelist[] = $data['fullname'];
+        }
+        
+        return $whitelist;
+    }
+
+    public static function merge($project, $codeCoverageInformation)
+    {
+        $props = self::_getDatabase($project);
         
         $coverageTotal = $codeCoverageInformation;
@@ -125 +150 @@
         }
 
-        $props->store($database);
+        $props->store();
     }
 }

classes/phing/tasks/ext/coverage/CoverageSetupTask.php

@@ -141 +141 @@
     function main()
     {
-        /**
-         * Whitelist files when using PHPUnit > 3.5
-         */
-        @include_once 'PHPUnit/Runner/Version.php';
-
-        if (version_compare(PHPUnit_Runner_Version::id(), '3.5.0') >= 0) {
-            $newFilter = true;
-        } else {
-            $newFilter = false;
-            @include_once 'PHPUnit/Util/Filter.php';
-        }
-        
         $files = $this->getFilenames();
 
@@ -165 +153 @@
             
             $props->setProperty($filename, serialize(array('fullname' => $fullname, 'coverage' => array())));
-            
-            if ($newFilter) {
-                //PHP_CodeCoverage_Filter::getInstance()->addFileToWhiteList($file['fullname']);
-            } else {
-                PHPUnit_Util_Filter::addFileToWhitelist($file['fullname']);
-            }
         }
 

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

@@ -96 +96 @@
         if ($this->codecoverage)
         {
+            $whitelist = CoverageMerger::getWhiteList($this->project);
+            
+            $this->codecoverage->filter()->addFilesToWhiteList($whitelist);
+            
             $res->setCodeCoverage($this->codecoverage);
         }