simplecov 0.7.1 → 0.8.0.pre

data/test/test_result.rb

@@ -1,162 +1,160 @@
 require 'helper'
 
 class TestResult < Test::Unit::TestCase
-  on_ruby "1.9" do
-    context "With a (mocked) Coverage.result" do
-      setup do
-        SimpleCov.filters = []
-        SimpleCov.groups = {}
-        SimpleCov.formatter = nil
-        @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]}
-      end
+  context "With a (mocked) Coverage.result" do
+    setup do
+      SimpleCov.filters = []
+      SimpleCov.groups = {}
+      SimpleCov.formatter = nil
+      @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]}
+    end
 
-      context "a simple cov result initialized from that" do
-        setup { @result = SimpleCov::Result.new(@original_result) }
+    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 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 "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 "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 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
+      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_hash" do
-          setup { @hash = @result.to_hash }
-          should("be a hash") { assert_equal Hash, @hash.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_hash(@hash) }
+        context "loaded back with from_yaml" do
+          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 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 covered_percent" do
+            assert_equal @result.covered_percent, @dumped_result.covered_percent
+          end
 
-            should "have the same timestamp" do
-              assert_equal @result.created_at.to_i, @dumped_result.created_at.to_i
-            end
+          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 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
+          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
+    context "with some filters set up" do
+      setup do
+        SimpleCov.add_filter 'sample.rb'
       end
 
-      context "with groups set up for all files" do
-        setup do
-          SimpleCov.add_group 'Models', 'app/models'
-          SimpleCov.add_group 'Controllers', 'app/controllers'
-          SimpleCov.add_group 'Other' do |src_file|
-            File.basename(src_file.filename) == 'sample.rb'
-          end
-          @result = SimpleCov::Result.new(@original_result)
-        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 3 groups" do
-          assert_equal 3, @result.groups.length
-        end
+      should "have 80 covered percent" do
+        assert_equal 80, SimpleCov::Result.new(@original_result).covered_percent
+      end
+    end
 
-        should "have user.rb in 'Models' group" do
-          assert_equal 'user.rb', File.basename(@result.groups['Models'].first.filename)
+    context "with groups set up for all files" do
+      setup do
+        SimpleCov.add_group 'Models', 'app/models'
+        SimpleCov.add_group 'Controllers', 'app/controllers'
+        SimpleCov.add_group 'Other' do |src_file|
+          File.basename(src_file.filename) == 'sample.rb'
         end
+        @result = SimpleCov::Result.new(@original_result)
+      end
 
-        should "have sample_controller.rb in 'Controllers' group" do
-          assert_equal 'sample_controller.rb', File.basename(@result.groups['Controllers'].first.filename)
-        end
+      should "have 3 groups" do
+        assert_equal 3, @result.groups.length
+      end
 
-        context "and simple formatter being used" do
-          setup {SimpleCov.formatter = SimpleCov::Formatter::SimpleFormatter}
+      should "have user.rb in 'Models' group" do
+        assert_equal 'user.rb', File.basename(@result.groups['Models'].first.filename)
+      end
 
-          should "return a formatted string with result.format!" do
-            assert_equal String, @result.format!.class
-          end
-        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 multi formatter being used" do
-          setup do
-            SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-              SimpleCov::Formatter::SimpleFormatter,
-              SimpleCov::Formatter::SimpleFormatter,
-            ]
-          end
+      context "and simple formatter being used" do
+        setup {SimpleCov.formatter = SimpleCov::Formatter::SimpleFormatter}
 
-          should "return an array containing formatted string with result.format!" do
-            formated = @result.format!
-            assert_equal 2, formated.count
-            assert_equal String, formated.first.class
-          end
+        should "return a formatted string with result.format!" do
+          assert_equal String, @result.format!.class
         end
       end
 
-      context "with groups set up that do not match all files" do
+      context "and multi formatter being used" do
         setup do
-          SimpleCov.configure do
-            add_group 'Models', 'app/models'
-            add_group 'Controllers', 'app/controllers'
-          end
-          @result = SimpleCov::Result.new(@original_result)
+          SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+            SimpleCov::Formatter::SimpleFormatter,
+            SimpleCov::Formatter::SimpleFormatter,
+          ]
         end
 
-        should "have 3 groups" do
-          assert_equal 3, @result.groups.length
+        should "return an array containing formatted string with result.format!" do
+          formated = @result.format!
+          assert_equal 2, formated.count
+          assert_equal String, formated.first.class
         end
+      end
+    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"
-          end
+    context "with groups set up that do not match all files" do
+      setup do
+        SimpleCov.configure do
+          add_group 'Models', 'app/models'
+          add_group 'Controllers', 'app/controllers'
         end
+        @result = SimpleCov::Result.new(@original_result)
+      end
 
-        should "have sample.rb in 'Ungrouped' group" do
-          assert_equal 'sample.rb', File.basename(@result.groups['Ungrouped'].first.filename)
+      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"
         end
+      end
 
-        should "return all groups as instances of SimpleCov::FileList" do
-          @result.groups.each do |name, files|
-            assert_equal SimpleCov::FileList, files.class
-          end
+      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
+end if SimpleCov.usable?

data/test/test_return_codes.rb

@@ -3,37 +3,35 @@ require 'helper'
 # Make sure that exit codes of tests are propagated properly when using
 # simplecov. See github issue #5
 class TestReturnCodes < Test::Unit::TestCase
-  on_ruby '1.8', '1.9' do
-    context "Inside fixtures/frameworks" do
-      setup do
-        @current_dir = Dir.getwd
-        Dir.chdir(File.join(File.dirname(__FILE__), 'fixtures', 'frameworks'))
-        FileUtils.rm_rf('./coverage')
-      end
+  context "Inside fixtures/frameworks" do
+    setup do
+      @current_dir = Dir.getwd
+      Dir.chdir(File.join(File.dirname(__FILE__), 'fixtures', 'frameworks'))
+      FileUtils.rm_rf('./coverage')
+    end
 
-      should "have return code 0 when running testunit_good.rb" do
-        `ruby testunit_good.rb`
-        assert_equal 0, $?.exitstatus
-      end
+    should "have return code 0 when running testunit_good.rb" do
+      `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 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 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
+    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
+    teardown do
+      Dir.chdir(@current_dir)
     end
   end
 end

data/test/test_source_file.rb

@@ -1,95 +1,106 @@
 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'), COVERAGE_FOR_SAMPLE_RB)
-      end
+  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'), COVERAGE_FOR_SAMPLE_RB)
+    end
 
-      should "have a filename" do
-        assert @source_file.filename
-      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 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 source_lines equal to lines" do
+      assert_equal @source_file.source_lines, @source_file.lines
+    end
 
-      should "have 16 source lines" do
-        assert_equal 16, @source_file.lines.count
-      end
+    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 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 "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 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 8 for missed_lines" do
+      assert_equal [8], @source_file.missed_lines.map(&:line)
+    end
 
-      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 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 "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
+    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
+  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 "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 }
+    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
 
-      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
 
-        assert_match(/^Warning: coverage data provided/, captured_output)
+  context "Encoding" do
+    should "handle utf-8 encoded source files" do
+      source_file = SimpleCov::SourceFile.new(source_fixture('utf-8.rb'), [nil, nil, 1])
+
+      assert_nothing_raised do
+        source_file.process_skipped_lines!
       end
     end
 
-    context "Encoding" do
-      should "handle utf-8 encoded source files" do
-        source_file = SimpleCov::SourceFile.new(source_fixture('utf-8.rb'), [nil, nil, 1])
+    should "handle iso-8859 encoded source files" do
+      source_file = SimpleCov::SourceFile.new(source_fixture('iso-8859.rb'), [nil, nil, 1])
 
-        assert_nothing_raised do
-          source_file.process_skipped_lines!
-        end
+      assert_nothing_raised do
+        source_file.process_skipped_lines!
       end
+    end
 
-      should "handle iso-8859 encoded source files" do
-        source_file = SimpleCov::SourceFile.new(source_fixture('iso-8859.rb'), [nil, nil, 1])
+    should "handle utf-8 encoded source files when the default_internal encoding is binary" do
+      original_internal_encoding = Encoding.default_internal
+      Encoding.default_internal = "BINARY"
+      begin
+        source_file = SimpleCov::SourceFile.new(source_fixture('utf-8.rb'), [nil, nil, 1])
+      ensure
+        Encoding.default_internal = original_internal_encoding
+      end
 
-        assert_nothing_raised do
-          source_file.process_skipped_lines!
-        end
+      assert_nothing_raised do
+        source_file.process_skipped_lines!
       end
     end
-
   end
-end
+end if SimpleCov.usable?