Second merge from trunk.rexml_adds_tests

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/rexml_adds_tests@19455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 4 deletions

diff --git a/test/json/test_json_unicode.rb b/test/json/test_json_unicode.rb
index cad93846b5..862c6ea1e0 100755
--- a/test/json/test_json_unicode.rb
+++ b/test/json/test_json_unicode.rb
@@ -7,9 +7,6 @@ require 'json'
 class TC_JSONUnicode < Test::Unit::TestCase
   include JSON
 
-  def setup
-  end
-
   def test_unicode
     assert_equal '""', ''.to_json
     assert_equal '"\\b"', "\b".to_json
@@ -54,7 +51,7 @@ class TC_JSONUnicode < Test::Unit::TestCase
       end
     end
     assert_raises(JSON::GeneratorError) do
-      JSON.generate(["" << 0x80])
+      JSON.generate(["\x80"])
     end
     assert_equal "\302\200", JSON.parse('["\u0080"]').first
   end