1 files changed, 17 insertions, 44 deletions

diff --git a/csharp/test/Ice/faultTolerance/Client.cs b/csharp/test/Ice/faultTolerance/Client.cs
index 30f09d793b6..457f1eb446e 100644
--- a/csharp/test/Ice/faultTolerance/Client.cs
+++ b/csharp/test/Ice/faultTolerance/Client.cs
@@ -8,7 +8,6 @@
 // **********************************************************************
 
 using System;
-using System.Diagnostics;
 using System.Reflection;
 
 [assembly: CLSCompliant(true)]
@@ -17,14 +16,14 @@ using System.Reflection;
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client
+public class Client : TestCommon.Application
 {
     private static void usage()
     {
-        System.Console.Error.WriteLine("Usage: client port...");
+        Console.Error.WriteLine("Usage: client port...");
     }
 
-    private static int run(string[] args, Ice.Communicator communicator)
+    public override int run(string[] args)
     {
         System.Collections.Generic.List<int> ports = new System.Collections.Generic.List<int>();
         for(int i = 0; i < args.Length; i++)
@@ -32,11 +31,11 @@ public class Client
             int port = 0;
             try
             {
-                port = System.Int32.Parse(args[i]);
+                port = Int32.Parse(args[i]);
             }
-            catch(System.FormatException ex)
+            catch(FormatException ex)
             {
-                System.Console.Error.WriteLine(ex);
+                Console.Error.WriteLine(ex);
                 return 1;
             }
             ports.Add(port);
@@ -44,51 +43,25 @@ public class Client
 
         if(ports.Count == 0)
         {
-            System.Console.Error.WriteLine("Client: no ports specified");
+            Console.Error.WriteLine("Client: no ports specified");
             usage();
             return 1;
         }
 
-        AllTests.allTests(communicator, ports);
+        AllTests.allTests(this, ports);
         return 0;
     }
 
-    public static int Main(string[] args)
+    protected override Ice.InitializationData getInitData(ref string[] args)
     {
-        int status = 0;
-        Ice.Communicator communicator = null;
-
-        try
-        {
-            //
-            // This test aborts servers, so we don't want warnings.
-            //
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties(ref args);
-            initData.properties.setProperty("Ice.Warn.Connections", "0");
-
-            communicator = Ice.Util.initialize(ref args, initData);
-            status = run(args, communicator);
-        }
-        catch(System.Exception ex)
-        {
-            System.Console.Error.WriteLine(ex);
-            status = 1;
-        }
-
-        if(communicator != null)
-        {
-            try
-            {
-                communicator.destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                System.Console.Error.WriteLine(ex);
-                status = 1;
-            }
-        }
+        Ice.InitializationData initData = base.getInitData(ref args);
+        initData.properties.setProperty("Ice.Warn.Connections", "0");
+        return initData;
+    }
 
-        return status;
+    public static int Main(string[] args)
+    {
+        Client app = new Client();
+        return app.runmain(args);
     }
 }