Merged android-testsuite branch.

1 files changed, 29 insertions, 47 deletions

diff --git a/java/test/Ice/retry/Client.java b/java/test/Ice/retry/Client.java
index 0a2fad21024..52150ba5b75 100644
--- a/java/test/Ice/retry/Client.java
+++ b/java/test/Ice/retry/Client.java
@@ -7,61 +7,43 @@
 //
 // **********************************************************************
 
-public class Client
+package test.Ice.retry;
+
+import test.Ice.retry.Test.RetryPrx;
+
+public class Client extends test.Util.Application
 {
-    public static int
-    run(String[] args, Ice.Communicator communicator, java.io.PrintStream out)
+    public int run(String[] args)
     {
-        Test.RetryPrx retry = AllTests.allTests(communicator, out);
+        Ice.Communicator communicator = communicator();
+        RetryPrx retry = AllTests.allTests(communicator, getWriter());
         retry.shutdown();
         return 0;
     }
 
-    public static void
-    main(String[] args)
+    protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
     {
-        int status = 0;
-        Ice.Communicator communicator = null;
-
-        try
-        {
-            Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args);
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties(argsH);
-
-            //
-            // For this test, we want to disable retries.
-            //
-            initData.properties.setProperty("Ice.RetryIntervals", "-1");
-
-            //
-            // We don't want connection warnings because of the timeout test.
-            //
-            initData.properties.setProperty("Ice.Warn.Connections", "0");
-
-            communicator = Ice.Util.initialize(argsH, initData);
-            status = run(argsH.value, communicator, System.out);
-        }
-        catch(Exception ex)
-        {
-            ex.printStackTrace();
-            status = 1;
-        }
-
-        if(communicator != null)
-        {
-            try
-            {
-                communicator.destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                status = 1;
-            }
-        }
+        Ice.InitializationData initData = new Ice.InitializationData();
+        initData.properties = Ice.Util.createProperties(argsH);
+        initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry");
+        //
+        // For this test, we want to disable retries.
+        //
+        initData.properties.setProperty("Ice.RetryIntervals", "-1");
+
+        //
+        // We don't want connection warnings because of the timeout
+        //
+        initData.properties.setProperty("Ice.Warn.Connections", "0");
+
+        return initData;
+    }
 
+    public static void main(String[] args)
+    {
+        Client app = new Client();
+        int result = app.main("Client", args);
         System.gc();
-        System.exit(status);
+        System.exit(result);
     }
 }