minitest-ok 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0393c06bdcd679080b979ab6d402b16363b9ac52
-  data.tar.gz: 6c0f9dbd1af465ca6601b8be8cadad2809e8393f
+  metadata.gz: 4aa9f8f89625dcaab1a15d2875489ce3aa9bc5c4
+  data.tar.gz: c5d799128def76bdafb54e3e0e7d3509dcbd4e8e
 SHA512:
-  metadata.gz: 08609c6a464436a7ab37ff3045bdcf18dd7d1b9360c728609251ef1e0e7ab3f76983de8a2569cca55f68dbd62a768dddbc8d785fbbf40031253d263e70acb918
-  data.tar.gz: e869d5d3fcb907eb6ae6aae167f1f1313f25220009e5c8e7880f3e36cb4629897c10e440002f7fbc23baaeb307e670bbb2f88ca03d9c4e2fb3181c40c0615ae5
+  metadata.gz: 8d5cae13adc0e3119d3b9c8f24c210922f99e63c28851768cd655190a45ca0e4ecfecfb702d6983a807bcf5879bca10a60333661f262d140c7a54b41682a95a0
+  data.tar.gz: 230d68777e669036f620757e47d9f25f04783afcdc51e0b69b0736d0cd0b7c50815914c4ae59fbd19f4a52f022cf5d1e3d8652332495527946f768817b039a47

data/lib/minitest/ok.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 0.2.0 $
+### $Release: 0.3.0 $
 ### $Copyright: copyright(c) 2015 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -59,7 +59,7 @@ module Minitest
 
   module Ok
 
-    VERSION = '$Release: 0.2.0 $'.split()[1]
+    VERSION = '$Release: 0.3.0 $'.split()[1]
 
 
     class Msg < Proc    # :nodoc:
@@ -111,9 +111,17 @@ module Minitest
       ##
       def ==(expected)
         _mark_as_tested()
-        @context.assert_equal expected, @actual  unless @not
-        @context.refute_equal expected, @actual  if     @not
+        if nil == expected
+          @context.assert_nil @actual  unless @not
+          @context.refute_nil @actual  if     @not
+        else
+          @context.assert_equal expected, @actual  unless @not
+          @context.refute_equal expected, @actual  if     @not
+        end
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -127,6 +135,9 @@ module Minitest
         @context.refute_equal expected, @actual  unless @not
         @context.assert_equal expected, @actual  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -141,6 +152,9 @@ module Minitest
         @context.assert_operator @actual, :'>', expected  unless @not
         @context.refute_operator @actual, :'>', expected  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -155,6 +169,9 @@ module Minitest
         @context.assert_operator @actual, :'>=', expected  unless @not
         @context.refute_operator @actual, :'>=', expected  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -169,6 +186,9 @@ module Minitest
         @context.assert_operator @actual, :'<', expected  unless @not
         @context.refute_operator @actual, :'<', expected  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -183,6 +203,9 @@ module Minitest
         @context.assert_operator @actual, :'<=', expected  unless @not
         @context.refute_operator @actual, :'<=', expected  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -196,6 +219,9 @@ module Minitest
         @context.assert_operator @actual, :'===', expected  unless @not
         @context.refute_operator @actual, :'===', expected  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -209,6 +235,9 @@ module Minitest
         @context.assert_match expected, @actual  unless @not
         @context.refute_match expected, @actual  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -222,6 +251,9 @@ module Minitest
         @context.refute_match expected, @actual  unless @not
         @context.assert_match expected, @actual  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -236,6 +268,9 @@ module Minitest
         @context.assert_kind_of expected, @actual  unless @not
         @context.refute_kind_of expected, @actual  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -258,6 +293,9 @@ module Minitest
         @context.assert_instance_of expected, @actual  unless @not
         @context.refute_instance_of expected, @actual  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -273,6 +311,9 @@ module Minitest
         @context.assert_same expected, @actual  unless @not
         @context.refute_same expected, @actual  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -288,6 +329,9 @@ module Minitest
         @context.assert_empty @actual  unless @not
         @context.refute_empty @actual  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -301,6 +345,9 @@ module Minitest
         @context.assert_in_delta(expected, @actual, delta)  unless @not
         @context.refute_in_delta(expected, @actual, delta)  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -314,6 +361,9 @@ module Minitest
         @context.assert_in_epsilon(expected, @actual, epsilon)  unless @not
         @context.refute_in_epsilon(expected, @actual, epsilon)  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -348,6 +398,9 @@ module Minitest
           end
         end
         return ex   # not self!
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -362,6 +415,9 @@ module Minitest
           raise "NOT.throw? is unsupported because refute_throws() is not defined in Minitest."
         @context.assert_throws(sym) { @actual.call }
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -375,6 +431,9 @@ module Minitest
         @context.assert_respond_to @actual, expected  unless @not
         @context.refute_respond_to @actual, expected  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -389,6 +448,9 @@ module Minitest
         @context.assert_includes @actual, expected  unless @not
         @context.refute_includes @actual, expected  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -403,6 +465,9 @@ module Minitest
         @context.assert_includes expected, @actual  unless @not
         @context.refute_includes expected, @actual  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -417,6 +482,9 @@ module Minitest
           raise "use ok().silent? instead of ok().NOT.output?."
         @context.assert_output(stdout, stderr, &@actual)
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -431,6 +499,9 @@ module Minitest
           raise "use ok().output? instead of ok().NOT.silent?."
         @context.assert_silent(&@actual)
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ## for predicates
@@ -446,6 +517,9 @@ module Minitest
         @context.assert_predicate @actual, :frozen?  unless @not
         @context.refute_predicate @actual, :frozen?  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -459,6 +533,9 @@ module Minitest
         @context.assert_predicate @actual, :tainted?  unless @not
         @context.refute_predicate @actual, :tainted?  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -478,6 +555,9 @@ module Minitest
           @context.refute result, "Expected #{@actual.inspect} not to have instance variable #{varname}, but has it."
         end
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -512,6 +592,9 @@ module Minitest
           end
         end
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ## other helpers
@@ -534,6 +617,9 @@ module Minitest
           @context.refute @actual, Msg.new { "Expected (!! #{@actual.inspect}) == false, but not." }
         end
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -554,6 +640,9 @@ module Minitest
           @context.assert @actual, Msg.new { "Expected (!! #{@actual.inspect}) == true, but not." }
         end
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -574,6 +663,9 @@ module Minitest
         @context.assert_equal expected, actual, Msg.new { pr.call('==') }  unless @not
         @context.refute_equal expected, actual, Msg.new { pr.call('!=') }  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -589,6 +681,9 @@ module Minitest
           attr(name, expected)
         end
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -608,6 +703,9 @@ module Minitest
         @context.assert_equal expected, actual, Msg.new { pr.call('==') }  unless @not
         @context.refute_equal expected, actual, Msg.new { pr.call('!=') }  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -622,6 +720,9 @@ module Minitest
           item(key, expected)
         end
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -640,6 +741,9 @@ module Minitest
         else
           @context.refute File.exist?(fpath), "File '#{fpath}' exists unexpectedly."
         end
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -658,6 +762,9 @@ module Minitest
         else
           @context.refute File.exist?(fpath),     "Directory '#{fpath}' exists unexpectedly."
         end
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -673,6 +780,9 @@ module Minitest
         @context.assert ! File.exist?(fpath), "'#{fpath}' exists unexpectedly." unless @not
         @context.refute ! File.exist?(fpath), "'#{fpath}' doesn't exist."       if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
     end

data/test/minitest/ok_test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 0.2.0 $
+### $Release: 0.3.0 $
 ### $Copyright: copyright(c) 2015 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -169,7 +169,9 @@ describe Minitest::Ok::AssertionObject do
       should_not_raise  { ok {String}.NOT === 123   }
       should_not_raise  { ok {/\d+/ }.NOT === 'abc' }
       ex = should_raise { ok {String}.NOT === '123' }
-      msg = 'Expected String to not be === "123".'
+      #msg = 'Expected String to not be === "123".'
+      msg = ('Expected String to not be === # encoding: UTF-8'+"\n"+
+             '"123".')
       assert_equal msg, ex.message
     end
 
@@ -181,14 +183,18 @@ describe Minitest::Ok::AssertionObject do
     it "calls assert_match()." do
       should_not_raise  { ok {"hom"} =~ /\w+/ }
       ex = should_raise { ok {"hom"} =~ /\d+/ }
-      msg = 'Expected /\d+/ to match "hom".'
+      #msg = 'Expected /\d+/ to match "hom".'
+      msg = ('Expected /\d+/ to match # encoding: UTF-8'+"\n"+
+             '"hom".')
       assert_equal msg, ex.message
     end
 
     it "calls refute_match() after NOT() called." do
       should_not_raise  { ok {"hom"}.NOT =~ /\d+/ }
       ex = should_raise { ok {"hom"}.NOT =~ /\w+/ }
-      msg = 'Expected /\w+/ to not match "hom".'
+      #msg = 'Expected /\w+/ to not match "hom".'
+      msg = ('Expected /\w+/ to not match # encoding: UTF-8'+"\n"+
+             '"hom".')
       assert_equal msg, ex.message
     end
 
@@ -200,14 +206,18 @@ describe Minitest::Ok::AssertionObject do
     it "calls refute_match()." do
       should_not_raise  { ok {"hom"} !~ /\d+/ }
       ex = should_raise { ok {"hom"} !~ /\w+/ }
-      msg = 'Expected /\w+/ to not match "hom".'
+      #msg = 'Expected /\w+/ to not match "hom".'
+      msg = ('Expected /\w+/ to not match # encoding: UTF-8'+"\n"+
+             '"hom".')
       assert_equal msg, ex.message
     end
 
     it "calls assert_match() after NOT() called." do
       should_not_raise  { ok {"hom"}.NOT !~ /\w+/ }
       ex = should_raise { ok {"hom"}.NOT !~ /\d+/ }
-      msg = 'Expected /\d+/ to match "hom".'
+      #msg = 'Expected /\d+/ to match "hom".'
+      msg = ('Expected /\d+/ to match # encoding: UTF-8'+"\n"+
+             '"hom".')
       assert_equal msg, ex.message
     end
 
@@ -219,14 +229,18 @@ describe Minitest::Ok::AssertionObject do
     it "calls assert_kind_of()." do
       should_not_raise  { ok {"hom"}.is_a?(String) }
       ex = should_raise { ok {"hom"}.is_a?(Array)  }
-      msg = 'Expected "hom" to be a kind of Array, not String.'
+      #msg = 'Expected "hom" to be a kind of Array, not String.'
+      msg = ('Expected # encoding: UTF-8'+"\n"+
+             '"hom" to be a kind of Array, not String.')
       assert_equal msg, ex.message
     end
 
     it "calls refute_kind_of() after NOT() called." do
       should_not_raise  { ok {"hom"}.NOT.is_a?(Array) }
       ex = should_raise { ok {"hom"}.NOT.is_a?(String) }
-      msg = 'Expected "hom" to not be a kind of String.'
+      #msg = 'Expected "hom" to not be a kind of String.'
+      msg = ('Expected # encoding: UTF-8'+"\n"+
+             '"hom" to not be a kind of String.')
       assert_equal msg, ex.message
     end
 
@@ -238,14 +252,18 @@ describe Minitest::Ok::AssertionObject do
     it "calls assert_kind_of()." do
       should_not_raise  { ok {"hom"}.kind_of?(String) }
       ex = should_raise { ok {"hom"}.kind_of?(Array)  }
-      msg = 'Expected "hom" to be a kind of Array, not String.'
+      #msg = 'Expected "hom" to be a kind of Array, not String.'
+      msg = ('Expected # encoding: UTF-8'+"\n"+
+             '"hom" to be a kind of Array, not String.')
       assert_equal msg, ex.message
     end
 
     it "calls refute_kind_of() after NOT() called." do
       should_not_raise  { ok {"hom"}.NOT.kind_of?(Array) }
       ex = should_raise { ok {"hom"}.NOT.kind_of?(String) }
-      msg = 'Expected "hom" to not be a kind of String.'
+      #msg = 'Expected "hom" to not be a kind of String.'
+      msg = ('Expected # encoding: UTF-8'+"\n"+
+             '"hom" to not be a kind of String.')
       assert_equal msg, ex.message
     end
 
@@ -255,16 +273,16 @@ describe Minitest::Ok::AssertionObject do
   describe '#instance_of?' do
 
     it "calls assert_instance_of()." do
-      should_not_raise  { ok {123}.instance_of?(Fixnum)  }
-      ex = should_raise { ok {123}.instance_of?(Integer) }
-      msg = 'Expected 123 to be an instance of Integer, not Fixnum.'
+      should_not_raise  { ok {1.23}.instance_of?(Float)  }
+      ex = should_raise { ok {1.23}.instance_of?(Integer) }
+      msg = 'Expected 1.23 to be an instance of Integer, not Float.'
       assert_equal msg, ex.message
     end
 
     it "calls refute_instance_of() after NOT() called." do
-      should_not_raise  { ok {123}.NOT.instance_of?(Integer) }
-      ex = should_raise { ok {123}.NOT.instance_of?(Fixnum)  }
-      msg = 'Expected 123 to not be an instance of Fixnum.'
+      should_not_raise  { ok {1.23}.NOT.instance_of?(Integer) }
+      ex = should_raise { ok {1.23}.NOT.instance_of?(Float)  }
+      msg = 'Expected 1.23 to not be an instance of Float.'
       assert_equal msg, ex.message
     end
 
@@ -371,14 +389,26 @@ describe Minitest::Ok::AssertionObject do
     it "can take error message string in addition to exception class." do
       should_not_raise  { ok {proc{1/0}}.raise?(ZeroDivisionError, "divided by 0") }
       ex = should_raise { ok {proc{1/0}}.raise?(ZeroDivisionError, "foobar") }
-      expected = "Expected: \"foobar\"\n  Actual: \"divided by 0\""
+      #expected = "Expected: \"foobar\"\n  Actual: \"divided by 0\""
+      expected = [
+        '--- expected',
+        '+++ actual',
+        '@@ -1,2 +1,2 @@',
+        '-# encoding: UTF-8',
+        '-"foobar"',
+        '+# encoding: ASCII-8BIT',
+        '+"divided by 0"',
+        '',
+      ].join("\n")
       assert_equal expected, ex.message
     end
 
     it "can take error message regexp instead of string." do
       should_not_raise  { ok {proc{1/0}}.raise?(ZeroDivisionError, /by [0]/) }
       ex = should_raise { ok {proc{1/0}}.raise?(ZeroDivisionError, /by 99/) }
-      expected = "Expected /by 99/ to match \"divided by 0\"."
+      #expected = "Expected /by 99/ to match \"divided by 0\"."
+      expected = ('Expected /by 99/ to match # encoding: ASCII-8BIT'+"\n"+
+                  '"divided by 0".')
       assert_equal expected, ex.message
     end
 
@@ -413,14 +443,14 @@ describe Minitest::Ok::AssertionObject do
     it "calls assert_respond_to()." do
       should_not_raise  { ok {[1]}.respond_to?(:each) }
       ex = should_raise { ok {123}.respond_to?(:each) }
-      msg = "Expected 123 (Fixnum) to respond to #each."
+      msg = "Expected 123 (#{1.class}) to respond to #each."
       assert_equal msg, ex.message
     end
 
     it "calls refute_respond_to() after NOT() called." do
       should_not_raise  { ok {[1]}.respond_to?(:each) }
       ex = should_raise { ok {123}.respond_to?(:each) }
-      msg = "Expected 123 (Fixnum) to respond to #each."
+      msg = "Expected 123 (#{1.class}) to respond to #each."
       assert_equal msg, ex.message
     end
 
@@ -470,11 +500,22 @@ describe Minitest::Ok::AssertionObject do
     it "calls assert_output()." do
       should_not_raise  { ok {proc {puts 123}}.output?("123\n", "") }
       ex = should_raise { ok {proc {puts 123}}.output?("", "123\n") }
+      #msg = [
+      #  'In stderr.',
+      #  '--- expected',
+      #  '+++ actual',
+      #  '@@ -1,2 +1 @@',
+      #  '-"123',
+      #  '-"',
+      #  '+""',
+      #  '',
+      #].join("\n")
       msg = [
         'In stderr.',
         '--- expected',
         '+++ actual',
-        '@@ -1,2 +1 @@',
+        '@@ -1,3 +1 @@',
+        '-# encoding: UTF-8',
         '-"123',
         '-"',
         '+""',
@@ -499,11 +540,22 @@ describe Minitest::Ok::AssertionObject do
     it "calls assert_silent()." do
       should_not_raise  { ok {proc {nil}}.silent? }
       ex = should_raise { ok {proc {puts 123}}.silent? }
+      #msg = [
+      #  'In stdout.',
+      #  '--- expected',
+      #  '+++ actual',
+      #  '@@ -1 +1,2 @@',
+      #  '-""',
+      #  '+"123',
+      #  '+"',
+      #  '',
+      #].join("\n")
       msg = [
         'In stdout.',
         '--- expected',
         '+++ actual',
-        '@@ -1 +1,2 @@',
+        '@@ -1,2 +1,2 @@',
+        '-# encoding: UTF-8',
         '-""',
         '+"123',
         '+"',
@@ -528,14 +580,18 @@ describe Minitest::Ok::AssertionObject do
     it "calls assert_predicate()." do
       should_not_raise  { ok {"".freeze}.frozen? }
       ex = should_raise { ok {"".dup() }.frozen? }
-      msg = 'Expected "" to be frozen?.'
+      #msg = 'Expected "" to be frozen?.'
+      msg = ('Expected # encoding: UTF-8'+"\n"+
+             '"" to be frozen?.')
       assert_equal msg, ex.message
     end
 
     it "calls refute_predicate() after NOT() called." do
       should_not_raise  { ok {"".dup() }.NOT.frozen? }
       ex = should_raise { ok {"".freeze}.NOT.frozen? }
-      msg = 'Expected "" to not be frozen?.'
+      #msg = 'Expected "" to not be frozen?.'
+      msg = ('Expected # encoding: UTF-8'+"\n"+
+             '"" to not be frozen?.')
       assert_equal msg, ex.message
     end
 
@@ -547,14 +603,18 @@ describe Minitest::Ok::AssertionObject do
     it "calls assert_predicate()." do
       should_not_raise  { ok {"".taint}.tainted? }
       ex = should_raise { ok {"".dup()}.tainted? }
-      msg = 'Expected "" to be tainted?.'
+      #msg = 'Expected "" to be tainted?.'
+      msg = ('Expected # encoding: UTF-8'+"\n"+
+             '"" to be tainted?.')
       assert_equal msg, ex.message
     end
 
     it "calls refute_predicate() after NOT() called." do
       should_not_raise  { ok {"".dup()}.NOT.tainted? }
       ex = should_raise { ok {"".taint}.NOT.tainted? }
-      msg = 'Expected "" to not be tainted?.'
+      #msg = 'Expected "" to not be tainted?.'
+      msg = ('Expected # encoding: UTF-8'+"\n"+
+             '"" to not be tainted?.')
       assert_equal msg, ex.message
     end
 
@@ -694,7 +754,7 @@ describe Minitest::Ok::AssertionObject do
 
   describe '#attr' do
 
-    class User
+    class User1
       def initialize(name, age)
         @name, @age = name, age
       end
@@ -702,24 +762,24 @@ describe Minitest::Ok::AssertionObject do
     end
 
     it "calles assert_equal()." do
-      user = User.new('Haruhi', 16)
+      user = User1.new('Haruhi', 16)
       should_not_raise  { ok {user}.attr(:name, 'Haruhi').attr(:age, 16) }
       ex = should_raise { ok {user}.attr(:name, 'Haruhi').attr(:age, 12) }
       msg = ("Expected <object>.age == <exected>, but failed.\n" +
-             " (object: #<User:0xXXXXXX @name=\"Haruhi\", @age=16>).\n" +
+             " (object: #<User1:0xXXXXXX @name=\"Haruhi\", @age=16>).\n" +
              "Expected: 12\n" +
              "  Actual: 16")
-      assert_equal msg, ex.message.gsub(/<User:0x\w+/, '<User:0xXXXXXX')
+      assert_equal msg, ex.message.gsub(/<User1:0x\w+/, '<User1:0xXXXXXX')
     end
 
     it "calles refute_equal() after NOT() called." do
-      user = User.new('Haruhi', 16)
+      user = User1.new('Haruhi', 16)
       should_not_raise  { ok {user}.NOT.attr(:name, 'Suzumiya').attr(:age, 12) }
       ex = should_raise { ok {user}.NOT.attr(:name, 'Suzumiya').attr(:age, 16) }
       msg = ("Expected <object>.age != <exected>, but failed.\n" +
-             " (object: #<User:0xXXXXXX @name=\"Haruhi\", @age=16>).\n" +
+             " (object: #<User1:0xXXXXXX @name=\"Haruhi\", @age=16>).\n" +
              "Expected 16 to not be equal to 16.")
-      assert_equal msg, ex.message.gsub(/<User:0x\w+/, '<User:0xXXXXXX')
+      assert_equal msg, ex.message.gsub(/<User1:0x\w+/, '<User1:0xXXXXXX')
     end
 
   end
@@ -727,7 +787,7 @@ describe Minitest::Ok::AssertionObject do
 
   describe '#attrs' do
 
-    class User
+    class User2
       def initialize(name, age)
         @name, @age = name, age
       end
@@ -735,24 +795,24 @@ describe Minitest::Ok::AssertionObject do
     end
 
     it "calles assert_equal()." do
-      user = User.new('Haruhi', 16)
+      user = User2.new('Haruhi', 16)
       should_not_raise  { ok {user}.attrs(name: 'Haruhi', age: 16) }
       ex = should_raise { ok {user}.attrs(name: 'Haruhi', age: 12) }
       msg = ("Expected <object>.age == <exected>, but failed.\n" +
-             " (object: #<User:0xXXXXXX @name=\"Haruhi\", @age=16>).\n" +
+             " (object: #<User2:0xXXXXXX @name=\"Haruhi\", @age=16>).\n" +
              "Expected: 12\n" +
              "  Actual: 16")
-      assert_equal msg, ex.message.gsub(/<User:0x\w+/, '<User:0xXXXXXX')
+      assert_equal msg, ex.message.gsub(/<User2:0x\w+/, '<User2:0xXXXXXX')
     end
 
     it "calles refute_equal() after NOT() called." do
-      user = User.new('Haruhi', 16)
+      user = User2.new('Haruhi', 16)
       should_not_raise  { ok {user}.NOT.attrs(name: 'Suzumiya', age: 12) }
       ex = should_raise { ok {user}.NOT.attrs(name: 'Suzumiya', age: 16) }
       msg = ("Expected <object>.age != <exected>, but failed.\n" +
-             " (object: #<User:0xXXXXXX @name=\"Haruhi\", @age=16>).\n" +
+             " (object: #<User2:0xXXXXXX @name=\"Haruhi\", @age=16>).\n" +
              "Expected 16 to not be equal to 16.")
-      assert_equal msg, ex.message.gsub(/<User:0x\w+/, '<User:0xXXXXXX')
+      assert_equal msg, ex.message.gsub(/<User2:0x\w+/, '<User2:0xXXXXXX')
     end
 
   end

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 0.2.0 $
+### $Release: 0.3.0 $
 ### $Copyright: copyright(c) 2015 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: minitest-ok
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - makoto kuwata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |
@@ -38,12 +38,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - MIT-LICENSE
+- README.md
 - Rakefile
 - lib/minitest/ok.rb
-- test/test_helper.rb
 - test/minitest/ok_test.rb
+- test/test_helper.rb
 homepage: https://github.com/kwatch/minitest-ok
 licenses:
 - MIT-License
@@ -54,18 +54,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
-summary: '''ok {1+1} == 2'' instead of ''assert_equal 2, 1+1'''
+summary: "'ok {1+1} == 2' instead of 'assert_equal 2, 1+1'"
 test_files: []