Align Java Executor Service behavior for shuttingdown? shutdown? …

…and `kill`

Co-authored-by: Benoit Daloze <eregontp@gmail.com>

lib/concurrent-ruby/concurrent/executor/java_executor_service.rb

@@ -46,8 +46,9 @@ def shutdown
       def kill
         synchronize do
           @executor.shutdownNow
-          nil
         end
+        wait_for_termination
+        nil
       end
 
       private
@@ -57,15 +58,11 @@ def ns_running?
       end
 
       def ns_shuttingdown?
-        if @executor.respond_to? :isTerminating
-          @executor.isTerminating
-        else
-          false
-        end
+        @executor.isShutdown && !@executor.isTerminated
       end
 
       def ns_shutdown?
-        @executor.isShutdown || @executor.isTerminated
+        @executor.isTerminated
       end
 
       class Job

spec/concurrent/executor/executor_service_shared.rb

@@ -3,7 +3,7 @@
 require 'concurrent/atomic/atomic_fixnum'
 require 'timeout'
 
-RSpec.shared_examples :executor_service do
+RSpec.shared_examples :executor_service do |immediate_type: false|
 
   after(:each) do
     subject.shutdown
@@ -84,6 +84,58 @@
     end
   end
 
+  context '#shuttingdown?' do
+    it 'returns false when the thread pool is running' do
+      expect(subject).not_to be_shuttingdown
+    end
+
+    it 'returns true when the thread pool is shutting down' do
+      skip "will never be in shuttingdown? state" if immediate_type
+
+      subject.post{ sleep(0.5) }
+      subject.shutdown
+      expect(subject).to be_shuttingdown
+      expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
+    end
+
+    it 'returns false when the thread pool is shutdown' do
+      subject.shutdown
+      expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
+      expect(subject).not_to be_shuttingdown
+    end
+
+    it 'returns false when the thread pool is killed' do
+      subject.kill
+      expect(subject).not_to be_shuttingdown
+    end
+  end
+
+  context '#shutdown?' do
+    it 'returns false when the thread pool is running' do
+      expect(subject).not_to be_shutdown
+    end
+
+    it 'returns false when the thread pool is shutting down' do
+      skip "will never be in shuttingdown? state" if immediate_type
+
+      subject.post{ sleep(0.5) }
+      subject.shutdown
+      expect(subject).not_to be_shutdown
+      expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
+    end
+
+    it 'returns true when the thread pool is shutdown' do
+      subject.shutdown
+      expect(subject.wait_for_termination(pool_termination_timeout)).to eq true
+      expect(subject).to be_shutdown
+    end
+
+    it 'returns true when the thread pool is killed' do
+      subject.kill
+      expect(subject).to be_shutdown
+    end
+  end
+
   context '#shutdown' do
 
     it 'stops accepting new tasks' do

spec/concurrent/executor/immediate_executor_spec.rb

@@ -7,6 +7,6 @@ module Concurrent
 
     subject { ImmediateExecutor.new }
 
-    it_should_behave_like :executor_service
+    it_should_behave_like :executor_service, immediate_type: true
   end
 end

spec/concurrent/executor/indirect_immediate_executor_spec.rb

@@ -7,7 +7,7 @@ module Concurrent
 
     subject { IndirectImmediateExecutor.new }
 
-    it_should_behave_like :executor_service
+    it_should_behave_like :executor_service, immediate_type: true
 
     it "runs its tasks synchronously" do
       start = Time.now

spec/concurrent/executor/serialized_execution_spec.rb

@@ -8,6 +8,6 @@ module Concurrent
 
     subject { SerializedExecutionDelegator.new(ImmediateExecutor.new) }
 
-    it_should_behave_like :executor_service
+    it_should_behave_like :executor_service, immediate_type: true
   end
 end