From aaa8924c84df5b8a68cafd6b4a3a1d92be2f5ba2 Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 16 Oct 2008 14:28:06 +0000 Subject: * lib/test/unit.rb (assert_equal): avoid incompatible character encodings error. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/test/unit.rb | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/ChangeLog b/ChangeLog index f87952893..e02cb8500 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Oct 16 23:27:27 2008 Tanaka Akira + + * lib/test/unit.rb (assert_equal): avoid incompatible character + encodings error. + Thu Oct 16 23:23:27 2008 Tanaka Akira * lib/test/unit.rb (assert_equal): failure message changed. diff --git a/lib/test/unit.rb b/lib/test/unit.rb index fddc994e6..14ddc08f2 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}" } -- cgit