Update to ruby/spec@cdd6ff7

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

4 files changed, 127 insertions, 0 deletions

diff --git a/spec/ruby/shared/sizedqueue/enque.rb b/spec/ruby/shared/sizedqueue/enque.rb
new file mode 100644
index 0000000000..b724101269
--- /dev/null
+++ b/spec/ruby/shared/sizedqueue/enque.rb
@@ -0,0 +1,50 @@
+describe :sizedqueue_enq, shared: true do
+  it "blocks if queued elements exceed size" do
+    q = @object.call(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 = @object.call(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
+
+  it "interrupts enqueuing threads with ClosedQueueError when the queue is closed" do
+    q = @object.call(1)
+    q << 1
+
+    t = Thread.new {
+      lambda { q.send(@method, 2) }.should raise_error(ClosedQueueError)
+    }
+
+    Thread.pass until q.num_waiting == 1
+
+    q.close
+
+    t.join
+    q.pop.should == 1
+  end
+end
diff --git a/spec/ruby/shared/sizedqueue/max.rb b/spec/ruby/shared/sizedqueue/max.rb
new file mode 100644
index 0000000000..cd4b47f1c1
--- /dev/null
+++ b/spec/ruby/shared/sizedqueue/max.rb
@@ -0,0 +1,47 @@
+describe :sizedqueue_max, shared: true do
+  it "returns the size of the queue" do
+    q = @object.call(5)
+    q.max.should == 5
+  end
+end
+
+describe :sizedqueue_max=, shared: true do
+  it "sets the size of the queue" do
+    q = @object.call(5)
+    q.max.should == 5
+    q.max = 10
+    q.max.should == 10
+  end
+
+  it "does not remove items already in the queue beyond the maximum" do
+    q = @object.call(5)
+    q.enq 1
+    q.enq 2
+    q.enq 3
+    q.max = 2
+    (q.size > q.max).should be_true
+    q.deq.should == 1
+    q.deq.should == 2
+    q.deq.should == 3
+  end
+
+  it "raises a TypeError when given a non-numeric value" do
+    q = @object.call(5)
+    lambda { q.max = "foo" }.should raise_error(TypeError)
+    lambda { q.max = Object.new }.should raise_error(TypeError)
+  end
+
+  it "raises an argument error when set to zero" do
+    q = @object.call(5)
+    q.max.should == 5
+    lambda { q.max = 0 }.should raise_error(ArgumentError)
+    q.max.should == 5
+  end
+
+  it "raises an argument error when set to a negative number" do
+    q = @object.call(5)
+    q.max.should == 5
+    lambda { q.max = -1 }.should raise_error(ArgumentError)
+    q.max.should == 5
+  end
+end
diff --git a/spec/ruby/shared/sizedqueue/new.rb b/spec/ruby/shared/sizedqueue/new.rb
new file mode 100644
index 0000000000..4439f2a9c6
--- /dev/null
+++ b/spec/ruby/shared/sizedqueue/new.rb
@@ -0,0 +1,18 @@
+describe :sizedqueue_new, shared: true do
+  it "raises a TypeError when the given argument is not Numeric" do
+    lambda { @object.call("foo") }.should raise_error(TypeError)
+    lambda { @object.call(Object.new) }.should raise_error(TypeError)
+  end
+
+  it "raises an argument error when no argument is given" do
+    lambda { @object.call }.should raise_error(ArgumentError)
+  end
+
+  it "raises an argument error when the given argument is zero" do
+    lambda { @object.call(0) }.should raise_error(ArgumentError)
+  end
+
+  it "raises an argument error when the given argument is negative" do
+    lambda { @object.call(-1) }.should raise_error(ArgumentError)
+  end
+end
diff --git a/spec/ruby/shared/sizedqueue/num_waiting.rb b/spec/ruby/shared/sizedqueue/num_waiting.rb
new file mode 100644
index 0000000000..8c31e48ca5
--- /dev/null
+++ b/spec/ruby/shared/sizedqueue/num_waiting.rb
@@ -0,0 +1,12 @@
+describe :sizedqueue_num_waiting, shared: true do
+  it "reports the number of threads waiting to push" do
+    q = @object.call(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