Merged android-testsuite branch.

1 files changed, 17 insertions, 34 deletions

diff --git a/java/test/IceGrid/simple/Client.java b/java/test/IceGrid/simple/Client.java
index 9920cce434d..8fc65043618 100644
--- a/java/test/IceGrid/simple/Client.java
+++ b/java/test/IceGrid/simple/Client.java
@@ -7,13 +7,13 @@
 //
 // **********************************************************************
 
-import Test.*;
+package test.IceGrid.simple;
 
-public class Client
+public class Client extends test.Util.Application
 {
-    private static int
-    run(String[] args, Ice.Communicator communicator)
+    public int run(String[] args)
     {
+        Ice.Communicator communicator = communicator();
         boolean withDeploy = false;
         for(int i = 1; i < args.length; i++)
         {
@@ -26,45 +26,28 @@ public class Client
 
         if(!withDeploy)
         {
-            AllTests.allTests(communicator);
+            AllTests.allTests(communicator, getWriter());
         }
         else
         {
-            AllTests.allTestsWithDeploy(communicator);
-        }       
+            AllTests.allTestsWithDeploy(communicator, getWriter());
+        }
 
         return 0;
     }
 
-    public static void
-    main(String[] args)
+    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
     {
-        int status = 0;
-        Ice.Communicator communicator = null;
-
-        try
-        {
-            communicator = Ice.Util.initialize(args);
-            status = run(args, communicator);
-        }
-        catch(Exception ex)
-        {
-            ex.printStackTrace();
-            status = 1;
-        }
+        Ice.InitializationData initData = new Ice.InitializationData();
+        initData.properties = Ice.Util.createProperties(argsH);
+        initData.properties.setProperty("Ice.Package.Test", "test.IceGrid.simple");
+        return initData;
+    }
 
-        if(communicator != null)
-        {
-            try
-            {
-                communicator.destroy();
-            }
-            catch (Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                status = 1;
-            }
-        }
+    public static void main(String[] args)
+    {
+        Client c = new Client();
+        int status = c.main("Client", args);
 
         System.gc();
         System.exit(status);