assert 2.15.2 → 2.16.0

data/test/unit/assertions/assert_kind_of_tests.rb

@@ -6,6 +6,8 @@ require 'assert/utils'
 module Assert::Assertions
 
   class AssertKindOfTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_kind_of`"
     setup do
       desc = @desc = "assert kind of fail desc"
@@ -15,25 +17,27 @@ module Assert::Assertions
         assert_kind_of(*args)            # fail
       end
       @c = @test.config
-      @test.run
+      @test.run(&test_run_callback)
     end
     subject{ @test }
 
     should "produce results as expected" do
-      assert_equal 2, subject.result_count
-      assert_equal 1, subject.result_count(:pass)
-      assert_equal 1, subject.result_count(:fail)
+      assert_equal 2, test_run_result_count
+      assert_equal 1, test_run_result_count(:pass)
+      assert_equal 1, test_run_result_count(:fail)
     end
 
     should "have a fail message with custom and generic explanations" do
       exp = "#{@args[2]}\nExpected #{Assert::U.show(@args[1], @c)} (#{@args[1].class})"\
             " to be a kind of #{@args[0]}."
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end
 
   class AssertNotKindOfTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_not_kind_of`"
     setup do
       desc = @desc = "assert not kind of fail desc"
@@ -43,20 +47,20 @@ module Assert::Assertions
         assert_not_kind_of(Array, "object") # pass
       end
       @c = @test.config
-      @test.run
+      @test.run(&test_run_callback)
     end
     subject{ @test }
 
     should "produce results as expected" do
-      assert_equal 2, subject.result_count
-      assert_equal 1, subject.result_count(:pass)
-      assert_equal 1, subject.result_count(:fail)
+      assert_equal 2, test_run_result_count
+      assert_equal 1, test_run_result_count(:pass)
+      assert_equal 1, test_run_result_count(:fail)
     end
 
     should "have a fail message with custom and generic explanations" do
       exp = "#{@args[2]}\nExpected #{Assert::U.show(@args[1], @c)} (#{@args[1].class})"\
             " to not be a kind of #{@args[0]}."
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end

data/test/unit/assertions/assert_match_tests.rb

@@ -6,6 +6,8 @@ require 'assert/utils'
 module Assert::Assertions
 
   class AssertMatchTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_match`"
     setup do
       desc = @desc = "assert match fail desc"
@@ -15,25 +17,27 @@ module Assert::Assertions
         assert_match(*args)           # fail
       end
       @c = @test.config
-      @test.run
+      @test.run(&test_run_callback)
     end
     subject{ @test }
 
     should "produce results as expected" do
-      assert_equal 2, subject.result_count
-      assert_equal 1, subject.result_count(:pass)
-      assert_equal 1, subject.result_count(:fail)
+      assert_equal 2, test_run_result_count
+      assert_equal 1, test_run_result_count(:pass)
+      assert_equal 1, test_run_result_count(:fail)
     end
 
     should "have a fail message with custom and generic explanations" do
       exp = "#{@args[2]}\nExpected #{Assert::U.show(@args[1], @c)}"\
             " to match #{Assert::U.show(@args[0], @c)}."
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end
 
   class AssertNotMatchTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_not_match`"
     setup do
       desc = @desc = "assert not match fail desc"
@@ -43,20 +47,20 @@ module Assert::Assertions
         assert_not_match("not", "a string") # pass
       end
       @c = @test.config
-      @test.run
+      @test.run(&test_run_callback)
     end
     subject{ @test }
 
     should "produce results as expected" do
-      assert_equal 2, subject.result_count
-      assert_equal 1, subject.result_count(:pass)
-      assert_equal 1, subject.result_count(:fail)
+      assert_equal 2, test_run_result_count
+      assert_equal 1, test_run_result_count(:pass)
+      assert_equal 1, test_run_result_count(:fail)
     end
 
     should "have a fail message with custom and generic explanations" do
       exp = "#{@args[2]}\nExpected #{Assert::U.show(@args[1], @c)}"\
             " to not match #{Assert::U.show(@args[0], @c)}."
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end

data/test/unit/assertions/assert_nil_tests.rb

@@ -6,6 +6,8 @@ require 'assert/utils'
 module Assert::Assertions
 
   class AssertNilTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_nil`"
     setup do
       desc = @desc = "assert nil empty fail desc"
@@ -15,24 +17,26 @@ module Assert::Assertions
         assert_nil(*args) # fail
       end
       @c = @test.config
-      @test.run
+      @test.run(&test_run_callback)
     end
     subject{ @test }
 
     should "produce results as expected" do
-      assert_equal 2, subject.result_count
-      assert_equal 1, subject.result_count(:pass)
-      assert_equal 1, subject.result_count(:fail)
+      assert_equal 2, test_run_result_count
+      assert_equal 1, test_run_result_count(:pass)
+      assert_equal 1, test_run_result_count(:fail)
     end
 
     should "have a fail message with custom and generic explanations" do
       exp = "#{@args[1]}\nExpected #{Assert::U.show(@args[0], @c)} to be nil."
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end
 
   class AssertNotNilTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_not_nil`"
     setup do
       desc = @desc = "assert not nil empty fail desc"
@@ -42,19 +46,19 @@ module Assert::Assertions
         assert_not_nil(*args) # fail
       end
       @c = @test.config
-      @test.run
+      @test.run(&test_run_callback)
     end
     subject{ @test }
 
     should "produce results as expected" do
-      assert_equal 2, subject.result_count
-      assert_equal 1, subject.result_count(:pass)
-      assert_equal 1, subject.result_count(:fail)
+      assert_equal 2, test_run_result_count
+      assert_equal 1, test_run_result_count(:pass)
+      assert_equal 1, test_run_result_count(:fail)
     end
 
     should "have a fail message with custom and generic explanations" do
       exp = "#{@args[1]}\nExpected #{Assert::U.show(@args[0], @c)} to not be nil."
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end

data/test/unit/assertions/assert_raises_tests.rb

@@ -4,6 +4,8 @@ require 'assert/assertions'
 module Assert::Assertions
 
   class AssertRaisesTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_raises`"
     setup do
       d = @d = "assert raises fail desc"
@@ -14,14 +16,14 @@ module Assert::Assertions
         assert_raises(RuntimeError, d){ true }                             # fail
         assert_raises(d){ true }                                           # fail
       end
-      @test.run
+      @test.run(&test_run_callback)
     end
     subject{ @test }
 
     should "produce results as expected" do
-      assert_equal 5, subject.result_count
-      assert_equal 1, subject.result_count(:pass)
-      assert_equal 4, subject.result_count(:fail)
+      assert_equal 5, test_run_result_count
+      assert_equal 1, test_run_result_count(:pass)
+      assert_equal 4, test_run_result_count(:fail)
     end
 
     should "have a fail message with custom and generic explanations" do
@@ -31,7 +33,7 @@ module Assert::Assertions
         "#{@d}\nRuntimeError exception expected but nothing raised.",
         "#{@d}\nAn exception expected but nothing raised."
       ]
-      messages = @test.fail_results.map(&:message)
+      messages = test_run_results(:fail).map(&:message)
       messages.each_with_index{ |msg, n| assert_match /^#{exp[n]}/, msg }
     end
 
@@ -58,6 +60,8 @@ module Assert::Assertions
   end
 
   class AssertNothingRaisedTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_nothing_raised`"
     setup do
       d = @d = "assert nothing raised fail desc"
@@ -68,14 +72,14 @@ module Assert::Assertions
         self.send(anr, d){ raise(RuntimeError) }                               # fail
         self.send(anr){ true }                                                 # pass
       end
-      @test.run
+      @test.run(&test_run_callback)
     end
     subject{ @test }
 
     should "produce results as expected" do
-      assert_equal 4, subject.result_count
-      assert_equal 2, subject.result_count(:pass)
-      assert_equal 2, subject.result_count(:fail)
+      assert_equal 4, test_run_result_count
+      assert_equal 2, test_run_result_count(:pass)
+      assert_equal 2, test_run_result_count(:fail)
     end
 
     should "have a fail message with custom and generic explanations" do
@@ -83,7 +87,7 @@ module Assert::Assertions
         "#{@d}\nStandardError or RuntimeError exception not expected, but raised:",
         "#{@d}\nAn exception not expected, but raised:"
       ]
-      messages = @test.fail_results.map(&:message)
+      messages = test_run_results(:fail).map(&:message)
       messages.each_with_index{ |msg, n| assert_match /^#{exp[n]}/, msg }
     end
 

data/test/unit/assertions/assert_respond_to_tests.rb

@@ -6,6 +6,8 @@ require 'assert/utils'
 module Assert::Assertions
 
   class AssertRespondToTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_respond_to`"
     setup do
       desc = @desc = "assert respond to fail desc"
@@ -15,26 +17,28 @@ module Assert::Assertions
         assert_respond_to(*args)   # fail
       end
       @c = @test.config
-      @test.run
+      @test.run(&test_run_callback)
     end
     subject{ @test }
 
     should "produce results as expected" do
-      assert_equal 2, subject.result_count
-      assert_equal 1, subject.result_count(:pass)
-      assert_equal 1, subject.result_count(:fail)
+      assert_equal 2, test_run_result_count
+      assert_equal 1, test_run_result_count(:pass)
+      assert_equal 1, test_run_result_count(:fail)
     end
 
     should "have a fail message with custom and generic explanations" do
       exp = "#{@args[2]}\n"\
             "Expected #{Assert::U.show(@args[1], @c)} (#{@args[1].class})"\
             " to respond to `#{@args[0]}`."
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end
 
   class AssertNotRespondToTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_not_respond_to`"
     setup do
       desc = @desc = "assert not respond to fail desc"
@@ -44,21 +48,21 @@ module Assert::Assertions
         assert_not_respond_to(:abs, "1") # pass
       end
       @c = @test.config
-      @test.run
+      @test.run(&test_run_callback)
     end
     subject{ @test }
 
     should "produce results as expected" do
-      assert_equal 2, subject.result_count
-      assert_equal 1, subject.result_count(:pass)
-      assert_equal 1, subject.result_count(:fail)
+      assert_equal 2, test_run_result_count
+      assert_equal 1, test_run_result_count(:pass)
+      assert_equal 1, test_run_result_count(:fail)
     end
 
     should "have a fail message with custom and generic explanations" do
       exp = "#{@args[2]}\n"\
             "Expected #{Assert::U.show(@args[1], @c)} (#{@args[1].class})"\
             " to not respond to `#{@args[0]}`."
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end

data/test/unit/assertions/assert_same_tests.rb

@@ -6,6 +6,8 @@ require 'assert/utils'
 module Assert::Assertions
 
   class AssertSameTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_same`"
     setup do
       klass = Class.new; object = klass.new
@@ -16,14 +18,14 @@ module Assert::Assertions
         assert_same(*args)          # fail
       end
       @c = @test.config
-      @test.run
+      @test.run(&test_run_callback)
     end
     subject{ @test }
 
     should "produce results as expected" do
-      assert_equal 2, subject.result_count
-      assert_equal 1, subject.result_count(:pass)
-      assert_equal 1, subject.result_count(:fail)
+      assert_equal 2, test_run_result_count
+      assert_equal 1, test_run_result_count(:pass)
+      assert_equal 1, test_run_result_count(:fail)
     end
 
     should "have a fail message with custom and generic explanations" do
@@ -32,12 +34,14 @@ module Assert::Assertions
             " (#<#{@args[1].class}:#{'0x0%x' % (@args[1].object_id << 1)}>)"\
             " to be the same as #{Assert::U.show(@args[0], @c)}"\
             " (#<#{@args[0].class}:#{'0x0%x' % (@args[0].object_id << 1)}>)."
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end
 
   class AssertNotSameTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_not_same`"
     setup do
       klass = Class.new; object = klass.new
@@ -48,14 +52,14 @@ module Assert::Assertions
         assert_not_same(object, klass.new) # pass
       end
       @c = @test.config
-      @test.run
+      @test.run(&test_run_callback)
     end
     subject{ @test }
 
     should "produce results as expected" do
-      assert_equal 2, subject.result_count
-      assert_equal 1, subject.result_count(:pass)
-      assert_equal 1, subject.result_count(:fail)
+      assert_equal 2, test_run_result_count
+      assert_equal 1, test_run_result_count(:pass)
+      assert_equal 1, test_run_result_count(:fail)
     end
 
     should "have a fail message with custom and generic explanations" do
@@ -64,12 +68,14 @@ module Assert::Assertions
             " (#<#{@args[1].class}:#{'0x0%x' % (@args[1].object_id << 1)}>)"\
             " to not be the same as #{Assert::U.show(@args[0], @c)}"\
             " (#<#{@args[0].class}:#{'0x0%x' % (@args[0].object_id << 1)}>)."
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end
 
   class DiffTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "with objects that should use diff when showing"
     setup do
       @exp_obj = "I'm a\nstring"
@@ -92,7 +98,7 @@ module Assert::Assertions
       @test = Factory.test(@c) do
         assert_same(exp_obj, act_obj)
       end
-      @test.run
+      @test.run(&test_run_callback)
     end
     subject{ @test }
 
@@ -102,7 +108,7 @@ module Assert::Assertions
             " #<#{@exp_obj.class}:#{'0x0%x' % (@exp_obj.object_id << 1)}>"\
             ", diff:\n"\
             "#{Assert::U.syscmd_diff_proc.call(@exp_obj_show, @act_obj_show)}"
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end
@@ -117,7 +123,7 @@ module Assert::Assertions
       @test = Factory.test(@c) do
         assert_not_same(exp_obj, exp_obj)
       end
-      @test.run
+      @test.run(&test_run_callback)
     end
     subject{ @test }
 
@@ -127,7 +133,7 @@ module Assert::Assertions
             " #<#{@exp_obj.class}:#{'0x0%x' % (@exp_obj.object_id << 1)}>"\
             ", diff:\n"\
             "#{Assert::U.syscmd_diff_proc.call(@exp_obj_show, @act_obj_show)}"
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end