* array.c (rb_ary_slice_bang): If an invalid negative index (<=

  -size) is given, do not raise an exception but return nil just
  like slice() does.

* test/ruby/test_array.rb (TestArray::test_slice,
  TestArray::test_slice!): Pull in test cases from trunk.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@14184 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 87 insertions, 0 deletions

diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb
index c56f06c3b2..38b760f02c 100644
--- a/test/ruby/test_array.rb
+++ b/test/ruby/test_array.rb
@@ -142,4 +142,91 @@ class TestArray < Test::Unit::TestCase
     assert_equal([0, 1, 12, 13, 14, 5], [0, 1, 2, 3, 4, 5].fill(2..-2){|i| i+10})
     assert_equal([0, 1, 12, 13, 4, 5], [0, 1, 2, 3, 4, 5].fill(2...-2){|i| i+10})
   end
+
+  # From rubicon
+
+  def setup
+    @cls = Array
+  end
+
+  def test_slice
+    a = @cls[*(1..100).to_a]
+
+    assert_equal(1, a.slice(0))
+    assert_equal(100, a.slice(99))
+    assert_nil(a.slice(100))
+    assert_equal(100, a.slice(-1))
+    assert_equal(99,  a.slice(-2))
+    assert_equal(1,   a.slice(-100))
+    assert_nil(a.slice(-101))
+
+    assert_equal(@cls[1],   a.slice(0,1))
+    assert_equal(@cls[100], a.slice(99,1))
+    assert_equal(@cls[],    a.slice(100,1))
+    assert_equal(@cls[100], a.slice(99,100))
+    assert_equal(@cls[100], a.slice(-1,1))
+    assert_equal(@cls[99],  a.slice(-2,1))
+
+    assert_equal(@cls[10, 11, 12], a.slice(9, 3))
+    assert_equal(@cls[10, 11, 12], a.slice(-91, 3))
+
+    assert_nil(a.slice(-101, 2))
+
+    assert_equal(@cls[1],   a.slice(0..0))
+    assert_equal(@cls[100], a.slice(99..99))
+    assert_equal(@cls[],    a.slice(100..100))
+    assert_equal(@cls[100], a.slice(99..200))
+    assert_equal(@cls[100], a.slice(-1..-1))
+    assert_equal(@cls[99],  a.slice(-2..-2))
+
+    assert_equal(@cls[10, 11, 12], a.slice(9..11))
+    assert_equal(@cls[10, 11, 12], a.slice(-91..-89))
+    
+    assert_nil(a.slice(-101..-1))
+
+    assert_nil(a.slice(10, -3))
+    # Ruby 1.8 feature change:
+    # Array#slice[size..x] always returns [].
+    #assert_nil(a.slice(10..7))
+    assert_equal @cls[], a.slice(10..7)
+  end
+
+  def test_slice!
+    a = @cls[1, 2, 3, 4, 5]
+    assert_equal(3, a.slice!(2))
+    assert_equal(@cls[1, 2, 4, 5], a)
+
+    a = @cls[1, 2, 3, 4, 5]
+    assert_equal(4, a.slice!(-2))
+    assert_equal(@cls[1, 2, 3, 5], a)
+
+    a = @cls[1, 2, 3, 4, 5]
+    assert_equal(@cls[3,4], a.slice!(2,2))
+    assert_equal(@cls[1, 2, 5], a)
+
+    a = @cls[1, 2, 3, 4, 5]
+    assert_equal(@cls[4,5], a.slice!(-2,2))
+    assert_equal(@cls[1, 2, 3], a)
+
+    a = @cls[1, 2, 3, 4, 5]
+    assert_equal(@cls[3,4], a.slice!(2..3))
+    assert_equal(@cls[1, 2, 5], a)
+
+    a = @cls[1, 2, 3, 4, 5]
+    assert_equal(nil, a.slice!(20))
+    assert_equal(@cls[1, 2, 3, 4, 5], a)
+
+    a = @cls[1, 2, 3, 4, 5]
+    assert_equal(nil, a.slice!(-6))
+    assert_equal(@cls[1, 2, 3, 4, 5], a)
+
+    a = @cls[1, 2, 3, 4, 5]
+    assert_equal(nil, a.slice!(-6..4))
+    assert_equal(@cls[1, 2, 3, 4, 5], a)
+
+    a = @cls[1, 2, 3, 4, 5]
+    assert_equal(nil, a.slice!(-6,2))
+    assert_equal(@cls[1, 2, 3, 4, 5], a)
+  end
+
 end