diff options
| -rw-r--r-- | test/assert.rb | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/test/assert.rb b/test/assert.rb index d6e394a9f..158fc8ead 100644 --- a/test/assert.rb +++ b/test/assert.rb @@ -19,12 +19,11 @@ 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? + msg += " [#{iso}]" if iso && !iso.empty? + msg += " => #{e}" if e && !e.to_s.empty? + if Object.const_defined?(:GEMNAME) + msg += " (#{GEMNAME == 'mruby-test' ? 'core' : "mrbgems: #{GEMNAME}"})" end - msg += " (#{GEMNAME == 'mruby-test' ? 'core' : "mrbgems: #{GEMNAME}"})" if $mrbtest_assert && $mrbtest_assert.size > 0 $mrbtest_assert.each do |idx, assert_msg, diff| msg += "\n - Assertion[#{idx}] Failed: #{assert_msg}\n#{diff}" @@ -258,12 +257,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) |