aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-25 08:10:40 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-25 08:10:40 +0000
commit246c3a0b7cba62ea55aead9c3040ee2c2c1dd55c (patch)
tree0e52df35ba06df191567b5ca8bf100f7b58f93fd
parent6ff10e76d7669925c623167ed01962c5b57dd43f (diff)
downloadruby-246c3a0b7cba62ea55aead9c3040ee2c2c1dd55c.tar.gz
test_string.rb: ENUMERATORS_WANTARRAY
* test/ruby/test_string.rb (TestString::ENUMERATOR_WANTARRAY): name test branching codition. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/ruby/test_string.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb
index 7b4dc2951d..1dd09d9081 100644
--- a/test/ruby/test_string.rb
+++ b/test/ruby/test_string.rb
@@ -6,6 +6,7 @@ def pre_1_7_1
end
class TestString < Test::Unit::TestCase
+ ENUMERATOR_WANTARRAY = RUBY_VERSION >= "2.1.0"
def initialize(*args)
@cls = String
@@ -642,7 +643,7 @@ class TestString < Test::Unit::TestCase
s = S("ABC")
assert_equal [65, 66, 67], s.bytes
- if RUBY_VERSION >= "2.1.0"
+ if ENUMERATOR_WANTARRAY
assert_warn(/block not used/) {
assert_equal [65, 66, 67], s.bytes {}
}
@@ -679,7 +680,7 @@ class TestString < Test::Unit::TestCase
s = S("\u3042\u3044\u3046")
assert_equal [0x3042, 0x3044, 0x3046], s.codepoints
- if RUBY_VERSION >= "2.1.0"
+ if ENUMERATOR_WANTARRAY
assert_warn(/block not used/) {
assert_equal [0x3042, 0x3044, 0x3046], s.codepoints {}
}
@@ -710,7 +711,7 @@ class TestString < Test::Unit::TestCase
s = S("ABC")
assert_equal ["A", "B", "C"], s.chars
- if RUBY_VERSION >= "2.1.0"
+ if ENUMERATOR_WANTARRAY
assert_warn(/block not used/) {
assert_equal ["A", "B", "C"], s.chars {}
}
@@ -772,7 +773,7 @@ class TestString < Test::Unit::TestCase
assert_equal ["hello\n", "world"], s.lines
assert_equal ["hello\nworld"], s.lines(nil)
- if RUBY_VERSION >= "2.1.0"
+ if ENUMERATOR_WANTARRAY
assert_warn(/block not used/) {
assert_equal ["hello\n", "world"], s.lines {}
}