Ruby test suite updates

1 files changed, 12 insertions, 28 deletions

diff --git a/ruby/test/Ice/exceptions/Client.rb b/ruby/test/Ice/exceptions/Client.rb
index b5d2ca30429..0de13f419a0 100755
--- a/ruby/test/Ice/exceptions/Client.rb
+++ b/ruby/test/Ice/exceptions/Client.rb
@@ -8,34 +8,18 @@
 #
 # **********************************************************************
 
-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 run(args, communicator)
-    thrower = allTests(communicator)
-    thrower.shutdown()
-    return true
-end
-
-begin
-    initData = Ice::InitializationData.new
-    initData.properties = Ice.createProperties(ARGV)
-    initData.properties.setProperty("Ice.MessageSizeMax", "10")
-    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
+class Client < ::TestHelper
+    def run(args)
+        properties = self.createTestProperties(args:args)
+        properties.setProperty("Ice.MessageSizeMax", "10")
+        properties.setProperty("Ice.Warn.Connections", "0")
+        self.init(properties:properties) do |communicator|
+            thrower = allTests(self, communicator)
+            thrower.shutdown()
+        end
+    end
 end
-
-if communicator
-    communicator.destroy()
-end
-
-exit(status ? 0 : 1)