summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorduerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-12 12:59:46 +0000
committerduerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-12 12:59:46 +0000
commit7c0cb4351a4ec726a7c8fad94c61d1781125ca86 (patch)
tree5f22437cba0bc57120d780cac331ce038383908e /test
parent7b66f0bae9ee8f41b8765b175c9ccbb825a294cf (diff)
* revert r55642 (previous commit) because of test failure at
https://travis-ci.org/ruby/ruby/builds/144148780 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55643 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/enc/test_case_comprehensive.rb13
1 files changed, 3 insertions, 10 deletions
diff --git a/test/ruby/enc/test_case_comprehensive.rb b/test/ruby/enc/test_case_comprehensive.rb
index 8d202ca148..9a5c17724d 100644
--- a/test/ruby/enc/test_case_comprehensive.rb
+++ b/test/ruby/enc/test_case_comprehensive.rb
@@ -168,15 +168,8 @@ class TestComprehensiveCaseFold
begin
target = "#{test.first_data[code]}#{test.follow_data[code]*4}".encode(encoding)
rescue Encoding::UndefinedConversionError
- if test.first_data[code]=="i\u0307" or test.follow_data[code]=="i\u0307" # explicit dot above
- first_data = test.first_data[code]=="i\u0307" ? 'i' : test.first_data[code]
- follow_data = test.follow_data[code]=="i\u0307" ? 'i' : test.follow_data[code]
- target = "#{first_data}#{follow_data*4}".encode(encoding)
- elsif code =~ /i|I/ # special case for Turkic
- raise
- else
- target = source
- end
+ raise if code =~ /i|I/ # special case for Turkic
+ target = source
end
result = source.send(test.method_name, *test.attributes)
assert_equal target, result,
@@ -251,7 +244,7 @@ class TestComprehensiveCaseFold
end
generate_ascii_only_case_mapping_tests 'ISO-8859-2'
- generate_case_mapping_tests 'ISO-8859-3'
+ generate_ascii_only_case_mapping_tests 'ISO-8859-3'
generate_case_mapping_tests 'ISO-8859-4'
generate_ascii_only_case_mapping_tests 'ISO-8859-5'
generate_ascii_only_case_mapping_tests 'ISO-8859-7'