simplecov 0.4.2 → 0.5.2

data/test/test_command_guesser.rb

@@ -9,12 +9,12 @@ class TestCommandGuesser < Test::Unit::TestCase
         end
       end
     end
-  
+
     should_guess_command_name "Unit Tests", '/some/path/test/units/foo_bar_test.rb', 'test/units/foo.rb', 'test/foo.rb'
     should_guess_command_name "Functional Tests", '/some/path/test/functional/foo_bar_controller_test.rb'
-    should_guess_command_name "Integration Tests", '/some/path/test/integration/foo_bar_controller_test.rb'  
+    should_guess_command_name "Integration Tests", '/some/path/test/integration/foo_bar_controller_test.rb'
     should_guess_command_name "Cucumber Features", 'features', 'cucumber', 'cucumber features'
     should_guess_command_name "RSpec", '/some/path/spec/foo.rb'
     should_guess_command_name "some_arbitrary_command with arguments", 'some_arbitrary_command with arguments'
   end
-end
+end

data/test/test_file_list.rb

@@ -0,0 +1,24 @@
+require 'helper'
+
+class TestFileList < Test::Unit::TestCase
+  on_ruby "1.9" do
+    context "With a file list from a result" do
+      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]}
+        @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 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
+    end
+  end
+end

data/test/test_filters.rb

@@ -6,70 +6,75 @@ class TestFilters < Test::Unit::TestCase
       setup do
         @source_file = SimpleCov::SourceFile.new(source_fixture('sample.rb'), [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil])
       end
-    
+
       should "pass a new SimpleCov::StringFilter 'foobar'" do
         assert SimpleCov::StringFilter.new('foobar').passes?(@source_file)
       end
-    
+
       should "pass a new SimpleCov::StringFilter 'some/path'" do
         assert SimpleCov::StringFilter.new('some/path').passes?(@source_file)
       end
-    
+
       should "not pass a new SimpleCov::StringFilter 'test/fixtures'" do
         assert !SimpleCov::StringFilter.new('test/fixtures').passes?(@source_file)
       end
-    
+
       should "not pass a new SimpleCov::StringFilter 'test/fixtures/sample.rb'" do
         assert !SimpleCov::StringFilter.new('test/fixtures/sample.rb').passes?(@source_file)
       end
-    
+
       should "not pass a new SimpleCov::StringFilter 'sample.rb'" do
         assert !SimpleCov::StringFilter.new('sample.rb').passes?(@source_file)
       end
-    
+
       should "pass a new SimpleCov::BlockFilter that is not applicable" do
         assert SimpleCov::BlockFilter.new(Proc.new {|s| File.basename(s.filename) == 'foo.rb'}).passes?(@source_file)
       end
-    
+
       should "not pass a new SimpleCov::BlockFilter that is applicable" do
         assert !SimpleCov::BlockFilter.new(Proc.new {|s| File.basename(s.filename) == 'sample.rb'}).passes?(@source_file)
       end
     end
-  
+
     context "with no filters set up and a basic source file in an array" do
       setup do
         SimpleCov.filters = []
         @files = [SimpleCov::SourceFile.new(source_fixture('sample.rb'), [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil])]
       end
-    
+
       should "return 0 items after executing SimpleCov.filtered on files when using a 'sample' string filter" do
         SimpleCov.add_filter "sample"
         assert_equal 0, SimpleCov.filtered(@files).count
       end
-    
+
       should "return 0 items after executing SimpleCov.filtered on files when using a 'test/fixtures/' string filter" do
         SimpleCov.add_filter "test/fixtures"
         assert_equal 0, SimpleCov.filtered(@files).count
       end
-    
+
       should "return 1 item after executing SimpleCov.filtered on files when using a 'fooo' string filter" do
         SimpleCov.add_filter "fooo"
         assert_equal 1, SimpleCov.filtered(@files).count
       end
-    
+
       should "return 0 items after executing SimpleCov.filtered on files when using a block filter that returns true" do
         SimpleCov.add_filter do |src_file|
           true
         end
         assert_equal 0, SimpleCov.filtered(@files).count
       end
-    
+
       should "return 1 item after executing SimpleCov.filtered on files when using an always-false block filter" do
         SimpleCov.add_filter do |src_file|
           false
         end
         assert_equal 1, SimpleCov.filtered(@files).count
       end
+
+      should "return a FileList after filtering" do
+        SimpleCov.add_filter "fooo"
+        assert_equal SimpleCov::FileList, SimpleCov.filtered(@files).class
+      end
     end
   end
 end

data/test/test_merge_helpers.rb

@@ -9,51 +9,51 @@ class TestMergeHelpers < Test::Unit::TestCase
             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('resultset1.rb') => [1, 1, 1, 1]}
-          
+
         @resultset2 = {source_fixture('sample.rb') => [1, nil, 1, 1, nil, nil, 1, 1, nil, nil],
             source_fixture('app/models/user.rb') => [nil, 1, 5, 1, nil, nil, 1, 0, nil, nil],
             source_fixture('app/controllers/sample_controller.rb') => [nil, 3, 1, nil, nil, nil, 1, 0, nil, nil],
             source_fixture('resultset2.rb') => [nil, 1, 1, nil]}
       end
-    
+
       context "a merge" do
         setup do
           assert @merged = @resultset1.merge_resultset(@resultset2)
         end
-      
+
         should "have proper results for sample.rb" do
           assert_equal [1, 1, 2, 2, nil, nil, 2, 2, nil, nil], @merged[source_fixture('sample.rb')]
         end
-      
+
         should "have proper results for user.rb" do
           assert_equal [nil, 2, 6, 2, nil, nil, 2, 0, nil, nil], @merged[source_fixture('app/models/user.rb')]
         end
-      
+
         should "have proper results for sample_controller.rb" do
           assert_equal [nil, 4, 2, 1, nil, nil, 2, 0, nil, nil], @merged[source_fixture('app/controllers/sample_controller.rb')]
         end
-      
+
         should "have proper results for resultset1.rb" do
           assert_equal [1, 1, 1, 1], @merged[source_fixture('resultset1.rb')]
         end
-      
+
         should "have proper results for resultset2.rb" do
           assert_equal [nil, 1, 1, nil], @merged[source_fixture('resultset2.rb')]
         end
       end
-    
+
       # See Github issue #6
       should "return an empty hash when the resultset cache file is empty" do
         File.open(SimpleCov::ResultMerger.resultset_path, "w+") {|f| f.puts ""}
-        assert_equal Hash.new, SimpleCov::ResultMerger.resultset 
+        assert_equal Hash.new, SimpleCov::ResultMerger.resultset
       end
 
-      # See Github issue #6    
+      # See Github issue #6
       should "return an empty hash when the resultset cache file is not present" do
         system "rm #{SimpleCov::ResultMerger.resultset_path}" if File.exist?(SimpleCov::ResultMerger.resultset_path)
-        assert_equal Hash.new, SimpleCov::ResultMerger.resultset 
+        assert_equal Hash.new, SimpleCov::ResultMerger.resultset
       end
-    
+
       context "and results generated from those" do
         setup do
           system "rm #{SimpleCov::ResultMerger.resultset_path}" if File.exist?(SimpleCov::ResultMerger.resultset_path)
@@ -62,46 +62,46 @@ class TestMergeHelpers < Test::Unit::TestCase
           @result2 = SimpleCov::Result.new(@resultset2)
           @result2.command_name = "result2"
         end
-      
+
         context "with stored results" do
           setup do
             assert SimpleCov::ResultMerger.store_result(@result1)
             assert SimpleCov::ResultMerger.store_result(@result2)
           end
-        
+
           should "have stored data in resultset_path yaml file" do
             assert File.readlines(SimpleCov::ResultMerger.resultset_path).length > 50
           end
-        
+
           should "return a hash containing keys ['result1' and 'result2'] for resultset" do
             assert_equal ['result1', 'result2'], SimpleCov::ResultMerger.resultset.keys.sort
           end
-        
+
           should "return proper values for merged_result" do
             assert_equal [nil, 2, 6, 2, nil, nil, 2, 0, nil, nil], SimpleCov::ResultMerger.merged_result.source_files.find {|s| s.filename =~ /user/}.lines.map(&:coverage)
           end
-        
+
           context "with second result way above the merge_timeout" do
-            setup do 
+            setup do
               @result2.created_at = Time.now - 172800 # two days ago
               assert SimpleCov::ResultMerger.store_result(@result2)
             end
-          
+
             should "have only one result in SimpleCov::ResultMerger.results" do
               assert_equal 1, SimpleCov::ResultMerger.results.length
             end
           end
-        
+
           context "with merging disabled" do
             setup { SimpleCov.use_merging false }
-          
+
             should "return nil for SimpleCov.result" do
               assert_nil SimpleCov.result
             end
           end
         end
-      
+
       end
     end
   end
-end
+end

data/test/test_result.rb

@@ -11,74 +11,77 @@ class TestResult < Test::Unit::TestCase
             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]}
       end
-  
+
       context "a simple cov result initialized from that" do
         setup { @result = SimpleCov::Result.new(@original_result) }
-    
+
         should "have 3 filenames" do
           assert_equal 3, @result.filenames.count
         end
-    
+
         should "have 3 source files" do
           assert_equal 3, @result.source_files.count
           assert @result.source_files.all? {|s| s.instance_of?(SimpleCov::SourceFile)}, "Not alL instances are of SimpleCov::SourceFile type"
         end
-    
+
+        should "return an instance of SimpleCov::FileList for source_files and files" do
+          assert_equal SimpleCov::FileList, @result.source_files.class
+          assert_equal SimpleCov::FileList, @result.files.class
+        end
+
         should "have files equal to source_files" do
           assert_equal @result.files, @result.source_files
         end
-      
+
         should "have accurate covered percent" do
           # in our fixture, there are 13 covered line (result in 1) in all 15 relevant line (result in non-nil)
           assert_equal 100.0*13/15, @result.covered_percent
         end
-      
-        context "dumped with to_yaml" do
-          setup { @yaml = @result.to_yaml }
-          should("be a string") { assert_equal String, @yaml.class }
-        
+
+        context "dumped with to_hash" do
+          setup { @hash = @result.to_hash }
+          should("be a hash") { assert_equal Hash, @hash.class }
+
           context "loaded back with from_yaml" do
-            setup { @dumped_result = SimpleCov::Result.from_yaml(@yaml) }
-          
+            setup { @dumped_result = SimpleCov::Result.from_hash(@hash) }
+
             should "have 3 source files" do
               assert_equal @result.source_files.count, @dumped_result.source_files.count
             end
-          
+
             should "have the same covered_percent" do
               assert_equal @result.covered_percent, @dumped_result.covered_percent
             end
-          
-            should "have the same created_at" do
-              # Using to_i here since direct comparison seems to fail on 64-bit architecture because
-              # of fraction difference...
+
+            should "have the same timestamp" do
               assert_equal @result.created_at.to_i, @dumped_result.created_at.to_i
             end
-          
+
             should "have the same command_name" do
               assert_equal @result.command_name, @dumped_result.command_name
             end
-          
+
             should "have the same original_result" do
               assert_equal @result.original_result, @dumped_result.original_result
             end
           end
         end
       end
-    
+
       context "with some filters set up" do
         setup do
           SimpleCov.add_filter 'sample.rb'
         end
-      
+
         should "have 2 files in a new simple cov result" do
           assert_equal 2, SimpleCov::Result.new(@original_result).source_files.length
         end
-      
+
         should "have 80 covered percent" do
           assert_equal 80, SimpleCov::Result.new(@original_result).covered_percent
         end
       end
-    
+
       context "with groups set up for all files" do
         setup do
           SimpleCov.add_group 'Models', 'app/models'
@@ -88,28 +91,28 @@ class TestResult < Test::Unit::TestCase
           end
           @result = SimpleCov::Result.new(@original_result)
         end
-      
+
         should "have 3 groups" do
           assert_equal 3, @result.groups.length
         end
-      
+
         should "have user.rb in 'Models' group" do
           assert_equal 'user.rb', File.basename(@result.groups['Models'].first.filename)
         end
-      
+
         should "have sample_controller.rb in 'Controllers' group" do
           assert_equal 'sample_controller.rb', File.basename(@result.groups['Controllers'].first.filename)
         end
-      
+
         context "and simple formatter being used" do
           setup {SimpleCov.formatter = SimpleCov::Formatter::SimpleFormatter}
-        
+
           should "return a formatted string with result.format!" do
             assert_equal String, @result.format!.class
           end
         end
       end
-  
+
       context "with groups set up that do not match all files" do
         setup do
           SimpleCov.configure do
@@ -118,11 +121,11 @@ class TestResult < Test::Unit::TestCase
           end
           @result = SimpleCov::Result.new(@original_result)
         end
-      
+
         should "have 3 groups" do
           assert_equal 3, @result.groups.length
         end
-      
+
         should "have 1 item per group" do
           @result.groups.each do |name, files|
             assert_equal 1, files.length, "Group #{name} should have 1 file"
@@ -132,6 +135,12 @@ class TestResult < Test::Unit::TestCase
         should "have sample.rb in 'Ungrouped' group" do
           assert_equal 'sample.rb', File.basename(@result.groups['Ungrouped'].first.filename)
         end
+
+        should "return all groups as instances of SimpleCov::FileList" do
+          @result.groups.each do |name, files|
+            assert_equal SimpleCov::FileList, files.class
+          end
+        end
       end
     end
   end

data/test/test_return_codes.rb

@@ -15,25 +15,25 @@ class TestReturnCodes < Test::Unit::TestCase
         `ruby testunit_good.rb`
         assert_equal 0, $?.exitstatus
       end
-    
+
       should "have return code 0 when running rspec_good.rb" do
         `rspec rspec_good.rb`
         assert_equal 0, $?.exitstatus
       end
-    
+
       should "have non-0 return code when running testunit_bad.rb" do
         `ruby testunit_bad.rb`
         assert_not_equal 0, $?.exitstatus
       end
-    
+
       should "have return code 1 when running rspec_bad.rb" do
         `rspec rspec_bad.rb`
         assert_not_equal 0, $?.exitstatus
       end
-    
+
       teardown do
         Dir.chdir(@current_dir)
       end
     end
   end
-end
+end

data/test/test_source_file.rb

@@ -2,50 +2,74 @@ require 'helper'
 
 class TestSourceFile < Test::Unit::TestCase
   on_ruby '1.9' do
+    COVERAGE_FOR_SAMPLE_RB = [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil, nil, nil, nil, nil, nil, nil]
     context "A source file initialized with some coverage data" do
       setup do
-        @source_file = SimpleCov::SourceFile.new(source_fixture('sample.rb'), [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil])
+        @source_file = SimpleCov::SourceFile.new(source_fixture('sample.rb'), COVERAGE_FOR_SAMPLE_RB)
       end
-    
+
       should "have a filename" do
         assert @source_file.filename
       end
-    
+
       should "have source equal to src" do
         assert_equal @source_file.source, @source_file.src
       end
-    
+
       should "have source_lines equal to lines" do
         assert_equal @source_file.source_lines, @source_file.lines
       end
-    
-      should "have 10 source lines" do
-        assert_equal 10, @source_file.lines.count
+
+      should "have 16 source lines" do
+        assert_equal 16, @source_file.lines.count
       end
-    
+
       should "have all source lines of type SimpleCov::SourceFile::Line" do
         assert @source_file.lines.all? {|l| l.instance_of?(SimpleCov::SourceFile::Line)}
       end
-    
+
       should "have 'class Foo' as line(2).source" do
         assert_equal "class Foo\n", @source_file.line(2).source
       end
-    
+
       should "return lines number 2, 3, 4, 7 for covered_lines" do
         assert_equal [2, 3, 4, 7], @source_file.covered_lines.map(&:line)
       end
-    
+
       should "return lines number 8 for missed_lines" do
         assert_equal [8], @source_file.missed_lines.map(&:line)
       end
-    
-      should "return lines number 1, 5, 6, 9, 10 for never_lines" do
-        assert_equal [1, 5, 6, 9, 10], @source_file.never_lines.map(&:line)
+
+      should "return lines number 1, 5, 6, 9, 10, 11, 15, 16 for never_lines" do
+        assert_equal [1, 5, 6, 9, 10, 11, 15, 16], @source_file.never_lines.map(&:line)
+      end
+
+      should "return line numbers 12, 13, 14 for skipped_lines" do
+        assert_equal [12, 13, 14], @source_file.skipped_lines.map(&:line)
       end
-    
+
       should "have 80% covered_percent" do
         assert_equal 80.0, @source_file.covered_percent
       end
     end
+
+    context "Simulating potential Ruby 1.9 defect -- see Issue #56" do
+      setup do
+        @source_file = SimpleCov::SourceFile.new(source_fixture('sample.rb'), COVERAGE_FOR_SAMPLE_RB + [nil])
+      end
+
+      should "have 16 source lines regardless of extra data in coverage array" do
+        # Do not litter test output with known warning
+        capture_stderr { assert_equal 16, @source_file.lines.count }
+      end
+
+      should "print a warning to stderr if coverage array contains more data than lines in the file" do
+        captured_output = capture_stderr do
+          @source_file.lines
+        end
+
+        assert_match /^Warning: coverage data provided/, captured_output
+      end
+    end
   end
 end