Do not use Ice::Application for Ice testsuite

1 files changed, 14 insertions, 13 deletions

diff --git a/csharp/test/Ice/proxy/Server.cs b/csharp/test/Ice/proxy/Server.cs
index 850fa47b213..7214723faf3 100644
--- a/csharp/test/Ice/proxy/Server.cs
+++ b/csharp/test/Ice/proxy/Server.cs
@@ -16,28 +16,29 @@ 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)
     {
+        Ice.Properties properties = createTestProperties(ref args);
         //
         // We don't want connection warnings because of the timeout test.
         //
-        communicator().getProperties().setProperty("Ice.Warn.Connections", "0");
-        communicator().getProperties().setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.Warn.Dispatch", "0");
 
-        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
-        adapter.activate();
-
-        communicator().waitForShutdown();
-        return 0;
+        using(var communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            adapter.add(new MyDerivedClassI(), Ice.Util.stringToIdentity("test"));
+            adapter.activate();
+            communicator.waitForShutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Server app = new Server();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Server>(args);
     }
 }