diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-16 14:28:06 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-16 14:28:06 +0000 |
commit | ba1e27f3ca9bca11a80c906bba0627073e95f9cc (patch) | |
tree | 4f0783bc7f6bed4e3a6769a64a88d560c79b40ff | |
parent | 338253cbe54569137cff26f6cb5dd6db379f481b (diff) | |
download | ruby-ba1e27f3ca9bca11a80c906bba0627073e95f9cc.tar.gz |
* lib/test/unit.rb (assert_equal): avoid incompatible character
encodings error.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/test/unit.rb | 10 |
2 files changed, 15 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Thu Oct 16 23:27:27 2008 Tanaka Akira <akr@fsij.org> + + * lib/test/unit.rb (assert_equal): avoid incompatible character + encodings error. + Thu Oct 16 23:23:27 2008 Tanaka Akira <akr@fsij.org> * lib/test/unit.rb (assert_equal): failure message changed. diff --git a/lib/test/unit.rb b/lib/test/unit.rb index fddc994e64..14ddc08f2e 100644 --- a/lib/test/unit.rb +++ b/lib/test/unit.rb @@ -102,6 +102,16 @@ module Test exp_comment = " (nsec=#{exp.nsec})" act_comment = " (nsec=#{act.nsec})" end + elsif !Encoding.compatible?(exp_str, act_str) + if exp.is_a?(String) && act.is_a?(String) + exp_str = exp.dump + act_str = act.dump + exp_comment = " (#{exp.encoding})" + act_comment = " (#{act.encoding})" + else + exp_str = exp_str.dump + act_str = act_str.dump + end end "<#{exp_str}>#{exp_comment} expected but was\n<#{act_str}>#{act_comment}" } |