1 files changed, 8 insertions, 41 deletions

diff --git a/csharp/test/Ice/stream/Client.cs b/csharp/test/Ice/stream/Client.cs
index c344c86aa0d..ac2b0dd6975 100644
--- a/csharp/test/Ice/stream/Client.cs
+++ b/csharp/test/Ice/stream/Client.cs
@@ -8,10 +8,7 @@
 // **********************************************************************
 
 using System;
-using System.Diagnostics;
 using System.Reflection;
-using System.Collections;
-using System.Collections.Generic;
 
 [assembly: CLSCompliant(true)]
 
@@ -19,46 +16,16 @@ using System.Collections.Generic;
 [assembly: AssemblyDescription("Ice test")]
 [assembly: AssemblyCompany("ZeroC, Inc.")]
 
-public class Client
+public class Client : TestCommon.Application
 {
-    public static int Main(string[] args)
+    public override int run(string[] args)
     {
-        int status = 0;
-        Ice.Communicator communicator = null;
-
-        try
-        {
-            Ice.InitializationData data = new Ice.InitializationData();
-#if COMPACT
-            //
-            // When using Ice for .NET Compact Framework, we need to specify
-            // the assembly so that Ice can locate classes and exceptions.
-            //
-            data.properties = Ice.Util.createProperties();
-            data.properties.setProperty("Ice.FactoryAssemblies", "client");
-#endif
-            communicator = Ice.Util.initialize(ref args, data);
-            status = AllTests.run(communicator);
-        }
-        catch(System.Exception ex)
-        {
-            Console.Error.WriteLine(ex);
-            status = 1;
-        }
-
-        if(communicator != null)
-        {
-            try
-            {
-                communicator.destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                Console.Error.WriteLine(ex);
-                status = 1;
-            }
-        }
+        return AllTests.allTests(this);
+    }
 
-        return status;
+    public static int Main(string[] args)
+    {
+        Client app = new Client();
+        return app.runmain(args);
     }
 }