assert 2.15.2 → 2.16.0

data/test/unit/assertions/assert_block_tests.rb

@@ -4,6 +4,8 @@ require 'assert/assertions'
 module Assert::Assertions
 
   class AssertBlockTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_block`"
     setup do
       desc = @desc = "assert block fail desc"
@@ -11,24 +13,26 @@ module Assert::Assertions
         assert_block{ true }        # pass
         assert_block(desc){ false } # fail
       end
-      @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 = "#{@desc}\nExpected block to return a true value."
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end
 
   class AssertNotBlockTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_not_block`"
     setup do
       desc = @desc = "assert not block fail desc"
@@ -36,19 +40,19 @@ module Assert::Assertions
         assert_not_block(desc){ true } # fail
         assert_not_block{ false }      # pass
       end
-      @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 = "#{@desc}\nExpected block to not return a true value."
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end

data/test/unit/assertions/assert_empty_tests.rb

@@ -6,6 +6,8 @@ require 'assert/utils'
 module Assert::Assertions
 
   class AssertEmptyTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_empty`"
     setup do
       desc = @desc = "assert empty fail desc"
@@ -15,24 +17,26 @@ module Assert::Assertions
         assert_empty(*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 empty."
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end
 
   class AssertNotEmptyTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_not_empty`"
     setup do
       desc = @desc = "assert not empty fail desc"
@@ -42,19 +46,19 @@ module Assert::Assertions
         assert_not_empty(*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 empty."
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end

data/test/unit/assertions/assert_equal_tests.rb

@@ -6,6 +6,8 @@ require 'assert/utils'
 module Assert::Assertions
 
   class AssertEqualTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_equal`"
     setup do
       desc = @desc = "assert equal fail desc"
@@ -15,25 +17,27 @@ module Assert::Assertions
         assert_equal(*a)   # 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 = "#{@a[2]}\nExpected #{Assert::U.show(@a[1], @c)}"\
             " to be equal to #{Assert::U.show(@a[0], @c)}."
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end
 
   class AssertNotEqualTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_not_equal`"
     setup do
       desc = @desc = "assert not equal fail desc"
@@ -43,25 +47,27 @@ module Assert::Assertions
         assert_not_equal(1, 2) # 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 = "#{@a[2]}\nExpected #{Assert::U.show(@a[1], @c)}"\
             " to not be equal to #{Assert::U.show(@a[0], @c)}."
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end
 
   class EqualOrderTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "with objects that define custom equality operators"
     setup do
       is_class = Class.new do
@@ -83,6 +89,8 @@ module Assert::Assertions
   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"
@@ -105,14 +113,14 @@ module Assert::Assertions
       @test = Factory.test(@c) do
         assert_equal(exp_obj, act_obj)
       end
-      @test.run
+      @test.run(&test_run_callback)
     end
     subject{ @test }
 
     should "include diff output in the fail messages" do
       exp = "Expected does not equal actual, 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
@@ -124,14 +132,14 @@ module Assert::Assertions
       @test = Factory.test(@c) do
         assert_not_equal(exp_obj, exp_obj)
       end
-      @test.run
+      @test.run(&test_run_callback)
     end
     subject{ @test }
 
     should "include diff output in the fail messages" do
       exp = "Expected equals actual, diff:\n"\
             "#{Assert::U.syscmd_diff_proc.call(@exp_obj_show, @exp_obj_show)}"
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end

data/test/unit/assertions/assert_file_exists_tests.rb

@@ -6,6 +6,8 @@ require 'assert/utils'
 module Assert::Assertions
 
   class AssertFileExistsTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_file_exists`"
     setup do
       desc = @desc = "assert file exists empty fail desc"
@@ -15,24 +17,26 @@ module Assert::Assertions
         assert_file_exists(*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 exist."
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end
 
   class AssertNotFileExistsTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_not_file_exists`"
     setup do
       desc = @desc = "assert not file exists empty fail desc"
@@ -42,19 +46,19 @@ module Assert::Assertions
         assert_not_file_exists(*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 exist."
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end

data/test/unit/assertions/assert_includes_tests.rb

@@ -6,6 +6,8 @@ require 'assert/utils'
 module Assert::Assertions
 
   class AssertIncludesTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_includes`"
     setup do
       desc = @desc = "assert includes fail desc"
@@ -15,26 +17,28 @@ module Assert::Assertions
         assert_includes(*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)}"\
             " to include #{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 AssertNotIncludedTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_not_included`"
     setup do
       desc = @desc = "assert not included fail desc"
@@ -44,21 +48,21 @@ module Assert::Assertions
         assert_not_included(*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)}"\
             " to not include #{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_instance_of_tests.rb

@@ -6,6 +6,8 @@ require 'assert/utils'
 module Assert::Assertions
 
   class AssertInstanceOfTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_instance_of`"
     setup do
       desc = @desc = "assert instance of fail desc"
@@ -15,25 +17,27 @@ module Assert::Assertions
         assert_instance_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 an instance of #{@args[0]}."
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end
 
   class AssertNotInstanceOfTests < Assert::Context
+    include Assert::Test::TestHelpers
+
     desc "`assert_not_instance_of`"
     setup do
       desc = @desc = "assert not instance of fail desc"
@@ -43,20 +47,20 @@ module Assert::Assertions
         assert_not_instance_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 an instance of #{@args[0]}."
-      assert_equal exp, subject.fail_results.first.message
+      assert_equal exp, test_run_results(:fail).first.message
     end
 
   end