* test/ruby/test_enumerator.rb: add tests to achieve over 90% test

coverage of enumerator.c.
* test/ruby/test_enum.rb: add for enum.c.


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

ChangeLog

@@ -1,3 +1,9 @@
+Tue Jan 29 22:58:11 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* test/ruby/test_enumerator.rb: add tests to achieve over 90% test
+	  coverage of enumerator.c.
+	* test/ruby/test_enum.rb: add for enum.c.
+
 Tue Jan 29 22:29:48 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* enumerator.c: fix documents.

test/ruby/test_enum.rb

@@ -0,0 +1,250 @@
+require 'test/unit'
+require 'continuation'
+
+class TestEnumerable < Test::Unit::TestCase
+  def setup
+    @obj = Object.new
+    class << @obj
+      include Enumerable
+      def each
+        yield 1
+        yield 2
+        yield 3
+        yield 1
+        yield 2
+      end
+    end
+  end
+
+  def test_grep
+    assert_equal([1, 2, 1, 2], @obj.grep(1..2))
+    a = []
+    @obj.grep(2) {|x| a << x }
+    assert_equal([2, 2], a)
+  end
+
+  def test_count
+    assert_equal(2, @obj.count(1))
+    assert_equal(3, @obj.count {|x| x % 2 == 1 })
+    assert_equal(2, @obj.count(1) {|x| x % 2 == 1 })
+    assert_raise(ArgumentError) { @obj.count(0, 1) }
+  end
+
+  def test_find
+    assert_equal(2, @obj.find {|x| x % 2 == 0 })
+    assert_equal(nil, @obj.find {|x| false })
+    assert_equal(:foo, @obj.find(proc { :foo }) {|x| false })
+  end
+
+  def test_find_index
+    assert_equal(1, @obj.find_index {|x| x % 2 == 0 })
+    assert_equal(nil, @obj.find_index {|x| false })
+  end
+
+  def test_find_all
+    assert_equal([1, 3, 1], @obj.find_all {|x| x % 2 == 1 })
+  end
+
+  def test_reject
+    assert_equal([2, 3, 2], @obj.reject {|x| x < 2 })
+  end
+
+  def test_to_a
+    assert_equal([1, 2, 3, 1, 2], @obj.to_a)
+  end
+
+  def test_inject
+    assert_equal(12, @obj.inject {|z, x| z * x })
+    assert_equal(48, @obj.inject {|z, x| z * 2 + x })
+    assert_equal(12, @obj.inject(:*))
+    assert_equal(24, @obj.inject(2) {|z, x| z * x })
+    assert_equal(24, @obj.inject(2, :*) {|z, x| z * x })
+  end
+
+  def test_partition
+    assert_equal([[1, 3, 1], [2, 2]], @obj.partition {|x| x % 2 == 1 })
+  end
+
+  def test_group_by
+    h = { 1 => [1, 1], 2 => [2, 2], 3 => [3] }
+    assert_equal(h, @obj.group_by {|x| x })
+  end
+
+  def test_first
+    assert_equal(1, @obj.first)
+    assert_equal([1, 2, 3], @obj.first(3))
+  end
+
+  def test_sort
+    assert_equal([1, 1, 2, 2, 3], @obj.sort)
+  end
+
+  def test_sort_by
+    assert_equal([3, 2, 2, 1, 1], @obj.sort_by {|x| -x })
+  end
+
+  def test_all
+    assert_equal(true, @obj.all? {|x| x <= 3 })
+    assert_equal(false, @obj.all? {|x| x < 3 })
+    assert_equal(true, @obj.all?)
+    assert_equal(false, [true, true, false].all?)
+  end
+
+  def test_any
+    assert_equal(true, @obj.any? {|x| x >= 3 })
+    assert_equal(false, @obj.any? {|x| x > 3 })
+    assert_equal(true, @obj.any?)
+    assert_equal(false, [false, false, false].any?)
+  end
+
+  def test_one
+    assert(@obj.one? {|x| x == 3 })
+    assert(!(@obj.one? {|x| x == 1 }))
+    assert(!(@obj.one? {|x| x == 4 }))
+    assert(%w{ant bear cat}.one? {|word| word.length == 4})
+    assert(!(%w{ant bear cat}.one? {|word| word.length > 4}))
+    assert(!(%w{ant bear cat}.one? {|word| word.length < 4}))
+    assert(!([ nil, true, 99 ].one?))
+    assert([ nil, true, false ].one?)
+  end
+
+  def test_none
+    assert(@obj.none? {|x| x == 4 })
+    assert(!(@obj.none? {|x| x == 1 }))
+    assert(!(@obj.none? {|x| x == 3 }))
+    assert(%w{ant bear cat}.none? {|word| word.length == 5})
+    assert(!(%w{ant bear cat}.none? {|word| word.length >= 4}))
+    assert([].none?)
+    assert([nil].none?)
+    assert([nil,false].none?)
+  end
+
+  def test_min
+    assert_equal(1, @obj.min)
+    assert_equal(3, @obj.min {|a,b| b <=> a })
+    a = %w(albatross dog horse)
+    assert_equal("albatross", a.min)
+    assert_equal("dog", a.min {|a,b| a.length <=> b.length })
+    assert_equal(1, [3,2,1].min)
+  end
+
+  def test_max
+    assert_equal(3, @obj.max)
+    assert_equal(1, @obj.max {|a,b| b <=> a })
+    a = %w(albatross dog horse)
+    assert_equal("horse", a.max)
+    assert_equal("albatross", a.max {|a,b| a.length <=> b.length })
+    assert_equal(1, [3,2,1].max{|a,b| b <=> a })
+  end
+
+  def test_minmax
+    assert_equal([1, 3], @obj.minmax)
+    assert_equal([3, 1], @obj.minmax {|a,b| b <=> a })
+    a = %w(albatross dog horse)
+    assert_equal(["albatross", "horse"], a.minmax)
+    assert_equal(["dog", "albatross"], a.minmax {|a,b| a.length <=> b.length })
+    assert_equal([1, 3], [2,3,1].minmax)
+    assert_equal([3, 1], [2,3,1].minmax {|a,b| b <=> a })
+  end
+
+  def test_min_by
+    assert_equal(3, @obj.min_by {|x| -x })
+    a = %w(albatross dog horse)
+    assert_equal("dog", a.min_by {|x| x.length })
+    assert_equal(3, [2,3,1].min_by {|x| -x })
+  end
+
+  def test_max_by
+    assert_equal(1, @obj.max_by {|x| -x })
+    a = %w(albatross dog horse)
+    assert_equal("albatross", a.max_by {|x| x.length })
+    assert_equal(1, [2,3,1].max_by {|x| -x })
+  end
+
+  def test_minmax_by
+    assert_equal([3, 1], @obj.minmax_by {|x| -x })
+    a = %w(albatross dog horse)
+    assert_equal(["dog", "albatross"], a.minmax_by {|x| x.length })
+    assert_equal([3, 1], [2,3,1].minmax_by {|x| -x })
+  end
+
+  def test_member
+    assert(@obj.member?(1))
+    assert(!(@obj.member?(4)))
+    assert([1,2,3].member?(1))
+    assert(!([1,2,3].member?(4)))
+  end
+
+  def test_each_with_index
+    a = []
+    @obj.each_with_index {|x, i| a << [x, i] }
+    assert_equal([[1,0],[2,1],[3,2],[1,3],[2,4]], a)
+
+    hash = Hash.new
+    %w(cat dog wombat).each_with_index do |item, index|
+      hash[item] = index
+    end
+    assert_equal({"cat"=>0, "wombat"=>2, "dog"=>1}, hash)
+  end
+
+  def test_zip
+    assert_equal([[1,1],[2,2],[3,3],[1,1],[2,2]], @obj.zip(@obj))
+    a = []
+    @obj.zip([:a, :b, :c]) {|x,y| a << [x, y] }
+    assert_equal([[1,:a],[2,:b],[3,:c],[1,nil],[2,nil]], a)
+  end
+
+  def test_take
+    assert_equal([1,2,3], @obj.take(3))
+  end
+
+  def test_take_while
+    assert_equal([1,2], @obj.take_while {|x| x <= 2})
+  end
+
+  def test_drop
+    assert_equal([3,1,2], @obj.drop(2))
+  end
+
+  def test_drop_while
+    assert_equal([3,1,2], @obj.drop_while {|x| x <= 2})
+  end
+
+  def test_cycle
+    assert_equal([1,2,3,1,2,1,2,3,1,2], @obj.cycle.take(10))
+  end
+
+  def test_callcc
+    assert_raise(RuntimeError) do
+      c = nil
+      @obj.sort_by {|x| callcc {|c2| c ||= c2 }; x }
+      c.call
+    end
+
+    assert_raise(RuntimeError) do
+      c = nil
+      o = Object.new
+      class << o; self; end.class_eval do
+        define_method(:<=>) do |x|
+          callcc {|c2| c ||= c2 }
+          0
+        end
+      end
+      [o, o].sort_by {|x| x }
+      c.call
+    end
+
+    assert_raise(RuntimeError) do
+      c = nil
+      o = Object.new
+      class << o; self; end.class_eval do
+        define_method(:<=>) do |x|
+          callcc {|c2| c ||= c2 }
+          0
+        end
+      end
+      [o, o, o].sort_by {|x| x }
+      c.call
+    end
+  end
+end

test/ruby/test_enumerator.rb

@@ -1,6 +1,16 @@
 require 'test/unit'
 
 class TestEnumerator < Test::Unit::TestCase
+  def setup
+    @obj = Object.new
+    class << @obj
+      include Enumerable
+      def foo(*a)
+        a.each {|x| yield x }
+      end
+    end
+  end
+
   def enum_test obj
     i = 0
     obj.map{|e|
@@ -43,5 +53,54 @@ class TestEnumerator < Test::Unit::TestCase
     assert_equal :ok2, e.next
     assert_raise(StopIteration){e.next}
   end
+
+
+  def test_initialize
+    assert_equal([1, 2, 3], @obj.to_enum(:foo, 1, 2, 3).to_a)
+    assert_equal([2, 3, 4], @obj.to_enum(:foo, 1, 2, 3) {|x| x + 1 }.to_a)
+    assert_equal([1, 2, 3], Enumerable::Enumerator.new(@obj, :foo, 1, 2, 3).to_a)
+    assert_raise(ArgumentError) { Enumerable::Enumerator.new }
+  end
+
+  def test_initialize_copy
+    assert_equal([1, 2, 3], @obj.to_enum(:foo, 1, 2, 3).dup.to_a)
+    e = @obj.to_enum(:foo, 1, 2, 3)
+    assert_nothing_raised { assert_equal(1, e.next) }
+    assert_raise(TypeError) { e.dup }
+  end
+
+  def test_gc
+    assert_nothing_raised do
+      1.times do
+        foo = [1,2,3].to_enum
+        GC.start
+      end
+      GC.start
+    end
+  end
+
+  def test_slice
+    assert_equal([[1,2,3],[4,5,6],[7,8,9],[10]], (1..10).each_slice(3).to_a)
+  end
+
+  def test_cons
+    a = [[1,2,3], [2,3,4], [3,4,5], [4,5,6], [5,6,7], [6,7,8], [7,8,9], [8,9,10]]
+    assert_equal(a, (1..10).each_cons(3).to_a)
+  end
+
+  def test_with_index
+    assert_equal([[1,0],[2,1],[3,2]], @obj.to_enum(:foo, 1, 2, 3).with_index.to_a)
+  end
+
+  def test_next_rewind
+    e = @obj.to_enum(:foo, 1, 2, 3)
+    assert_equal(1, e.next)
+    assert_equal(2, e.next)
+    e.rewind
+    assert_equal(1, e.next)
+    assert_equal(2, e.next)
+    assert_equal(3, e.next)
+    assert_raise(StopIteration) { e.next }
+  end
 end