From 4092e43f49604ecf32c4e86c2d9e6a879faf81e9 Mon Sep 17 00:00:00 2001 From: ko1 Date: Sat, 25 Aug 2007 02:03:44 +0000 Subject: * cont.c: separate Continuation and Fiber from core. * ext/continuation/*, ext/fiber/*: ditto. * include/ruby/ruby.h: remove rb_cFiber. * include/ruby/intern.h: add the rb_fiber_new() declaration. * enumerator.c (next_init): fix to use rb_fiber_new(). * test/ruby/test_enumerator.rb: remove next? tests. * test/ruby/test_continuation.rb: add a require 'continuation'. * test/ruby/test_fiber.rb: add a require 'fiber'. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_continuation.rb | 2 ++ test/ruby/test_enumerator.rb | 11 +++++------ test/ruby/test_fiber.rb | 5 +++-- 3 files changed, 10 insertions(+), 8 deletions(-) (limited to 'test/ruby') diff --git a/test/ruby/test_continuation.rb b/test/ruby/test_continuation.rb index 729da88e6..eccc97393 100644 --- a/test/ruby/test_continuation.rb +++ b/test/ruby/test_continuation.rb @@ -1,4 +1,6 @@ require 'test/unit' +require 'continuation' +require 'fiber' class TestContinuation < Test::Unit::TestCase def test_create diff --git a/test/ruby/test_enumerator.rb b/test/ruby/test_enumerator.rb index 885cb4a5f..27a71e423 100644 --- a/test/ruby/test_enumerator.rb +++ b/test/ruby/test_enumerator.rb @@ -24,14 +24,13 @@ class TestEnumerator < Test::Unit::TestCase assert_raise(StopIteration){e.next} end - def test_next? + def test_loop e = 3.times - assert_equal true, e.next? - 3.times{|i| - assert_equal true, e.next? - assert_equal i, e.next + i = 0 + loop{ + assert_equal(i, e.next) + i += 1 } - assert_equal false, e.next? end def test_nested_itaration diff --git a/test/ruby/test_fiber.rb b/test/ruby/test_fiber.rb index bd39ba5af..a8bce8a06 100644 --- a/test/ruby/test_fiber.rb +++ b/test/ruby/test_fiber.rb @@ -1,4 +1,5 @@ require 'test/unit' +require 'fiber' class TestFiber < Test::Unit::TestCase def test_normal @@ -118,11 +119,11 @@ class TestFiber < Test::Unit::TestCase def test_transfer ary = [] f2 = nil - f1 = Fiber::Core.new{ + f1 = Fiber.new{ ary << f2.transfer(:foo) :ok } - f2 = Fiber::Core.new{ + f2 = Fiber.new{ ary << f1.transfer(:baz) :ng } -- cgit