Fixed ICE-6501: android SSL test failure and other minor Android test failures

2 files changed, 14 insertions, 14 deletions

diff --git a/java/test/src/main/java/test/Ice/operations/AllTests.java b/java/test/src/main/java/test/Ice/operations/AllTests.java
index 1fcb9f40a97..b49967cc3e3 100644
--- a/java/test/src/main/java/test/Ice/operations/AllTests.java
+++ b/java/test/src/main/java/test/Ice/operations/AllTests.java
@@ -43,17 +43,17 @@ public class AllTests
         TwowaysAMI.twowaysAMI(app, cl);
         TwowaysAMI.twowaysAMI(app, derived);
         out.println("ok");
-        
+
         //
         // Use reflection to load TwowaysLambdaAMI as that is only supported with Java >= 1.8
-        // 
+        //
         try
         {
             Class<?> cls = IceInternal.Util.findClass("test.Ice.operations.lambda.TwowaysLambdaAMI", null);
             if(cls != null)
             {
-                java.lang.reflect.Method twowaysLambdaAMI = 
-                    cls.getDeclaredMethod("twowaysLambdaAMI", 
+                java.lang.reflect.Method twowaysLambdaAMI =
+                    cls.getDeclaredMethod("twowaysLambdaAMI",
                                           new Class<?>[]{test.Util.Application.class, MyClassPrx.class});
                 out.print("testing twoway operations with lambda AMI mapping... ");
                 out.flush();
@@ -74,22 +74,22 @@ public class AllTests
         {
             throw new RuntimeException(ex);
         }
-            
+
         out.print("testing oneway operations with AMI... ");
         out.flush();
         OnewaysAMI.onewaysAMI(app, cl);
         out.println("ok");
-            
+
         //
         // Use reflection to load OnewaysLambdaAMI as that is only supported with Java >= 1.8
-        // 
+        //
         try
         {
             Class<?> cls = IceInternal.Util.findClass("test.Ice.operations.lambda.OnewaysLambdaAMI", null);
             if(cls != null)
             {
-                java.lang.reflect.Method onewaysLambdaAMI = 
-                    cls.getDeclaredMethod("onewaysLambdaAMI", 
+                java.lang.reflect.Method onewaysLambdaAMI =
+                    cls.getDeclaredMethod("onewaysLambdaAMI",
                                           new Class<?>[]{test.Util.Application.class, MyClassPrx.class});
                 out.print("testing twoway operations with lambda AMI mapping... ");
                 out.flush();
@@ -113,8 +113,8 @@ public class AllTests
 
         out.print("testing batch oneway operations... ");
         out.flush();
-        BatchOneways.batchOneways(cl, out);
-        BatchOneways.batchOneways(derived, out);
+        BatchOneways.batchOneways(app, cl, out);
+        BatchOneways.batchOneways(app, derived, out);
         out.println("ok");
 
         out.print("testing batch AMI oneway operations... ");
diff --git a/java/test/src/main/java/test/Ice/operations/BatchOneways.java b/java/test/src/main/java/test/Ice/operations/BatchOneways.java
index 6982d89a4c3..66b8b6a8ffd 100644
--- a/java/test/src/main/java/test/Ice/operations/BatchOneways.java
+++ b/java/test/src/main/java/test/Ice/operations/BatchOneways.java
@@ -73,7 +73,7 @@ class BatchOneways
     };
 
     static void
-    batchOneways(MyClassPrx p, PrintWriter out)
+    batchOneways(test.Util.Application app, MyClassPrx p, PrintWriter out)
     {
         final byte[] bs1 = new byte[10  * 1024];
 
@@ -142,11 +142,11 @@ class BatchOneways
 
         if(batch.ice_getConnection() != null)
         {
-            Ice.InitializationData initData = new Ice.InitializationData();
+            Ice.InitializationData initData = app.createInitializationData();
             initData.properties = p.ice_getCommunicator().getProperties()._clone();
             BatchRequestInterceptorI interceptor = new BatchRequestInterceptorI();
             initData.batchRequestInterceptor = interceptor;
-            Ice.Communicator ic = Ice.Util.initialize(initData);
+            Ice.Communicator ic = app.initialize(initData);
 
             batch = MyClassPrxHelper.uncheckedCast(ic.stringToProxy(p.toString()).ice_batchOneway());