Refactored test scripts

1 files changed, 13 insertions, 16 deletions

diff --git a/csharp/test/Ice/adapterDeactivation/Server.cs b/csharp/test/Ice/adapterDeactivation/Server.cs
index a7cc8b99fc9..6af39d08350 100644
--- a/csharp/test/Ice/adapterDeactivation/Server.cs
+++ b/csharp/test/Ice/adapterDeactivation/Server.cs
@@ -16,25 +16,22 @@ using System.Reflection;
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Server
+public class Server : TestCommon.Application
 {
-    internal class App : Ice.Application
+    public override int run(string[] args)
     {
-        public override int run(string[] args)
-        {
-            communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
-            Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-            Ice.ServantLocator locator = new ServantLocatorI();
-            adapter.addServantLocator(locator, "");
-            adapter.activate();
-            adapter.waitForDeactivate();
-            return 0;
-        }
+        communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0) + ":udp");
+        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
+        Ice.ServantLocator locator = new ServantLocatorI();
+        adapter.addServantLocator(locator, "");
+        adapter.activate();
+        adapter.waitForDeactivate();
+        return 0;
     }
-    
+
     public static int Main(string[] args)
     {
-        App app = new App();
-        return app.main(args);
+        Server app = new Server();
+        return app.runmain(args);
     }
-}
+}
\ No newline at end of file