diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2019-03-03 23:22:23 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-03-03 23:22:23 +0900 |
| commit | d1cdb9ef7589f2c85b8e14a680fc31002b650240 (patch) | |
| tree | a954c982c76cbd3ac65bf06e6cc94d4331b23285 | |
| parent | 83a1df3785a248cdd570e18328d09446f9afebb6 (diff) | |
| parent | c6b81069246a89b214964f1c7f13d729c2f14918 (diff) | |
| download | mruby-d1cdb9ef7589f2c85b8e14a680fc31002b650240.tar.gz mruby-d1cdb9ef7589f2c85b8e14a680fc31002b650240.zip | |
Merge pull request #4311 from shuujii/simplify-MRubyTestSkip-in-test-assert.rb
Simplify `MRubyTestSkip` in `test/assert.rb`
| -rw-r--r-- | test/assert.rb | 14 |
1 files changed, 3 insertions, 11 deletions
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) |
