1 files changed, 35 insertions, 60 deletions
diff --git a/csharp/test/Ice/background/Client.cs b/csharp/test/Ice/background/Client.cs
index da54678ded4..92fabf45672 100644
--- a/csharp/test/Ice/background/Client.cs
+++ b/csharp/test/Ice/background/Client.cs
@@ -16,73 +16,48 @@ using System.Reflection;
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client
+public class Client : TestCommon.Application
 {
-    public static int run(string[] args, Ice.Communicator communicator)
+    public override int run(string[] args)
     {
-        Test.BackgroundPrx background = AllTests.allTests(communicator);
+        PluginI plugin = new PluginI(communicator());
+        plugin.initialize();
+        communicator().getPluginManager().addPlugin("Test", plugin);
+        Test.BackgroundPrx background = AllTests.allTests(this);
         background.shutdown();
         return 0;
     }
 
-    public static int Main(string[] args)
+    protected override Ice.InitializationData getInitData(ref string[] args)
     {
-        int status = 0;
-        Ice.Communicator communicator = null;
-
-        try
-        {
-            Ice.InitializationData initData = new Ice.InitializationData();
-            initData.properties = Ice.Util.createProperties(ref args);
-
-            //
-            // For this test, we want to disable retries.
-            //
-            initData.properties.setProperty("Ice.RetryIntervals", "-1");
-
-            //
-            // This test kills connections, so we don't want warnings.
-            //
-            initData.properties.setProperty("Ice.Warn.Connections", "0");
-
-            initData.properties.setProperty("Ice.MessageSizeMax", "50000");
-
-            // This test relies on filling the TCP send/recv buffer, so
-            // we rely on a fixed value for these buffers.
-            initData.properties.setProperty("Ice.TCP.SndSize", "50000");
-
-            //
-            // Setup the test transport plug-in.
-            //
-            string defaultProtocol = initData.properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
-            initData.properties.setProperty("Ice.Default.Protocol", "test-" + defaultProtocol);
-
-            communicator = Ice.Util.initialize(ref args, initData);
-            PluginI plugin = new PluginI(communicator);
-            plugin.initialize();
-            communicator.getPluginManager().addPlugin("Test", plugin);
-
-            status = run(args, communicator);
-        }
-        catch(Exception ex)
-        {
-            Console.Error.WriteLine(ex);
-            status = 1;
-        }
-
-        if(communicator != null)
-        {
-            try
-            {
-                communicator.destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                Console.Error.WriteLine(ex);
-                status = 1;
-            }
-        }
+        Ice.InitializationData initData = base.getInitData(ref args);
+        //
+        // For this test, we want to disable retries.
+        //
+        initData.properties.setProperty("Ice.RetryIntervals", "-1");
+
+        //
+        // This test kills connections, so we don't want warnings.
+        //
+        initData.properties.setProperty("Ice.Warn.Connections", "0");
+
+        initData.properties.setProperty("Ice.MessageSizeMax", "50000");
+
+        // This test relies on filling the TCP send/recv buffer, so
+        // we rely on a fixed value for these buffers.
+        initData.properties.setProperty("Ice.TCP.SndSize", "50000");
+
+        //
+        // Setup the test transport plug-in.
+        //
+        string defaultProtocol = initData.properties.getPropertyWithDefault("Ice.Default.Protocol", "tcp");
+        initData.properties.setProperty("Ice.Default.Protocol", "test-" + defaultProtocol);
+        return initData;
+    }
 
-        return status;
+    public static int Main(string[] args)
+    {
+        Client app = new Client();
+        return app.runmain(args);
     }
 }