diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-04-03 08:11:41 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-04-03 08:11:41 +0000 |
commit | 95f7992b89efd35de6b28ac095c4d3477019c583 (patch) | |
tree | 5e38be092ece82da7a19a78af047598be1bf2079 /test | |
parent | dd2479bcea6cfbfb7656ef691ad5f9ff6ae543cd (diff) | |
download | ruby-95f7992b89efd35de6b28ac095c4d3477019c583.tar.gz |
Introduce beginless range [Feature#14799]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67422 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/ruby/test_array.rb | 15 | ||||
-rw-r--r-- | test/ruby/test_range.rb | 11 |
2 files changed, 24 insertions, 2 deletions
diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index b61bac03c2..8bb9288822 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -42,6 +42,8 @@ class TestArray < Test::Unit::TestCase assert_equal([1, 2, 3], x[1..3]) assert_equal([1, 2, 3], x[1,3]) assert_equal([3, 4, 5], x[3..]) + assert_equal([0, 1, 2], x[..2]) + assert_equal([0, 1], x[...2]) x[0, 2] = 10 assert_equal([10, 2, 3, 4, 5], x) @@ -375,8 +377,11 @@ class TestArray < Test::Unit::TestCase assert_equal(@cls[10, 11, 12], a[9..11]) assert_equal(@cls[98, 99, 100], a[97..]) + assert_equal(@cls[1, 2, 3], a[..2]) + assert_equal(@cls[1, 2], a[...2]) assert_equal(@cls[10, 11, 12], a[-91..-89]) - assert_equal(@cls[98, 99, 100], a[-3..]) + assert_equal(@cls[1, 2, 3], a[..-98]) + assert_equal(@cls[1, 2], a[...-98]) assert_nil(a[10, -3]) assert_equal [], a[10..7] @@ -462,6 +467,14 @@ class TestArray < Test::Unit::TestCase assert_equal(nil, a[10..] = nil) assert_equal(@cls[*(0..9).to_a] + @cls[nil], a) + a = @cls[*(0..99).to_a] + assert_equal(nil, a[..10] = nil) + assert_equal(@cls[nil] + @cls[*(11..99).to_a], a) + + a = @cls[*(0..99).to_a] + assert_equal(nil, a[...10] = nil) + assert_equal(@cls[nil] + @cls[*(10..99).to_a], a) + a = @cls[1, 2, 3] a[1, 0] = a assert_equal([1, 1, 2, 3, 2, 3], a) diff --git a/test/ruby/test_range.rb b/test/ruby/test_range.rb index 6a2081fcd2..6c1761f3b0 100644 --- a/test/ruby/test_range.rb +++ b/test/ruby/test_range.rb @@ -691,6 +691,8 @@ class TestRange < Test::Unit::TestCase assert_equal Float::INFINITY, (1...).size assert_equal Float::INFINITY, (1.0...).size + assert_equal Float::INFINITY, (...1).size + assert_equal Float::INFINITY, (...1.0).size assert_nil ("a"...).size end @@ -735,6 +737,7 @@ class TestRange < Test::Unit::TestCase assert_equal(1, (0...ary.size).bsearch {|i| ary[i] >= 100 }) assert_equal(1_000_001, (0...).bsearch {|i| i > 1_000_000 }) + assert_equal( -999_999, (...0).bsearch {|i| i > -1_000_000 }) end def test_bsearch_for_float @@ -787,7 +790,8 @@ class TestRange < Test::Unit::TestCase assert_in_delta(1.0, (0.0..inf).bsearch {|x| Math.log(x) >= 0 }) assert_in_delta(7.0, (0.0..10).bsearch {|x| 7.0 - x }) - assert_equal(1_000_000.0.next_float, (0.0..).bsearch {|x| x > 1_000_000 }) + assert_equal( 1_000_000.0.next_float, (0.0..).bsearch {|x| x > 1_000_000 }) + assert_equal(-1_000_000.0.next_float, (..0.0).bsearch {|x| x > -1_000_000 }) end def check_bsearch_values(range, search, a) @@ -890,6 +894,7 @@ class TestRange < Test::Unit::TestCase assert_equal(bignum + 0, (bignum...bignum+ary.size).bsearch {|i| true }) assert_equal(nil, (bignum...bignum+ary.size).bsearch {|i| false }) assert_equal(bignum * 2 + 1, (bignum...).bsearch {|i| i > bignum * 2 }) + assert_equal(-bignum * 2 + 1, (...-bignum).bsearch {|i| i > -bignum * 2 }) assert_raise(TypeError) { ("a".."z").bsearch {} } end @@ -907,4 +912,8 @@ class TestRange < Test::Unit::TestCase assert_equal([1,2,3,4], (1...5).to_a) assert_raise(RangeError) { (1..).to_a } end + + def test_beginless_range_iteration + assert_raise(TypeError) { (..1).each { } } + end end |