improve minitest adapter

Author: alexch

Gemfile

@@ -6,8 +6,7 @@ group :development, :test do
   gem "rvm"
   gem "bundler"
   gem "rake"
-  gem "minitest", "~> 1.7.2"
-  gem "test-unit", "~> 2.1.1"
+  gem "minitest", "~> 1.7.2"  # built in to ruby distro
 end
 
 platforms :jruby do

Gemfile-minitest1

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+gemspec :name => "wrong"
+
+group :development, :test do
+  gem "rvm"
+  gem "bundler"
+  gem "rake"
+  gem "minitest", "~> 5.0"
+end
+
+platforms :jruby do
+  gem "jruby-openssl" # to silence annoying warning
+end

Gemfile-minitest1.lock

@@ -0,0 +1,35 @@
+PATH
+  remote: .
+  specs:
+    wrong (0.7.1)
+      diff-lcs (~> 1.2.5)
+      predicated (~> 0.2.6)
+      ruby2ruby (>= 2.0.1)
+      ruby_parser (>= 3.0.1)
+      sexp_processor (>= 4.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    minitest (5.4.3)
+    predicated (0.2.6)
+    rake (10.3.2)
+    ruby2ruby (2.1.3)
+      ruby_parser (~> 3.1)
+      sexp_processor (~> 4.0)
+    ruby_parser (3.6.3)
+      sexp_processor (~> 4.1)
+    rvm (1.11.3.9)
+    sexp_processor (4.4.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  jruby-openssl
+  minitest (~> 5.0)
+  rake
+  rvm
+  wrong!

Gemfile-minitest5

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+gemspec :name => "wrong"
+
+group :development, :test do
+  gem "rvm"
+  gem "bundler"
+  gem "rake"
+  gem "minitest", "~> 5.0"
+end
+
+platforms :jruby do
+  gem "jruby-openssl" # to silence annoying warning
+end

Gemfile-minitest5.lock

@@ -0,0 +1,35 @@
+PATH
+  remote: .
+  specs:
+    wrong (0.7.1)
+      diff-lcs (~> 1.2.5)
+      predicated (~> 0.2.6)
+      ruby2ruby (>= 2.0.1)
+      ruby_parser (>= 3.0.1)
+      sexp_processor (>= 4.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    minitest (5.4.3)
+    predicated (0.2.6)
+    rake (10.3.2)
+    ruby2ruby (2.1.3)
+      ruby_parser (~> 3.1)
+      sexp_processor (~> 4.0)
+    ruby_parser (3.6.3)
+      sexp_processor (~> 4.1)
+    rvm (1.11.3.9)
+    sexp_processor (4.4.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  jruby-openssl
+  minitest (~> 5.0)
+  rake
+  rvm
+  wrong!

Gemfile-testunit

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+gemspec :name => "wrong"
+
+group :development, :test do
+  gem "rvm"
+  gem "bundler"
+  gem "rake"
+  gem "test-unit", "~> 3.0"
+end
+
+platforms :jruby do
+  gem "jruby-openssl" # to silence annoying warning
+end

Gemfile-testunit.lock

@@ -0,0 +1,37 @@
+PATH
+  remote: .
+  specs:
+    wrong (0.7.1)
+      diff-lcs (~> 1.2.5)
+      predicated (~> 0.2.6)
+      ruby2ruby (>= 2.0.1)
+      ruby_parser (>= 3.0.1)
+      sexp_processor (>= 4.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    power_assert (0.2.2)
+    predicated (0.2.6)
+    rake (10.3.2)
+    ruby2ruby (2.1.3)
+      ruby_parser (~> 3.1)
+      sexp_processor (~> 4.0)
+    ruby_parser (3.6.3)
+      sexp_processor (~> 4.1)
+    rvm (1.11.3.9)
+    sexp_processor (4.4.4)
+    test-unit (3.0.7)
+      power_assert
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  jruby-openssl
+  rake
+  rvm
+  test-unit (~> 3.0)
+  wrong!

Rakefile

@@ -5,10 +5,11 @@ Bundler.setup
 task :default => :test
 
 def separate
-  Dir["./test/adapters/*_test.rb"] + [
+  Dir["./test/adapters/*_test.rb"] +
+    [
       "./test/message/test_context_test.rb",
       "./test/assert_advanced_test.rb",
-  ]
+    ]
 end
 
 def sys cmd
@@ -20,16 +21,23 @@ end
 
 desc 'run all tests (in current ruby)'
 task :test do
-  all_passed = separate.collect do |test_file|
+  return_values = separate.collect do |test_file|
     puts "\n>> Separately running #{test_file} under #{ENV['RUBY_VERSION']}..."
-    Bundler.with_clean_env do
-      sys("ruby #{test_file}")
-    end
-  end.uniq == [true]
-  if !all_passed
-    at_exit { exit false }
+    sys("ruby #{test_file}")
   end
 
+  return_values += [
+    {"./test/adapters/minitest_test.rb" => "./Gemfile-minitest1"},
+    {"./test/adapters/minitest_test.rb" => "./Gemfile-minitest5"},
+    {"./test/adapters/test_unit_test.rb" => "./Gemfile-testunit"},
+  ].collect do |pair|
+    test_file = pair.keys.first
+    gemfile = pair.values.first
+    puts "\n>> Separately running #{test_file} under #{gemfile} and #{ENV['RUBY_VERSION']}..."
+    sys("BUNDLE_GEMFILE=#{gemfile} bundle exec ruby #{test_file}")
+  end
+  all_passed = return_values.uniq == [true]
+  at_exit { exit false } unless all_passed
   Rake::Task[:test_most].invoke
 end
 
@@ -69,13 +77,15 @@ namespace :rvm do
            '1.9.1-p378', # we can't use p429 or p431, see http://bugs.ruby-lang.org/issues/show/3584 and http://bugs.ruby-lang.org/issues/2404
            '1.9.2',
            '1.9.3',
+           '2.0.0',
+           '2.1.4',
            'jruby']
   @rubies_str = @rubies.join(', ')
 
   def rvm
     @rvm_path ||= begin
       rvm = `which rvm`.strip
-      raise 'rvm not available; go to http://rvm.beginrescueend.com' unless rvm
+      raise 'rvm not available; go to http://rvm.io' unless rvm
       rvm
     end
   end
@@ -115,6 +125,8 @@ namespace :rvm do
   task :test do
     rvm_run "bundle exec rake test"
     rvm_run "ruby ./test/suite.rb"
+    rvm_run ""
+
     # todo: fail if any test failed
     # todo: figure out a way to run suite with jruby --1.9 (it's harder than you'd think)
   end

lib/wrong/adapters/minitest.rb

@@ -1,22 +1,61 @@
 require "wrong/assert"
 require "wrong/helpers"
 
-class MiniTest::Unit::TestCase
+module Wrong::MiniTestAdapter
   include Wrong::Assert
   include Wrong::Helpers
 
-  def failure_class
-    MiniTest::Assertion
+  def self.minitest_version
+    if defined?(MiniTest::VERSION)
+      MiniTest::VERSION
+    else
+      MiniTest::Unit::VERSION
+    end
+  end
+
+  def self.minitest_base_class
+    if minitest_version >= "5.0.0"
+      MiniTest::Test
+    else
+      MiniTest::Unit::TestCase
+    end
+  end
+
+  def self.minitest_autorun
+    require 'minitest/autorun'
+    if minitest_version >= "5.0.0"
+      MiniTest.autorun
+    else
+      MiniTest::Unit.autorun
+    end
+  end
+
+  def minitest_assertion_count
+    if Wrong::MiniTestAdapter.minitest_version >= "5.0.0"
+      self.assertions
+    else
+      self._assertions
+    end
   end
 
-  if MiniTest::VERSION >= "5.0.6"
-    alias_method :_assertions, :assertions
-    alias_method :"_assertions=", :"assertions="
+  def minitest_increment_assertions
+    if Wrong::MiniTestAdapter.minitest_version >= "5.0.0"
+      self.assertions += 1
+    else
+      self._assertions +=1
+    end
+  end
+
+  def failure_class
+    MiniTest::Assertion
   end
 
   def aver(valence, explanation = nil, depth = 0)
-    self._assertions += 1 # increment minitest's assert count
+    minitest_increment_assertions
     super(valence, explanation, depth + 1) # apparently this passes along the default block
   end
-  
+
+  $stderr.puts "Loading Wrong adapter for MiniTest #{minitest_version}"
 end
+
+Wrong::MiniTestAdapter.minitest_base_class.include Wrong::MiniTestAdapter

lib/wrong/adapters/test_unit.rb

@@ -13,7 +13,7 @@ def wrong_adapter_failure(why)
 end
 
 if Test::Unit.const_defined? :TEST_UNIT_IMPLEMENTATION
-  wrong_adapter_failure "You are using MiniTest's compatibility layer, not the real Test::Unit."
+  $stderr.puts "You are using MiniTest's compatibility layer, not the real Test::Unit."
 end
 
 begin
@@ -24,6 +24,7 @@ def wrong_adapter_failure(why)
   require 'test/unit/failure'
   Test::Unit::TestResultFailureSupport # this class is only in 2.x, to catch mixups between 1.8's lib and gem versions
 rescue Exception => e
+  p e
   wrong_adapter_failure "You are using an outdated version of Test::Unit."
 end
 

lib/wrong/close_to.rb

@@ -1,3 +1,5 @@
+require 'date'
+
 module Wrong
   module CloseTo
     def close_to?(other, tolerance = 0.001)
@@ -8,7 +10,7 @@ def close_to?(other, tolerance = 0.001)
       end
     end
   end
-  Numeric.send :include, CloseTo
-  Date.send :include, CloseTo
-  Time.send :include, CloseTo
+  ::Numeric.send :include, CloseTo
+  ::Date.send :include, CloseTo
+  ::Time.send :include, CloseTo
 end