diff options
| author | Nobuyoshi Nakada <[email protected]> | 2021-10-09 16:17:01 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <[email protected]> | 2021-10-09 16:17:01 +0900 |
| commit | 3932227d96ada8d63873d1b5a66c6f4b2df188aa () | |
| tree | 346e262b6e047f9413e5e63772ccce678b8d2346 /tool/lib/core_assertions.rb | |
| parent | 489c22b17f347d15500931397a1a4c8b66b023dd (diff) | |
Unify `Test::Unit::Assertions#message`
Merge `Test::Unit::CoreAssertions#message`.
| -rw-r--r-- | tool/lib/core_assertions.rb | 31 |
1 files changed, 10 insertions, 21 deletions
@@ -16,9 +16,16 @@ module Test def message msg = nil, ending = nil, &default proc { - msg = msg.call.chomp(".") if Proc === msg - custom_message = "#{msg}.\n" unless msg.nil? or msg.to_s.empty? - "#{custom_message}#{default.call}#{ending || "."}" } end end @@ -729,24 +736,6 @@ eom end alias all_assertions_foreach assert_all_assertions_foreach - def message(msg = nil, *args, &default) # :nodoc: - if Proc === msg - super(nil, *args) do - ary = [msg.call, (default.call if default)].compact.reject(&:empty?) - if 1 < ary.length - ary[0...-1] = ary[0...-1].map {|str| str.sub(/(?<!\.)\z/, '.') } - end - begin - ary.join("\n") - rescue Encoding::CompatibilityError - ary.map(&:b).join("\n") - end - end - else - super - end - end - def diff(exp, act) require 'pp' q = PP.new(+"") |