diff options
20 files changed, 44 insertions, 50 deletions
diff --git a/android/demo/chat/chat.iml b/android/demo/chat/chat.iml index 568a2dbfd66..f7ac420f600 100644 --- a/android/demo/chat/chat.iml +++ b/android/demo/chat/chat.iml @@ -81,6 +81,7 @@ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> + <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> </content> <orderEntry type="jdk" jdkName="Android API 17 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/android/demo/library/library.iml b/android/demo/library/library.iml index 75eeb0736cb..78508801778 100644 --- a/android/demo/library/library.iml +++ b/android/demo/library/library.iml @@ -81,6 +81,7 @@ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> + <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> </content> <orderEntry type="jdk" jdkName="Android API 17 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/android/test/android/testApp.iml b/android/test/android/testApp.iml index 981662e19b1..299ec77ac2d 100644 --- a/android/test/android/testApp.iml +++ b/android/test/android/testApp.iml @@ -80,6 +80,7 @@ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> + <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> </content> <orderEntry type="jdk" jdkName="Android API 17 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> diff --git a/java/test/src/main/java/test/Ice/acm/AllTests.java b/java/test/src/main/java/test/Ice/acm/AllTests.java index 844c2d8b7cb..125bf3de4c1 100644 --- a/java/test/src/main/java/test/Ice/acm/AllTests.java +++ b/java/test/src/main/java/test/Ice/acm/AllTests.java @@ -143,8 +143,7 @@ public class AllTests { _adapter = _com.createObjectAdapter(_serverACMTimeout, _serverACMClose, _serverACMHeartbeat); - Ice.InitializationData initData = new Ice.InitializationData(); - initData.classLoader = IceInternal.Util.getInstance(_app.communicator()).getClassLoader(); + Ice.InitializationData initData = _app.createInitializationData(); initData.properties = _app.communicator().getProperties()._clone(); initData.logger = _logger; initData.properties.setProperty("Ice.ACM.Timeout", "1"); diff --git a/java/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java b/java/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java index 09dfee83406..b01b2fc3c9a 100644 --- a/java/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java +++ b/java/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java @@ -73,8 +73,7 @@ public class AllTests out.flush(); for(int i = 0; i < 10; ++i) { - Ice.InitializationData initData = new Ice.InitializationData(); - initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); + Ice.InitializationData initData = app.createInitializationData(); initData.properties = communicator.getProperties()._clone(); Ice.Communicator comm = app.initialize(initData); comm.stringToProxy("test:default -p 12010").begin_ice_ping(); diff --git a/java/test/src/main/java/test/Ice/ami/AMI.java b/java/test/src/main/java/test/Ice/ami/AMI.java index 336cb5c0fdf..903c9ad1e34 100644 --- a/java/test/src/main/java/test/Ice/ami/AMI.java +++ b/java/test/src/main/java/test/Ice/ami/AMI.java @@ -1171,8 +1171,7 @@ public class AMI // if(p.ice_getConnection() != null) { - Ice.InitializationData initData = new Ice.InitializationData(); - initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); + Ice.InitializationData initData = app.createInitializationData(); initData.properties = communicator.getProperties()._clone(); Ice.Communicator ic = app.initialize(initData); Ice.ObjectPrx o = ic.stringToProxy(p.toString()); diff --git a/java/test/src/main/java/test/Ice/binding/AllTests.java b/java/test/src/main/java/test/Ice/binding/AllTests.java index 2217fcb247f..a52887b29b0 100644 --- a/java/test/src/main/java/test/Ice/binding/AllTests.java +++ b/java/test/src/main/java/test/Ice/binding/AllTests.java @@ -16,6 +16,7 @@ import test.Ice.binding.Test.RemoteCommunicatorPrxHelper; import test.Ice.binding.Test.RemoteObjectAdapterPrx; import test.Ice.binding.Test.TestIntfPrx; import test.Ice.binding.Test.TestIntfPrxHelper; +import test.Util.Application; public class AllTests { @@ -97,12 +98,15 @@ public class AllTests } public static void - allTests(Ice.Communicator communicator, PrintWriter out) + allTests(Application app) { + Ice.Communicator communicator = app.communicator(); + PrintWriter out = app.getWriter(); + String ref = "communicator:default -p 12010"; RemoteCommunicatorPrx com = RemoteCommunicatorPrxHelper.uncheckedCast(communicator.stringToProxy(ref)); - out.print("testing binding with single endpoint... "); + out.print("testing binding with single endpoint... "); out.flush(); { RemoteObjectAdapterPrx adapter = com.createObjectAdapter("Adapter", "default"); @@ -905,10 +909,9 @@ public class AllTests boolean ipv6NotSupported = false; for(Ice.Properties p : serverProps) { - Ice.InitializationData serverInitData = new Ice.InitializationData(); - serverInitData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); + Ice.InitializationData serverInitData = app.createInitializationData(); serverInitData.properties = p; - Ice.Communicator serverCommunicator = Ice.Util.initialize(serverInitData); + Ice.Communicator serverCommunicator = app.initialize(serverInitData); Ice.ObjectAdapter oa; try { @@ -933,10 +936,9 @@ public class AllTests String strPrx = oa.createProxy(serverCommunicator.stringToIdentity("dummy")).toString(); for(Ice.Properties q : clientProps) { - Ice.InitializationData clientInitData = new Ice.InitializationData(); - clientInitData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); + Ice.InitializationData clientInitData = app.createInitializationData(); clientInitData.properties = q; - Ice.Communicator clientCommunicator = Ice.Util.initialize(clientInitData); + Ice.Communicator clientCommunicator = app.initialize(clientInitData); Ice.ObjectPrx prx = clientCommunicator.stringToProxy(strPrx); try { diff --git a/java/test/src/main/java/test/Ice/binding/Client.java b/java/test/src/main/java/test/Ice/binding/Client.java index e566234255d..92a1cace7a0 100644 --- a/java/test/src/main/java/test/Ice/binding/Client.java +++ b/java/test/src/main/java/test/Ice/binding/Client.java @@ -14,7 +14,7 @@ public class Client extends test.Util.Application @Override public int run(String[] args) { - AllTests.allTests(communicator(), getWriter()); + AllTests.allTests(this); return 0; } diff --git a/java/test/src/main/java/test/Ice/classLoader/AllTests.java b/java/test/src/main/java/test/Ice/classLoader/AllTests.java index 3259d47e51d..036f6bb3728 100644 --- a/java/test/src/main/java/test/Ice/classLoader/AllTests.java +++ b/java/test/src/main/java/test/Ice/classLoader/AllTests.java @@ -89,8 +89,7 @@ public class AllTests { out.print("testing package... "); out.flush(); - Ice.InitializationData initData = new Ice.InitializationData(); - initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); + Ice.InitializationData initData = app.createInitializationData(); initData.properties = communicator.getProperties()._clone(); MyClassLoader classLoader = new MyClassLoader(initData.classLoader); initData.classLoader = classLoader; @@ -106,8 +105,7 @@ public class AllTests { out.print("testing plug-in... "); out.flush(); - Ice.InitializationData initData = new Ice.InitializationData(); - initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); + Ice.InitializationData initData = app.createInitializationData(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("Ice.Plugin.Test", "test.Ice.classLoader.PluginFactoryI"); MyClassLoader classLoader = new MyClassLoader(initData.classLoader); @@ -125,8 +123,7 @@ public class AllTests { out.print("testing IceSSL certificate verifier and password callback... "); out.flush(); - Ice.InitializationData initData = new Ice.InitializationData(); - initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); + Ice.InitializationData initData = app.createInitializationData(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("IceSSL.CertVerifier", "test.Ice.classLoader.CertificateVerifierI"); initData.properties.setProperty("IceSSL.PasswordCallback", "test.Ice.classLoader.PasswordCallbackI"); @@ -143,8 +140,7 @@ public class AllTests // Marshaling tests. // { - Ice.InitializationData initData = new Ice.InitializationData(); - initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); + Ice.InitializationData initData = app.createInitializationData(); initData.properties = communicator.getProperties()._clone(); MyClassLoader classLoader = new MyClassLoader(initData.classLoader); initData.classLoader = classLoader; diff --git a/java/test/src/main/java/test/Ice/interrupt/AllTests.java b/java/test/src/main/java/test/Ice/interrupt/AllTests.java index 69b7e218096..ce8a80fc25c 100644 --- a/java/test/src/main/java/test/Ice/interrupt/AllTests.java +++ b/java/test/src/main/java/test/Ice/interrupt/AllTests.java @@ -85,9 +85,11 @@ public class AllTests } public static void - allTests(test.Util.Application app, Ice.Communicator communicator, PrintWriter out) + allTests(test.Util.Application app) throws InterruptedException { + Ice.Communicator communicator = app.communicator(); + PrintWriter out = app.getWriter(); String sref = "test:default -p 12010"; Ice.ObjectPrx obj = communicator.stringToProxy(sref); test(obj != null); @@ -568,8 +570,7 @@ public class AllTests // // Check that CommunicatorDestroyedException is raised directly. // - Ice.InitializationData initData = new Ice.InitializationData(); - initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); + Ice.InitializationData initData = app.createInitializationData(); initData.properties = communicator.getProperties()._clone(); Ice.Communicator ic = app.initialize(initData); @@ -715,8 +716,7 @@ public class AllTests { final Thread mainThread = Thread.currentThread(); ExecutorService executor = java.util.concurrent.Executors.newFixedThreadPool(1); - Ice.InitializationData initData = new Ice.InitializationData(); - initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); + Ice.InitializationData initData = app.createInitializationData(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("ClientTestAdapter.Endpoints", "default -p 12030"); Ice.Communicator ic = app.initialize(initData); diff --git a/java/test/src/main/java/test/Ice/interrupt/Client.java b/java/test/src/main/java/test/Ice/interrupt/Client.java index 0f707e6ee75..f0cb88541bb 100644 --- a/java/test/src/main/java/test/Ice/interrupt/Client.java +++ b/java/test/src/main/java/test/Ice/interrupt/Client.java @@ -16,7 +16,7 @@ public class Client extends test.Util.Application { try { - AllTests.allTests(this, communicator(), getWriter()); + AllTests.allTests(this); } catch (InterruptedException e) { diff --git a/java/test/src/main/java/test/Ice/interrupt/Collocated.java b/java/test/src/main/java/test/Ice/interrupt/Collocated.java index 9f72490974c..02e0d75c672 100644 --- a/java/test/src/main/java/test/Ice/interrupt/Collocated.java +++ b/java/test/src/main/java/test/Ice/interrupt/Collocated.java @@ -24,7 +24,7 @@ public class Collocated extends test.Util.Application try { - AllTests.allTests(this, communicator(), getWriter()); + AllTests.allTests(this); } catch (InterruptedException e) { diff --git a/java/test/src/main/java/test/Ice/location/AllTests.java b/java/test/src/main/java/test/Ice/location/AllTests.java index da933f4cf17..561101dfa51 100644 --- a/java/test/src/main/java/test/Ice/location/AllTests.java +++ b/java/test/src/main/java/test/Ice/location/AllTests.java @@ -546,8 +546,7 @@ public class AllTests out.print("testing locator cache background updates... "); out.flush(); { - Ice.InitializationData initData = new Ice.InitializationData(); - initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); + Ice.InitializationData initData = app.createInitializationData(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("Ice.BackgroundLocatorCacheUpdates", "1"); Ice.Communicator ic = app.initialize(initData); diff --git a/java/test/src/main/java/test/Ice/operations/Twoways.java b/java/test/src/main/java/test/Ice/operations/Twoways.java index 0a2fba2ed99..7d9a5f09df3 100644 --- a/java/test/src/main/java/test/Ice/operations/Twoways.java +++ b/java/test/src/main/java/test/Ice/operations/Twoways.java @@ -843,8 +843,7 @@ class Twoways String[] impls = {"Shared", "PerThread"}; for(int i = 0; i < 2; i++) { - Ice.InitializationData initData = new Ice.InitializationData(); - initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); + Ice.InitializationData initData = app.createInitializationData(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("Ice.ImplicitContext", impls[i]); diff --git a/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java b/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java index df5a224a008..e1f817e98b3 100644 --- a/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java +++ b/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java @@ -1678,8 +1678,7 @@ class TwowaysAMI String[] impls = {"Shared", "PerThread"}; for(int i = 0; i < 2; i++) { - Ice.InitializationData initData = new Ice.InitializationData(); - initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); + Ice.InitializationData initData = app.createInitializationData(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("Ice.ImplicitContext", impls[i]); diff --git a/java/test/src/main/java/test/Ice/retry/Client.java b/java/test/src/main/java/test/Ice/retry/Client.java index 9c3ab3bcd26..e7417731e7f 100644 --- a/java/test/src/main/java/test/Ice/retry/Client.java +++ b/java/test/src/main/java/test/Ice/retry/Client.java @@ -25,11 +25,11 @@ public class Client extends test.Util.Application // + retry test, we need to configure a large retry interval // to avoid time-sensitive failures. // - Ice.InitializationData initData2 = new Ice.InitializationData(); + Ice.InitializationData initData2 = createInitializationData(); initData2.properties = communicator.getProperties()._clone(); initData2.properties.setProperty("Ice.RetryIntervals", "0 1 10000"); initData2.observer = instrumentation.getObserver(); - Ice.Communicator communicator2 = Ice.Util.initialize(initData2); + Ice.Communicator communicator2 = initialize(initData2); try { diff --git a/java/test/src/main/java/test/Ice/retry/Collocated.java b/java/test/src/main/java/test/Ice/retry/Collocated.java index d2aad14a32e..24eaea7ba70 100644 --- a/java/test/src/main/java/test/Ice/retry/Collocated.java +++ b/java/test/src/main/java/test/Ice/retry/Collocated.java @@ -33,11 +33,11 @@ public class Collocated extends test.Util.Application // + retry test, we need to configure a large retry interval // to avoid time-sensitive failures. // - Ice.InitializationData initData2 = new Ice.InitializationData(); + Ice.InitializationData initData2 = createInitializationData(); initData2.properties = communicator.getProperties()._clone(); initData2.properties.setProperty("Ice.RetryIntervals", "0 1 10000"); initData2.observer = instrumentation.getObserver(); - Ice.Communicator communicator2 = Ice.Util.initialize(initData2); + Ice.Communicator communicator2 = initialize(initData2); setupObjectAdapter(communicator); setupObjectAdapter(communicator2); diff --git a/java/test/src/main/java/test/Ice/timeout/AllTests.java b/java/test/src/main/java/test/Ice/timeout/AllTests.java index 0222be9e2de..394198a0012 100644 --- a/java/test/src/main/java/test/Ice/timeout/AllTests.java +++ b/java/test/src/main/java/test/Ice/timeout/AllTests.java @@ -365,8 +365,7 @@ public class AllTests // Test Ice.Override.Timeout. This property overrides all // endpoint timeouts. // - Ice.InitializationData initData = new Ice.InitializationData(); - initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); + Ice.InitializationData initData = app.createInitializationData(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("Ice.Override.Timeout", "100"); Ice.Communicator comm = app.initialize(initData); @@ -402,8 +401,7 @@ public class AllTests // // Test Ice.Override.ConnectTimeout. // - Ice.InitializationData initData = new Ice.InitializationData(); - initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); + Ice.InitializationData initData = app.createInitializationData(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("Ice.Override.ConnectTimeout", "250"); @@ -456,8 +454,7 @@ public class AllTests // // Test Ice.Override.CloseTimeout. // - Ice.InitializationData initData = new Ice.InitializationData(); - initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); + Ice.InitializationData initData = app.createInitializationData(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("Ice.Override.CloseTimeout", "100"); Ice.Communicator comm = app.initialize(initData); diff --git a/java/test/src/main/java/test/IceGrid/simple/AllTests.java b/java/test/src/main/java/test/IceGrid/simple/AllTests.java index 0288b56a179..0de0bd4cca0 100644 --- a/java/test/src/main/java/test/IceGrid/simple/AllTests.java +++ b/java/test/src/main/java/test/IceGrid/simple/AllTests.java @@ -25,8 +25,11 @@ public class AllTests } public static void - allTests(Ice.Communicator communicator, PrintWriter out) + allTests(test.Util.Application app) { + Ice.Communicator communicator = app.communicator(); + PrintWriter out = app.getWriter(); + out.print("testing stringToProxy... "); out.flush(); String ref = "test @ TestAdapter"; @@ -83,8 +86,7 @@ public class AllTests // Ensure the IceGrid discovery locator can discover the // registries and make sure locator requests are forwarded. // - Ice.InitializationData initData = new Ice.InitializationData(); - initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); + Ice.InitializationData initData = app.createInitializationData(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("Ice.Default.Locator", ""); initData.properties.setProperty("Ice.Plugin.IceGridDiscovery", "IceGrid:IceGrid.DiscoveryPluginFactoryI"); diff --git a/java/test/src/main/java/test/IceGrid/simple/Client.java b/java/test/src/main/java/test/IceGrid/simple/Client.java index 9fd18b7967e..a99e0b6d52f 100644 --- a/java/test/src/main/java/test/IceGrid/simple/Client.java +++ b/java/test/src/main/java/test/IceGrid/simple/Client.java @@ -27,7 +27,7 @@ public class Client extends test.Util.Application if(!withDeploy) { - AllTests.allTests(communicator, getWriter()); + AllTests.allTests(this); } else { |