diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-13 08:03:30 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-13 08:03:30 +0000 |
commit | d4b7cc796cfbc8224a387d4e906ce1e3908f4970 (patch) | |
tree | 1a611f44450721f2acb72d3120782fe4a5f640b4 /test | |
parent | 16612b360b376d0cb3f50f966e2e671cf80fdc25 (diff) | |
download | ruby-d4b7cc796cfbc8224a387d4e906ce1e3908f4970.tar.gz |
* golf_prelude.rb, lib/set.rb (TC_Set#test_each),
test/readline/test_readline_history.rb (Readline#test_each__enumerator),
test/ruby/test_array.rb (TestArray#test_collect),
test/ruby/test_enumerator.rb (TestEnumerator#test_initialize):
Enumerable::Enumerator is now called Enumerator.
* lib/rinda/tuplespace.rb (Rinda::TupleBag#initialize): Use
enum_for instead of hardcoding Enumerable::Enumerator.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18571 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/readline/test_readline_history.rb | 2 | ||||
-rw-r--r-- | test/ruby/test_array.rb | 2 | ||||
-rw-r--r-- | test/ruby/test_enumerator.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/test/readline/test_readline_history.rb b/test/readline/test_readline_history.rb index 0235a4ec90..8033a9a827 100644 --- a/test/readline/test_readline_history.rb +++ b/test/readline/test_readline_history.rb @@ -219,7 +219,7 @@ class Readline::TestHistory < Test::Unit::TestCase def test_each__enumerator e = HISTORY.each - assert_instance_of(Enumerable::Enumerator, e) + assert_instance_of(Enumerator, e) end def test_length diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 1139e36900..234fb238a2 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -479,7 +479,7 @@ class TestArray < Test::Unit::TestCase # Ruby 1.9 feature change: # Enumerable#collect without block returns an Enumerator. #assert_equal([1, 2, 3], @cls[1, 2, 3].collect) - assert_kind_of Enumerable::Enumerator, @cls[1, 2, 3].collect + assert_kind_of Enumerator, @cls[1, 2, 3].collect end # also update map! diff --git a/test/ruby/test_enumerator.rb b/test/ruby/test_enumerator.rb index 07a54e8233..d1e75208f8 100644 --- a/test/ruby/test_enumerator.rb +++ b/test/ruby/test_enumerator.rb @@ -57,8 +57,8 @@ class TestEnumerator < Test::Unit::TestCase def test_initialize assert_equal([1, 2, 3], @obj.to_enum(:foo, 1, 2, 3).to_a) - assert_equal([1, 2, 3], Enumerable::Enumerator.new(@obj, :foo, 1, 2, 3).to_a) - assert_raise(ArgumentError) { Enumerable::Enumerator.new } + assert_equal([1, 2, 3], Enumerator.new(@obj, :foo, 1, 2, 3).to_a) + assert_raise(ArgumentError) { Enumerator.new } end def test_initialize_copy |