diff options
author | Jose <jose@zeroc.com> | 2018-12-20 12:56:13 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2018-12-20 12:56:42 +0100 |
commit | 017c304ad07fd2e8939c77d5c7f788bcace54268 (patch) | |
tree | d7aca5a957aa5cd09b16cf7ea433614cb292881e | |
parent | Improve global metadata code style, Close #321 (diff) | |
download | ice-017c304ad07fd2e8939c77d5c7f788bcace54268.tar.bz2 ice-017c304ad07fd2e8939c77d5c7f788bcace54268.tar.xz ice-017c304ad07fd2e8939c77d5c7f788bcace54268.zip |
Simplify C# ControllerHelper interface
-rw-r--r-- | csharp/test/Ice/interceptor/Client.cs | 2 | ||||
-rw-r--r-- | csharp/test/TestCommon/TestHelper.cs | 9 | ||||
-rw-r--r-- | csharp/test/xamarin/controller/MainPage.xaml.cs | 4 |
3 files changed, 3 insertions, 12 deletions
diff --git a/csharp/test/Ice/interceptor/Client.cs b/csharp/test/Ice/interceptor/Client.cs index 4f98834ac30..dbb4ad198a0 100644 --- a/csharp/test/Ice/interceptor/Client.cs +++ b/csharp/test/Ice/interceptor/Client.cs @@ -112,7 +112,7 @@ namespace Ice test(interceptor.getLastStatus()); output.WriteLine("ok"); - output.WriteLine("testing user exception... "); + output.Write("testing user exception... "); try { prx.amdBadAdd(33, 12); diff --git a/csharp/test/TestCommon/TestHelper.cs b/csharp/test/TestCommon/TestHelper.cs index 5b40b3e3d8e..b966ada4a4e 100644 --- a/csharp/test/TestCommon/TestHelper.cs +++ b/csharp/test/TestCommon/TestHelper.cs @@ -13,16 +13,7 @@ namespace Test { public interface ControllerHelper { - string getOutput(); - void join(); - void completed(int status); - void run(); - string loggerPrefix(); - void print(string message); void serverReady(); - void shutdown(); - void waitReady(int msec); - int waitSuccess(int msec); void communicatorInitialized(Ice.Communicator communicator); } diff --git a/csharp/test/xamarin/controller/MainPage.xaml.cs b/csharp/test/xamarin/controller/MainPage.xaml.cs index 326d59de559..f07697b63f0 100644 --- a/csharp/test/xamarin/controller/MainPage.xaml.cs +++ b/csharp/test/xamarin/controller/MainPage.xaml.cs @@ -560,7 +560,7 @@ namespace controller public class ProccessI : Test.Common.ProcessDisp_ { - public ProccessI(ControllerHelper controllerHelper) + public ProccessI(ControllerHelperI controllerHelper) { _controllerHelper = controllerHelper; } @@ -583,7 +583,7 @@ namespace controller return _controllerHelper.getOutput(); } - private ControllerHelper _controllerHelper; + private ControllerHelperI _controllerHelper; } public class ProcessControllerI : Test.Common.ProcessControllerDisp_ |