1 files changed, 27 insertions, 59 deletions

diff --git a/csharp/test/Ice/udp/Server.cs b/csharp/test/Ice/udp/Server.cs
index 6b905455e06..71d7f8c581f 100644
--- a/csharp/test/Ice/udp/Server.cs
+++ b/csharp/test/Ice/udp/Server.cs
@@ -8,7 +8,6 @@
 // **********************************************************************
 
 using System;
-using System.Diagnostics;
 using System.Reflection;
 
 [assembly: CLSCompliant(true)]
@@ -17,93 +16,62 @@ using System.Reflection;
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Server
+public class Server : TestCommon.Application
 {
-    private static int run(string[] args, Ice.Communicator communicator)
+    public override int run(string[] args)
     {
-        Ice.Properties properties = communicator.getProperties();
+        Ice.Properties properties = communicator().getProperties();
 
-        int port = 12010;
+        int num = 0;
         try
         {
-            port += args.Length == 1 ? System.Int32.Parse(args[0]) : 0;
+            num = args.Length == 1 ? Int32.Parse(args[0]) : 0;
         }
-        catch(System.FormatException)
+        catch(FormatException)
         {
         }
-        properties.setProperty("ControlAdapter.Endpoints", "tcp -p " + port);
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ControlAdapter");
-        adapter.add(new TestIntfI(), communicator.stringToIdentity("control"));
+        properties.setProperty("ControlAdapter.Endpoints", getTestEndpoint(num, "tcp"));
+        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("ControlAdapter");
+        adapter.add(new TestIntfI(), Ice.Util.stringToIdentity("control"));
         adapter.activate();
 
-        if(port == 12010)
+        if(num == 0)
         {
-            properties.setProperty("TestAdapter.Endpoints", "udp -p 12010");
-            Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter");
-            adapter2.add(new TestIntfI(), communicator.stringToIdentity("test"));
+            properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(num, "udp"));
+            Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("TestAdapter");
+            adapter2.add(new TestIntfI(), Ice.Util.stringToIdentity("test"));
             adapter2.activate();
         }
 
         string endpoint;
         if(properties.getProperty("Ice.IPv6").Equals("1"))
         {
-            if(IceInternal.AssemblyUtil.osx_)
-            {
-                endpoint = "udp -h \"ff15::1:1\" -p 12020 --interface \"::1\"";
-            }
-            else
-            {
-                endpoint = "udp -h \"ff15::1:1\" -p 12020";
-            }
+            endpoint = "udp -h \"ff15::1:1\" -p 12020";
         }
         else
         {
             endpoint = "udp -h 239.255.1.1 -p 12020";
         }
         properties.setProperty("McastTestAdapter.Endpoints", endpoint);
-        Ice.ObjectAdapter mcastAdapter = communicator.createObjectAdapter("McastTestAdapter");
-        mcastAdapter.add(new TestIntfI(), communicator.stringToIdentity("test"));
+        Ice.ObjectAdapter mcastAdapter = communicator().createObjectAdapter("McastTestAdapter");
+        mcastAdapter.add(new TestIntfI(), Ice.Util.stringToIdentity("test"));
         mcastAdapter.activate();
 
-        communicator.waitForShutdown();
+        communicator().waitForShutdown();
         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.RcvSize", "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.RcvSize", "16384");
+        return initData;
+    }
 
-        return status;
+    public static int Main(string[] args)
+    {
+        Server app = new Server();
+        return app.runmain(args);
     }
 }