summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-21 14:47:11 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-21 14:47:11 +0000
commit3c84bb31479840329e4d8953a5828781b07f9ab5 (patch)
tree5deddc1f57b83e5fa7c089d9c179a0093cf90676 /test
parent5453b6d4a7423e4c4b949bc27da03e6667f80293 (diff)
merges r23361 from trunk into ruby_1_9_1.
-- * array.c (rb_ary_flatten_bang): returns nil if nothing changed. a patch from Marc-Andre Lafortune in [ruby-core:23382]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_array.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb
index 384ce239f9..372e727381 100644
--- a/test/ruby/test_array.rb
+++ b/test/ruby/test_array.rb
@@ -736,11 +736,14 @@ class TestArray < Test::Unit::TestCase
a5 = @cls[ a1, @cls[], a3 ]
assert_equal(@cls[1, 2, 3, 4, 5, 6], a5.flatten!)
+ assert_nil(a5.flatten!(0), '[ruby-core:23382]')
assert_equal(@cls[1, 2, 3, 4, 5, 6], a5)
assert_equal(@cls[], @cls[].flatten)
assert_equal(@cls[],
@cls[@cls[@cls[@cls[],@cls[]],@cls[@cls[]],@cls[]],@cls[@cls[@cls[]]]].flatten)
+
+ assert_nil(@cls[].flatten!(0), '[ruby-core:23382]')
end
def test_flatten_with_callcc