diff options
Diffstat (limited to 'java/test/IceBox/configuration/AllTests.java')
| -rw-r--r-- | java/test/IceBox/configuration/AllTests.java | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/java/test/IceBox/configuration/AllTests.java b/java/test/IceBox/configuration/AllTests.java index 7c71df16120..3f78413a201 100644 --- a/java/test/IceBox/configuration/AllTests.java +++ b/java/test/IceBox/configuration/AllTests.java @@ -7,7 +7,12 @@ // // ********************************************************************** -import Test.*; +package test.IceBox.configuration; + +import java.io.PrintWriter; + +import test.IceBox.configuration.Test.TestIntfPrx; +import test.IceBox.configuration.Test.TestIntfPrxHelper; public class AllTests { @@ -21,7 +26,7 @@ public class AllTests } public static void - allTests(Ice.Communicator communicator) + allTests(Ice.Communicator communicator, PrintWriter out) { TestIntfPrx service1 = TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:tcp -p 12010")); TestIntfPrx service2 = TestIntfPrxHelper.uncheckedCast(communicator.stringToProxy("test:tcp -p 12011")); @@ -30,8 +35,8 @@ public class AllTests if(service1.getProperty("IceBox.InheritProperties").equals("")) { - System.out.print("testing service properties... "); - System.out.flush(); + out.print("testing service properties... "); + out.flush(); test(service1.getProperty("Ice.ProgramName").equals("IceBox-Service1")); test(service1.getProperty("Service").equals("1")); @@ -50,10 +55,10 @@ public class AllTests String[] args2 = {"--Service1.ArgProp=1"}; test(java.util.Arrays.equals(service2.getArgs(), args2)); - System.out.println("ok"); + out.println("ok"); - System.out.print("testing with shared communicator... "); - System.out.flush(); + out.print("testing with shared communicator... "); + out.flush(); test(service3.getProperty("Ice.ProgramName").equals("IceBox-SharedCommunicator")); test(service3.getProperty("Service").equals("4")); @@ -70,12 +75,12 @@ public class AllTests String[] args4 = {"--Service3.Prop=2"}; test(java.util.Arrays.equals(service4.getArgs(), args4)); - System.out.println("ok"); + out.println("ok"); } else { - System.out.print("testing property inheritance... "); - System.out.flush(); + out.print("testing property inheritance... "); + out.flush(); test(service1.getProperty("Ice.ProgramName").equals("IceBox2-Service1")); test(service1.getProperty("ServerProp").equals("1")); @@ -90,7 +95,7 @@ public class AllTests test(service2.getProperty("UnsetMe").equals("")); test(service2.getProperty("Service2.Prop").equals("1")); - System.out.println("ok"); + out.println("ok"); } } } |