summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/enc/test_case_comprehensive.rb17
2 files changed, 17 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c023a4c..6648512 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 28 19:08:36 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
+
+ * test/ruby/enc/test_case_comprehensive.rb: Add error messages to tests
+ for data file availability; refactoring.
+
Sat May 28 14:00:10 2016 Kazuki Yamaguchi <k@rhe.jp>
* ext/openssl/lib/openssl/ssl.rb (SSLSocket): Move the implementation of
diff --git a/test/ruby/enc/test_case_comprehensive.rb b/test/ruby/enc/test_case_comprehensive.rb
index bd2350f..dcaebd1 100644
--- a/test/ruby/enc/test_case_comprehensive.rb
+++ b/test/ruby/enc/test_case_comprehensive.rb
@@ -21,8 +21,12 @@ class TestComprehensiveCaseFold < Test::Unit::TestCase
s.split(' ').map { |c| c.to_i(16) }.pack('U*')
end
+ def self.expand_filename(basename)
+ File.expand_path("#{UNICODE_DATA_PATH}/#{basename}.txt", __dir__)
+ end
+
def self.read_data_file (filename)
- IO.readlines(File.expand_path("#{UNICODE_DATA_PATH}/#{filename}.txt", __dir__), encoding: Encoding::ASCII_8BIT)
+ IO.readlines(expand_filename(filename), encoding: Encoding::ASCII_8BIT)
.tap do |lines|
raise "File Version Mismatch" unless filename=='UnicodeData' or /#{filename}-#{UNICODE_VERSION}\.txt/ =~ lines[0]
end
@@ -113,10 +117,13 @@ class TestComprehensiveCaseFold < Test::Unit::TestCase
end
end
- def test_AAAAA_data_files_available
- assert File.exist? File.expand_path("#{UNICODE_DATA_PATH}/UnicodeData.txt", __dir__)
- assert File.exist? File.expand_path("#{UNICODE_DATA_PATH}/CaseFolding.txt", __dir__)
- assert File.exist? File.expand_path("#{UNICODE_DATA_PATH}/SpecialCasing.txt", __dir__)
+ def check_file_available(filename)
+ expanded = self.class.expand_filename(filename)
+ assert File.exist?(expanded), "File #{expanded} missing."
+ end
+
+ def test_AAAAA_data_files_available # AAAAA makes sure this test is run first
+ %w[UnicodeData CaseFolding SpecialCasing].each { |f| check_file_available f }
end
generate_casefold_tests 'US-ASCII'