idle_spec.rb in libuv-3.0.0

- old
+ new
@@ -4,51 +4,37 @@
 describe Libuv::Idle do
 	before :each do
 		@log = []
 		@general_failure = []
 
-		@loop = Libuv::Loop.default
-		@server = @loop.pipe
-		@client = @loop.pipe
-		@timeout = @loop.timer do
-			@loop.stop
-			@general_failure << "test timed out"
+		@reactor = Libuv::Reactor.default
+		@reactor.notifier do |error, context|
+			begin
+				@general_failure << "Log called: #{context}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
+			rescue Exception => e
+				@general_failure << "error in logger #{e.inspect}"
+			end
 		end
-		@timeout.start(5000)
-
-		@loop.all(@server, @client, @timeout).catch do |reason|
-			@general_failure << reason.inspect
-			p "Failed with: #{reason.message}\n#{reason.backtrace.join("\n")}\n"
-		end
+		@timeout = @reactor.timer {
+			@reactor.stop
+			@general_failure << "test timed out"
+		}.start(5000)
 	end
 	
 	it "should increase the idle count when there is nothing to process" do
-		@loop.run { |logger|
-			logger.progress do |level, errorid, error|
-				begin
-					p "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-				rescue Exception
-					p 'error in logger'
-				end
-			end
-
+		@reactor.run { |reactor|
 			@idle_calls = 0
   
-			idle = @loop.idle do |e|
+			idle = @reactor.idle { |e|
 				@idle_calls += 1
-			end
-			idle.start
+			}.start
 
-			timer = @loop.timer proc {}
-			timer.start(1, 0)
-
-			stopper = @loop.timer do
-				idle.close
-				timer.close
+			stopper = @reactor.timer {
+				idle.stop.close
 				stopper.close
-				@loop.stop
-			end
-			stopper.start(1000, 0)
+				@timeout.close
+				@reactor.stop
+			}.start(1000)
 		}
 
 		expect(@general_failure).to eq([])
 		expect((@idle_calls > 0)).to eq(true)
 	end