[test] Remove manual synchronzation for mocks

chadlwilson · chadlwilson · commit 5a2df2de33b4 · 2026-03-03T12:43:57.000+08:00
This _should_ be better after rspec/rspec#286 so let's give it a go
diff --git a/src/spec/ruby/rack/application_spec.rb b/src/spec/ruby/rack/application_spec.rb
@@ -554,20 +554,8 @@ def createRackServletWrapper(runtime, rackup, filename)
 
 describe org.jruby.rack.PoolingRackApplicationFactory do
 
-  # Workaround rspec mocks/proxies not being thread-safe which causes occasional failures
-  class Synchronized
-    def initialize(obj)
-      @delegate = obj
-      @lock = Mutex.new
-    end
-
-    def method_missing(name, *args, &block)
-      @lock.synchronize { @delegate.send(name, *args, &block) }
-    end
-  end
-
   before :each do
-    @factory = Synchronized.new(double("factory").as_null_object)
+    @factory = double("factory").as_null_object
     @pooling_factory = org.jruby.rack.PoolingRackApplicationFactory.new @factory
     @pooling_factory.context = @rack_context
   end
@@ -617,7 +605,7 @@ def method_missing(name, *args, &block)
   it "creates applications during initialization according to the jruby.min.runtimes context parameter" do
     allow(@factory).to receive(:init)
     allow(@factory).to receive(:newApplication) do
-      app = Synchronized.new(double("app").as_null_object)
+      app = double("app").as_null_object
       expect(app).to receive(:init)
       app
     end
@@ -650,7 +638,7 @@ def method_missing(name, *args, &block)
   it "forces the maximum size to be greater or equal to the initial size" do
     allow(@factory).to receive(:init)
     allow(@factory).to receive(:newApplication) do
-      app = Synchronized.new(double("app").as_null_object)
+      app = double("app").as_null_object
       expect(app).to receive(:init)
       app
     end
@@ -672,7 +660,7 @@ def method_missing(name, *args, &block)
   it "waits till initial runtimes get initialized (with wait set to true)" do
     allow(@factory).to receive(:init)
     allow(@factory).to receive(:newApplication) do
-      app = Synchronized.new(double("app").as_null_object)
+      app = double("app").as_null_object
       allow(app).to receive(:init) do
         sleep(0.05)
       end
@@ -692,7 +680,7 @@ def method_missing(name, *args, &block)
     allow(@factory).to receive(:init)
     app_count = java.util.concurrent.atomic.AtomicInteger.new(0)
     allow(@factory).to receive(:newApplication) do
-      app = Synchronized.new(double("app").as_null_object)
+      app = double("app").as_null_object
       allow(app).to receive(:init) do
         if app_count.addAndGet(1) == 2
           raise org.jruby.rack.RackInitializationException.new('failed app init')
@@ -730,7 +718,7 @@ def method_missing(name, *args, &block)
     app_init_secs = 0.2
     allow(@factory).to receive(:init)
     allow(@factory).to receive(:newApplication) do
-      app = Synchronized.new(double("app").as_null_object)
+      app = double("app").as_null_object
       allow(app).to receive(:init) { sleep(app_init_secs) }
       app
     end
@@ -748,7 +736,7 @@ def method_missing(name, *args, &block)
     app_init_secs = 0.2
     allow(@factory).to receive(:init)
     expect(@factory).to receive(:newApplication).twice do
-      app = Synchronized.new(double("app").as_null_object)
+      app = double("app").as_null_object
       expect(app).to receive(:init) { sleep(app_init_secs) }
       app
     end
@@ -777,7 +765,7 @@ def method_missing(name, *args, &block)
     app_init_secs = 0.1
     allow(@factory).to receive(:init)
     expect(@factory).to receive(:newApplication).twice do
-      app = Synchronized.new(double("app (new)").as_null_object)
+      app = double("app (new)").as_null_object
       expect(app).to receive(:init) { sleep(app_init_secs) }
       app
     end
@@ -793,7 +781,7 @@ def method_missing(name, *args, &block)
 
     app_get_secs = 0.15
     expect(@factory).to receive(:getApplication).twice do
-      app = Synchronized.new(double("app (get)").as_null_object)
+      app = double("app (get)").as_null_object
       sleep(app_get_secs)
       app
     end
@@ -813,7 +801,7 @@ def method_missing(name, *args, &block)
     app_init_secs = 0.15
     allow(@factory).to receive(:init)
     allow(@factory).to receive(:newApplication) do
-      app = Synchronized.new(double("app").as_null_object)
+      app = double("app").as_null_object
       allow(app).to receive(:init) { sleep(app_init_secs) }
       app
     end
@@ -840,7 +828,7 @@ def method_missing(name, *args, &block)
     app_init_secs = 0.05
     allow(@factory).to receive(:init)
     allow(@factory).to receive(:newApplication) do
-      app = Synchronized.new(double("app").as_null_object)
+      app = double("app").as_null_object
       allow(app).to receive(:init) { sleep(app_init_secs); raise "app.init raising" }
       app
     end
