1 files changed, 20 insertions, 38 deletions

diff --git a/csharp/test/Ice/dispatcher/Client.cs b/csharp/test/Ice/dispatcher/Client.cs
index c1ed78778f0..080753f9b8c 100644
--- a/csharp/test/Ice/dispatcher/Client.cs
+++ b/csharp/test/Ice/dispatcher/Client.cs
@@ -8,7 +8,6 @@
 // **********************************************************************
 
 using System;
-using System.Diagnostics;
 using System.Reflection;
 
 [assembly: CLSCompliant(true)]
@@ -17,54 +16,37 @@ 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)
     {
-        AllTests.allTests(communicator);
+        AllTests.allTests(this);
         return 0;
     }
 
-    public static int Main(string[] args)
+    protected override Ice.InitializationData getInitData(ref string[] args)
     {
-        int status = 0;
-        Ice.Communicator communicator = null;
+        Ice.InitializationData initData = base.getInitData(ref args);
+        initData.properties.setProperty("Ice.Warn.AMICallback", "0");
+        //
+        // Limit the send buffer size, this test relies on the socket
+        // send() blocking after sending a given amount of data.
+        //
+        initData.properties.setProperty("Ice.TCP.SndSize", "50000");
+        initData.dispatcher = new Dispatcher().dispatch;
+        return initData;
+    }
 
+    public static int Main(string[] args)
+    {
+        Client app = new Client();
         try
         {
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties(ref args);
-            initData.properties.setProperty("Ice.Warn.AMICallback", "0");
-            //
-            // Limit the send buffer size, this test relies on the socket
-            // send() blocking after sending a given amount of data.
-            //
-            initData.properties.setProperty("Ice.TCP.SndSize", "50000");
-            initData.dispatcher = new Dispatcher().dispatch;
-            communicator = Ice.Util.initialize(ref args, initData);
-            status = run(args, communicator);
+            return app.runmain(args);
         }
-        catch(System.Exception ex)
+        finally
         {
-            System.Console.Error.WriteLine(ex);
-            status = 1;
+            Dispatcher.terminate();
         }
-
-        if(communicator != null)
-        {
-            try
-            {
-                communicator.destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                System.Console.Error.WriteLine(ex);
-                status = 1;
-            }
-        }
-
-        Dispatcher.terminate();
-
-        return status;
     }
 }