test/unit/pigeon_queue_test.rb in pigeon-1.0.2 vs test/unit/pigeon_queue_test.rb in pigeon-1.1.0

@@ -1,6 +1,6 @@
-require File.expand_path(File.join(*%w[ .. helper ]), File.dirname(__FILE__))
+require_relative '../helper'
 
 class PigeonQueueTest < Minitest::Test
   class TaggedTask < Pigeon::Task
     attr_accessor :tag
     
@@ -18,11 +18,11 @@
     queue = Pigeon::Queue.new
     
     assert_equal 0, queue.length
     assert_equal true, queue.empty?
     
-    assert_equal nil, queue.pop
+    assert_nil queue.pop
     
     assert_equal [ ], queue.processors
   end
   
   def test_cycling
@@ -78,19 +78,21 @@
 
       assert_equal tasks[8], queue.peek(:over_7)
       assert_equal 2, queue.length(:over_7)
     
       pulled_task = queue.pop(:over_7)
+
+      assert pulled_task
     
       assert_equal 9, queue.length
 
       assert_equal tasks[9], queue.peek(:over_7)
       assert_equal 1, queue.length(:over_7)
     
       queue.pop(:over_7)
 
-      assert_equal nil, queue.peek(:over_7)
+      assert_nil queue.peek(:over_7)
       assert_equal 0, queue.length(:over_7)
       assert_equal true, queue.empty?(:over_7)
     
       new_task = queue << TaggedTask.new(10)
     
@@ -102,11 +104,11 @@
       assert_equal 1, queue.length(:over_7)
       assert_equal false, queue.empty?(:over_7)
     
       queue.claim(new_task)
     
-      assert_equal nil, queue.peek(:over_7)
+      assert_nil queue.peek(:over_7)
       assert_equal 0, queue.length(:over_7)
       assert_equal true, queue.empty?(:over_7)
     end
   end
 
@@ -144,11 +146,11 @@
       
       assert_eventually(2) do
         queue.include?(new_task)
       end
     
-      assert_equal nil, added_odd
+      assert_nil added_odd
 
       odd_1 = queue << TaggedTask.new(11)
       
       assert_eventually(2) do
         queue.include?(odd_1)
@@ -165,21 +167,21 @@
       end
     
       # Observer callbacks are not triggered on existing data, only on new
       # insertions.
       assert_equal false, has_run
-      assert_equal nil, claimed_task
+      assert_nil claimed_task
       assert_equal 7, queue.length
       assert_equal 1, queue.length(:odd)
 
       new_task = queue << TaggedTask.new(12)
       
       assert_eventually(2) do
         queue.include?(new_task)
       end
     
-      assert_equal nil, claimed_task
+      assert_nil claimed_task
       assert_equal 8, queue.length
       assert_equal 1, queue.length(:odd)
 
       odd_2 = queue << TaggedTask.new(13)
       
@@ -201,11 +203,11 @@
       
       assert_eventually(2) do
         queue.include?(new_task)
       end
 
-      assert_equal nil, claimed_task
+      assert_nil claimed_task
       assert_equal false, has_run
 
       odd_2 = queue << TaggedTask.new(15)
 
       assert_eventually(2) do
@@ -230,10 +232,10 @@
 
           queue << TaggedTask.new(task.tag + 1)
         end
       end
     
-      new_task = queue << TaggedTask.new(0)
+      queue << TaggedTask.new(0)
       
       assert_eventually(2) do
         queue.peek
       end