summaryrefslogtreecommitdiff
path: root/lib/test
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-16 14:28:06 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-16 14:28:06 +0000
commitba1e27f3ca9bca11a80c906bba0627073e95f9cc (patch)
tree4f0783bc7f6bed4e3a6769a64a88d560c79b40ff /lib/test
parent338253cbe54569137cff26f6cb5dd6db379f481b (diff)
* 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
Diffstat (limited to 'lib/test')
-rw-r--r--lib/test/unit.rb10
1 files changed, 10 insertions, 0 deletions
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}"
}