minitest_tu_shim 1.3.1 → 1.3.2

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.3.2 / 2010-03-27
+
+* 2 bug fixes:
+
+  * Fixed failed tests for new assert_same output
+  * Fixed tests for changes to minitest output
+
 === 1.3.1 / 2009-06-23
 
 * 1 minor enhancement:

data/Rakefile

@@ -16,7 +16,7 @@ Hoe.spec 'minitest_tu_shim' do
 
   self.rubyforge_name = "bfts"
 
-  extra_deps << 'minitest'
+  extra_deps << ['minitest', ">= #{MiniTest::Unit::VERSION}"]
 end
 
 # vim: syntax=ruby

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.1'
+    VERSION = '1.3.2'
 
     tu_deprecate :method_name, :name # 2009-06-01
 

data/test/test_mini_test.rb

@@ -103,7 +103,7 @@ class TestMiniTest < MiniTest::Unit::TestCase
   end
 
   def test_class_run_test_suites
-    tc = Class.new(MiniTest::Unit::TestCase) do
+    tc = Class.new MiniTest::Unit::TestCase do
       def test_something
         assert true
       end
@@ -115,7 +115,11 @@ class TestMiniTest < MiniTest::Unit::TestCase
   end
 
   def test_run_failing # TODO: add error test
-    tc = Class.new(MiniTest::Unit::TestCase) do
+    tc = Class.new MiniTest::Unit::TestCase do
+      def self.test_order
+        :alpha
+      end
+
       def test_something
         assert true
       end
@@ -139,12 +143,18 @@ test_failure(ATestCase) [FILE:LINE]:
 Failed assertion, no message given.
 
 2 tests, 2 assertions, 1 failures, 0 errors, 0 skips
+
+Test run options:
 "
     util_assert_report expected
   end
 
   def test_run_error
-    tc = Class.new(MiniTest::Unit::TestCase) do
+    tc = Class.new MiniTest::Unit::TestCase do
+      def self.test_order
+        :alpha
+      end
+
       def test_something
         assert true
       end
@@ -169,12 +179,14 @@ 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
   end
 
   def test_run_error_teardown
-    tc = Class.new(MiniTest::Unit::TestCase) do
+    tc = Class.new MiniTest::Unit::TestCase do
       def test_something
         assert true
       end
@@ -199,12 +211,18 @@ RuntimeError: unhandled exception
     FILE:LINE:in `teardown'
 
 1 tests, 1 assertions, 0 failures, 1 errors, 0 skips
+
+Test run options:
 "
     util_assert_report expected
   end
 
   def test_run_skip
-    tc = Class.new(MiniTest::Unit::TestCase) do
+    tc = Class.new MiniTest::Unit::TestCase do
+      def self.test_order
+        :alpha
+      end
+
       def test_something
         assert true
       end
@@ -228,6 +246,8 @@ test_skip(ATestCase) [FILE:LINE]:
 not yet
 
 2 tests, 1 assertions, 0 failures, 0 errors, 1 skips
+
+Test run options:
 "
     util_assert_report expected
   end
@@ -239,15 +259,22 @@ Started
 Finished in 0.00
 
 1 tests, 1 assertions, 0 failures, 0 errors, 0 skips
+
+Test run options:
 "
     output = @output.string.sub(/Finished in .*/, "Finished in 0.00")
     output.sub!(/Loaded suite .*/, 'Loaded suite blah')
     output.sub!(/[\w\/\.]+:\d+/, 'FILE:LINE')
+    output.gsub!(/(Test run options:).+/, '\1')
     assert_equal(expected, output)
   end
 
   def test_run_failing_filtered
-    tc = Class.new(MiniTest::Unit::TestCase) do
+    tc = Class.new MiniTest::Unit::TestCase do
+      def self.test_order
+        :alpha
+      end
+
       def test_something
         assert true
       end
@@ -265,7 +292,7 @@ Finished in 0.00
   end
 
   def test_run_passing
-    tc = Class.new(MiniTest::Unit::TestCase) do
+    tc = Class.new MiniTest::Unit::TestCase do
       def test_something
         assert true
       end
@@ -297,18 +324,18 @@ class TestMiniTestTestCase < MiniTest::Unit::TestCase
   def test_class_inherited
     @assertion_count = 0
 
-    Object.const_set(:ATestCase, Class.new(MiniTest::Unit::TestCase))
+    testcase = Class.new MiniTest::Unit::TestCase
 
-    assert_equal [ATestCase], MiniTest::Unit::TestCase.test_suites
+    assert_equal [testcase], MiniTest::Unit::TestCase.test_suites
   end
 
   def test_class_test_suites
     @assertion_count = 0
 
-    Object.const_set(:ATestCase, Class.new(MiniTest::Unit::TestCase))
+    testcase = Class.new MiniTest::Unit::TestCase
 
     assert_equal 1, MiniTest::Unit::TestCase.test_suites.size
-    assert_equal [ATestCase], MiniTest::Unit::TestCase.test_suites
+    assert_equal [testcase], MiniTest::Unit::TestCase.test_suites
   end
 
   def test_class_asserts_match_refutes
@@ -538,16 +565,16 @@ Expected [RuntimeError] to include SyntaxError."
   end
 
   def test_assert_same_triggered
-    @assertion_count = 2
-
-    util_assert_triggered 'Expected 2 (0xXXX) to be the same as 1 (0xXXX).' do
+    util_assert_triggered 'Expected 2 (oid=N) to be the same as 1 (oid=N).' do
       @tc.assert_same 1, 2
     end
+  end
 
+  def test_assert_same_equal_triggered
     s1 = "blah"
     s2 = "blah"
 
-    util_assert_triggered 'Expected "blah" (0xXXX) to be the same as "blah" (0xXXX).' do
+    util_assert_triggered 'Expected "blah" (oid=N) to be the same as "blah" (oid=N).' do
       @tc.assert_same s1, s2
     end
   end
@@ -623,16 +650,11 @@ Expected [RuntimeError] to include SyntaxError."
   def test_test_methods_sorted
     @assertion_count = 0
 
-    sample_test_case = Class.new(MiniTest::Unit::TestCase)
-
-    class << sample_test_case
-      def test_order; :sorted end
-    end
-
-    sample_test_case.instance_eval do
-      define_method :test_test3 do assert "does not matter" end
-      define_method :test_test2 do assert "does not matter" end
-      define_method :test_test1 do assert "does not matter" end
+    sample_test_case = Class.new MiniTest::Unit::TestCase do
+      def self.test_order; :sorted; end
+      def test_test3; assert "does not matter" end
+      def test_test2; assert "does not matter" end
+      def test_test1; assert "does not matter" end
     end
 
     expected = %w(test_test1 test_test2 test_test3)
@@ -642,16 +664,11 @@ Expected [RuntimeError] to include SyntaxError."
   def test_test_methods_random
     @assertion_count = 0
 
-    sample_test_case = Class.new(MiniTest::Unit::TestCase)
-
-    class << sample_test_case
-      def test_order; :random end
-    end
-
-    sample_test_case.instance_eval do
-      define_method :test_test1 do assert "does not matter" end
-      define_method :test_test2 do assert "does not matter" end
-      define_method :test_test3 do assert "does not matter" end
+    sample_test_case = Class.new MiniTest::Unit::TestCase do
+      def self.test_order; :random end
+      def test_test1; assert "does not matter" end
+      def test_test2; assert "does not matter" end
+      def test_test3; assert "does not matter" end
     end
 
     srand 42
@@ -803,7 +820,7 @@ Expected [RuntimeError] to include SyntaxError."
 
   # TODO: "with id <id>" crap from assertions.rb
   def test_refute_same_triggered
-    util_assert_triggered 'Expected 1 to not be the same as 1.' do
+    util_assert_triggered 'Expected 1 (oid=N) to not be the same as 1 (oid=N).' do
       @tc.refute_same 1, 1
     end
   end
@@ -822,7 +839,8 @@ Expected [RuntimeError] to include SyntaxError."
     end
 
     msg = e.message.sub(/(---Backtrace---).*/m, '\1')
-    msg.gsub!(/\(0x[0-9a-f]+\)/, '(0xXXX)')
+    msg.gsub!(/\(oid=[-0-9]+\)/, '(oid=N)')
+    msg.gsub!(/(Test run options:).+/, '\1')
 
     assert_equal expected, msg
   end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: minitest_tu_shim
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Ryan Davis
@@ -30,29 +35,51 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2009-06-23 00:00:00 -07:00
+date: 2010-03-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 6
+        - 0
+        version: 1.6.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        segments: 
+        - 2
+        - 0
+        - 3
+        version: 2.0.3
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.0
-    version: 
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  type: :development
+  version_requirements: *id003
 description: |-
   minitest_tu_shim bridges the gap between the small and fast minitest
   and ruby's huge and slow test/unit.
@@ -93,18 +120,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: bfts
-rubygems_version: 1.3.4
+rubygems_version: 1.3.6
 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.