From c6b81069246a89b214964f1c7f13d729c2f14918 Mon Sep 17 00:00:00 2001 From: KOBAYASHI Shuji Date: Sun, 3 Mar 2019 18:58:11 +0900 Subject: Simplify `MRubyTestSkip` in `test/assert.rb` --- test/assert.rb | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'test/assert.rb') diff --git a/test/assert.rb b/test/assert.rb index d6e394a9f..9d807d52c 100644 --- a/test/assert.rb +++ b/test/assert.rb @@ -19,11 +19,8 @@ end # Create the assertion in a readable way def assertion_string(err, str, iso=nil, e=nil, bt=nil) msg = "#{err}#{str}" - msg += " [#{iso}]" if iso && iso != '' - if e - m = e.respond_to?(:cause) ? e.cause : e.message - msg += " => #{m}" if m && !m.empty? - end + msg += " [#{iso}]" if iso && !iso.empty? + msg += " => #{e}" if e && !e.to_s.empty? msg += " (#{GEMNAME == 'mruby-test' ? 'core' : "mrbgems: #{GEMNAME}"})" if $mrbtest_assert && $mrbtest_assert.size > 0 $mrbtest_assert.each do |idx, assert_msg, diff| @@ -258,12 +255,7 @@ end ## # Skip the test -class MRubyTestSkip < NotImplementedError - attr_accessor :cause - def initialize(cause) - @cause = cause - end -end +class MRubyTestSkip < NotImplementedError; end def skip(cause = "") raise MRubyTestSkip.new(cause) -- cgit v1.2.3