1 files changed, 17 insertions, 41 deletions

diff --git a/csharp/test/Ice/udp/Client.cs b/csharp/test/Ice/udp/Client.cs
index ea507d61874..3f4f2e0ee71 100644
--- a/csharp/test/Ice/udp/Client.cs
+++ b/csharp/test/Ice/udp/Client.cs
@@ -9,7 +9,6 @@
 
 using Test;
 using System;
-using System.Diagnostics;
 using System.Reflection;
 
 [assembly: CLSCompliant(true)]
@@ -18,63 +17,40 @@ 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);
 
         int num;
         try
         {
-            num = args.Length == 1 ? System.Int32.Parse(args[0]) : 0;
+            num = args.Length == 1 ? Int32.Parse(args[0]) : 0;
         }
-        catch(System.FormatException)
+        catch(FormatException)
         {
             num = 0;
         }
         for(int i = 0; i < num; ++i)
         {
-            TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("control:tcp -p " + (12010 + i))).shutdown();
+            string endpoint = getTestEndpoint(i, "tcp");
+            TestIntfPrxHelper.uncheckedCast(communicator().stringToProxy("control:" + endpoint)).shutdown();
         }
         return 0;
     }
 
-    public static int Main(string[] args)
+    protected override Ice.InitializationData getInitData(ref string[] args)
     {
-        int status = 0;
-        Ice.Communicator communicator = null;
-
-        try
-        {
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties(ref args);
-
-            initData.properties.setProperty("Ice.Warn.Connections", "0");
-            initData.properties.setProperty("Ice.UDP.SndSize", "16384");
-
-            communicator = Ice.Util.initialize(ref args, initData);
-            status = run(args, communicator);
-        }
-        catch(System.Exception ex)
-        {
-            System.Console.Error.WriteLine(ex);
-            status = 1;
-        }
-
-        if(communicator != null)
-        {
-            try
-            {
-                communicator.destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                System.Console.Error.WriteLine(ex);
-                status = 1;
-            }
-        }
+        Ice.InitializationData initData = base.getInitData(ref args);
+        initData.properties.setProperty("Ice.Warn.Connections", "0");
+        initData.properties.setProperty("Ice.UDP.SndSize", "16384");
+        return initData;
+    }
 
-        return status;
+    public static int Main(string[] args)
+    {
+        Client app = new Client();
+        return app.runmain(args);
     }
 }