summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2019-06-28 20:08:52 +0900
committerGitHub <[email protected]>2019-06-28 20:08:52 +0900
commit4f4e240024f4e1980a64bc13bcc7fbf518533cbb (patch)
tree25a4691a0440688b659f425b3c1157fa7269e0e4
parentcf7a2292f345be5e8988fa532b85ac40b27c7cab (diff)
parentbc3176da630e3e055d58aa065ff897aec66df280 (diff)
downloadmruby-4f4e240024f4e1980a64bc13bcc7fbf518533cbb.tar.gz
mruby-4f4e240024f4e1980a64bc13bcc7fbf518533cbb.zip
Merge pull request #4538 from shuujii/use-__ENCODING__-in-tests
Use `__ENCODING__` in tests
-rw-r--r--mrbgems/mruby-string-ext/test/string.rb2
-rw-r--r--mrbgems/mruby-symbol-ext/test/symbol.rb2
-rw-r--r--test/t/string.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/mrbgems/mruby-string-ext/test/string.rb b/mrbgems/mruby-string-ext/test/string.rb
index bf633bcef..9a324c46d 100644
--- a/mrbgems/mruby-string-ext/test/string.rb
+++ b/mrbgems/mruby-string-ext/test/string.rb
@@ -2,7 +2,7 @@
##
# String(Ext) Test
-UTF8STRING = ("\343\201\202".size == 1)
+UTF8STRING = __ENCODING__ == "UTF-8"
assert('String#getbyte') do
str1 = "hello"
diff --git a/mrbgems/mruby-symbol-ext/test/symbol.rb b/mrbgems/mruby-symbol-ext/test/symbol.rb
index 61ecad247..db686e5f4 100644
--- a/mrbgems/mruby-symbol-ext/test/symbol.rb
+++ b/mrbgems/mruby-symbol-ext/test/symbol.rb
@@ -14,7 +14,7 @@ end
assert("Symbol##{n}") do
assert_equal 5, :hello.__send__(n)
assert_equal 4, :"aA\0b".__send__(n)
- if "あ".size == 1 # enable MRB_UTF8_STRING?
+ if __ENCODING__ == "UTF-8"
assert_equal 8, :"こんにちは世界!".__send__(n)
assert_equal 4, :"aあ\0b".__send__(n)
else
diff --git a/test/t/string.rb b/test/t/string.rb
index 7ef236dbe..81699f17e 100644
--- a/test/t/string.rb
+++ b/test/t/string.rb
@@ -2,7 +2,7 @@
##
# String ISO Test
-UTF8STRING = ("\343\201\202".size == 1)
+UTF8STRING = __ENCODING__ == "UTF-8"
assert('String', '15.2.10') do
assert_equal Class, String.class