1 files changed, 31 insertions, 66 deletions
diff --git a/ruby/test/Slice/escape/Client.rb b/ruby/test/Slice/escape/Client.rb
index 84a31048a45..eb418cb005c 100755
--- a/ruby/test/Slice/escape/Client.rb
+++ b/ruby/test/Slice/escape/Client.rb
@@ -8,75 +8,40 @@
 #
 # **********************************************************************
 
-require 'pathname'
-
-rubyDir = nil
-for toplevel in [".", "..", "../..", "../../..", "../../../.."]
-    path = Pathname.new(toplevel).join("ruby", "Ice.rb")
-    if path.file?
-        rubyDir = Pathname.new(toplevel).join("ruby")
-        break
-    end
-end
-if not rubyDir
-    fail "can't find toplevel directory!"
-end
-
 require 'Ice'
 Ice::loadSlice('Key.ice')
 Ice::loadSlice('Clash.ice')
 
-def test(b)
-    if !b
-        raise RuntimeError, 'test assertion failed'
+class Client < ::TestHelper
+    def run(args)
+        self.init(args:args) do |communicator|
+            print "testing type names... "
+            STDOUT.flush
+            a = BEGIN_::END_::Alias
+            b = BEGIN_::And.new
+            b._begin = 0;
+            c = BEGIN_::BreakPrx::uncheckedCast(communicator.stringToProxy("test:tcp"))
+            test(c.method(:_case))
+            test(c.method(:_to_a))
+            test(c.method(:_instance_variable_set))
+            test(c.method(:_instance_variables))
+            d1 = BEGIN_::Display.new
+            d1._when = 0
+            d1._do = 0
+            d1._dup = communicator.stringToProxy("test:tcp")
+            d1._else = 0
+            e = BEGIN_::ElsifPrx::uncheckedCast(communicator.stringToProxy("test:tcp"))
+            test(e.method(:_case))
+            f = BEGIN_::Next.new
+            f._new = 0
+            g = BEGIN_::Nil.new
+            g._new = 0
+            g._not = 0
+            g._or = 0
+            # TODO: Test local interface
+            #h = BEGIN_::ExtendPrx::uncheckedCast(communicator.stringToProxy("test:tcp"))
+            i = BEGIN_::Redo
+            puts "ok"
+        end
     end
 end
-
-def run(args, communicator)
-    print "testing type names... "
-    STDOUT.flush
-    a = BEGIN_::END_::Alias
-    b = BEGIN_::And.new
-    b._begin = 0;
-    c = BEGIN_::BreakPrx::uncheckedCast(communicator.stringToProxy("test:tcp"))
-    test(c.method(:_case))
-    test(c.method(:_to_a))
-    test(c.method(:_instance_variable_set))
-    test(c.method(:_instance_variables))
-    d1 = BEGIN_::Display.new
-    d1._when = 0
-    d1._do = 0
-    d1._dup = communicator.stringToProxy("test:tcp")
-    d1._else = 0
-    e = BEGIN_::ElsifPrx::uncheckedCast(communicator.stringToProxy("test:tcp"))
-    test(e.method(:_case))
-    f = BEGIN_::Next.new
-    f._new = 0
-    g = BEGIN_::Nil.new
-    g._new = 0
-    g._not = 0
-    g._or = 0
-    # TODO: Test local interface
-    #h = BEGIN_::ExtendPrx::uncheckedCast(communicator.stringToProxy("test:tcp"))
-    i = BEGIN_::Redo
-    puts "ok"
-
-    return true
-end
-
-begin
-    initData = Ice::InitializationData.new
-    initData.properties = Ice.createProperties(ARGV)
-    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)