2 files changed, 11 insertions, 36 deletions
diff --git a/ruby/test/Ice/acm/AllTests.rb b/ruby/test/Ice/acm/AllTests.rb
index 8b307d528c5..a5cdfa1b173 100644
--- a/ruby/test/Ice/acm/AllTests.rb
+++ b/ruby/test/Ice/acm/AllTests.rb
@@ -84,8 +84,8 @@ def testHeartbeatManual(communicator, com)
     puts "ok"
 end
 
-def allTests(communicator)
-    ref = "communicator:default -p 12010"
+def allTests(helper, communicator)
+    ref = "communicator:#{helper.getTestEndpoint()}"
     com = Test::RemoteCommunicatorPrx::uncheckedCast(communicator.stringToProxy(ref))
 
     testSetACM(communicator, com)
diff --git a/ruby/test/Ice/acm/Client.rb b/ruby/test/Ice/acm/Client.rb
index 408e720921c..c81258c0bff 100755
--- a/ruby/test/Ice/acm/Client.rb
+++ b/ruby/test/Ice/acm/Client.rb
@@ -8,41 +8,16 @@
 #
 # **********************************************************************
 
-require 'pathname'
-require 'Ice'
-slice_dir = Ice.getSliceDir
-if slice_dir.empty?
-    fail "Slice directory not found"
-end
-
-Ice::loadSlice("'-I" + slice_dir + "' Test.ice")
+require "Ice"
+Ice::loadSlice("Test.ice")
 require './AllTests'
 
-def test(b)
-    if !b
-        raise RuntimeError, 'test assertion failed'
+class Client < ::TestHelper
+    def run(args)
+        properties = self.createTestProperties(args:args)
+        properties.setProperty("Ice.Warn.Connections", "0")
+        self.init(properties:properties) do |communicator|
+            allTests(self, communicator)
+        end
     end
 end
-
-def run(args, communicator)
-    allTests(communicator)
-    return true
-end
-
-begin
-    initData = Ice::InitializationData.new
-    initData.properties = Ice.createProperties(ARGV)
-    initData.properties.setProperty("Ice.Warn.Connections", "0")
-    communicator = Ice.initialize(ARGV, initData)
-    status = run(ARGV, communicator)
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
-end
-
-if communicator
-    communicator.destroy()
-end
-
-exit(status ? 0 : 1)