Fix new failing specs

Author: billdueber

lib/concurrent/executor/java_fixed_thread_pool.rb

@@ -17,14 +17,22 @@ class JavaFixedThreadPool < JavaThreadPoolExecutor
       #
       # @see http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Executors.html#newFixedThreadPool-int-
       def initialize(num_threads, opts = {})
-        @overflow_policy = opts.fetch(:overflow_policy, :abort)
-        @max_queue = 0
 
-        raise ArgumentError.new('number of threads must be greater than zero') if num_threads < 1
-        raise ArgumentError.new("#{@overflow_policy} is not a valid overflow policy") unless OVERFLOW_POLICIES.keys.include?(@overflow_policy)
+        opts = {
+            min_threads: num_threads,
+            max_threads: num_threads
+        }.merge(opts)
+        super(opts)
 
-        @executor = java.util.concurrent.Executors.newFixedThreadPool(num_threads)
-        @executor.setRejectedExecutionHandler(OVERFLOW_POLICIES[@overflow_policy].new)
+
+        #@overflow_policy = opts.fetch(:overflow_policy, :abort)
+        #@max_queue = 0
+        #
+        #raise ArgumentError.new('number of threads must be greater than zero') if num_threads < 1
+        #raise ArgumentError.new("#{@overflow_policy} is not a valid overflow policy") unless OVERFLOW_POLICIES.keys.include?(@overflow_policy)
+        #
+        #@executor = java.util.concurrent.Executors.newFixedThreadPool(num_threads)
+        #@executor.setRejectedExecutionHandler(OVERFLOW_POLICIES[@overflow_policy].new)
 
         set_shutdown_hook
       end

lib/concurrent/executor/java_thread_pool_executor.rb

@@ -71,6 +71,7 @@ def initialize(opts = {})
 
         raise ArgumentError.new('max_threads must be greater than zero') if max_length <= 0
         raise ArgumentError.new('min_threads cannot be less than zero') if min_length < 0
+        raise ArgumentError.new('min_threads cannot be more than max_threads') if min_length > max_length
         raise ArgumentError.new("#{@overflow_policy} is not a valid overflow policy") unless OVERFLOW_POLICIES.keys.include?(@overflow_policy)
 
         if min_length == 0 && @max_queue == 0
@@ -171,16 +172,7 @@ def status
       #
       # @return [Boolean] `true` when running, `false` when shutting down or shutdown
       def running?
-        super && ! @executor.isTerminating
-      end
-
-      # Begin an orderly shutdown. Tasks already in the queue will be executed,
-      # but no new tasks will be accepted. Has no additional effect if the
-      # thread pool is not running.
-      def shutdown
-        super
-        @executor.getQueue.clear
-        nil
+        super && !@executor.isTerminating
       end
     end
   end

lib/concurrent/executor/ruby_fixed_thread_pool.rb

@@ -19,13 +19,13 @@ def initialize(num_threads, opts = {})
       raise ArgumentError.new('number of threads must be greater than zero') if num_threads < 1
       raise ArgumentError.new("#{overflow_policy} is not a valid overflow policy") unless OVERFLOW_POLICIES.include?(overflow_policy)
 
-      opts = opts.merge(
+      opts = {
         min_threads: num_threads,
         max_threads: num_threads,
-        num_threads: overflow_policy,
+        overflow_policy: overflow_policy,
         max_queue: DEFAULT_MAX_QUEUE_SIZE,
-        idletime: 0
-      )
+        idletime: DEFAULT_THREAD_IDLETIMEOUT,
+      }.merge(opts)
       super(opts)
     end
   end

lib/concurrent/executor/ruby_thread_pool_executor.rb

@@ -86,6 +86,7 @@ def initialize(opts = {})
       raise ArgumentError.new('max_threads must be greater than zero') if @max_length <= 0
       raise ArgumentError.new('min_threads cannot be less than zero') if @min_length < 0
       raise ArgumentError.new("#{overflow_policy} is not a valid overflow policy") unless OVERFLOW_POLICIES.include?(@overflow_policy)
+      raise ArgumentError.new('min_threads cannot be more than max_threads') if min_length > max_length
 
       init_executor