Fixed calculation of covered percentage for groups of files

CHANGELOG.md

@@ -2,6 +2,7 @@ Unreleased ([changes](https://github.com/colszowka/simplecov/compare/v0.7.0...ma
 -------------------
 
   * [FEATURE] Adds support for Rails 4 command guessing.
+  * [BUGFIX] Average hits per line for groups of files weighed each file equally, ignoring the length of the files.
 
 v0.7.1, 2012-10-12 ([changes](https://github.com/colszowka/simplecov/compare/v0.7.0...v0.7.1))
 -------------------

lib/simplecov/file_list.rb

@@ -39,6 +39,6 @@ def covered_percent
   # Computes the strength (hits / line) based upon lines covered and lines missed
   def covered_strength
     return 0 if empty? or lines_of_code == 0
-    map {|f| f.covered_strength }.inject(&:+).to_f / size
+    covered_lines.to_f / lines_of_code
   end
 end

test/test_file_list.rb

@@ -6,19 +6,17 @@ class TestFileList < Test::Unit::TestCase
       setup do
         original_result = {source_fixture('sample.rb') => [nil, 1, 1, 1, nil, nil, 1, 1, nil, nil],
             source_fixture('app/models/user.rb') => [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil],
-            source_fixture('app/controllers/sample_controller.rb') => [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil]}
+            source_fixture('app/controllers/sample_controller.rb') => [nil, 1, 1, 0, nil, nil, 0, nil, nil, nil]}
         @file_list = SimpleCov::Result.new(original_result).files
       end
 
-      should("have 13 covered_lines") { assert_equal 13, @file_list.covered_lines }
-      should("have 2 missed_lines")   { assert_equal 2, @file_list.missed_lines }
-      should("have 18 never_lines")   { assert_equal 18, @file_list.never_lines }
-      should("have 15 lines_of_code") { assert_equal 15, @file_list.lines_of_code }
+      should("have 11 covered_lines") { assert_equal 11, @file_list.covered_lines }
+      should("have 3 missed_lines")   { assert_equal 3, @file_list.missed_lines }
+      should("have 19 never_lines")   { assert_equal 19, @file_list.never_lines }
+      should("have 14 lines_of_code") { assert_equal 14, @file_list.lines_of_code }
       should("have 3 skipped_lines")  { assert_equal 3, @file_list.skipped_lines }
 
-      should "have correct covered_percent" do
-        assert_equal 100.0*13/15, @file_list.covered_percent
-      end
+      should ("have correct covered_percent") { assert_equal 100.0*11/14, @file_list.covered_percent }
     end
   end
 end