diff options
Diffstat (limited to 'test/unit/lib/redmine/codeset_util_test.rb')
| -rw-r--r-- | test/unit/lib/redmine/codeset_util_test.rb | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/test/unit/lib/redmine/codeset_util_test.rb b/test/unit/lib/redmine/codeset_util_test.rb index c3040b553..7ae502cba 100644 --- a/test/unit/lib/redmine/codeset_util_test.rb +++ b/test/unit/lib/redmine/codeset_util_test.rb @@ -23,8 +23,8 @@ class Redmine::CodesetUtilTest < ActiveSupport::TestCase def test_to_utf8_by_setting_from_latin1 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do - s1 = "Texte encod\xc3\xa9".force_encoding("UTF-8") - s2 = "Texte encod\xe9".force_encoding("ASCII-8BIT") + s1 = 'Texte encodé' + s2 = (+"Texte encod\xe9").force_encoding("ASCII-8BIT") s3 = s2.dup.force_encoding("UTF-8") assert_equal s1, Redmine::CodesetUtil.to_utf8_by_setting(s2) assert_equal s1, Redmine::CodesetUtil.to_utf8_by_setting(s3) @@ -33,8 +33,8 @@ class Redmine::CodesetUtilTest < ActiveSupport::TestCase def test_to_utf8_by_setting_from_euc_jp with_settings :repositories_encodings => 'UTF-8,EUC-JP' do - s1 = "\xe3\x83\xac\xe3\x83\x83\xe3\x83\x89\xe3\x83\x9e\xe3\x82\xa4\xe3\x83\xb3".force_encoding("UTF-8") - s2 = "\xa5\xec\xa5\xc3\xa5\xc9\xa5\xde\xa5\xa4\xa5\xf3".force_encoding("ASCII-8BIT") + s1 = 'レッドマイン' + s2 = (+"\xa5\xec\xa5\xc3\xa5\xc9\xa5\xde\xa5\xa4\xa5\xf3").force_encoding("ASCII-8BIT") s3 = s2.dup.force_encoding("UTF-8") assert_equal s1, Redmine::CodesetUtil.to_utf8_by_setting(s2) assert_equal s1, Redmine::CodesetUtil.to_utf8_by_setting(s3) @@ -43,8 +43,8 @@ class Redmine::CodesetUtilTest < ActiveSupport::TestCase def test_to_utf8_by_setting_should_be_converted_all_latin1 with_settings :repositories_encodings => 'ISO-8859-1' do - s1 = "\xc3\x82\xc2\x80".force_encoding("UTF-8") - s2 = "\xC2\x80".force_encoding("ASCII-8BIT") + s1 = "Â\u0080" + s2 = (+"\xC2\x80").force_encoding("ASCII-8BIT") s3 = s2.dup.force_encoding("UTF-8") assert_equal s1, Redmine::CodesetUtil.to_utf8_by_setting(s2) assert_equal s1, Redmine::CodesetUtil.to_utf8_by_setting(s3) @@ -57,7 +57,7 @@ class Redmine::CodesetUtilTest < ActiveSupport::TestCase end def test_to_utf8_by_setting_returns_ascii_as_utf8 - s1 = "ASCII".force_encoding("UTF-8") + s1 = 'ASCII' s2 = s1.dup.force_encoding("ISO-8859-1") str1 = Redmine::CodesetUtil.to_utf8_by_setting(s1) str2 = Redmine::CodesetUtil.to_utf8_by_setting(s2) @@ -69,8 +69,7 @@ class Redmine::CodesetUtilTest < ActiveSupport::TestCase def test_to_utf8_by_setting_invalid_utf8_sequences_should_be_stripped with_settings :repositories_encodings => '' do - # s1 = File.read("#{RAILS_ROOT}/test/fixtures/encoding/iso-8859-1.txt") - s1 = "Texte encod\xe9 en ISO-8859-1.".force_encoding("ASCII-8BIT") + s1 = (+"Texte encod\xe9 en ISO-8859-1.").force_encoding("ASCII-8BIT") str = Redmine::CodesetUtil.to_utf8_by_setting(s1) assert str.valid_encoding? assert_equal "UTF-8", str.encoding.to_s @@ -80,7 +79,7 @@ class Redmine::CodesetUtilTest < ActiveSupport::TestCase def test_to_utf8_by_setting_invalid_utf8_sequences_should_be_stripped_ja_jis with_settings :repositories_encodings => 'ISO-2022-JP' do - s1 = "test\xb5\xfetest\xb5\xfe".force_encoding("ASCII-8BIT") + s1 = (+"test\xb5\xfetest\xb5\xfe").force_encoding("ASCII-8BIT") str = Redmine::CodesetUtil.to_utf8_by_setting(s1) assert str.valid_encoding? assert_equal "UTF-8", str.encoding.to_s @@ -89,18 +88,18 @@ class Redmine::CodesetUtilTest < ActiveSupport::TestCase end test "#replace_invalid_utf8 should replace invalid utf8" do - s1 = "\xe3\x81\x93\xe3\x82\x93\xe3\x81\xab\xe3\x81\xa1\xE3\x81\xFF".force_encoding("UTF-8") + s1 = "こんにち\xE3\x81\xFF" s2 = Redmine::CodesetUtil.replace_invalid_utf8(s1) assert s2.valid_encoding? assert_equal "UTF-8", s2.encoding.to_s - assert_equal "\xe3\x81\x93\xe3\x82\x93\xe3\x81\xab\xe3\x81\xa1??".force_encoding("UTF-8"), s2 + assert_equal 'こんにち??', s2 end test "#to_utf8 should replace invalid non utf8" do - s1 = "\xa4\xb3\xa4\xf3\xa4\xcb\xa4\xc1\xa4".force_encoding("EUC-JP") + s1 = (+"\xa4\xb3\xa4\xf3\xa4\xcb\xa4\xc1\xa4").force_encoding("EUC-JP") s2 = Redmine::CodesetUtil.to_utf8(s1, "EUC-JP") assert s2.valid_encoding? assert_equal "UTF-8", s2.encoding.to_s - assert_equal "\xe3\x81\x93\xe3\x82\x93\xe3\x81\xab\xe3\x81\xa1?".force_encoding("UTF-8"), s2 + assert_equal 'こんにち?', s2 end end |