Merged android-testsuite branch.

1 files changed, 6 insertions, 5 deletions

diff --git a/java/test/Ice/serialize/AllTests.java b/java/test/Ice/serialize/AllTests.java
index 2a540d546df..ea69059e355 100644
--- a/java/test/Ice/serialize/AllTests.java
+++ b/java/test/Ice/serialize/AllTests.java
@@ -7,7 +7,8 @@
 //
 // **********************************************************************
 
-import Test.*;
+package test.Ice.serialize;
+import test.Ice.serialize.Test.*;
 import java.io.*;
 
 public class AllTests
@@ -22,14 +23,14 @@ public class AllTests
     }
 
     public static InitialPrx
-    allTests(Ice.Communicator communicator, boolean collocated)
+    allTests(Ice.Communicator communicator, boolean collocated, PrintWriter out)
     {
         String ref = "initial:default -p 12010 -t 10000";
         Ice.ObjectPrx base = communicator.stringToProxy(ref);
         InitialPrx initial = InitialPrxHelper.checkedCast(base);
 
-        System.out.print("testing serialization... ");
-        System.out.flush();
+        out.print("testing serialization... ");
+        out.flush();
 
         //
         // Call getStruct1 and force an error.
@@ -105,7 +106,7 @@ public class AllTests
             test(false);
         }
 
-        System.out.println("ok");
+        out.println("ok");
 
         return initial;
     }