mirror of
https://github.com/redmine/redmine.git
synced 2025-11-15 09:46:02 +01:00
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -27,11 +27,10 @@ class PdfTest < ActiveSupport::TestCase
|
||||
end
|
||||
|
||||
def test_rdm_pdf_iconv_cannot_convert_ja_cp932
|
||||
encoding = ( RUBY_PLATFORM == 'java' ? "SJIS" : "CP932" )
|
||||
utf8_txt_1 = "\xe7\x8b\x80\xe6\x85\x8b"
|
||||
utf8_txt_2 = "\xe7\x8b\x80\xe6\x85\x8b\xe7\x8b\x80"
|
||||
utf8_txt_3 = "\xe7\x8b\x80\xe7\x8b\x80\xe6\x85\x8b\xe7\x8b\x80"
|
||||
if utf8_txt_1.respond_to?(:force_encoding)
|
||||
["CP932", "SJIS"].each do |encoding|
|
||||
txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_1, encoding)
|
||||
txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_2, encoding)
|
||||
txt_3 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_3, encoding)
|
||||
@@ -41,88 +40,65 @@ class PdfTest < ActiveSupport::TestCase
|
||||
assert_equal "ASCII-8BIT", txt_1.encoding.to_s
|
||||
assert_equal "ASCII-8BIT", txt_2.encoding.to_s
|
||||
assert_equal "ASCII-8BIT", txt_3.encoding.to_s
|
||||
elsif RUBY_PLATFORM == 'java'
|
||||
assert_equal "??",
|
||||
Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_1, encoding)
|
||||
assert_equal "???",
|
||||
Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_2, encoding)
|
||||
assert_equal "????",
|
||||
Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_3, encoding)
|
||||
else
|
||||
assert_equal "???\x91\xd4",
|
||||
Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_1, encoding)
|
||||
assert_equal "???\x91\xd4???",
|
||||
Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_2, encoding)
|
||||
assert_equal "??????\x91\xd4???",
|
||||
Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(utf8_txt_3, encoding)
|
||||
end
|
||||
end
|
||||
|
||||
def test_rdm_pdf_iconv_invalid_utf8_should_be_replaced_en
|
||||
str1 = "Texte encod\xe9 en ISO-8859-1"
|
||||
str2 = "\xe9a\xe9b\xe9c\xe9d\xe9e test"
|
||||
str1.force_encoding("UTF-8") if str1.respond_to?(:force_encoding)
|
||||
str2.force_encoding("ASCII-8BIT") if str2.respond_to?(:force_encoding)
|
||||
str1 = "Texte encod\xe9 en ISO-8859-1".force_encoding("UTF-8")
|
||||
str2 = "\xe9a\xe9b\xe9c\xe9d\xe9e test".force_encoding("ASCII-8BIT")
|
||||
txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(str1, 'UTF-8')
|
||||
txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(str2, 'UTF-8')
|
||||
if txt_1.respond_to?(:force_encoding)
|
||||
assert_equal "ASCII-8BIT", txt_1.encoding.to_s
|
||||
assert_equal "ASCII-8BIT", txt_2.encoding.to_s
|
||||
end
|
||||
assert_equal "ASCII-8BIT", txt_1.encoding.to_s
|
||||
assert_equal "ASCII-8BIT", txt_2.encoding.to_s
|
||||
assert_equal "Texte encod? en ISO-8859-1", txt_1
|
||||
assert_equal "?a?b?c?d?e test", txt_2
|
||||
end
|
||||
|
||||
def test_rdm_pdf_iconv_invalid_utf8_should_be_replaced_ja
|
||||
str1 = "Texte encod\xe9 en ISO-8859-1"
|
||||
str2 = "\xe9a\xe9b\xe9c\xe9d\xe9e test"
|
||||
str1.force_encoding("UTF-8") if str1.respond_to?(:force_encoding)
|
||||
str2.force_encoding("ASCII-8BIT") if str2.respond_to?(:force_encoding)
|
||||
str1 = "Texte encod\xe9 en ISO-8859-1".force_encoding("UTF-8")
|
||||
str2 = "\xe9a\xe9b\xe9c\xe9d\xe9e test".force_encoding("ASCII-8BIT")
|
||||
encoding = ( RUBY_PLATFORM == 'java' ? "SJIS" : "CP932" )
|
||||
txt_1 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(str1, encoding)
|
||||
txt_2 = Redmine::Export::PDF::RDMPdfEncoding::rdm_from_utf8(str2, encoding)
|
||||
if txt_1.respond_to?(:force_encoding)
|
||||
assert_equal "ASCII-8BIT", txt_1.encoding.to_s
|
||||
assert_equal "ASCII-8BIT", txt_2.encoding.to_s
|
||||
end
|
||||
assert_equal "ASCII-8BIT", txt_1.encoding.to_s
|
||||
assert_equal "ASCII-8BIT", txt_2.encoding.to_s
|
||||
assert_equal "Texte encod? en ISO-8859-1", txt_1
|
||||
assert_equal "?a?b?c?d?e test", txt_2
|
||||
end
|
||||
|
||||
def test_attach
|
||||
set_fixtures_attachments_directory
|
||||
["CP932", "SJIS"].each do |encoding|
|
||||
set_fixtures_attachments_directory
|
||||
|
||||
str2 = "\x83e\x83X\x83g"
|
||||
str2.force_encoding("ASCII-8BIT") if str2.respond_to?(:force_encoding)
|
||||
encoding = ( RUBY_PLATFORM == 'java' ? "SJIS" : "CP932" )
|
||||
str2 = "\x83e\x83X\x83g".force_encoding("ASCII-8BIT")
|
||||
|
||||
a1 = Attachment.find(17)
|
||||
a2 = Attachment.find(19)
|
||||
a1 = Attachment.find(17)
|
||||
a2 = Attachment.find(19)
|
||||
User.current = User.find(1)
|
||||
assert a1.readable?
|
||||
assert a1.visible?
|
||||
assert a2.readable?
|
||||
assert a2.visible?
|
||||
|
||||
User.current = User.find(1)
|
||||
assert a1.readable?
|
||||
assert a1.visible?
|
||||
assert a2.readable?
|
||||
assert a2.visible?
|
||||
aa1 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "Testfile.PNG", "UTF-8")
|
||||
assert_not_nil aa1
|
||||
assert_equal 17, aa1.id
|
||||
|
||||
aa1 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "Testfile.PNG", "UTF-8")
|
||||
assert_not_nil aa1
|
||||
assert_equal 17, aa1.id
|
||||
aa2 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "test#{str2}.png", encoding)
|
||||
assert_not_nil aa2
|
||||
assert_equal 19, aa2.id
|
||||
aa2 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "test#{str2}.png", encoding)
|
||||
assert_not_nil aa2
|
||||
assert_equal 19, aa2.id
|
||||
|
||||
User.current = nil
|
||||
assert a1.readable?
|
||||
assert (! a1.visible?)
|
||||
assert a2.readable?
|
||||
assert (! a2.visible?)
|
||||
User.current = nil
|
||||
assert a1.readable?
|
||||
assert (! a1.visible?)
|
||||
assert a2.readable?
|
||||
assert (! a2.visible?)
|
||||
aa1 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "Testfile.PNG", "UTF-8")
|
||||
assert_equal nil, aa1
|
||||
aa2 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "test#{str2}.png", encoding)
|
||||
assert_equal nil, aa2
|
||||
|
||||
aa1 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "Testfile.PNG", "UTF-8")
|
||||
assert_equal nil, aa1
|
||||
aa2 = Redmine::Export::PDF::RDMPdfEncoding::attach(Attachment.all, "test#{str2}.png", encoding)
|
||||
assert_equal nil, aa2
|
||||
|
||||
set_tmp_attachments_directory
|
||||
set_tmp_attachments_directory
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user