Merged android-testsuite branch.

1 files changed, 24 insertions, 35 deletions

diff --git a/java/test/Ice/seqMapping/Client.java b/java/test/Ice/seqMapping/Client.java
index dff52ec6dd6..50f10b56976 100644
--- a/java/test/Ice/seqMapping/Client.java
+++ b/java/test/Ice/seqMapping/Client.java
@@ -7,50 +7,39 @@
 //
 // **********************************************************************
 
-public class Client
+package test.Ice.seqMapping;
+
+import test.Ice.seqMapping.Test.*;
+
+public class Client extends test.Util.Application
 {
-    private static int
-    run(String[] args, Ice.Communicator communicator)
+    public int
+    run(String[] args)
     {
-        Test.MyClassPrx myClass = AllTests.allTests(communicator, false);
+        java.io.PrintWriter out = getWriter();
+
+        MyClassPrx myClass = AllTests.allTests(communicator(), false, out);
 
-        System.out.print("shutting down server... ");
-        System.out.flush();
+        out.print("shutting down server... ");
+        out.flush();
         myClass.shutdown();
-        System.out.println("ok");
+        out.println("ok");
 
         return 0;
     }
 
-    public static void
-    main(String[] args)
+    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
+    {
+        Ice.InitializationData initData = new Ice.InitializationData();
+        initData.properties = Ice.Util.createProperties(argsH);
+        initData.properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping");
+        return initData;
+    }
+
+    public static void main(String[] args)
     {
-        int status = 0;
-        Ice.Communicator communicator = null;
-
-        try
-        {
-            communicator = Ice.Util.initialize(args);
-            status = run(args, communicator);
-        }
-        catch(Exception ex)
-        {
-            ex.printStackTrace();
-            status = 1;
-        }
-
-        if(communicator != null)
-        {
-            try
-            {
-                communicator.destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                status = 1;
-            }
-        }
+        Client c = new Client();
+        int status = c.main("Client", args);
 
         System.gc();
         System.exit(status);