simplecov 0.9.1 → 0.10.0

data/test/fixtures/sample.rb

@@ -1,7 +1,7 @@
 # Foo class
 class Foo
   def initialize
-    @foo = 'baz'
+    @foo = "baz"
   end
 
   def bar

data/test/fixtures/utf-8.rb

@@ -1,3 +1,3 @@
 # encoding: utf-8
 
-puts '135°C'
+puts "135°C"

data/test/helper.rb

@@ -1,18 +1,16 @@
-require 'bundler/setup'
-require 'simplecov'
-require 'test/unit'
-require 'shoulda'
+require "bundler/setup"
+require "simplecov"
+require "minitest/autorun"
+require "shoulda"
 
-SimpleCov.coverage_dir('tmp/coverage')
+SimpleCov.coverage_dir("tmp/coverage")
 
-class Test::Unit::TestCase
-  def source_fixture(filename)
-    File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', filename))
-  end
+def source_fixture(filename)
+  File.expand_path(File.join(File.dirname(__FILE__), "fixtures", filename))
 end
 
-require 'shoulda_macros'
-Test::Unit::TestCase.send :extend, ShouldaMacros
+require "shoulda_macros"
+Minitest::Test.send :extend, ShouldaMacros
 
 # Taken from http://stackoverflow.com/questions/4459330/how-do-i-temporarily-redirect-stderr-in-ruby
 require "stringio"

data/test/test_1_8_fallbacks.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require "helper"
 
 # Tests that verify that on 1.8 versions of ruby, simplecov simply
 # does not launch and does not cause errors on the way
@@ -6,26 +6,26 @@ require 'helper'
 # TODO: This should be expanded upon all methods that could potentially
 # be called in a test/spec-helper simplecov config block
 #
-class Test18FallBacks < Test::Unit::TestCase
+class Test18FallBacks < Minitest::Test
   should "return false when calling SimpleCov.start" do
     assert_equal false, SimpleCov.start
   end
 
   should "return false when calling SimpleCov.start with a block" do
-    assert_equal false, SimpleCov.start { raise "Shouldn't reach this!?" }
+    assert_equal false, SimpleCov.start { fail "Shouldn't reach this!?" }
   end
 
   should "return false when calling SimpleCov.configure with a block" do
-    assert_equal false, SimpleCov.configure { raise "Shouldn't reach this!?" }
+    assert_equal false, SimpleCov.configure { fail "Shouldn't reach this!?" }
   end
 
   should "allow to define a profile" do
     begin
-      SimpleCov.profiles.define 'testprofile' do
-        add_filter '/config/'
+      SimpleCov.profiles.define "testprofile" do
+        add_filter "/config/"
       end
     rescue => err
       assert false, "Profile definition should have been fine, but raised #{err}"
     end
   end
-end if RUBY_VERSION.start_with? '1.8'
+end if RUBY_VERSION.start_with? "1.8"

data/test/test_command_guesser.rb

@@ -1,6 +1,6 @@
-require 'helper'
+require "helper"
 
-class TestCommandGuesser < Test::Unit::TestCase
+class TestCommandGuesser < Minitest::Test
   def self.should_guess_command_name(expectation, *argv)
     argv.each do |args|
       should "return '#{expectation}' for '#{args}'" do
@@ -10,10 +10,10 @@ class TestCommandGuesser < Test::Unit::TestCase
     end
   end
 
-  should_guess_command_name "Unit Tests", '/some/path/test/units/foo_bar_test.rb', 'test/units/foo.rb', 'test/foo.rb', 'test/{models,helpers,unit}/**/*_test.rb'
-  should_guess_command_name "Functional Tests", '/some/path/test/functional/foo_bar_controller_test.rb', 'test/{controllers,mailers,functional}/**/*_test.rb'
-  should_guess_command_name "Integration Tests", '/some/path/test/integration/foo_bar_controller_test.rb', 'test/integration/**/*_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 "Unit Tests", 'some_arbitrary_command with arguments' # Because Test::Unit const is defined!
+  should_guess_command_name "Unit Tests", "/some/path/test/units/foo_bar_test.rb", "test/units/foo.rb", "test/foo.rb", "test/{models,helpers,unit}/**/*_test.rb"
+  should_guess_command_name "Functional Tests", "/some/path/test/functional/foo_bar_controller_test.rb", "test/{controllers,mailers,functional}/**/*_test.rb"
+  should_guess_command_name "Integration Tests", "/some/path/test/integration/foo_bar_controller_test.rb", "test/integration/**/*_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 "Unit Tests", "some_arbitrary_command with arguments" # Because Test::Unit const is defined!
 end if SimpleCov.usable?

data/test/test_deleted_source.rb

@@ -1,11 +1,11 @@
-require 'helper'
+require "helper"
 
 # Test to verify correct handling of deleted files,
 # see issue #9 on github
-class TestDeletedSource < Test::Unit::TestCase
+class TestDeletedSource < Minitest::Test
   context "A source file which is subsequently deleted" do
     should "not cause an error" do
-      Dir.chdir(File.join(File.dirname(__FILE__), 'fixtures')) do
+      Dir.chdir(File.join(File.dirname(__FILE__), "fixtures")) do
         `ruby deleted_source_sample.rb`
         assert_equal 0, $?.exitstatus
       end

data/test/test_file_list.rb

@@ -1,11 +1,13 @@
-require 'helper'
+require "helper"
 
-class TestFileList < Test::Unit::TestCase
+class TestFileList < Minitest::Test
   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, 2, 2, 0, nil, nil, 0, nil, nil, 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, 2, 2, 0, nil, nil, 0, nil, nil, nil],
+      }
       @file_list = SimpleCov::Result.new(original_result).files
     end
 
@@ -15,7 +17,7 @@ class TestFileList < Test::Unit::TestCase
     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") { assert_equal 100.0*11/14, @file_list.covered_percent }
-    should("have correct covered_strength") { assert_equal 13.to_f/14, @file_list.covered_strength }
+    should("have correct covered_percent") { assert_equal 100.0 * 11 / 14, @file_list.covered_percent }
+    should("have correct covered_strength") { assert_equal 13.to_f / 14, @file_list.covered_strength }
   end
 end if SimpleCov.usable?

data/test/test_filters.rb

@@ -1,44 +1,60 @@
-require 'helper'
+require "helper"
 
-class TestFilters < Test::Unit::TestCase
+class TestFilters < Minitest::Test
   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"), [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil])
     end
 
     should "not match a new SimpleCov::StringFilter 'foobar'" do
-      assert !SimpleCov::StringFilter.new('foobar').matches?(@source_file)
+      assert !SimpleCov::StringFilter.new("foobar").matches?(@source_file)
     end
 
     should "not match a new SimpleCov::StringFilter 'some/path'" do
-      assert !SimpleCov::StringFilter.new('some/path').matches?(@source_file)
+      assert !SimpleCov::StringFilter.new("some/path").matches?(@source_file)
     end
 
     should "match a new SimpleCov::StringFilter 'test/fixtures'" do
-      assert SimpleCov::StringFilter.new('test/fixtures').matches?(@source_file)
+      assert SimpleCov::StringFilter.new("test/fixtures").matches?(@source_file)
     end
 
     should "match a new SimpleCov::StringFilter 'test/fixtures/sample.rb'" do
-      assert SimpleCov::StringFilter.new('test/fixtures/sample.rb').matches?(@source_file)
+      assert SimpleCov::StringFilter.new("test/fixtures/sample.rb").matches?(@source_file)
     end
 
     should "match a new SimpleCov::StringFilter 'sample.rb'" do
-      assert SimpleCov::StringFilter.new('sample.rb').matches?(@source_file)
+      assert SimpleCov::StringFilter.new("sample.rb").matches?(@source_file)
     end
 
     should "not match a new SimpleCov::BlockFilter that is not applicable" do
-      assert !SimpleCov::BlockFilter.new(Proc.new {|s| File.basename(s.filename) == 'foo.rb'}).matches?(@source_file)
+      assert !SimpleCov::BlockFilter.new(proc { |s| File.basename(s.filename) == "foo.rb" }).matches?(@source_file)
     end
 
     should "match a new SimpleCov::BlockFilter that is applicable" do
-      assert SimpleCov::BlockFilter.new(Proc.new {|s| File.basename(s.filename) == 'sample.rb'}).matches?(@source_file)
+      assert SimpleCov::BlockFilter.new(proc { |s| File.basename(s.filename) == "sample.rb" }).matches?(@source_file)
+    end
+
+    should "match a new SimpleCov::ArrayFilter when 'sample.rb' is passed as array" do
+      assert SimpleCov::ArrayFilter.new(["sample.rb"]).matches?(@source_file)
+    end
+
+    should "not match a new SimpleCov::ArrayFilter when a file path different than 'sample.rb' is passed as array" do
+      assert !SimpleCov::ArrayFilter.new(["other_file.rb"]).matches?(@source_file)
+    end
+
+    should "match a new SimpleCov::ArrayFilter when two file paths including 'sample.rb' are passed as array" do
+      assert SimpleCov::ArrayFilter.new(["sample.rb", "other_file.rb"]).matches?(@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])]
+      @prev_filters, SimpleCov.filters = SimpleCov.filters, []
+      @files = [SimpleCov::SourceFile.new(source_fixture("sample.rb"), [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil])]
+    end
+
+    teardown do
+      SimpleCov.filters = @prev_filters
     end
 
     should "return 0 items after executing SimpleCov.filtered on files when using a 'sample' string filter" do
@@ -57,14 +73,14 @@ class TestFilters < Test::Unit::TestCase
     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|
+      SimpleCov.add_filter do
         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|
+      SimpleCov.add_filter do
         false
       end
       assert_equal 1, SimpleCov.filtered(@files).count

data/test/test_merge_helpers.rb

@@ -1,18 +1,26 @@
-require 'helper'
+require "helper"
+
+class TestMergeHelpers < Minitest::Test
+  def self.test_order
+    :alpha
+  end
 
-class TestMergeHelpers < Test::Unit::TestCase
   context "With two faked coverage resultsets" do
     setup do
       SimpleCov.use_merging true
-      @resultset1 = {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('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]}
+      @resultset1 = {
+        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("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
@@ -21,36 +29,36 @@ class TestMergeHelpers < Test::Unit::TestCase
       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')]
+        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')]
+        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')]
+        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')]
+        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')]
+        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
+      File.open(SimpleCov::ResultMerger.resultset_path, "w+") { |f| f.puts "" }
+      assert_empty SimpleCov::ResultMerger.resultset
     end
 
     # 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_empty SimpleCov::ResultMerger.resultset
     end
 
     context "and results generated from those" do
@@ -68,21 +76,21 @@ class TestMergeHelpers < Test::Unit::TestCase
           assert SimpleCov::ResultMerger.store_result(@result2)
         end
 
-        should "have stored data in resultset_path yaml file" do
+        should "have stored data in resultset_path JSON 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
+          assert_equal %w(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)
+          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
-            @result2.created_at = Time.now - 172800 # two days ago
+            @result2.created_at = Time.now - 172_800 # two days ago
             assert SimpleCov::ResultMerger.store_result(@result2)
           end
 
@@ -99,7 +107,6 @@ class TestMergeHelpers < Test::Unit::TestCase
           end
         end
       end
-
     end
   end
 end if SimpleCov.usable?

data/test/test_result.rb

@@ -1,14 +1,23 @@
-require 'helper'
+require "helper"
 
-class TestResult < Test::Unit::TestCase
+class TestResult < Minitest::Test # rubocop:disable Metrics/ClassLength
   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]}
+      @prev_filters,   SimpleCov.filters   = SimpleCov.filters,   []
+      @prev_groups,    SimpleCov.groups    = SimpleCov.groups,    {}
+      @prev_formatter, SimpleCov.formatter = 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
+
+    teardown do
+      SimpleCov.filters   = @prev_filters
+      SimpleCov.groups    = @prev_groups
+      SimpleCov.formatter = @prev_formatter
     end
 
     context "a simple cov result initialized from that" do
@@ -20,7 +29,7 @@ class TestResult < Test::Unit::TestCase
 
       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"
+        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
@@ -34,7 +43,7 @@ class TestResult < Test::Unit::TestCase
 
       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
+        assert_equal 100.0 * 13 / 15, @result.covered_percent
       end
 
       [:covered_percent, :covered_strength, :covered_lines, :missed_lines, :total_lines].each do |msg|
@@ -47,7 +56,7 @@ class TestResult < Test::Unit::TestCase
         setup { @hash = @result.to_hash }
         should("be a hash") { assert_equal Hash, @hash.class }
 
-        context "loaded back with from_yaml" do
+        context "loaded back with from_hash" do
           setup { @dumped_result = SimpleCov::Result.from_hash(@hash) }
 
           should "have 3 source files" do
@@ -75,7 +84,7 @@ class TestResult < Test::Unit::TestCase
 
     context "with some filters set up" do
       setup do
-        SimpleCov.add_filter 'sample.rb'
+        SimpleCov.add_filter "sample.rb"
       end
 
       should "have 2 files in a new simple cov result" do
@@ -89,10 +98,10 @@ class TestResult < Test::Unit::TestCase
 
     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'
+        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
@@ -102,15 +111,15 @@ class TestResult < Test::Unit::TestCase
       end
 
       should "have user.rb in 'Models' group" do
-        assert_equal 'user.rb', File.basename(@result.groups['Models'].first.filename)
+        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)
+        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}
+        setup { SimpleCov.formatter = SimpleCov::Formatter::SimpleFormatter }
 
         should "return a formatted string with result.format!" do
           assert_equal String, @result.format!.class
@@ -136,8 +145,8 @@ class TestResult < Test::Unit::TestCase
     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'
+          add_group "Models", "app/models"
+          add_group "Controllers", "app/controllers"
         end
         @result = SimpleCov::Result.new(@original_result)
       end
@@ -153,11 +162,11 @@ class TestResult < Test::Unit::TestCase
       end
 
       should "have sample.rb in 'Ungrouped' group" do
-        assert_equal 'sample.rb', File.basename(@result.groups['Ungrouped'].first.filename)
+        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|
+        @result.groups.each_value do |files|
           assert_equal SimpleCov::FileList, files.class
         end
       end

data/test/test_return_codes.rb

@@ -1,13 +1,17 @@
-require 'helper'
+require "helper"
 
 # Make sure that exit codes of tests are propagated properly when using
 # simplecov. See github issue #5
-class TestReturnCodes < Test::Unit::TestCase
+class TestReturnCodes < Minitest::Test
+  def self.test_order
+    :alpha
+  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')
+      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
@@ -22,12 +26,12 @@ class TestReturnCodes < Test::Unit::TestCase
 
     should "have non-0 return code when running testunit_bad.rb" do
       `ruby testunit_bad.rb`
-      assert_not_equal 0, $?.exitstatus
+      refute_equal 0, $?.exitstatus
     end
 
     should "have return code 1 when running rspec_bad.rb" do
       `rspec rspec_bad.rb`
-      assert_not_equal 0, $?.exitstatus
+      refute_equal 0, $?.exitstatus
     end
 
     teardown do

data/test/test_source_file.rb

@@ -1,10 +1,10 @@
-require 'helper'
+require "helper"
 
-class TestSourceFile < Test::Unit::TestCase
+class TestSourceFile < Minitest::Test
   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)
+      @source_file = SimpleCov::SourceFile.new(source_fixture("sample.rb"), COVERAGE_FOR_SAMPLE_RB)
     end
 
     should "have a filename" do
@@ -24,7 +24,7 @@ class TestSourceFile < Test::Unit::TestCase
     end
 
     should "have all source lines of type SimpleCov::SourceFile::Line" do
-      assert @source_file.lines.all? {|l| l.instance_of?(SimpleCov::SourceFile::Line)}
+      assert @source_file.lines.all? { |l| l.instance_of?(SimpleCov::SourceFile::Line) }
     end
 
     should "have 'class Foo' as line(2).source" do
@@ -54,7 +54,7 @@ class TestSourceFile < Test::Unit::TestCase
 
   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])
+      @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
@@ -70,37 +70,4 @@ class TestSourceFile < Test::Unit::TestCase
       assert_match(/^Warning: coverage data provided/, captured_output)
     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])
-
-      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])
-
-      assert_nothing_raised do
-        source_file.process_skipped_lines!
-      end
-    end
-
-    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
-    end
-  end
 end if SimpleCov.usable?
-