minitest_tu_shim 1.3.2 → 1.3.3

data/History.txt

@@ -1,3 +1,15 @@
+=== 1.3.3 / 2013-08-29
+
+* 1 minor enhancement:
+
+  * Added assert_block because rails 3 and other old libs still use it.
+
+* 3 bug fixes:
+
+  * Cleaned up 1.9.3 warnings.
+  * Minor fixes to tests to get them happy for minitest changes.
+  * Updated tests to work with new minitest output and methods
+
 === 1.3.2 / 2010-03-27
 
 * 2 bug fixes:

data/Rakefile

@@ -5,7 +5,7 @@ $TESTING_MINIUNIT = true
 require 'rubygems'
 require 'hoe'
 
-Hoe.add_include_dirs "../../minitest/dev/lib", "lib"
+Hoe.add_include_dirs "../../minitest/4.7.5/lib"
 
 require 'test/unit/testcase'
 
@@ -14,9 +14,7 @@ Hoe.plugin :perforce, :email # can't do minitest, so no seattlerb wrapper
 Hoe.spec 'minitest_tu_shim' do
   developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
 
-  self.rubyforge_name = "bfts"
-
-  extra_deps << ['minitest', ">= #{MiniTest::Unit::VERSION}"]
+  dependency "minitest", "~> 4.0"
 end
 
 # vim: syntax=ruby

data/lib/test/unit/assertions.rb

@@ -34,6 +34,15 @@ module Test::Unit
     tu_deprecate :assert_not_nil,        :refute_nil            # 2009-06-01
     tu_deprecate :assert_not_same,       :refute_same           # 2009-06-01
 
+    ##
+    # Fails unless the block returns a true value.
+
+    def assert_block msg = nil
+      warn "NOTE: MiniTest::Unit::TestCase#assert_block is deprecated, use assert. It will be removed on 2013-01-01. Called from #{caller.first}"
+      msg = message(msg) { "Expected block to return true value" }
+      assert yield, msg
+    end
+
     def assert_nothing_raised _ = :ignored                      # 2009-06-01
       self.class.tu_deprecation_warning :assert_nothing_raised
       self._assertions += 1

data/lib/test/unit/deprecate.rb

@@ -15,7 +15,7 @@ class Module # define deprecation api
   def tu_deprecate old, new
     class_eval <<-EOM
       def #{old} *args, &block
-        cls, clr = self.class, caller.first
+        clr = caller.first
         self.class.tu_deprecation_warning #{old.inspect}, #{new.inspect}, clr
         #{new}(*args, &block)
       end

data/lib/test/unit/testcase.rb

@@ -12,7 +12,7 @@ module Test::Unit # was ::Mini::Test, but rails' horrid code forced my hand
 
   class TestCase < ::MiniTest::Unit::TestCase
 
-    VERSION = '1.3.2'
+    VERSION = '1.3.3'
 
     tu_deprecate :method_name, :name # 2009-06-01
 

data/test/test_mini_test.rb

@@ -1,17 +1,15 @@
 require 'stringio'
-require 'minitest/unit'
-
-MiniTest::Unit.autorun
+require 'minitest/autorun'
+require 'test/unit'
 
 class TestMiniTest < MiniTest::Unit::TestCase
-
   def setup
     srand 42
     MiniTest::Unit::TestCase.reset
     @tu = MiniTest::Unit.new
     @output = StringIO.new("")
+    MiniTest::Unit.runner = nil # protect the outer runner from the inner tests
     MiniTest::Unit.output = @output
-    assert_equal [0, 0], @tu.run_test_suites
   end
 
   def teardown
@@ -27,26 +25,6 @@ class TestMiniTest < MiniTest::Unit::TestCase
                "./lib/mini/test.rb:139:in `run'",
                "./lib/mini/test.rb:106:in `run'"]
 
-#   def test_filter_backtrace
-#     # this is a semi-lame mix of relative paths.
-#     # I cheated by making the autotest parts not have ./
-#     bt = (["lib/autotest.rb:571:in `add_exception'",
-#            "test/test_autotest.rb:62:in `test_add_exception'",
-#            "./lib/mini/test.rb:165:in `__send__'"] +
-#           BT_MIDDLE +
-#           ["./lib/mini/test.rb:29",
-#            "test/test_autotest.rb:422"])
-#     bt = util_expand_bt bt
-
-#     ex = ["lib/autotest.rb:571:in `add_exception'",
-#           "test/test_autotest.rb:62:in `test_add_exception'"]
-#     ex = util_expand_bt ex
-
-#     fu = MiniTest::filter_backtrace(bt)
-
-#     assert_equal ex, fu
-#   end
-
   def util_expand_bt bt
     if RUBY_VERSION =~ /^1\.9/ then
       bt.map { |f| (f =~ /^\./) ? File.expand_path(f) : f }
@@ -64,19 +42,6 @@ class TestMiniTest < MiniTest::Unit::TestCase
     assert_equal ex, fu
   end
 
-#   def test_filter_backtrace_unit_starts
-#     bt = (["./lib/mini/test.rb:165:in `__send__'"] +
-#           BT_MIDDLE +
-#           ["./lib/mini/test.rb:29",
-#            "-e:1"])
-
-#     bt = util_expand_bt bt
-
-#     ex = ["-e:1"]
-#     fu = MiniTest::filter_backtrace(bt)
-#     assert_equal ex, fu
-#   end
-
   def test_class_puke_with_assertion_failed
     exception = MiniTest::Assertion.new "Oh no!"
     exception.set_backtrace ["unhappy"]
@@ -109,9 +74,7 @@ class TestMiniTest < MiniTest::Unit::TestCase
       end
     end
 
-    Object.const_set(:ATestCase, tc)
-
-    assert_equal [1, 1], @tu.run_test_suites
+    assert_equal [1, 1], @tu._run_suite(tc, "test")
   end
 
   def test_run_failing # TODO: add error test
@@ -133,20 +96,21 @@ class TestMiniTest < MiniTest::Unit::TestCase
 
     @tu.run
 
-    expected = "Loaded suite blah
-Started
+    expected = "Run options:
+
+# Running tests:
+
 F.
-Finished in 0.00
+
+Finished tests in 0.00s, 0.00 tests/s, 0.00 assertions/s.
 
   1) Failure:
-test_failure(ATestCase) [FILE:LINE]:
+ATestCase#test_failure [FILE:LINE]:
 Failed assertion, no message given.
 
 2 tests, 2 assertions, 1 failures, 0 errors, 0 skips
-
-Test run options:
 "
-    util_assert_report expected
+    assert_report expected
   end
 
   def test_run_error
@@ -168,21 +132,22 @@ Test run options:
 
     @tu.run
 
-    expected = "Loaded suite blah
-Started
+    expected = "Run options:
+
+# Running tests:
+
 E.
-Finished in 0.00
+
+Finished tests in 0.00s, 0.00 tests/s, 0.00 assertions/s.
 
   1) Error:
-test_error(ATestCase):
+ATestCase#test_error:
 RuntimeError: unhandled exception
     FILE:LINE:in `test_error'
 
 2 tests, 1 assertions, 0 failures, 1 errors, 0 skips
-
-Test run options:
 "
-    util_assert_report expected
+    assert_report expected
   end
 
   def test_run_error_teardown
@@ -200,21 +165,22 @@ Test run options:
 
     @tu.run
 
-    expected = "Loaded suite blah
-Started
+    expected = "Run options:
+
+# Running tests:
+
 E
-Finished in 0.00
+
+Finished tests in 0.00s, 0.00 tests/s, 0.00 assertions/s.
 
   1) Error:
-test_something(ATestCase):
+ATestCase#test_something:
 RuntimeError: unhandled exception
     FILE:LINE:in `teardown'
 
 1 tests, 1 assertions, 0 failures, 1 errors, 0 skips
-
-Test run options:
 "
-    util_assert_report expected
+    assert_report expected
   end
 
   def test_run_skip
@@ -234,38 +200,42 @@ Test run options:
 
     Object.const_set(:ATestCase, tc)
 
-    @tu.run
+    @tu.run %w[--seed 42 --verbose]
+
+    expected = "Run options:
+
+# Running tests:
 
-    expected = "Loaded suite blah
-Started
-S.
-Finished in 0.00
+ATestCase#test_skip = 0.00 s = S
+ATestCase#test_something = 0.00 s = .
+
+
+Finished tests in 0.00s, 0.00 tests/s, 0.00 assertions/s.
 
   1) Skipped:
-test_skip(ATestCase) [FILE:LINE]:
+ATestCase#test_skip [FILE:LINE]:
 not yet
 
 2 tests, 1 assertions, 0 failures, 0 errors, 1 skips
-
-Test run options:
 "
-    util_assert_report expected
+    assert_report expected
   end
 
-  def util_assert_report expected = nil
-    expected ||= "Loaded suite blah
-Started
+  def assert_report expected = nil
+    expected ||= "Run options:
+
+# Running tests:
+
 .
-Finished in 0.00
 
-1 tests, 1 assertions, 0 failures, 0 errors, 0 skips
+Finished tests in 0.00s, 0.00 tests/s, 0.00 assertions/s.
 
-Test run options:
+1 tests, 1 assertions, 0 failures, 0 errors, 0 skips
 "
-    output = @output.string.sub(/Finished in .*/, "Finished in 0.00")
+    output = @output.string.gsub(/\d+\.\d+/, "0.00")
     output.sub!(/Loaded suite .*/, 'Loaded suite blah')
     output.sub!(/[\w\/\.]+:\d+/, 'FILE:LINE')
-    output.gsub!(/(Test run options:).+/, '\1')
+    output.gsub!(/(Run options:).+/, '\1')
     assert_equal(expected, output)
   end
 
@@ -288,7 +258,7 @@ Test run options:
 
     @tu.run(%w(-n /something/))
 
-    util_assert_report
+    assert_report
   end
 
   def test_run_passing
@@ -302,7 +272,7 @@ Test run options:
 
     @tu.run
 
-    util_assert_report
+    assert_report
   end
 end
 
@@ -344,9 +314,11 @@ class TestMiniTestTestCase < MiniTest::Unit::TestCase
     methods = MiniTest::Assertions.public_instance_methods
     methods.map! { |m| m.to_s } if Symbol === methods.first
 
-    ignores = %w(assert_block assert_no_match assert_not_equal assert_not_nil
-                 assert_not_same assert_nothing_thrown assert_raise
-                 assert_nothing_raised assert_raises assert_throws assert_send)
+    ignores = %w(assert_no_match assert_not_equal
+                 assert_not_nil assert_not_same assert_nothing_thrown
+                 assert_output assert_raise assert_nothing_raised
+                 assert_raises assert_throws assert_send
+                 assert_silent assert_block)
     asserts = methods.grep(/^assert/).sort - ignores
     refutes = methods.grep(/^refute/).sort - ignores
 
@@ -372,20 +344,6 @@ class TestMiniTestTestCase < MiniTest::Unit::TestCase
     end
   end
 
-  def test_assert_block
-    @tc.assert_block do
-      true
-    end
-  end
-
-  def test_assert_block_triggered
-    util_assert_triggered 'Expected block to return true value.' do
-      @tc.assert_block do
-        false
-      end
-    end
-  end
-
   def test_assert_empty
     @assertion_count = 2
 
@@ -405,7 +363,7 @@ class TestMiniTestTestCase < MiniTest::Unit::TestCase
   end
 
   def test_assert_equal_different
-    util_assert_triggered "Expected 1, not 2." do
+    util_assert_triggered "Expected: 1\n  Actual: 2" do
       @tc.assert_equal 1, 2
     end
   end
@@ -415,7 +373,7 @@ class TestMiniTestTestCase < MiniTest::Unit::TestCase
   end
 
   def test_assert_in_delta_triggered
-    util_assert_triggered 'Expected 0.0 - 0.001 (0.001) to be < 1.0e-06.' do
+    util_assert_triggered 'Expected |0.0 - 0.001| (0.001) to be <= 1.0e-06.' do
       @tc.assert_in_delta 0.0, 1.0 / 1000, 0.000001
     end
   end
@@ -435,7 +393,7 @@ class TestMiniTestTestCase < MiniTest::Unit::TestCase
   end
 
   def test_assert_in_epsilon_triggered
-    util_assert_triggered 'Expected 10000 - 9990 (10) to be < 9.99.' do
+    util_assert_triggered 'Expected |10000 - 9990| (10) to be <= 9.99.' do
       @tc.assert_in_epsilon 10000, 9990
     end
   end
@@ -479,13 +437,13 @@ class TestMiniTestTestCase < MiniTest::Unit::TestCase
 
   def test_assert_match
     @assertion_count = 2
-    @tc.assert_match "blah blah blah", /\w+/
+    @tc.assert_match(/\w+/, "blah blah blah")
   end
 
   def test_assert_match_triggered
     @assertion_count = 2
-    util_assert_triggered 'Expected "blah blah blah" to match /\d+/.' do
-      @tc.assert_match "blah blah blah", /\d+/
+    util_assert_triggered 'Expected /\d+/ to match "blah blah blah".' do
+      @tc.assert_match(/\d+/, "blah blah blah")
     end
   end
 
@@ -522,15 +480,18 @@ class TestMiniTestTestCase < MiniTest::Unit::TestCase
       end
     end
 
-    expected = "<[RuntimeError]> exception expected, not
+    expected = "[RuntimeError] exception expected, not
 Class: <SyntaxError>
 Message: <\"icky\">
 ---Backtrace---
 FILE:LINE:in `test_assert_raises_triggered_different'
----------------.
-Expected [RuntimeError] to include SyntaxError."
+---------------"
+
+    actual = e.message.
+      gsub(/[\w\/\.]+:\d+/, 'FILE:LINE').
+      gsub(/block .\d+ levels. in /, '')
 
-    assert_equal expected, expected.gsub(/[\w\/\.]+:\d+/, 'FILE:LINE')
+    assert_equal expected, actual
   end
 
   def test_assert_raises_triggered_none
@@ -717,17 +678,17 @@ Expected [RuntimeError] to include SyntaxError."
   end
 
   def test_refute_in_delta_triggered
-    util_assert_triggered 'Expected 0.0 - 0.001 (0.001) to not be < 0.1.' do
+    util_assert_triggered 'Expected |0.0 - 0.001| (0.001) to not be <= 0.1.' do
       @tc.refute_in_delta 0.0, 1.0 / 1000, 0.1
     end
   end
 
   def test_refute_in_epsilon
-    @tc.refute_in_epsilon 10000, 9990
+    @tc.refute_in_epsilon 10000, 9989
   end
 
   def test_refute_in_epsilon_triggered
-    util_assert_triggered 'Expected 10000 - 9991 (9) to not be < 10.0.' do
+    util_assert_triggered 'Expected |10000 - 9991| (9) to not be <= 10.0.' do
       @tc.refute_in_epsilon 10000, 9991
       fail
     end
@@ -773,14 +734,14 @@ Expected [RuntimeError] to include SyntaxError."
   def test_refute_match
     @assertion_count = 2
 
-    @tc.refute_match "blah blah blah", /\d+/
+    @tc.refute_match(/\d+/, "blah blah blah")
   end
 
   def test_refute_match_triggered
     @assertion_count = 2
 
-    util_assert_triggered 'Expected "blah blah blah" to not match /\w+/.' do
-      @tc.refute_match "blah blah blah", /\w+/
+    util_assert_triggered 'Expected /\w+/ to not match "blah blah blah".' do
+      @tc.refute_match(/\w+/, "blah blah blah")
     end
   end
 
@@ -840,7 +801,7 @@ Expected [RuntimeError] to include SyntaxError."
 
     msg = e.message.sub(/(---Backtrace---).*/m, '\1')
     msg.gsub!(/\(oid=[-0-9]+\)/, '(oid=N)')
-    msg.gsub!(/(Test run options:).+/, '\1')
+    msg.gsub!(/(Run options:).+/, '\1')
 
     assert_equal expected, msg
   end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minitest_tu_shim
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 29
+  prerelease: 
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - Ryan Davis
@@ -35,49 +36,51 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2010-03-27 00:00:00 -07:00
-default_executable: 
+date: 2013-08-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
-        - 1
-        - 6
+        - 4
         - 0
-        version: 1.6.0
+        version: "4.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: rdoc
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
-        - 2
+        - 4
         - 0
-        - 3
-        version: 2.0.3
+        version: "4.0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
-        - 2
-        - 6
-        - 0
-        version: 2.6.0
+        - 3
+        - 7
+        version: "3.7"
   type: :development
   version_requirements: *id003
 description: |-
@@ -106,10 +109,10 @@ files:
 - lib/test/unit/error.rb
 - lib/test/unit/testcase.rb
 - test/test_mini_test.rb
-has_rdoc: true
+- .gemtest
 homepage: http://rubyforge.org/projects/bfts
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: 
 - --main
@@ -117,23 +120,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
-rubyforge_project: bfts
-rubygems_version: 1.3.6
+rubyforge_project: minitest_tu_shim
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: minitest_tu_shim bridges the gap between the small and fast minitest and ruby's huge and slow test/unit.