From afb1901848f9b6998f320423474e830a1e95d780 Mon Sep 17 00:00:00 2001 From: ko1 Date: Fri, 15 Jun 2007 04:25:07 +0000 Subject: * hash.c: exchange semantics of Hash#each and Hash#each_pair. pointed out by [ruby-dev:30997]. * test/ruby/test_iterator.rb: ditto. * test/ruby/test_yield.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12546 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_iterator.rb | 17 +++++++++++++---- test/ruby/test_yield.rb | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) (limited to 'test/ruby') diff --git a/test/ruby/test_iterator.rb b/test/ruby/test_iterator.rb index 20d3b55d1c..0fce5eabd7 100644 --- a/test/ruby/test_iterator.rb +++ b/test/ruby/test_iterator.rb @@ -359,15 +359,24 @@ class TestIterator < Test::Unit::TestCase class H def each + yield [:key, :value] + end + + def each_pair yield :key, :value end end def test_assoc_yield - [{:key=>:value}, H.new].each {|h| - h.each{|a| assert_equal(:key, a)} # changed at 1.9 - h.each{|*a| assert_equal([:key, :value], a)} - h.each{|k,v| assert_equal([:key, :value], [k,v])} + [{:key=>:value}, H.new].each {|h| + h.each{|a| assert_equal([:key, :value], a)} + h.each{|a,| assert_equal(:key, a)} + h.each{|*a| assert_equal([[:key, :value]], a)} + h.each{|k,v| assert_equal([:key, :value], [k,v])} + h.each_pair{|a| assert_equal(:key, a)} + h.each_pair{|a,| assert_equal(:key, a)} + h.each_pair{|*a| assert_equal([:key, :value], a)} + h.each_pair{|k,v| assert_equal([:key, :value], [k,v])} } end diff --git a/test/ruby/test_yield.rb b/test/ruby/test_yield.rb index e5e288be1a..99f0a0c3fc 100644 --- a/test/ruby/test_yield.rb +++ b/test/ruby/test_yield.rb @@ -17,7 +17,7 @@ class TestRubyYield < Test::Unit::TestCase assert_equal 1, v end h.each do |k| - assert_equal :a, k # changed at 1.9 + assert_equal [:a, 1], k end end -- cgit v1.2.3