Permalink
Browse files

Move multibyte test helpers to a separate file and make the conforman…

…ce tests run again.
  • Loading branch information...
1 parent 85c05b5 commit 3c9eedec3c17861c354635a33f3012e85083301f @Manfred Manfred committed Sep 21, 2008
@@ -1,24 +1,7 @@
# encoding: utf-8
require 'abstract_unit'
-
-module MultibyteTest
- UNICODE_STRING = 'こにちわ'
- ASCII_STRING = 'ohayo'
- BYTE_STRING = "\270\236\010\210\245"
-
- def chars(str)
- ActiveSupport::Multibyte::Chars.new(str)
- end
-
- def inspect_codepoints(str)
- str.to_s.unpack("U*").map{|cp| cp.to_s(16) }.join(' ')
- end
-
- def assert_equal_codepoints(expected, actual, message=nil)
- assert_equal(inspect_codepoints(expected), inspect_codepoints(actual), message)
- end
-end
+require 'multibyte_test_helpers'
class String
def __method_for_multibyte_testing_with_integer_result; 1; end
@@ -27,7 +10,7 @@ def __method_for_multibyte_testing!; 'result'; end
end
class MultibyteCharsTest < Test::Unit::TestCase
- include MultibyteTest
+ include MultibyteTestHelpers
def setup
@proxy_class = ActiveSupport::Multibyte::Chars
@@ -113,7 +96,7 @@ def test_concatenate_should_return_proxy_instance
end
class MultibyteCharsUTF8BehaviourTest < Test::Unit::TestCase
- include MultibyteTest
+ include MultibyteTestHelpers
def setup
@chars = UNICODE_STRING.dup.mb_chars
@@ -445,7 +428,7 @@ def test_acts_like_string
# for the implementation of these features should run on all Ruby versions and shouldn't be tested
# through the proxy methods.
class MultibyteCharsExtrasTest < Test::Unit::TestCase
- include MultibyteTest
+ include MultibyteTestHelpers
if RUBY_VERSION >= '1.9'
def test_tidy_bytes_is_broken_on_1_9_0
@@ -1,4 +1,8 @@
+# encoding: utf-8
+
require 'abstract_unit'
+require 'multibyte_test_helpers'
+
require 'fileutils'
require 'open-uri'
require 'tmpdir'
@@ -22,7 +26,7 @@ def self.download(from, to)
end
class MultibyteConformanceTest < Test::Unit::TestCase
- include MultibyteTest
+ include MultibyteTestHelpers
UNIDATA_URL = "http://www.unicode.org/Public/#{ActiveSupport::Multibyte::UNICODE_VERSION}/ucd"
UNIDATA_FILE = '/NormalizationTest.txt'
@@ -0,0 +1,17 @@
+module MultibyteTestHelpers
+ UNICODE_STRING = 'こにちわ'
+ ASCII_STRING = 'ohayo'
+ BYTE_STRING = "\270\236\010\210\245"
+
+ def chars(str)
+ ActiveSupport::Multibyte::Chars.new(str)
+ end
+
+ def inspect_codepoints(str)
+ str.to_s.unpack("U*").map{|cp| cp.to_s(16) }.join(' ')
+ end
+
+ def assert_equal_codepoints(expected, actual, message=nil)
+ assert_equal(inspect_codepoints(expected), inspect_codepoints(actual), message)
+ end
+end

0 comments on commit 3c9eede

Please sign in to comment.