assert 2.18.2 → 2.18.3

data/test/unit/assertions/assert_nil_tests.rb

@@ -8,27 +8,28 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_nil`"
-    setup do
-      desc = @desc = "assert nil empty fail desc"
-      args = @args = [1, desc]
-      @test = Factory.test do
+    subject { test1 }
+
+    let(:desc1) { "assert nil empty fail desc" }
+    let(:args1) { [1, desc1] }
+    let(:test1) {
+      args = args1
+      Factory.test do
         assert_nil(nil)   # pass
         assert_nil(*args) # fail
       end
-      @c = @test.config
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
+    let(:config1) { test1.config }
 
     should "produce results as expected" do
-      assert_equal 2, test_run_result_count
-      assert_equal 1, test_run_result_count(:pass)
-      assert_equal 1, test_run_result_count(:fail)
-    end
+      subject.run(&test_run_callback)
 
-    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, test_run_results(:fail).first.message
+      assert_that(test_run_result_count).equals(2)
+      assert_that(test_run_result_count(:pass)).equals(1)
+      assert_that(test_run_result_count(:fail)).equals(1)
+
+      exp = "#{args1[1]}\nExpected #{Assert::U.show(args1[0], config1)} to be nil."
+      assert_that(test_run_results(:fail).first.message).equals(exp)
     end
   end
 
@@ -36,28 +37,28 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_not_nil`"
-    setup do
-      desc = @desc = "assert not nil empty fail desc"
-      args = @args = [nil, desc]
-      @test = Factory.test do
+    subject { test1 }
+
+    let(:desc1) { "assert not nil empty fail desc" }
+    let(:args1) { [nil, desc1] }
+    let(:test1) {
+      args = args1
+      Factory.test do
         assert_not_nil(1)     # pass
         assert_not_nil(*args) # fail
       end
-      @c = @test.config
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
+    let(:config1) { test1.config }
 
     should "produce results as expected" do
-      assert_equal 2, test_run_result_count
-      assert_equal 1, test_run_result_count(:pass)
-      assert_equal 1, test_run_result_count(:fail)
-    end
+      subject.run(&test_run_callback)
 
-    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, test_run_results(:fail).first.message
+      assert_that(test_run_result_count).equals(2)
+      assert_that(test_run_result_count(:pass)).equals(1)
+      assert_that(test_run_result_count(:fail)).equals(1)
+
+      exp = "#{args1[1]}\nExpected #{Assert::U.show(args1[0], config1)} to not be nil."
+      assert_that(test_run_results(:fail).first.message).equals(exp)
     end
   end
 end
-

data/test/unit/assertions/assert_raises_tests.rb

@@ -6,54 +6,55 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_raises`"
-    setup do
-      d = @d = "assert raises fail desc"
-      @test = Factory.test do
-        assert_raises(StandardError, RuntimeError){ raise(StandardError) } # pass
-        assert_raises(StandardError, RuntimeError, d){ raise(Exception) }  # fail
-        assert_raises(RuntimeError, d){ raise(StandardError) }             # fail
-        assert_raises(RuntimeError, d){ true }                             # fail
-        assert_raises(d){ true }                                           # fail
+    subject { test1 }
+
+    let(:desc1) { "assert raises fail desc" }
+    let(:test1) {
+      desc = desc1
+      Factory.test do
+        assert_raises(StandardError, RuntimeError) { raise(StandardError) }    # pass
+        assert_raises(StandardError, RuntimeError, desc) { raise(Exception) }  # fail
+        assert_raises(RuntimeError, desc) { raise(StandardError) }             # fail
+        assert_raises(RuntimeError, desc) { true }                             # fail
+        assert_raises(desc) { true }                                           # fail
       end
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
 
     should "produce results as expected" do
-      assert_equal 5, test_run_result_count
-      assert_equal 1, test_run_result_count(:pass)
-      assert_equal 4, test_run_result_count(:fail)
-    end
+      subject.run(&test_run_callback)
 
-    should "have a fail message with custom and generic explanations" do
-      exp = [
-        "#{@d}\nStandardError or RuntimeError exception expected, not:",
-        "#{@d}\nRuntimeError exception expected, not:",
-        "#{@d}\nRuntimeError exception expected but nothing raised.",
-        "#{@d}\nAn exception expected but nothing raised."
-      ]
+      assert_that(test_run_result_count).equals(5)
+      assert_that(test_run_result_count(:pass)).equals(1)
+      assert_that(test_run_result_count(:fail)).equals(4)
+
+      exp =
+        [ "#{desc1}\nStandardError or RuntimeError exception expected, not:",
+          "#{desc1}\nRuntimeError exception expected, not:",
+          "#{desc1}\nRuntimeError exception expected but nothing raised.",
+          "#{desc1}\nAn exception expected but nothing raised."
+        ]
       messages = test_run_results(:fail).map(&:message)
-      messages.each_with_index{ |msg, n| assert_match(/^#{exp[n]}/, msg) }
+      messages.each_with_index{ |msg, n| assert_that(msg).matches(/^#{exp[n]}/) }
     end
 
     should "return any raised exception instance" do
       error     = nil
       error_msg = Factory.string
-      test = Factory.test do
-        error = assert_raises(RuntimeError){ raise(RuntimeError, error_msg) }
-      end
+
+      test =
+        Factory.test do
+          error = assert_raises(RuntimeError) { raise(RuntimeError, error_msg) }
+        end
       test.run
 
-      assert_not_nil error
-      assert_kind_of RuntimeError, error
-      assert_equal error_msg, error.message
+      assert_that(error).is_not_nil
+      assert_that(error).is_kind_of(RuntimeError)
+      assert_that(error.message).equals(error_msg)
 
-      test = Factory.test do
-        error = assert_raises(RuntimeError){ }
-      end
+      test = Factory.test { error = assert_raises(RuntimeError) {} }
       test.run
 
-      assert_nil error
+      assert_that(error).is_nil
     end
   end
 
@@ -61,33 +62,32 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_nothing_raised`"
-    setup do
-      d = @d = "assert nothing raised fail desc"
-      @test = Factory.test do
-        anr = :assert_nothing_raised
-        self.send(anr, StandardError, RuntimeError, d){ raise(StandardError) } # fail
-        self.send(anr, RuntimeError){ raise(StandardError) }                   # pass
-        self.send(anr, d){ raise(RuntimeError) }                               # fail
-        self.send(anr){ true }                                                 # pass
+    subject { test1 }
+
+    let(:desc1) { "assert nothing raised fail desc" }
+    let(:test1) {
+      desc = desc1
+      Factory.test do
+        assert_nothing_raised(StandardError, RuntimeError, desc) { raise(StandardError) } # fail
+        assert_nothing_raised(RuntimeError) { raise(StandardError) }                      # pass
+        assert_nothing_raised(desc) { raise(RuntimeError) }                               # fail
+        assert_nothing_raised { true }                                                    # pass
       end
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
 
     should "produce results as expected" do
-      assert_equal 4, test_run_result_count
-      assert_equal 2, test_run_result_count(:pass)
-      assert_equal 2, test_run_result_count(:fail)
-    end
+      subject.run(&test_run_callback)
+
+      assert_that(test_run_result_count).equals(4)
+      assert_that(test_run_result_count(:pass)).equals(2)
+      assert_that(test_run_result_count(:fail)).equals(2)
 
-    should "have a fail message with custom and generic explanations" do
-      exp = [
-        "#{@d}\nStandardError or RuntimeError exception not expected, but raised:",
-        "#{@d}\nAn exception not expected, but raised:"
-      ]
+      exp =
+        [ "#{desc1}\nStandardError or RuntimeError exception not expected, but raised:",
+          "#{desc1}\nAn exception not expected, but raised:"
+        ]
       messages = test_run_results(:fail).map(&:message)
-      messages.each_with_index{ |msg, n| assert_match(/^#{exp[n]}/, msg) }
+      messages.each_with_index{ |msg, n| assert_that(msg).matches(/^#{exp[n]}/) }
     end
   end
 end
-

data/test/unit/assertions/assert_respond_to_tests.rb

@@ -8,29 +8,31 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_respond_to`"
-    setup do
-      desc = @desc = "assert respond to fail desc"
-      args = @args = [:abs, "1", desc]
-      @test = Factory.test do
+    subject { test1 }
+
+    let(:desc1) { "assert respond to fail desc" }
+    let(:args1) { [:abs, "1", desc1] }
+    let(:test1) {
+      args = args1
+      Factory.test do
         assert_respond_to(:abs, 1) # pass
         assert_respond_to(*args)   # fail
       end
-      @c = @test.config
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
+    let(:config1) { test1.config }
 
     should "produce results as expected" do
-      assert_equal 2, test_run_result_count
-      assert_equal 1, test_run_result_count(:pass)
-      assert_equal 1, test_run_result_count(:fail)
-    end
+      subject.run(&test_run_callback)
 
-    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, test_run_results(:fail).first.message
+      assert_that(test_run_result_count).equals(2)
+      assert_that(test_run_result_count(:pass)).equals(1)
+      assert_that(test_run_result_count(:fail)).equals(1)
+
+      exp =
+        "#{args1[2]}\n"\
+        "Expected #{Assert::U.show(args1[1], config1)} (#{args1[1].class})"\
+        " to respond to `#{args1[0]}`."
+      assert_that(test_run_results(:fail).first.message).equals(exp)
     end
   end
 
@@ -38,30 +40,31 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_not_respond_to`"
-    setup do
-      desc = @desc = "assert not respond to fail desc"
-      args = @args = [:abs, 1, desc]
-      @test = Factory.test do
+    subject { test1 }
+
+    let(:desc1) { "assert not respond to fail desc" }
+    let(:args1) { [:abs, 1, desc1] }
+    let(:test1) {
+      args = args1
+      Factory.test do
         assert_not_respond_to(*args)     # fail
         assert_not_respond_to(:abs, "1") # pass
       end
-      @c = @test.config
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
+    let(:config1) { test1.config }
 
     should "produce results as expected" do
-      assert_equal 2, test_run_result_count
-      assert_equal 1, test_run_result_count(:pass)
-      assert_equal 1, test_run_result_count(:fail)
-    end
+      subject.run(&test_run_callback)
 
-    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, test_run_results(:fail).first.message
+      assert_that(test_run_result_count).equals(2)
+      assert_that(test_run_result_count(:pass)).equals(1)
+      assert_that(test_run_result_count(:fail)).equals(1)
+
+      exp =
+        "#{args1[2]}\n"\
+        "Expected #{Assert::U.show(args1[1], config1)} (#{args1[1].class})"\
+        " to not respond to `#{args1[0]}`."
+      assert_that(test_run_results(:fail).first.message).equals(exp)
     end
   end
 end
-

data/test/unit/assertions/assert_same_tests.rb

@@ -8,32 +8,36 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_same`"
-    setup do
-      klass = Class.new; object = klass.new
-      desc = @desc = "assert same fail desc"
-      args = @args = [object, klass.new, desc]
-      @test = Factory.test do
+    subject { test1 }
+
+    let(:class1) { Class.new }
+    let(:object1) { class1.new }
+    let(:desc1) { "assert same fail desc" }
+    let(:args1) { [object1, class1.new, desc1] }
+    let(:test1) {
+      args   = args1
+      object = object1
+      Factory.test do
         assert_same(object, object) # pass
         assert_same(*args)          # fail
       end
-      @c = @test.config
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
+    let(:config1) { test1.config }
 
     should "produce results as expected" do
-      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}:#{"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, test_run_results(:fail).first.message
+      subject.run(&test_run_callback)
+
+      assert_that(test_run_result_count).equals(2)
+      assert_that(test_run_result_count(:pass)).equals(1)
+      assert_that(test_run_result_count(:fail)).equals(1)
+
+      exp =
+        "#{args1[2]}\n"\
+        "Expected #{Assert::U.show(args1[1], config1)}"\
+        " (#<#{args1[1].class}:#{"0x0%x" % (args1[1].object_id << 1)}>)"\
+        " to be the same as #{Assert::U.show(args1[0], config1)}"\
+        " (#<#{args1[0].class}:#{"0x0%x" % (args1[0].object_id << 1)}>)."
+      assert_that(test_run_results(:fail).first.message).equals(exp)
     end
   end
 
@@ -41,32 +45,37 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_not_same`"
-    setup do
-      klass = Class.new; object = klass.new
-      desc = @desc = "assert not same fail desc"
-      args = @args = [object, object, desc]
-      @test = Factory.test do
+    subject { test1 }
+
+    let(:class1) { Class.new }
+    let(:object1) { class1.new }
+    let(:desc1) { "assert not same fail desc" }
+    let(:args1) { [object1, object1, desc1] }
+    let(:test1) {
+      args   = args1
+      object = object1
+      klass  = class1
+      Factory.test do
         assert_not_same(*args)             # fail
         assert_not_same(object, klass.new) # pass
       end
-      @c = @test.config
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
+    let(:config1) { test1.config }
 
     should "produce results as expected" do
-      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}:#{"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, test_run_results(:fail).first.message
+      subject.run(&test_run_callback)
+
+      assert_that(test_run_result_count).equals(2)
+      assert_that(test_run_result_count(:pass)).equals(1)
+      assert_that(test_run_result_count(:fail)).equals(1)
+
+      exp =
+        "#{args1[2]}\n"\
+        "Expected #{Assert::U.show(args1[1], config1)}"\
+        " (#<#{args1[1].class}:#{"0x0%x" % (args1[1].object_id << 1)}>)"\
+        " to not be the same as #{Assert::U.show(args1[0], config1)}"\
+        " (#<#{args1[0].class}:#{"0x0%x" % (args1[0].object_id << 1)}>)."
+      assert_that(test_run_results(:fail).first.message).equals(exp)
     end
   end
 
@@ -74,62 +83,64 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "with objects that should use diff when showing"
-    setup do
-      @exp_obj = "I'm a\nstring"
-      @act_obj = "I am a \nstring"
-
-      @c = Factory.modes_off_config
-      @c.use_diff_proc(Assert::U.default_use_diff_proc)
-      @c.run_diff_proc(Assert::U.syscmd_diff_proc)
+    let(:config1) {
+      Factory.modes_off_config.tap do |config|
+        config.use_diff_proc(Assert::U.default_use_diff_proc)
+        config.run_diff_proc(Assert::U.syscmd_diff_proc)
+      end
+    }
 
-      @exp_obj_show = Assert::U.show_for_diff(@exp_obj, @c)
-      @act_obj_show = Assert::U.show_for_diff(@act_obj, @c)
-    end
+    let(:exp_obj1) { "I'm a\nstring" }
+    let(:act_obj1) { "I am a \nstring" }
+    let(:exp_obj_show1) { Assert::U.show_for_diff(exp_obj1, config1) }
+    let(:act_obj_show1) { Assert::U.show_for_diff(act_obj1, config1) }
   end
 
   class AssertSameDiffTests < DiffTests
     desc "`assert_same`"
-    setup do
-      exp_obj, act_obj = @exp_obj, @act_obj
-      @test = Factory.test(@c) do
+    subject { test1 }
+
+    let(:test1) {
+      exp_obj, act_obj = exp_obj1, act_obj1
+      Factory.test(config1) do
         assert_same(exp_obj, act_obj)
       end
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
 
     should "include diff output in the fail messages" do
-      exp = "Expected #<#{@act_obj.class}:#{"0x0%x" % (@act_obj.object_id << 1)}>"\
-            " to be the same as"\
-            " #<#{@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, test_run_results(:fail).first.message
+      subject.run(&test_run_callback)
+
+      exp =
+        "Expected #<#{act_obj1.class}:#{"0x0%x" % (act_obj1.object_id << 1)}>"\
+        " to be the same as"\
+        " #<#{exp_obj1.class}:#{"0x0%x" % (exp_obj1.object_id << 1)}>"\
+        ", diff:\n"\
+        "#{Assert::U.syscmd_diff_proc.call(exp_obj_show1, act_obj_show1)}"
+      assert_that(test_run_results(:fail).first.message).equals(exp)
     end
   end
 
   class AssertNotSameDiffTests < DiffTests
     desc "`assert_not_same`"
-    setup do
-      @exp_obj = @act_obj
-      @exp_obj_show = @act_obj_show
+    subject { test1 }
 
-      exp_obj, act_obj = @exp_obj, @act_obj
-      @test = Factory.test(@c) do
-        assert_not_same(exp_obj, exp_obj)
+    let(:test1) {
+      act_obj = act_obj1
+      Factory.test(config1) do
+        assert_not_same(act_obj, act_obj)
       end
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
 
     should "include diff output in the fail messages" do
-      exp = "Expected #<#{@act_obj.class}:#{"0x0%x" % (@act_obj.object_id << 1)}>"\
-            " to not be the same as"\
-            " #<#{@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, test_run_results(:fail).first.message
+      subject.run(&test_run_callback)
+
+      exp =
+        "Expected #<#{act_obj1.class}:#{"0x0%x" % (act_obj1.object_id << 1)}>"\
+        " to not be the same as"\
+        " #<#{act_obj1.class}:#{"0x0%x" % (act_obj1.object_id << 1)}>"\
+        ", diff:\n"\
+        "#{Assert::U.syscmd_diff_proc.call(act_obj_show1, act_obj_show1)}"
+      assert_that(test_run_results(:fail).first.message).equals(exp)
     end
   end
 end
-