1 files changed, 20 insertions, 37 deletions

diff --git a/csharp/test/Ice/dispatcher/Collocated.cs b/csharp/test/Ice/dispatcher/Collocated.cs
index ae25fc29faf..fe7fd156df7 100644
--- a/csharp/test/Ice/dispatcher/Collocated.cs
+++ b/csharp/test/Ice/dispatcher/Collocated.cs
@@ -16,61 +16,44 @@ using System.Reflection;
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Collocated
+public class Collocated : TestCommon.Application
 {
-    private static int run(string[] args, Ice.Communicator communicator)
+    public override int run(string[] args)
     {
-        communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010");
-        communicator.getProperties().setProperty("ControllerAdapter.Endpoints", "tcp -p 12011");
-        communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+        communicator().getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+        communicator().getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
 
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("ControllerAdapter");
+        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
+        Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
 
         adapter.add(new TestI(), Ice.Util.stringToIdentity("test"));
         //adapter.activate(); // Don't activate OA to ensure collocation is used.
         adapter2.add(new TestControllerI(adapter), Ice.Util.stringToIdentity("testController"));
         //adapter2.activate(); // Don't activate OA to ensure collocation is used.
 
-        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");
+        initData.dispatcher = new Dispatcher().dispatch;
+        return initData;
+    }
 
+    public static int Main(string[] args)
+    {
+        Collocated app = new Collocated();
         try
         {
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties(ref args);
-            initData.properties.setProperty("Ice.Warn.AMICallback", "0");
-            initData.dispatcher = new Dispatcher().dispatch;
-            communicator = Ice.Util.initialize(ref args, initData);
-            status = run(args, communicator);
+            return app.runmain(args);
         }
-        catch(Exception ex)
+        finally
         {
-            Console.Error.WriteLine(ex);
-            status = 1;
+            Dispatcher.terminate();
         }
-
-        if(communicator != null)
-        {
-            try
-            {
-                communicator.destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                Console.Error.WriteLine(ex);
-                status = 1;
-            }
-        }
-
-        Dispatcher.terminate();
-
-        return status;
     }
 }