From: Toshi MARUYAMA Date: Fri, 18 Nov 2011 14:57:58 +0000 (+0000) Subject: move repositories helper to_utf8 tests to new CodesetUtilTest (#2371) X-Git-Tag: 1.3.0~183 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b38dc9a301c3ab0fafc5dd824ad57059ec58fc91;p=redmine.git move repositories helper to_utf8 tests to new CodesetUtilTest (#2371) git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7828 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/test/unit/helpers/repository_helper_test.rb b/test/unit/helpers/repository_helper_test.rb deleted file mode 100644 index c4297c5e9..000000000 --- a/test/unit/helpers/repository_helper_test.rb +++ /dev/null @@ -1,116 +0,0 @@ -# Redmine - project management software -# Copyright (C) 2006-2011 Jean-Philippe Lang -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -require File.expand_path('../../../test_helper', __FILE__) - -class RepositoryHelperTest < ActionView::TestCase - include RepositoriesHelper - - def test_from_latin1_to_utf8 - with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do - s1 = "Texte encod\xc3\xa9" - s2 = "Texte encod\xe9" - s3 = s2.dup - if s1.respond_to?(:force_encoding) - s1.force_encoding("UTF-8") - s2.force_encoding("ASCII-8BIT") - s3.force_encoding("UTF-8") - end - assert_equal s1, to_utf8(s2) - assert_equal s1, to_utf8(s3) - end - end - - def test_from_euc_jp_to_utf8 - 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" - s2 = "\xa5\xec\xa5\xc3\xa5\xc9\xa5\xde\xa5\xa4\xa5\xf3" - s3 = s2.dup - if s1.respond_to?(:force_encoding) - s1.force_encoding("UTF-8") - s2.force_encoding("ASCII-8BIT") - s3.force_encoding("UTF-8") - end - assert_equal s1, to_utf8(s2) - assert_equal s1, to_utf8(s3) - end - end - - def test_to_utf8_should_be_converted_all_latin1_to_utf8 - with_settings :repositories_encodings => 'ISO-8859-1' do - s1 = "\xc3\x82\xc2\x80" - s2 = "\xC2\x80" - s3 = s2.dup - if s1.respond_to?(:force_encoding) - s1.force_encoding("UTF-8") - s2.force_encoding("ASCII-8BIT") - s3.force_encoding("UTF-8") - end - assert_equal s1, to_utf8(s2) - assert_equal s1, to_utf8(s3) - end - end - - def test_to_utf8_blank_string - assert_equal "", to_utf8("") - assert_equal nil, to_utf8(nil) - end - - def test_to_utf8_returns_ascii_as_utf8 - s1 = "ASCII" - s2 = s1.dup - if s1.respond_to?(:force_encoding) - s1.force_encoding("UTF-8") - s2.force_encoding("ISO-8859-1") - end - str1 = to_utf8(s1) - str2 = to_utf8(s2) - assert_equal s1, str1 - assert_equal s1, str2 - if s1.respond_to?(:force_encoding) - assert_equal "UTF-8", str1.encoding.to_s - assert_equal "UTF-8", str2.encoding.to_s - end - end - - def test_to_utf8_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." - s1.force_encoding("ASCII-8BIT") if s1.respond_to?(:force_encoding) - str = to_utf8(s1) - if str.respond_to?(:force_encoding) - assert str.valid_encoding? - assert_equal "UTF-8", str.encoding.to_s - end - assert_equal "Texte encod? en ISO-8859-1.", str - end - end - - def test_to_utf8_invalid_utf8_sequences_should_be_stripped_ja_jis - with_settings :repositories_encodings => 'ISO-2022-JP' do - s1 = "test\xb5\xfetest\xb5\xfe" - s1.force_encoding("ASCII-8BIT") if s1.respond_to?(:force_encoding) - str = to_utf8(s1) - if str.respond_to?(:force_encoding) - assert str.valid_encoding? - assert_equal "UTF-8", str.encoding.to_s - end - assert_equal "test??test??", str - end - end -end diff --git a/test/unit/lib/redmine/codeset_util_test.rb b/test/unit/lib/redmine/codeset_util_test.rb new file mode 100644 index 000000000..681591d59 --- /dev/null +++ b/test/unit/lib/redmine/codeset_util_test.rb @@ -0,0 +1,115 @@ +# Redmine - project management software +# Copyright (C) 2006-2011 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +require File.expand_path('../../../../test_helper', __FILE__) + +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" + s2 = "Texte encod\xe9" + s3 = s2.dup + if s1.respond_to?(:force_encoding) + s1.force_encoding("UTF-8") + s2.force_encoding("ASCII-8BIT") + s3.force_encoding("UTF-8") + end + assert_equal s1, Redmine::CodesetUtil.to_utf8_by_setting(s2) + assert_equal s1, Redmine::CodesetUtil.to_utf8_by_setting(s3) + end + end + + 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" + s2 = "\xa5\xec\xa5\xc3\xa5\xc9\xa5\xde\xa5\xa4\xa5\xf3" + s3 = s2.dup + if s1.respond_to?(:force_encoding) + s1.force_encoding("UTF-8") + s2.force_encoding("ASCII-8BIT") + s3.force_encoding("UTF-8") + end + assert_equal s1, Redmine::CodesetUtil.to_utf8_by_setting(s2) + assert_equal s1, Redmine::CodesetUtil.to_utf8_by_setting(s3) + end + end + + def test_to_utf8_by_setting_should_be_converted_all_latin1 + with_settings :repositories_encodings => 'ISO-8859-1' do + s1 = "\xc3\x82\xc2\x80" + s2 = "\xC2\x80" + s3 = s2.dup + if s1.respond_to?(:force_encoding) + s1.force_encoding("UTF-8") + s2.force_encoding("ASCII-8BIT") + s3.force_encoding("UTF-8") + end + assert_equal s1, Redmine::CodesetUtil.to_utf8_by_setting(s2) + assert_equal s1, Redmine::CodesetUtil.to_utf8_by_setting(s3) + end + end + + def test_to_utf8_by_setting_blank_string + assert_equal "", Redmine::CodesetUtil.to_utf8_by_setting("") + assert_equal nil, Redmine::CodesetUtil.to_utf8_by_setting(nil) + end + + def test_to_utf8_by_setting_returns_ascii_as_utf8 + s1 = "ASCII" + s2 = s1.dup + if s1.respond_to?(:force_encoding) + s1.force_encoding("UTF-8") + s2.force_encoding("ISO-8859-1") + end + str1 = Redmine::CodesetUtil.to_utf8_by_setting(s1) + str2 = Redmine::CodesetUtil.to_utf8_by_setting(s2) + assert_equal s1, str1 + assert_equal s1, str2 + if s1.respond_to?(:force_encoding) + assert_equal "UTF-8", str1.encoding.to_s + assert_equal "UTF-8", str2.encoding.to_s + end + end + + 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." + s1.force_encoding("ASCII-8BIT") if s1.respond_to?(:force_encoding) + str = Redmine::CodesetUtil.to_utf8_by_setting(s1) + if str.respond_to?(:force_encoding) + assert str.valid_encoding? + assert_equal "UTF-8", str.encoding.to_s + end + assert_equal "Texte encod? en ISO-8859-1.", str + end + end + + 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" + s1.force_encoding("ASCII-8BIT") if s1.respond_to?(:force_encoding) + str = Redmine::CodesetUtil.to_utf8_by_setting(s1) + if str.respond_to?(:force_encoding) + assert str.valid_encoding? + assert_equal "UTF-8", str.encoding.to_s + end + assert_equal "test??test??", str + end + end +end