1 files changed, 15 insertions, 43 deletions

diff --git a/csharp/test/Ice/operations/Client.cs b/csharp/test/Ice/operations/Client.cs
index f9e6569ccd5..758ad8d7c47 100644
--- a/csharp/test/Ice/operations/Client.cs
+++ b/csharp/test/Ice/operations/Client.cs
@@ -8,7 +8,6 @@
 // **********************************************************************
 
 using System;
-using System.Diagnostics;
 using System.Reflection;
 
 [assembly: CLSCompliant(true)]
@@ -17,18 +16,18 @@ using System.Reflection;
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client
+public class Client : TestCommon.Application
 {
-    private static int run(string[] args, Ice.Communicator communicator)
+    public override int run(string[] args)
     {
-        Test.MyClassPrx myClass = AllTests.allTests(communicator);
+        Test.MyClassPrx myClass = AllTests.allTests(this);
 
         Console.Out.Write("testing server shutdown... ");
         Console.Out.Flush();
         myClass.shutdown();
         try
         {
-            myClass.opVoid();
+            myClass.ice_timeout(100).ice_ping(); // Use timeout to speed up testing on Windows
             throw new System.Exception();
         }
         catch(Ice.LocalException)
@@ -39,45 +38,18 @@ public class Client
         return 0;
     }
 
-    public static int Main(string[] args)
+    protected override Ice.InitializationData getInitData(ref string[] args)
     {
-        int status = 0;
-        Ice.Communicator communicator = null;
-
-        try
-        {
-            //
-            // In this test, we need at least two threads in the
-            // client side thread pool for nested AMI.
-            //
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties(ref args);
-            initData.properties.setProperty("Ice.ThreadPool.Client.Size", "2");
-            initData.properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
-            initData.properties.setProperty("Ice.BatchAutoFlushSize", "100");
-
-            communicator = Ice.Util.initialize(ref args, initData);
-            status = run(args, communicator);
-        }
-        catch(System.Exception ex)
-        {
-            Console.Error.WriteLine(ex);
-            status = 1;
-        }
-
-        if(communicator != null)
-        {
-            try
-            {
-                communicator.destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                Console.Error.WriteLine(ex);
-                status = 1;
-            }
-        }
+        Ice.InitializationData initData = base.getInitData(ref args);
+        initData.properties.setProperty("Ice.ThreadPool.Client.Size", "2");
+        initData.properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
+        initData.properties.setProperty("Ice.BatchAutoFlushSize", "100");
+        return initData;
+    }
 
-        return status;
+    public static int Main(string[] args)
+    {
+        Client app = new Client();
+        return app.runmain(args);
     }
 }