diff options
Diffstat (limited to 'test/rexml')
-rw-r--r-- | test/rexml/test_changing_encoding.rb | 4 | ||||
-rw-r--r-- | test/rexml/test_contrib.rb | 4 | ||||
-rw-r--r-- | test/rexml/test_core.rb | 10 | ||||
-rw-r--r-- | test/rexml/test_encoding.rb | 6 |
4 files changed, 13 insertions, 11 deletions
diff --git a/test/rexml/test_changing_encoding.rb b/test/rexml/test_changing_encoding.rb index f83247afb1..c6c1f59a1a 100644 --- a/test/rexml/test_changing_encoding.rb +++ b/test/rexml/test_changing_encoding.rb @@ -1,15 +1,13 @@ #!/usr/bin/ruby -Ku # -*- coding: utf-8 -*- -require 'kconv' -require 'iconv' require 'rexml/encoding' class ChangingEncodings < Test::Unit::TestCase def initialize a @u = 'テスト ほげ ふが 美しい' - @e = Kconv.toeuc(@u) + @e = @u.encode("EUC-JP") @f = Foo.new super end diff --git a/test/rexml/test_contrib.rb b/test/rexml/test_contrib.rb index 785169bdd0..f448b0fe4a 100644 --- a/test/rexml/test_contrib.rb +++ b/test/rexml/test_contrib.rb @@ -241,7 +241,7 @@ DELIMITER end doc = REXML::Document.new(source_iso) - assert_equal('ISO-8859-1', doc.xml_decl.encoding) + assert_equal('ISO-8859-1', doc.xml_decl.encoding.to_s) assert_equal(koln_utf, doc.root.text) doc.write(out="") assert_equal(source_iso, out ) @@ -270,7 +270,7 @@ EOF expected_utf = expected_iso.unpack('C*').pack('U*') if expected_utf.respond_to? :encode expected_iso.force_encoding("iso-8859-1") - expected_utf.force_encoding(Encoding::UTF_8) + expected_utf.force_encoding(::Encoding::UTF_8) end assert_equal(expected_utf, tn.to_s.strip) f = REXML::Formatters::Default.new diff --git a/test/rexml/test_core.rb b/test/rexml/test_core.rb index 48a31aee0e..5fae4f54e3 100644 --- a/test/rexml/test_core.rb +++ b/test/rexml/test_core.rb @@ -433,6 +433,11 @@ class Tester < Test::Unit::TestCase assert_equal source, decl2.to_s end + def test_xmldecl_utf_16be_encoding_name + assert_equal("<?xml version='1.0' encoding='UTF-16'?>", + XMLDecl.new("1.0", "UTF-16").to_s) + end + def each_test( element, xpath, num_children ) count = 0 element.each_element( xpath ) { |child| @@ -1123,7 +1128,6 @@ EOL end def test_repeated_writes - require 'iconv' a = IO.read(fixture_path("iso8859-1.xml")) f = REXML::Formatters::Pretty.new @@ -1246,9 +1250,9 @@ EOL def test_ticket_88 doc = REXML::Document.new("<?xml version=\"1.0\" encoding=\"shift_jis\"?>") - assert_equal("<?xml version='1.0' encoding='SHIFT_JIS'?>", doc.to_s) + assert_equal("<?xml version='1.0' encoding='Shift_JIS'?>", doc.to_s) doc = REXML::Document.new("<?xml version = \"1.0\" encoding = \"shift_jis\"?>") - assert_equal("<?xml version='1.0' encoding='SHIFT_JIS'?>", doc.to_s) + assert_equal("<?xml version='1.0' encoding='Shift_JIS'?>", doc.to_s) end def test_ticket_85 diff --git a/test/rexml/test_encoding.rb b/test/rexml/test_encoding.rb index 23e4802927..e1f9296821 100644 --- a/test/rexml/test_encoding.rb +++ b/test/rexml/test_encoding.rb @@ -26,7 +26,7 @@ class EncodingTester < Test::Unit::TestCase def test_encoded_in_change_out doc = Document.new( @encoded ) doc.xml_decl.encoding = "UTF-8" - assert_equal( doc.encoding, "UTF-8" ) + assert_equal( ::Encoding::UTF_8, doc.encoding ) REXML::Formatters::Default.new.write( doc.root, out="" ) out.force_encoding('binary') if out.respond_to? :force_encoding assert_equal( @not_encoded, out ) @@ -47,7 +47,7 @@ class EncodingTester < Test::Unit::TestCase def test_in_change_out doc = Document.new( @not_encoded ) doc.xml_decl.encoding = "ISO-8859-3" - assert_equal( doc.encoding, "ISO-8859-3" ) + assert_equal( ::Encoding::ISO_8859_3, doc.encoding ) doc.write( out="" ) out.force_encoding('binary') if out.respond_to? :force_encoding assert_equal( @encoded, out ) @@ -86,7 +86,7 @@ class EncodingTester < Test::Unit::TestCase def test_ticket_110 utf16 = REXML::Document.new(File.new(fixture_path("ticket_110_utf16.xml"))) - assert_equal( "UTF-16", utf16.encoding ) + assert_equal( ::Encoding::UTF_16BE, utf16.encoding ) assert( utf16[0].kind_of?(REXML::XMLDecl)) end end |