Do not use Ice::Application for Ice testsuite

1 files changed, 27 insertions, 29 deletions

diff --git a/csharp/test/Ice/exceptions/Server.cs b/csharp/test/Ice/exceptions/Server.cs
index b9b0a001fbe..e6bdf6a3dc2 100644
--- a/csharp/test/Ice/exceptions/Server.cs
+++ b/csharp/test/Ice/exceptions/Server.cs
@@ -45,41 +45,39 @@ public sealed class DummyLogger : Ice.Logger
     }
 }
 
-public class Server : TestCommon.Application
+public class Server : Test.TestHelper
 {
-    public override int run(string[] args)
+    public override void run(string[] args)
     {
-        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-        Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("TestAdapter2");
-        Ice.ObjectAdapter adapter3 = communicator().createObjectAdapter("TestAdapter3");
-        Ice.Object obj = new ThrowerI();
-        adapter.add(obj, Ice.Util.stringToIdentity("thrower"));
-        adapter2.add(obj, Ice.Util.stringToIdentity("thrower"));
-        adapter3.add(obj, Ice.Util.stringToIdentity("thrower"));
-        adapter.activate();
-        adapter2.activate();
-        adapter3.activate();
-        communicator().waitForShutdown();
-        return 0;
-    }
+        Ice.Properties properties = createTestProperties(ref args);
+        properties.setProperty("Ice.Warn.Dispatch", "0");
+        properties.setProperty("Ice.Warn.Connections", "0");
+        properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max
 
-    protected override Ice.InitializationData getInitData(ref string[] args)
-    {
-        Ice.InitializationData initData = base.getInitData(ref args);
-        initData.properties.setProperty("Ice.Warn.Dispatch", "0");
-        initData.properties.setProperty("Ice.Warn.Connections", "0");
-        initData.properties.setProperty("TestAdapter.Endpoints", getTestEndpoint(initData.properties, 0));
-        initData.properties.setProperty("Ice.MessageSizeMax", "10"); // 10KB max
-        initData.properties.setProperty("TestAdapter2.Endpoints", getTestEndpoint(initData.properties, 1));
-        initData.properties.setProperty("TestAdapter2.MessageSizeMax", "0");
-        initData.properties.setProperty("TestAdapter3.Endpoints", getTestEndpoint(initData.properties, 2));
-        initData.properties.setProperty("TestAdapter3.MessageSizeMax", "1");
-        return initData;
+        using(var communicator = initialize(properties))
+        {
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+            communicator.getProperties().setProperty("TestAdapter2.Endpoints", getTestEndpoint(1));
+            communicator.getProperties().setProperty("TestAdapter2.MessageSizeMax", "0");
+            communicator.getProperties().setProperty("TestAdapter3.Endpoints", getTestEndpoint(2));
+            communicator.getProperties().setProperty("TestAdapter3.MessageSizeMax", "1");
+
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
+            Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2");
+            Ice.ObjectAdapter adapter3 = communicator.createObjectAdapter("TestAdapter3");
+            Ice.Object obj = new ThrowerI();
+            adapter.add(obj, Ice.Util.stringToIdentity("thrower"));
+            adapter2.add(obj, Ice.Util.stringToIdentity("thrower"));
+            adapter3.add(obj, Ice.Util.stringToIdentity("thrower"));
+            adapter.activate();
+            adapter2.activate();
+            adapter3.activate();
+            communicator.waitForShutdown();
+        }
     }
 
     public static int Main(string[] args)
     {
-        Server app = new Server();
-        return app.runmain(args);
+        return Test.TestDriver.runTest<Server>(args);
     }
 }