jruby · Mar 30, 2015 · Mar 30, 2015
diff --git a/spec/ruby/core/string/crypt_spec.rb b/spec/ruby/core/string/crypt_spec.rb
@@ -28,14 +28,6 @@
     "hello world".crypt("aabc").should == "aayPz4hyPS1wI"
   end
 
-  platform_is :java do
-    it "returns NULL bytes prepended to the string when the salt contains NULL bytes" do
-      "hello".crypt("\x00\x00").should == "\x00\x00dR0/E99ehpU"
-      "hello".crypt("\x00a").should == "\x00aeipc4xPxhGY"
-      "hello".crypt("a\x00").should == "a\x00GJVggM8eWwo"
-    end
-  end
-
   it "raises an ArgumentError when the salt is shorter than two characters" do
     lambda { "hello".crypt("")  }.should raise_error(ArgumentError)
     lambda { "hello".crypt("f") }.should raise_error(ArgumentError)

diff --git a/spec/ruby/library/queue/append_spec.rb b/spec/ruby/library/queue/append_spec.rb
diff --git a/spec/ruby/library/queue/deq_spec.rb b/spec/ruby/library/queue/deq_spec.rb
diff --git a/spec/ruby/library/queue/enq_spec.rb b/spec/ruby/library/queue/enq_spec.rb
diff --git a/spec/ruby/library/queue/length_spec.rb b/spec/ruby/library/queue/length_spec.rb
diff --git a/spec/ruby/library/queue/pop_spec.rb b/spec/ruby/library/queue/pop_spec.rb
diff --git a/spec/ruby/library/queue/push_spec.rb b/spec/ruby/library/queue/push_spec.rb
diff --git a/spec/ruby/library/queue/shift_spec.rb b/spec/ruby/library/queue/shift_spec.rb
diff --git a/spec/ruby/library/queue/size_spec.rb b/spec/ruby/library/queue/size_spec.rb
diff --git a/spec/ruby/library/thread/queue/append_spec.rb b/spec/ruby/library/thread/queue/append_spec.rb
@@ -0,0 +1,7 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'thread'
+require File.expand_path('../../shared/queue/enque', __FILE__)
+
+describe "Thread::Queue#<<" do
+  it_behaves_like :queue_enq, :<<, Queue.new
+end
diff --git a/spec/ruby/library/thread/queue/clear_spec.rb b/spec/ruby/library/thread/queue/clear_spec.rb
@@ -0,0 +1,9 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'thread'
+require File.expand_path('../../shared/queue/clear', __FILE__)
+
+describe "Thread::Queue#clear" do
+  it_behaves_like :queue_clear, :clear, Queue.new
+
+  # TODO: test for atomicity of Queue#clear
+end
diff --git a/spec/ruby/library/thread/queue/deq_spec.rb b/spec/ruby/library/thread/queue/deq_spec.rb
@@ -0,0 +1,7 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'thread'
+require File.expand_path('../../shared/queue/deque', __FILE__)
+
+describe "Thread::Queue#deq" do
+  it_behaves_like :queue_deq, :deq, Queue.new
+end
diff --git a/spec/ruby/library/thread/queue/empty_spec.rb b/spec/ruby/library/thread/queue/empty_spec.rb
@@ -0,0 +1,7 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'thread'
+require File.expand_path('../../shared/queue/empty', __FILE__)
+
+describe "Thread::Queue#empty?" do
+  it_behaves_like :queue_empty?, :empty?, Queue.new
+end
diff --git a/spec/ruby/library/thread/queue/enq_spec.rb b/spec/ruby/library/thread/queue/enq_spec.rb
@@ -0,0 +1,7 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'thread'
+require File.expand_path('../../shared/queue/enque', __FILE__)
+
+describe "Thread::Queue#enq" do
+  it_behaves_like :queue_enq, :enq, Queue.new
+end
diff --git a/spec/ruby/library/thread/queue/length_spec.rb b/spec/ruby/library/thread/queue/length_spec.rb
@@ -0,0 +1,7 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'thread'
+require File.expand_path('../../shared/queue/length', __FILE__)
+
+describe "Thread::Queue#length" do
+  it_behaves_like :queue_length, :length, Queue.new
+end
diff --git a/spec/ruby/library/thread/queue/num_waiting_spec.rb b/spec/ruby/library/thread/queue/num_waiting_spec.rb
@@ -0,0 +1,7 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'thread'
+require File.expand_path('../../shared/queue/num_waiting', __FILE__)
+
+describe "Thread::Queue#num_waiting" do
+  it_behaves_like :queue_num_waiting, :num_waiting, Queue.new
+end
diff --git a/spec/ruby/library/thread/queue/pop_spec.rb b/spec/ruby/library/thread/queue/pop_spec.rb
@@ -0,0 +1,7 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'thread'
+require File.expand_path('../../shared/queue/deque', __FILE__)
+
+describe "Thread::Queue#pop" do
+  it_behaves_like :queue_deq, :pop, Queue.new
+end
diff --git a/spec/ruby/library/thread/queue/push_spec.rb b/spec/ruby/library/thread/queue/push_spec.rb
@@ -0,0 +1,7 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'thread'
+require File.expand_path('../../shared/queue/enque', __FILE__)
+
+describe "Thread::Queue#push" do
+  it_behaves_like :queue_enq, :push, Queue.new
+end
diff --git a/spec/ruby/library/thread/queue/shift_spec.rb b/spec/ruby/library/thread/queue/shift_spec.rb
@@ -0,0 +1,7 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'thread'
+require File.expand_path('../../shared/queue/deque', __FILE__)
+
+describe "Thread::Queue#shift" do
+  it_behaves_like :queue_deq, :shift, Queue.new
+end
diff --git a/spec/ruby/library/thread/queue/size_spec.rb b/spec/ruby/library/thread/queue/size_spec.rb
@@ -0,0 +1,7 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'thread'
+require File.expand_path('../../shared/queue/length', __FILE__)
+
+describe "Thread::Queue#size" do
+  it_behaves_like :queue_length, :size, Queue.new
+end
diff --git a/spec/ruby/library/queue/clear_spec.rb → ...ruby/library/thread/shared/queue/clear.rb b/spec/ruby/library/queue/clear_spec.rb → ...ruby/library/thread/shared/queue/clear.rb
@@ -1,15 +1,10 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require 'thread'
-
-describe "Queue#clear" do
+describe :queue_clear, :shared => true do
   it "removes all objects from the queue" do
-    queue = Queue.new
+    queue = @object
     queue << Object.new
     queue << 1
     queue.empty?.should be_false
     queue.clear
     queue.empty?.should be_true
   end
-
-  # TODO: test for atomicity of Queue#clear
 end
diff --git a/spec/ruby/library/queue/shared/deque.rb → ...ruby/library/thread/shared/queue/deque.rb b/spec/ruby/library/queue/shared/deque.rb → ...ruby/library/thread/shared/queue/deque.rb
@@ -1,22 +1,22 @@
 describe :queue_deq, :shared => true do
   it "removes an item from the Queue" do
-    q = Queue.new
+    q = @object
     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 = Queue.new
+    q = @object
     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 = Queue.new
+    q = @object
     v = 0
 
     th = Thread.new do
@@ -31,7 +31,7 @@
   end
 
   it "raises a ThreadError if Queue is empty" do
-    q = Queue.new
+    q = @object
     lambda { q.send(@method,true) }.should raise_error(ThreadError)
   end
 end
diff --git a/spec/ruby/library/queue/empty_spec.rb → ...ruby/library/thread/shared/queue/empty.rb b/spec/ruby/library/queue/empty_spec.rb → ...ruby/library/thread/shared/queue/empty.rb
@@ -1,14 +1,11 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require 'thread'
-
-describe "Queue#empty?" do
+describe :queue_empty?, :shared => true do
   it "returns true on an empty Queue" do
-    queue = Queue.new
+    queue = @object
     queue.empty?.should be_true
   end
 
   it "returns false when Queue is not empty" do
-    queue = Queue.new
+    queue = @object
     queue << Object.new
     queue.empty?.should be_false
   end

diff --git a/spec/ruby/library/queue/shared/enque.rb → ...ruby/library/thread/shared/queue/enque.rb b/spec/ruby/library/queue/shared/enque.rb → ...ruby/library/thread/shared/queue/enque.rb
@@ -1,6 +1,6 @@
 describe :queue_enq, :shared => true do
   it "adds an element to the Queue" do
-    q = Queue.new
+    q = @object
     q.size.should == 0
     q.send(@method, Object.new)
     q.size.should == 1

diff --git a/spec/ruby/library/queue/shared/length.rb → ...uby/library/thread/shared/queue/length.rb b/spec/ruby/library/queue/shared/length.rb → ...uby/library/thread/shared/queue/length.rb
@@ -1,6 +1,6 @@
 describe :queue_length, :shared => true do
   it "returns the number of elements" do
-    q = Queue.new
+    q = @object
     q.send(@method).should == 0
     q << Object.new
     q << Object.new

diff --git a/spec/ruby/library/queue/num_waiting_spec.rb → ...ibrary/thread/shared/queue/num_waiting.rb b/spec/ruby/library/queue/num_waiting_spec.rb → ...ibrary/thread/shared/queue/num_waiting.rb
@@ -1,9 +1,6 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require 'thread'
-
-describe "Queue#num_waiting" do
-  it "reports the number of threads waiting on the Queue" do
-    q = Queue.new
+describe :queue_num_waiting, :shared => true do
+  it "reports the number of threads waiting on the queue" do
+    q = @object
     threads = []
 
     5.times do |i|

diff --git a/spec/ruby/library/thread/sizedqueue/append_spec.rb b/spec/ruby/library/thread/sizedqueue/append_spec.rb
@@ -0,0 +1,12 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'thread'
+require File.expand_path('../../shared/queue/enque', __FILE__)
+require File.expand_path('../shared/enque', __FILE__)
+
+describe "Thread::SizedQueue#<<" do
+  it_behaves_like :queue_enq, :<<, SizedQueue.new(10)
+end
+
+describe "Thread::SizedQueue#<<" do
+  it_behaves_like :sizedqueue_enq, :<<, SizedQueue
+end
diff --git a/spec/ruby/library/thread/sizedqueue/clear_spec.rb b/spec/ruby/library/thread/sizedqueue/clear_spec.rb
@@ -0,0 +1,9 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'thread'
+require File.expand_path('../../shared/queue/clear', __FILE__)
+
+describe "Thread::SizedQueue#clear" do
+  it_behaves_like :queue_clear, :clear, SizedQueue.new(10)
+
+  # TODO: test for atomicity of Queue#clear
+end
diff --git a/spec/ruby/library/thread/sizedqueue/deq_spec.rb b/spec/ruby/library/thread/sizedqueue/deq_spec.rb
@@ -0,0 +1,7 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'thread'
+require File.expand_path('../../shared/queue/deque', __FILE__)
+
+describe "Thread::SizedQueue#deq" do
+  it_behaves_like :queue_deq, :deq, SizedQueue.new(10)
+end
diff --git a/spec/ruby/library/thread/sizedqueue/empty_spec.rb b/spec/ruby/library/thread/sizedqueue/empty_spec.rb
@@ -0,0 +1,7 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'thread'
+require File.expand_path('../../shared/queue/empty', __FILE__)
+
+describe "Thread::SizedQueue#empty?" do
+  it_behaves_like :queue_empty?, :empty?, SizedQueue.new(10)
+end
diff --git a/spec/ruby/library/thread/sizedqueue/enq_spec.rb b/spec/ruby/library/thread/sizedqueue/enq_spec.rb
@@ -0,0 +1,12 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'thread'
+require File.expand_path('../../shared/queue/enque', __FILE__)
+require File.expand_path('../shared/enque', __FILE__)
+
+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, SizedQueue
+end
diff --git a/spec/ruby/library/thread/sizedqueue/length_spec.rb b/spec/ruby/library/thread/sizedqueue/length_spec.rb
@@ -0,0 +1,7 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+require 'thread'
+require File.expand_path('../../shared/queue/length', __FILE__)
+
+describe "Thread::SizedQueue#length" do
+  it_behaves_like :queue_length, :length, SizedQueue.new(10)
+end
diff --git a/spec/ruby/library/thread/sizedqueue/max_spec.rb b/spec/ruby/library/thread/sizedqueue/max_spec.rb
@@ -0,0 +1,53 @@
+require File.expand_path('../../../../spec_helper', __FILE__)
+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
+
+  ruby_version_is ""..."2.1" do
+    it "raises a NoMethodError when a value without #>" do
+      lambda { @sized_queue.max = Object.new }.should raise_error(NoMethodError)
+    end
+
+    it "raises an ArgumentError for values not comparable to a number" do
+      lambda { @sized_queue.max = "foo" }.should raise_error(ArgumentError)
+    end
+  end
+
+  ruby_version_is "2.1" do
+    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
+  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