mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Update to ruby/spec@cdd6ff7
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66041 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
49cd16bfaf
commit
50441014ff
102 changed files with 771 additions and 426 deletions
|
@ -1,12 +0,0 @@
|
|||
require_relative '../../spec_helper'
|
||||
require 'thread'
|
||||
|
||||
describe "Thread.exclusive" do
|
||||
before :each do
|
||||
ScratchPad.clear
|
||||
end
|
||||
|
||||
it "returns the result of yielding" do
|
||||
Thread.exclusive { :result }.should == :result
|
||||
end
|
||||
end
|
|
@ -1,7 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/enque'
|
||||
|
||||
describe "Thread::Queue#<<" do
|
||||
it_behaves_like :queue_enq, :<<, -> { Queue.new }
|
||||
end
|
|
@ -1,9 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/clear'
|
||||
|
||||
describe "Thread::Queue#clear" do
|
||||
it_behaves_like :queue_clear, :clear, -> { Queue.new }
|
||||
|
||||
# TODO: test for atomicity of Queue#clear
|
||||
end
|
|
@ -1,7 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/close'
|
||||
|
||||
describe "Queue#close" do
|
||||
it_behaves_like :queue_close, :close, -> { Queue.new }
|
||||
end
|
|
@ -1,7 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/closed'
|
||||
|
||||
describe "Queue#closed?" do
|
||||
it_behaves_like :queue_closed?, :closed?, -> { Queue.new }
|
||||
end
|
|
@ -1,7 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/deque'
|
||||
|
||||
describe "Thread::Queue#deq" do
|
||||
it_behaves_like :queue_deq, :deq, -> { Queue.new }
|
||||
end
|
|
@ -1,7 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/empty'
|
||||
|
||||
describe "Thread::Queue#empty?" do
|
||||
it_behaves_like :queue_empty?, :empty?, -> { Queue.new }
|
||||
end
|
|
@ -1,7 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/enque'
|
||||
|
||||
describe "Thread::Queue#enq" do
|
||||
it_behaves_like :queue_enq, :enq, -> { Queue.new }
|
||||
end
|
|
@ -1,7 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/length'
|
||||
|
||||
describe "Thread::Queue#length" do
|
||||
it_behaves_like :queue_length, :length, -> { Queue.new }
|
||||
end
|
|
@ -1,7 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/num_waiting'
|
||||
|
||||
describe "Thread::Queue#num_waiting" do
|
||||
it_behaves_like :queue_num_waiting, :num_waiting, -> { Queue.new }
|
||||
end
|
|
@ -1,7 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/deque'
|
||||
|
||||
describe "Thread::Queue#pop" do
|
||||
it_behaves_like :queue_deq, :pop, -> { Queue.new }
|
||||
end
|
|
@ -1,7 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/enque'
|
||||
|
||||
describe "Thread::Queue#push" do
|
||||
it_behaves_like :queue_enq, :push, -> { Queue.new }
|
||||
end
|
|
@ -1,7 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/deque'
|
||||
|
||||
describe "Thread::Queue#shift" do
|
||||
it_behaves_like :queue_deq, :shift, -> { Queue.new }
|
||||
end
|
|
@ -1,7 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/length'
|
||||
|
||||
describe "Thread::Queue#size" do
|
||||
it_behaves_like :queue_length, :size, -> { Queue.new }
|
||||
end
|
8
spec/ruby/library/thread/queue_spec.rb
Normal file
8
spec/ruby/library/thread/queue_spec.rb
Normal file
|
@ -0,0 +1,8 @@
|
|||
require_relative '../../spec_helper'
|
||||
|
||||
describe "Thread::Queue" do
|
||||
it "is the same class as ::Queue" do
|
||||
Thread.should have_constant(:Queue)
|
||||
Thread::Queue.should equal ::Queue
|
||||
end
|
||||
end
|
|
@ -1,10 +0,0 @@
|
|||
describe :queue_clear, shared: true do
|
||||
it "removes all objects from the queue" do
|
||||
queue = @object.call
|
||||
queue << Object.new
|
||||
queue << 1
|
||||
queue.empty?.should be_false
|
||||
queue.clear
|
||||
queue.empty?.should be_true
|
||||
end
|
||||
end
|
|
@ -1,26 +0,0 @@
|
|||
describe :queue_close, shared: true do
|
||||
it "closes the queue and returns nil for further #pop" do
|
||||
q = @object.call
|
||||
q << 1
|
||||
q.close
|
||||
q.pop.should == 1
|
||||
q.pop.should == nil
|
||||
q.pop.should == nil
|
||||
end
|
||||
|
||||
it "prevents further #push" do
|
||||
q = @object.call
|
||||
q.close
|
||||
lambda {
|
||||
q << 1
|
||||
}.should raise_error(ClosedQueueError)
|
||||
end
|
||||
|
||||
it "may be called multiple times" do
|
||||
q = @object.call
|
||||
q.close
|
||||
q.closed?.should be_true
|
||||
q.close # no effect
|
||||
q.closed?.should be_true
|
||||
end
|
||||
end
|
|
@ -1,12 +0,0 @@
|
|||
describe :queue_closed?, shared: true do
|
||||
it "returns false initially" do
|
||||
queue = @object.call
|
||||
queue.closed?.should be_false
|
||||
end
|
||||
|
||||
it "returns true when the queue is closed" do
|
||||
queue = @object.call
|
||||
queue.close
|
||||
queue.closed?.should be_true
|
||||
end
|
||||
end
|
|
@ -1,37 +0,0 @@
|
|||
describe :queue_deq, shared: true do
|
||||
it "removes an item from the Queue" do
|
||||
q = @object.call
|
||||
q << Object.new
|
||||
q.size.should == 1
|
||||
q.send(@method)
|
||||
q.size.should == 0
|
||||
end
|
||||
|
||||
it "returns items in the order they were added" do
|
||||
q = @object.call
|
||||
q << 1
|
||||
q << 2
|
||||
q.send(@method).should == 1
|
||||
q.send(@method).should == 2
|
||||
end
|
||||
|
||||
it "blocks the thread until there are items in the queue" do
|
||||
q = @object.call
|
||||
v = 0
|
||||
|
||||
th = Thread.new do
|
||||
q.send(@method)
|
||||
v = 1
|
||||
end
|
||||
|
||||
v.should == 0
|
||||
q << Object.new
|
||||
th.join
|
||||
v.should == 1
|
||||
end
|
||||
|
||||
it "raises a ThreadError if Queue is empty" do
|
||||
q = @object.call
|
||||
lambda { q.send(@method,true) }.should raise_error(ThreadError)
|
||||
end
|
||||
end
|
|
@ -1,12 +0,0 @@
|
|||
describe :queue_empty?, shared: true do
|
||||
it "returns true on an empty Queue" do
|
||||
queue = @object.call
|
||||
queue.empty?.should be_true
|
||||
end
|
||||
|
||||
it "returns false when Queue is not empty" do
|
||||
queue = @object.call
|
||||
queue << Object.new
|
||||
queue.empty?.should be_false
|
||||
end
|
||||
end
|
|
@ -1,10 +0,0 @@
|
|||
describe :queue_enq, shared: true do
|
||||
it "adds an element to the Queue" do
|
||||
q = @object.call
|
||||
q.size.should == 0
|
||||
q.send(@method, Object.new)
|
||||
q.size.should == 1
|
||||
q.send(@method, Object.new)
|
||||
q.size.should == 2
|
||||
end
|
||||
end
|
|
@ -1,9 +0,0 @@
|
|||
describe :queue_length, shared: true do
|
||||
it "returns the number of elements" do
|
||||
q = @object.call
|
||||
q.send(@method).should == 0
|
||||
q << Object.new
|
||||
q << Object.new
|
||||
q.send(@method).should == 2
|
||||
end
|
||||
end
|
|
@ -1,16 +0,0 @@
|
|||
describe :queue_num_waiting, shared: true do
|
||||
it "reports the number of threads waiting on the queue" do
|
||||
q = @object.call
|
||||
threads = []
|
||||
|
||||
5.times do |i|
|
||||
q.num_waiting.should == i
|
||||
t = Thread.new { q.deq }
|
||||
Thread.pass until q.num_waiting == i+1
|
||||
threads << t
|
||||
end
|
||||
|
||||
threads.each { q.enq Object.new }
|
||||
threads.each {|t| t.join }
|
||||
end
|
||||
end
|
|
@ -1,12 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/enque'
|
||||
require_relative 'shared/enque'
|
||||
|
||||
describe "Thread::SizedQueue#<<" do
|
||||
it_behaves_like :queue_enq, :<<, -> { SizedQueue.new(10) }
|
||||
end
|
||||
|
||||
describe "Thread::SizedQueue#<<" do
|
||||
it_behaves_like :sizedqueue_enq, :<<
|
||||
end
|
|
@ -1,9 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/clear'
|
||||
|
||||
describe "Thread::SizedQueue#clear" do
|
||||
it_behaves_like :queue_clear, :clear, -> { SizedQueue.new(10) }
|
||||
|
||||
# TODO: test for atomicity of Queue#clear
|
||||
end
|
|
@ -1,7 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/close'
|
||||
|
||||
describe "SizedQueue#close" do
|
||||
it_behaves_like :queue_close, :close, -> { SizedQueue.new(10) }
|
||||
end
|
|
@ -1,7 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/closed'
|
||||
|
||||
describe "SizedQueue#closed?" do
|
||||
it_behaves_like :queue_closed?, :closed?, -> { SizedQueue.new(10) }
|
||||
end
|
|
@ -1,7 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/deque'
|
||||
|
||||
describe "Thread::SizedQueue#deq" do
|
||||
it_behaves_like :queue_deq, :deq, -> { SizedQueue.new(10) }
|
||||
end
|
|
@ -1,7 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/empty'
|
||||
|
||||
describe "Thread::SizedQueue#empty?" do
|
||||
it_behaves_like :queue_empty?, :empty?, -> { SizedQueue.new(10) }
|
||||
end
|
|
@ -1,12 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/enque'
|
||||
require_relative 'shared/enque'
|
||||
|
||||
describe "Thread::SizedQueue#enq" do
|
||||
it_behaves_like :queue_enq, :enq, -> { SizedQueue.new(10) }
|
||||
end
|
||||
|
||||
describe "Thread::SizedQueue#enq" do
|
||||
it_behaves_like :sizedqueue_enq, :enq
|
||||
end
|
|
@ -1,7 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/length'
|
||||
|
||||
describe "Thread::SizedQueue#length" do
|
||||
it_behaves_like :queue_length, :length, -> { SizedQueue.new(10) }
|
||||
end
|
|
@ -1,52 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
|
||||
describe "Thread::SizedQueue#max" do
|
||||
before :each do
|
||||
@sized_queue = SizedQueue.new(5)
|
||||
end
|
||||
|
||||
it "returns the size of the queue" do
|
||||
@sized_queue.max.should == 5
|
||||
end
|
||||
end
|
||||
|
||||
describe "Thread::SizedQueue#max=" do
|
||||
before :each do
|
||||
@sized_queue = SizedQueue.new(5)
|
||||
end
|
||||
|
||||
it "sets the size of the queue" do
|
||||
@sized_queue.max.should == 5
|
||||
@sized_queue.max = 10
|
||||
@sized_queue.max.should == 10
|
||||
end
|
||||
|
||||
it "does not remove items already in the queue beyond the maximum" do
|
||||
@sized_queue.enq 1
|
||||
@sized_queue.enq 2
|
||||
@sized_queue.enq 3
|
||||
@sized_queue.max = 2
|
||||
(@sized_queue.size > @sized_queue.max).should be_true
|
||||
@sized_queue.deq.should == 1
|
||||
@sized_queue.deq.should == 2
|
||||
@sized_queue.deq.should == 3
|
||||
end
|
||||
|
||||
it "raises a TypeError when given a non-numeric value" do
|
||||
lambda { @sized_queue.max = "foo" }.should raise_error(TypeError)
|
||||
lambda { @sized_queue.max = Object.new }.should raise_error(TypeError)
|
||||
end
|
||||
|
||||
it "raises an argument error when set to zero" do
|
||||
@sized_queue.max.should == 5
|
||||
lambda { @sized_queue.max = 0 }.should raise_error(ArgumentError)
|
||||
@sized_queue.max.should == 5
|
||||
end
|
||||
|
||||
it "raises an argument error when set to a negative number" do
|
||||
@sized_queue.max.should == 5
|
||||
lambda { @sized_queue.max = -1 }.should raise_error(ArgumentError)
|
||||
@sized_queue.max.should == 5
|
||||
end
|
||||
end
|
|
@ -1,25 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
|
||||
describe "Thread::SizedQueue#new" do
|
||||
it "returns a new SizedQueue" do
|
||||
SizedQueue.new(1).should be_kind_of(SizedQueue)
|
||||
end
|
||||
|
||||
it "raises a TypeError when the given argument is not Numeric" do
|
||||
lambda { SizedQueue.new("foo") }.should raise_error(TypeError)
|
||||
lambda { SizedQueue.new(Object.new) }.should raise_error(TypeError)
|
||||
end
|
||||
|
||||
it "raises an argument error when no argument is given" do
|
||||
lambda { SizedQueue.new }.should raise_error(ArgumentError)
|
||||
end
|
||||
|
||||
it "raises an argument error when the given argument is zero" do
|
||||
lambda { SizedQueue.new(0) }.should raise_error(ArgumentError)
|
||||
end
|
||||
|
||||
it "raises an argument error when the given argument is negative" do
|
||||
lambda { SizedQueue.new(-1) }.should raise_error(ArgumentError)
|
||||
end
|
||||
end
|
|
@ -1,18 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/num_waiting'
|
||||
|
||||
describe "Thread::SizedQueue#num_waiting" do
|
||||
it_behaves_like :queue_num_waiting, :num_waiting, -> { SizedQueue.new(10) }
|
||||
|
||||
it "reports the number of threads waiting to push" do
|
||||
q = SizedQueue.new(1)
|
||||
q.push(1)
|
||||
t = Thread.new { q.push(2) }
|
||||
sleep 0.05 until t.stop?
|
||||
q.num_waiting.should == 1
|
||||
|
||||
q.pop
|
||||
t.join
|
||||
end
|
||||
end
|
|
@ -1,7 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/deque'
|
||||
|
||||
describe "Thread::SizedQueue#pop" do
|
||||
it_behaves_like :queue_deq, :pop, -> { SizedQueue.new(10) }
|
||||
end
|
|
@ -1,12 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/enque'
|
||||
require_relative 'shared/enque'
|
||||
|
||||
describe "Thread::SizedQueue#push" do
|
||||
it_behaves_like :queue_enq, :push, -> { SizedQueue.new(10) }
|
||||
end
|
||||
|
||||
describe "Thread::SizedQueue#push" do
|
||||
it_behaves_like :sizedqueue_enq, :push
|
||||
end
|
|
@ -1,34 +0,0 @@
|
|||
describe :sizedqueue_enq, shared: true do
|
||||
it "blocks if queued elements exceed size" do
|
||||
q = SizedQueue.new(1)
|
||||
|
||||
q.size.should == 0
|
||||
q.send(@method, :first_element)
|
||||
q.size.should == 1
|
||||
|
||||
blocked_thread = Thread.new { q.send(@method, :second_element) }
|
||||
sleep 0.01 until blocked_thread.stop?
|
||||
|
||||
q.size.should == 1
|
||||
q.pop.should == :first_element
|
||||
|
||||
blocked_thread.join
|
||||
q.size.should == 1
|
||||
q.pop.should == :second_element
|
||||
q.size.should == 0
|
||||
end
|
||||
|
||||
it "raises a ThreadError if queued elements exceed size when not blocking" do
|
||||
q = SizedQueue.new(2)
|
||||
|
||||
non_blocking = true
|
||||
add_to_queue = lambda { q.send(@method, Object.new, non_blocking) }
|
||||
|
||||
q.size.should == 0
|
||||
add_to_queue.call
|
||||
q.size.should == 1
|
||||
add_to_queue.call
|
||||
q.size.should == 2
|
||||
add_to_queue.should raise_error(ThreadError)
|
||||
end
|
||||
end
|
|
@ -1,7 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/deque'
|
||||
|
||||
describe "Thread::SizedQueue#shift" do
|
||||
it_behaves_like :queue_deq, :shift, -> { SizedQueue.new(10) }
|
||||
end
|
|
@ -1,7 +0,0 @@
|
|||
require_relative '../../../spec_helper'
|
||||
require 'thread'
|
||||
require_relative '../shared/queue/length'
|
||||
|
||||
describe "Thread::SizedQueue#size" do
|
||||
it_behaves_like :queue_length, :size, -> { SizedQueue.new(10) }
|
||||
end
|
8
spec/ruby/library/thread/sizedqueue_spec.rb
Normal file
8
spec/ruby/library/thread/sizedqueue_spec.rb
Normal file
|
@ -0,0 +1,8 @@
|
|||
require_relative '../../spec_helper'
|
||||
|
||||
describe "Thread::SizedQueue" do
|
||||
it "is the same class as ::SizedQueue" do
|
||||
Thread.should have_constant(:SizedQueue)
|
||||
Thread::SizedQueue.should equal ::SizedQueue
|
||||
end
|
||||
end
|
Loading…
Add table
Add a link
Reference in a new issue