Do not use Ice::Application for Ice testsuite

1 files changed, 15 insertions, 14 deletions

diff --git a/csharp/test/Ice/servantLocator/Server.cs b/csharp/test/Ice/servantLocator/Server.cs
index d411fb3cedc..b4b5f1e5fb6 100644
--- a/csharp/test/Ice/servantLocator/Server.cs
+++ b/csharp/test/Ice/servantLocator/Server.cs
@@ -16,26 +16,27 @@ using System.Reflection;
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Server : TestCommon.Application
+public class Server : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        communicator().getProperties().setProperty("Ice.Warn.Dispatch", "0");
+        using(var communicator = initialize(ref args))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            communicator.getProperties().setProperty("Ice.Warn.Dispatch", "0");
 
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.addServantLocator(new ServantLocatorI("category"), "category");
-        adapter.addServantLocator(new ServantLocatorI(""), "");
-        adapter.add(new TestI(), Ice.Util.stringToIdentity("asm"));
-        adapter.add(new TestActivationI(), Ice.Util.stringToIdentity("test/activation"));
-        adapter.activate();
-        adapter.waitForDeactivate();
-        return 0;
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.addServantLocator(new ServantLocatorI("category"), "category");
+            adapter.addServantLocator(new ServantLocatorI(""), "");
+            adapter.add(new TestI(), Ice.Util.stringToIdentity("asm"));
+            adapter.add(new TestActivationI(), Ice.Util.stringToIdentity("test/activation"));
+            adapter.activate();
+            adapter.waitForDeactivate();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Server app = new Server();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Server>(args);
     }
 }