Obligation shared specs now called from IVar shared specs.

Author: jdantonio

lib/concurrent/ivar.rb

@@ -102,6 +102,7 @@ def add_observer(observer = nil, func = :update, &block)
     # @param [Object] value the value to store in the `IVar`
     # @raise [Concurrent::MultipleAssignmentError] if the `IVar` has already
     #   been set or otherwise completed
+    # @return [IVar] self
     def set(value = NO_VALUE)
       if (block_given? && value != NO_VALUE) || (!block_given? && value == NO_VALUE)
         raise ArgumentError.new('must set with either a value or a block')
@@ -122,6 +123,7 @@ def set(value = NO_VALUE)
     # @param [Object] reason for the failure
     # @raise [Concurrent::MultipleAssignmentError] if the `IVar` has already
     #   been set or otherwise completed
+    # @return [IVar] self
     def fail(reason = StandardError.new)
       set { raise reason }
     end

spec/concurrent/future_spec.rb

@@ -1,6 +1,5 @@
 require_relative 'dereferenceable_shared'
 require_relative 'ivar_shared'
-require_relative 'obligation_shared'
 require_relative 'observable_shared'
 require_relative 'thread_arguments_shared'
 
@@ -17,14 +16,26 @@ module Concurrent
       }.execute.tap{ sleep(0.1) }
     end
 
-    context 'manual completion' do
-      subject { Future.new(executor: :immediate){ nil } }
-      it_should_behave_like :ivar
+    let!(:fulfilled_value) { 10 }
+    let!(:rejected_reason) { StandardError.new('mojo jojo') }
+
+    let(:pending_subject) do
+      Future.new(executor: executor){ sleep(0.1); fulfilled_value }.execute
     end
 
-    context 'behavior' do
+    let(:fulfilled_subject) do
+      Future.new(executor: executor){ fulfilled_value }.execute.tap{ sleep(0.1) }
+    end
 
-      # thread_arguments
+    let(:rejected_subject) do
+      Future.new(executor: executor){ raise rejected_reason }.execute.tap{ sleep(0.1) }
+    end
+
+    it_should_behave_like :ivar do
+      subject { Future.new(executor: :immediate){ nil } }
+    end
+
+    it_should_behave_like :thread_arguments do
 
       def get_ivar_from_no_args
         Concurrent::Future.execute{|*args| args }
@@ -33,29 +44,9 @@ def get_ivar_from_no_args
       def get_ivar_from_args(opts)
         Concurrent::Future.execute(opts){|*args| args }
       end
+    end
 
-      it_should_behave_like :thread_arguments
-
-      # obligation
-
-      let!(:fulfilled_value) { 10 }
-      let!(:rejected_reason) { StandardError.new('mojo jojo') }
-
-      let(:pending_subject) do
-        Future.new(executor: executor){ sleep(3); fulfilled_value }.execute
-      end
-
-      let(:fulfilled_subject) do
-        Future.new(executor: executor){ fulfilled_value }.execute.tap{ sleep(0.1) }
-      end
-
-      let(:rejected_subject) do
-        Future.new(executor: executor){ raise rejected_reason }.execute.tap{ sleep(0.1) }
-      end
-
-      it_should_behave_like :obligation
-
-      # dereferenceable
+    it_should_behave_like :dereferenceable do
 
       def dereferenceable_subject(value, opts = {})
         opts = opts.merge(executor: executor)
@@ -71,19 +62,16 @@ def execute_dereferenceable(subject)
         subject.execute
         sleep(0.1)
       end
+    end
 
-      it_should_behave_like :dereferenceable
-
-      # observable
+    it_should_behave_like :observable do
 
       subject{ Future.new{ nil } }
 
       def trigger_observable(observable)
         observable.execute
         sleep(0.1)
       end
-
-      it_should_behave_like :observable
     end
 
     context '#initialize' do

spec/concurrent/ivar_shared.rb

@@ -1,5 +1,9 @@
+require_relative 'obligation_shared'
+
 shared_examples :ivar do
 
+  it_should_behave_like :obligation
+
   context 'initialization' do
 
     it 'sets the state to incomplete' do

spec/concurrent/ivar_spec.rb

@@ -1,6 +1,5 @@
 require_relative 'dereferenceable_shared'
 require_relative 'ivar_shared'
-require_relative 'obligation_shared'
 require_relative 'observable_shared'
 
 module Concurrent
@@ -9,48 +8,33 @@ module Concurrent
 
     let!(:value) { 10 }
 
-    subject do
-      i = IVar.new
-      i.set(14)
-      i
-    end
-
-    context 'manual completion' do
-      subject{ IVar.new }
-      it_should_behave_like :ivar
-    end
-
-    context 'behavior' do
-
-      # obligation
+    let!(:fulfilled_value) { 10 }
+    let(:rejected_reason) { StandardError.new('Boom!') }
 
-      let!(:fulfilled_value) { 10 }
-      let(:rejected_reason) { StandardError.new('Boom!') }
+    subject { IVar.new(value) }
 
-      let(:pending_subject) do
-        @i = IVar.new
-        Thread.new do
-          sleep(3)
-          @i.set(fulfilled_value)
-        end
-        @i
+    let(:pending_subject) do
+      ivar = IVar.new
+      Thread.new do
+        sleep(0.1)
+        ivar.set(fulfilled_value)
       end
+      ivar
+    end
 
-      let(:fulfilled_subject) do
-        i = IVar.new
-        i.set(fulfilled_value)
-        i
-      end
+    let(:fulfilled_subject) do
+      IVar.new.set(fulfilled_value)
+    end
 
-      let(:rejected_subject) do
-        i = IVar.new
-        i.fail(rejected_reason)
-        i
-      end
+    let(:rejected_subject) do
+      IVar.new.fail(rejected_reason)
+    end
 
-      it_should_behave_like :obligation
+    it_should_behave_like :ivar do
+      subject{ IVar.new }
+    end
 
-      # dereferenceable
+    it_should_behave_like :dereferenceable do
 
       def dereferenceable_subject(value, opts = {})
         IVar.new(value, opts)
@@ -63,18 +47,15 @@ def dereferenceable_observable(opts = {})
       def execute_dereferenceable(subject)
         subject.set('value')
       end
+    end
 
-      it_should_behave_like :dereferenceable
-
-      # observable
+    it_should_behave_like :observable do
 
       subject{ IVar.new }
 
       def trigger_observable(observable)
         observable.set('value')
       end
-
-      it_should_behave_like :observable
     end
 
     context '#initialize' do
@@ -93,7 +74,6 @@ def trigger_observable(observable)
         i = IVar.new(14)
         expect(i).to be_complete
       end
-
     end
 
     context 'observation' do
@@ -154,7 +134,6 @@ def reentrant_observer(i)
           expect(obs.value).to eq 42
         end
       end
-
     end
   end
 end

spec/concurrent/promise_spec.rb

@@ -1,5 +1,4 @@
 require_relative 'ivar_shared'
-require_relative 'obligation_shared'
 require_relative 'thread_arguments_shared'
 
 module Concurrent
@@ -13,7 +12,7 @@ module Concurrent
     let!(:rejected_reason) { StandardError.new('mojo jojo') }
 
     let(:pending_subject) do
-      Promise.new(executor: executor){ sleep(0.3); fulfilled_value }.execute
+      Promise.new(executor: executor){ sleep(0.1); fulfilled_value }.execute
     end
 
     let(:fulfilled_subject) do
@@ -24,14 +23,11 @@ module Concurrent
       Promise.reject(rejected_reason, executor: executor)
     end
 
-    context 'manual completion' do
+    it_should_behave_like :ivar do
       subject{ Promise.new(executor: :immediate) }
-      it_should_behave_like :ivar
     end
 
-    context 'behavior' do
-
-      # thread_arguments
+    it_should_behave_like :thread_arguments do
 
       def get_ivar_from_no_args
         Concurrent::Promise.execute{|*args| args }
@@ -40,12 +36,6 @@ def get_ivar_from_no_args
       def get_ivar_from_args(opts)
         Concurrent::Promise.execute(opts){|*args| args }
       end
-
-      it_should_behave_like :thread_arguments
-
-      # obligation
-
-      it_should_behave_like :obligation
     end
 
     it 'includes Dereferenceable' do