From 2f6c0e3be38b057239eb044426c152ac5633c88f Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 23 Aug 2010 22:07:39 +0000 Subject: * array.c (rb_ary_shuffle_bang, rb_ary_sample): add optional argument random. [ruby-dev:41923] [EXPERIMENTAL] * random.c (rb_random_{int32,real,bytes}): fallback to normal method invocation. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29083 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_array.rb | 17 ++++++++++++++++- test/ruby/test_rand.rb | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 3e32175012..f95d8870a1 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -1891,6 +1891,12 @@ class TestArray < Test::Unit::TestCase 100.times do assert_equal([0, 1, 2], [2, 1, 0].shuffle.sort) end + + gen = Random.new(0) + srand(0) + 100.times do + assert_equal([0, 1, 2].shuffle, [0, 1, 2].shuffle(random: gen)) + end end def test_sample @@ -1907,7 +1913,7 @@ class TestArray < Test::Unit::TestCase (0..20).each do |n| 100.times do b = a.sample(n) - assert_equal([n, 18].min, b.uniq.size) + assert_equal([n, 18].min, b.size) assert_equal(a, (a | b).sort) assert_equal(b.sort, (a & b).sort) end @@ -1920,6 +1926,15 @@ class TestArray < Test::Unit::TestCase end assert_raise(ArgumentError, '[ruby-core:23374]') {[1, 2].sample(-1)} + + gen = Random.new(0) + srand(0) + a = (1..18).to_a + (0..20).each do |n| + 100.times do |i| + assert_equal(a.sample(n), a.sample(n, random: gen), "#{i}/#{n}") + end + end end def test_cycle diff --git a/test/ruby/test_rand.rb b/test/ruby/test_rand.rb index 40b291f959..c3282cf804 100644 --- a/test/ruby/test_rand.rb +++ b/test/ruby/test_rand.rb @@ -171,6 +171,7 @@ class TestRand < Test::Unit::TestCase def test_shuffle srand(0) assert_equal([1,4,2,5,3], [1,2,3,4,5].shuffle) + assert_equal([1,4,2,5,3], [1,2,3,4,5].shuffle(random: Random.new(0))) end def test_big_seed -- cgit v1.2.3