diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/assert.rb | 8 | ||||
| -rw-r--r-- | test/t/kernel.rb | 4 | ||||
| -rw-r--r-- | test/t/superclass.rb | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/test/assert.rb b/test/assert.rb index 7efc24e19..4e1d309eb 100644 --- a/test/assert.rb +++ b/test/assert.rb @@ -23,8 +23,8 @@ def assertion_string(err, str, iso=nil, e=nil, bt=nil) msg += " => #{e.message}" if e msg += " (mrbgems: #{GEMNAME})" if Object.const_defined?(:GEMNAME) if $mrbtest_assert && $mrbtest_assert.size > 0 - $mrbtest_assert.each do |idx, str, diff| - msg += "\n - Assertion[#{idx}] Failed: #{str}\n#{diff}" + $mrbtest_assert.each do |idx, msg, diff| + msg += "\n - Assertion[#{idx}] Failed: #{msg}\n#{diff}" end end msg += "\nbacktrace:\n\t#{bt.join("\n\t")}" if bt @@ -62,7 +62,7 @@ def assert(str = 'Assertion failed', iso = '') $asserts.push(assertion_string("#{e.class}: ", str, iso, e, bt)) $kill_test += 1 t_print('X') - end + end ensure $mrbtest_assert = nil end @@ -157,7 +157,7 @@ def assert_raise(*exp) msg = "#{msg}#{exp.inspect} exception expected, not" diff = " Class: <#{e.class}>\n" + " Message: #{e.message}" - if not exp.any?{|ex| ex.instance_of?(Module) ? e.kind_of?(ex) : ex == e.class } + unless exp.any?{|ex| ex.instance_of?(Module) ? e.kind_of?(ex) : ex == e.class } $mrbtest_assert.push([$mrbtest_assert_idx, msg, diff]) ret = false end diff --git a/test/t/kernel.rb b/test/t/kernel.rb index aff2dd461..40a3482f8 100644 --- a/test/t/kernel.rb +++ b/test/t/kernel.rb @@ -387,7 +387,7 @@ assert('Kernel#method_missing', '15.3.1.3.30') do begin c.no_method_named_this rescue NoMethodError => e - assert_equal "undefined method 'no_method_named_this' for #{c.to_s}", e.message + assert_equal "undefined method 'no_method_named_this' for #{c}", e.message end class NoInspectClass @@ -397,7 +397,7 @@ assert('Kernel#method_missing', '15.3.1.3.30') do begin d.no_method_named_this rescue NoMethodError => e - assert_equal "undefined method 'no_method_named_this' for #{d.to_s}", e.message + assert_equal "undefined method 'no_method_named_this' for #{d}", e.message end end diff --git a/test/t/superclass.rb b/test/t/superclass.rb index 9fd8830b3..10b6438d3 100644 --- a/test/t/superclass.rb +++ b/test/t/superclass.rb @@ -23,7 +23,8 @@ [:Exception, :Object, '15.2.22.2'], [:StandardError, :Exception, '15.2.23.2'], [:ArgumentError, :StandardError, '15.2.24.2'], - [:LocalJumpError, :StandardError, '15.2.25.2'], + # [:LocalJumpError, :StandardError, '15.2.25.2'], + [:LocalJumpError, :ScriptError, '15.2.25.2'], # mruby specific [:RangeError, :StandardError, '12.2.26.2'], [:RegexpError, :StandardError, '12.2.27.2'], [:RuntimeError, :StandardError, '12.2.28.2'], |