1 files changed, 26 insertions, 54 deletions
diff --git a/ruby/test/Ice/operations/Client.rb b/ruby/test/Ice/operations/Client.rb
index 2167caea837..32a460f7688 100755
--- a/ruby/test/Ice/operations/Client.rb
+++ b/ruby/test/Ice/operations/Client.rb
@@ -8,61 +8,33 @@
 #
 # **********************************************************************
 
-require 'pathname'
-require 'Ice'
-
-slice_dir = Ice.getSliceDir
-Ice::loadSlice("'-I" + slice_dir + "' Test.ice")
+require "Ice"
+Ice::loadSlice("'-I#{Ice.getSliceDir()}' Test.ice")
 require './AllTests'
 
-def test(b)
-    if !b
-        raise RuntimeError, 'test assertion failed'
-    end
-end
-
-def run(args, communicator)
-    myClass = allTests(communicator)
-
-    print "testing server shutdown... "
-    STDOUT.flush
-    myClass.shutdown()
-    begin
-        myClass.ice_timeout(100).ice_ping(); # Use timeout to speed up testing on Windows
-        test(false)
-    rescue Ice::LocalException
-        puts "ok"
+class Client < ::TestHelper
+    def run(args)
+        properties = self.createTestProperties(args:args)
+        #
+        # This is not necessary since we don't have AMI support (yet).
+        #
+        #properties.setProperty('Ice.ThreadPool.Client.Size', '2')
+        #properties.setProperty('Ice.ThreadPool.Client.SizeWarn', '0')
+        properties.setProperty("Ice.BatchAutoFlushSize", "100")
+        self.init(properties:properties) do |communicator|
+            myClass = allTests(self, communicator)
+            print "testing server shutdown... "
+            STDOUT.flush
+            myClass.shutdown()
+            begin
+                myClass.ice_timeout(100).ice_ping(); # Use timeout to speed up testing on Windows
+                test(false)
+            rescue Ice::LocalException
+                puts "ok"
+            end
+            # Test multiple destroy calls
+            communicator.destroy()
+            communicator.destroy()
+        end
     end
-
-    return true
 end
-
-begin
-    initData = Ice::InitializationData.new
-    initData.properties = Ice.createProperties(ARGV)
-    #
-    # This is not necessary since we don't have AMI support (yet).
-    #
-    #initData.properties.setProperty('Ice.ThreadPool.Client.Size', '2')
-    #initData.properties.setProperty('Ice.ThreadPool.Client.SizeWarn', '0')
-
-    initData.properties.setProperty("Ice.BatchAutoFlushSize", "100")
-
-    communicator = Ice.initialize(ARGV, initData)
-    status = run(ARGV, communicator)
-
-    # Test multiple destroy calls
-    communicator.destroy()
-    communicator.destroy()
-
-rescue => ex
-    puts $!
-    print ex.backtrace.join("\n")
-    status = false
-end
-
-if communicator
-    communicator.destroy()
-end
-
-exit(status ? 0 : 1)