diff options
Diffstat (limited to 'java')
141 files changed, 727 insertions, 560 deletions
diff --git a/java/src/Ice/src/main/java/Ice/ConnectionI.java b/java/src/Ice/src/main/java/Ice/ConnectionI.java index 57ec2b58b49..5a12142973e 100644 --- a/java/src/Ice/src/main/java/Ice/ConnectionI.java +++ b/java/src/Ice/src/main/java/Ice/ConnectionI.java @@ -2607,9 +2607,9 @@ public final class ConnectionI extends IceInternal.EventHandler case IceInternal.Protocol.replyMsg: { - IceInternal.TraceUtil.traceRecv(info.stream, _logger, _traceLevels); info.requestId = info.stream.readInt(); + IceInternal.OutgoingAsync outAsync = _asyncRequests.remove(info.requestId); if(outAsync != null && outAsync.completed(info.stream)) { @@ -2993,6 +2993,7 @@ public final class ConnectionI extends IceInternal.EventHandler s.append(_endpoint.protocol()); s.append("\n"); s.append(toString()); + _instance.initializationData().logger.trace(_instance.traceLevels().networkCat, s.toString()); } return op; diff --git a/java/src/Ice/src/main/java/IceInternal/EndpointHostResolver.java b/java/src/Ice/src/main/java/IceInternal/EndpointHostResolver.java index 896eb21b8a1..e0ea6773d1b 100644 --- a/java/src/Ice/src/main/java/IceInternal/EndpointHostResolver.java +++ b/java/src/Ice/src/main/java/IceInternal/EndpointHostResolver.java @@ -211,7 +211,12 @@ class EndpointHostResolver // Wait for the executor to terminate. try { - _executor.awaitTermination(Long.MAX_VALUE, java.util.concurrent.TimeUnit.NANOSECONDS); + while(!_executor.isTerminated()) + { + // A very long time. + _executor.awaitTermination(100000, java.util.concurrent.TimeUnit.SECONDS); + } + } finally { diff --git a/java/src/Ice/src/main/java/IceInternal/Instance.java b/java/src/Ice/src/main/java/IceInternal/Instance.java index ebe7dd118df..0fa1a9d77bc 100644 --- a/java/src/Ice/src/main/java/IceInternal/Instance.java +++ b/java/src/Ice/src/main/java/IceInternal/Instance.java @@ -129,7 +129,11 @@ public final class Instance throws InterruptedException { shutdown(); - awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS); + while(!isTerminated()) + { + // A very long time. + awaitTermination(100000, java.util.concurrent.TimeUnit.SECONDS); + } } private final ThreadObserverHelper _observerHelper; @@ -727,6 +731,12 @@ public final class Instance return Util.findClass(className, _initData.classLoader); } + public ClassLoader + getClassLoader() + { + return _initData.classLoader; + } + public synchronized String getClassForType(String type) { @@ -991,7 +1001,9 @@ public final class Instance // // If Ice.ThreadInterruptSafe is set or we're running on Android all - // IO is done on the background thread. + // IO is done on the background thread. For Android we use the queue + // executor as Android doesn't allow any network invocations on the main + // thread even if the call is non-blocking. // if(_initData.properties.getPropertyAsInt("Ice.ThreadInterruptSafe") > 0 || Util.isAndroid()) { @@ -1342,7 +1354,11 @@ public final class Instance } if(_timer != null) { - _timer.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS); + while(!_timer.isTerminated()) + { + // A very long time. + _timer.awaitTermination(100000, java.util.concurrent.TimeUnit.SECONDS); + } } } catch(InterruptedException ex) diff --git a/java/src/Ice/src/main/java/IceInternal/StreamSocket.java b/java/src/Ice/src/main/java/IceInternal/StreamSocket.java index 9ab185a42d5..c0be3b3ba61 100644 --- a/java/src/Ice/src/main/java/IceInternal/StreamSocket.java +++ b/java/src/Ice/src/main/java/IceInternal/StreamSocket.java @@ -11,11 +11,12 @@ package IceInternal; public class StreamSocket { - public StreamSocket(ProtocolInstance instance, + public StreamSocket(ProtocolInstance instance, NetworkProxy proxy, java.net.InetSocketAddress addr, java.net.InetSocketAddress sourceAddr) { + _instance = instance; _proxy = proxy; _addr = addr; _fd = Network.createTcpSocket(); @@ -23,7 +24,7 @@ public class StreamSocket try { - init(instance); + init(); if(Network.doConnect(_fd, _proxy != null ? _proxy.getAddress() : _addr, sourceAddr)) { _state = StateConnected; @@ -41,6 +42,7 @@ public class StreamSocket public StreamSocket(ProtocolInstance instance, java.nio.channels.SocketChannel fd) { + _instance = instance; _proxy = null; _addr = null; _fd = fd; @@ -48,7 +50,7 @@ public class StreamSocket try { - init(instance); + init(); } catch(Exception ex) { @@ -174,11 +176,7 @@ public class StreamSocket assert(_fd != null); int read = 0; - if(_buffer != null && _buffer.hasRemaining()) - { - read = readBuffered(buf); - } - + while(buf.hasRemaining()) { try @@ -192,7 +190,7 @@ public class StreamSocket { return read; } - + read += ret; } catch(java.io.InterruptedIOException ex) @@ -274,10 +272,10 @@ public class StreamSocket return _desc; } - private void init(ProtocolInstance instance) + private void init() { Network.setBlock(_fd, false); - Network.setTcpBufSize(_fd, instance.properties(), instance.logger()); + Network.setTcpBufSize(_fd, _instance.properties(), _instance.logger()); if(System.getProperty("os.name").startsWith("Windows")) { @@ -294,28 +292,6 @@ public class StreamSocket } } - private int readBuffered(java.nio.ByteBuffer buf) - { - assert(_buffer != null); - int length = buf.remaining(); - if(length < _buffer.remaining()) - { - int limit = _buffer.limit(); - _buffer.limit(_buffer.position() + length); - buf.put(_buffer); - _buffer.position(_buffer.limit()); - _buffer.limit(limit); - return length; - } - else - { - int read = _buffer.remaining(); - buf.put(_buffer); - _buffer.clear(); - return read; - } - } - private int toState(int operation) { switch(operation) @@ -329,6 +305,8 @@ public class StreamSocket } } + private final ProtocolInstance _instance; + final private NetworkProxy _proxy; final private java.net.InetSocketAddress _addr; @@ -336,7 +314,6 @@ public class StreamSocket private int _maxSendPacketSize; private int _state; private String _desc; - private java.nio.ByteBuffer _buffer; private static final int StateNeedConnect = 0; private static final int StateConnectPending = 1; diff --git a/java/src/Ice/src/main/java/IceInternal/TraceUtil.java b/java/src/Ice/src/main/java/IceInternal/TraceUtil.java index f3c269aa9d5..6af4c41de3b 100644 --- a/java/src/Ice/src/main/java/IceInternal/TraceUtil.java +++ b/java/src/Ice/src/main/java/IceInternal/TraceUtil.java @@ -303,7 +303,7 @@ public final class TraceUtil try { byte mode = stream.readByte(); - out.write("\nmode = " + (int)mode + ' '); + out.write("\nmode = " + (int) mode + ' '); switch(Ice.OperationMode.values()[mode]) { case Normal: @@ -337,7 +337,7 @@ public final class TraceUtil { String key = stream.readString(); String value = stream.readString(); - out.write(key + '/'+ value); + out.write(key + '/' + value); if(sz > 0) { out.write(", "); diff --git a/java/src/Ice/src/main/java/IceSSL/SSLEngine.java b/java/src/Ice/src/main/java/IceSSL/SSLEngine.java index 5601d3f2312..9e121635fc8 100644 --- a/java/src/Ice/src/main/java/IceSSL/SSLEngine.java +++ b/java/src/Ice/src/main/java/IceSSL/SSLEngine.java @@ -48,7 +48,7 @@ class SSLEngine // Protocols selects which protocols to enable, by default we only enable TLS1.0 // TLS1.1 and TLS1.2 to avoid security issues with SSLv3 // - String[] protocols = + String[] protocols = properties.getPropertyAsListWithDefault(prefix + "Protocols", new String[]{"tls1_0", "tls1_1", "tls1_2"}); if(protocols.length != 0) { diff --git a/java/src/Ice/src/main/java/IceSSL/TransceiverI.java b/java/src/Ice/src/main/java/IceSSL/TransceiverI.java index 937d6cea068..7799dcf2caa 100644 --- a/java/src/Ice/src/main/java/IceSSL/TransceiverI.java +++ b/java/src/Ice/src/main/java/IceSSL/TransceiverI.java @@ -184,14 +184,17 @@ final class TransceiverI implements IceInternal.Transceiver _netInput.flip(); SSLEngineResult result = _engine.unwrap(_netInput, _appInput); _netInput.compact(); - switch(result.getStatus()) - { - case BUFFER_OVERFLOW: + + Status status = result.getStatus(); + assert status != Status.BUFFER_OVERFLOW; + + if(status == Status.CLOSED) { - assert(false); - break; + throw new Ice.ConnectionLostException(); } - case BUFFER_UNDERFLOW: + // Android API 21 SSLEngine doesn't report underflow, so look at the absence of + // network data and application data to signal a network read. + else if(status == Status.BUFFER_UNDERFLOW || (_appInput.position() == 0 && _netInput.position() == 0)) { if(_stream.read(_netInput) == 0) { @@ -199,15 +202,6 @@ final class TransceiverI implements IceInternal.Transceiver } continue; } - case CLOSED: - { - throw new Ice.ConnectionLostException(); - } - case OK: - { - break; - } - } fill(buf.b); } @@ -220,7 +214,8 @@ final class TransceiverI implements IceInternal.Transceiver // // Return a boolean to indicate whether more data is available. // - moreData.value = _netInput.position() > 0; + moreData.value = _netInput.position() > 0 || _appInput.position() > 0; + return IceInternal.SocketOperation.None; } @@ -325,7 +320,7 @@ final class TransceiverI implements IceInternal.Transceiver try { HandshakeStatus status = _engine.getHandshakeStatus(); - while(true) + while(!_engine.isOutboundDone() && !_engine.isInboundDone()) { SSLEngineResult result = null; switch(status) @@ -347,6 +342,11 @@ final class TransceiverI implements IceInternal.Transceiver } case NEED_UNWRAP: { + if(_netInput.position() == 0 && _stream.read(_netInput) == 0) + { + return IceInternal.SocketOperation.Read; + } + // // The engine needs more data. We might already have enough data in // the _netInput buffer to satisfy the engine. If not, the engine @@ -396,6 +396,7 @@ final class TransceiverI implements IceInternal.Transceiver { return IceInternal.SocketOperation.Write; } + // // FINISHED is only returned from wrap or unwrap, not from engine.getHandshakeResult(). // @@ -427,6 +428,7 @@ final class TransceiverI implements IceInternal.Transceiver { throw new Ice.SecurityException("IceSSL: handshake error", ex); } + return IceInternal.SocketOperation.None; } private int writeNonBlocking(ByteBuffer buf) @@ -445,6 +447,7 @@ final class TransceiverI implements IceInternal.Transceiver // // Encrypt the buffer. // + int position = _netOutput.position(); SSLEngineResult result = _engine.wrap(buf, _netOutput); switch(result.getStatus()) { diff --git a/java/test/src/main/java/test/Freeze/evictor/Client.java b/java/test/src/main/java/test/Freeze/evictor/Client.java index 82f8c8c3265..4de8cf8b1bc 100644 --- a/java/test/src/main/java/test/Freeze/evictor/Client.java +++ b/java/test/src/main/java/test/Freeze/evictor/Client.java @@ -1040,7 +1040,7 @@ public class Client extends test.Util.Application protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Freeze.evictor"); return initData; diff --git a/java/test/src/main/java/test/Freeze/evictor/Server.java b/java/test/src/main/java/test/Freeze/evictor/Server.java index e457fdf619e..f296e288d86 100644 --- a/java/test/src/main/java/test/Freeze/evictor/Server.java +++ b/java/test/src/main/java/test/Freeze/evictor/Server.java @@ -85,7 +85,7 @@ public class Server extends test.Util.Application protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Evictor.Endpoints", "default -p 12010"); initData.properties.setProperty("Ice.Package.Test", "test.Freeze.evictor"); diff --git a/java/test/src/main/java/test/Glacier2/router/Client.java b/java/test/src/main/java/test/Glacier2/router/Client.java index 257e81c12cd..4a05d8eb0cb 100644 --- a/java/test/src/main/java/test/Glacier2/router/Client.java +++ b/java/test/src/main/java/test/Glacier2/router/Client.java @@ -463,7 +463,7 @@ public class Client extends test.Util.Application protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Warn.Dispatch", "0"); initData.properties.setProperty("Ice.Warn.Connections", "0"); diff --git a/java/test/src/main/java/test/Glacier2/router/Server.java b/java/test/src/main/java/test/Glacier2/router/Server.java index 78ad7b573ce..e2182c1a091 100644 --- a/java/test/src/main/java/test/Glacier2/router/Server.java +++ b/java/test/src/main/java/test/Glacier2/router/Server.java @@ -32,7 +32,7 @@ public class Server extends test.Util.Application protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Glacier2.router"); diff --git a/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java b/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java index f61f84d0051..64ac7dafdf0 100644 --- a/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java +++ b/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java @@ -34,7 +34,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - _initData = new Ice.InitializationData(); + _initData = createInitializationData(); _initData.properties = Ice.Util.createProperties(argsH); _initData.properties.setProperty("Ice.Default.Router", "Glacier2/router:default -p 12347"); _initData.dispatcher = new Ice.Dispatcher() diff --git a/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java b/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java index d0cfd717a14..0429387cb80 100644 --- a/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java +++ b/java/test/src/main/java/test/Glacier2/sessionHelper/Server.java @@ -25,7 +25,7 @@ public class Server extends test.Util.Application protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Glacier2.router"); 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 a700cdb26b6..4a219511f65 100644 --- a/java/test/src/main/java/test/Ice/acm/AllTests.java +++ b/java/test/src/main/java/test/Ice/acm/AllTests.java @@ -16,9 +16,11 @@ import test.Ice.acm.Test.RemoteCommunicatorPrxHelper; import test.Ice.acm.Test.RemoteObjectAdapterPrx; import test.Ice.acm.Test.TestIntfPrx; import test.Ice.acm.Test.TestIntfPrxHelper; +import test.Util.Application; public class AllTests { + private static Ice.Communicator communicator; private static void test(boolean b) { @@ -118,8 +120,9 @@ public class AllTests static abstract class TestCase implements Ice.ConnectionCallback { - public TestCase(String name, RemoteCommunicatorPrx com, java.io.PrintWriter out) + public TestCase(Application app, String name, RemoteCommunicatorPrx com, PrintWriter out) { + _app = app; _name = name; _com = com; _logger = new LoggerI(out); @@ -141,7 +144,8 @@ public class AllTests _adapter = _com.createObjectAdapter(_serverACMTimeout, _serverACMClose, _serverACMHeartbeat); Ice.InitializationData initData = new Ice.InitializationData(); - initData.properties = _com.ice_getCommunicator().getProperties()._clone(); + initData.classLoader = IceInternal.Util.getInstance(_app.communicator()).getClassLoader(); + initData.properties = _app.communicator().getProperties()._clone(); initData.logger = _logger; initData.properties.setProperty("Ice.ACM.Timeout", "1"); if(_clientACMTimeout >= 0) @@ -158,7 +162,7 @@ public class AllTests } //initData.properties.setProperty("Ice.Trace.Protocol", "2"); //initData.properties.setProperty("Ice.Trace.Network", "2"); - _communicator = Ice.Util.initialize(initData); + _communicator = _app.initialize(initData); _thread = new Thread( new Runnable() @@ -247,6 +251,7 @@ public class AllTests _serverACMHeartbeat = heartbeat; } + private final Application _app; private String _name; private RemoteCommunicatorPrx _com; private String _msg; @@ -269,9 +274,9 @@ public class AllTests static class InvocationHeartbeatTest extends TestCase { - public InvocationHeartbeatTest(RemoteCommunicatorPrx com, java.io.PrintWriter out) + public InvocationHeartbeatTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out) { - super("invocation heartbeat", com, out); + super(app, "invocation heartbeat", com, out); } public void runTestCase(RemoteObjectAdapterPrx adapter, TestIntfPrx proxy) @@ -279,13 +284,13 @@ public class AllTests proxy.sleep(2); test(_heartbeat >= 2); } - }; + } static class InvocationHeartbeatOnHoldTest extends TestCase { - public InvocationHeartbeatOnHoldTest(RemoteCommunicatorPrx com, java.io.PrintWriter out) + public InvocationHeartbeatOnHoldTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out) { - super("invocation with heartbeat on hold", com, out); + super(app, "invocation with heartbeat on hold", com, out); // Use default ACM configuration. } @@ -310,13 +315,13 @@ public class AllTests } } } - }; + } static class InvocationNoHeartbeatTest extends TestCase { - public InvocationNoHeartbeatTest(RemoteCommunicatorPrx com, java.io.PrintWriter out) + public InvocationNoHeartbeatTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out) { - super("invocation with no heartbeat", com, out); + super(app, "invocation with no heartbeat", com, out); setServerACM(1, 2, 0); // Disable heartbeat on invocations } @@ -341,13 +346,13 @@ public class AllTests } } } - }; + } static class InvocationHeartbeatCloseOnIdleTest extends TestCase { - public InvocationHeartbeatCloseOnIdleTest(RemoteCommunicatorPrx com, java.io.PrintWriter out) + public InvocationHeartbeatCloseOnIdleTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out) { - super("invocation with no heartbeat and close on idle", com, out); + super(app, "invocation with no heartbeat and close on idle", com, out); setClientACM(1, 1, 0); // Only close on idle. setServerACM(1, 2, 0); // Disable heartbeat on invocations } @@ -364,13 +369,13 @@ public class AllTests test(!_closed); } } - }; + } static class CloseOnIdleTest extends TestCase { - public CloseOnIdleTest(RemoteCommunicatorPrx com, java.io.PrintWriter out) + public CloseOnIdleTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out) { - super("close on idle", com, out); + super(app, "close on idle", com, out); setClientACM(1, 1, 0); // Only close on idle } @@ -390,13 +395,13 @@ public class AllTests test(_closed); } } - }; + } static class CloseOnInvocationTest extends TestCase { - public CloseOnInvocationTest(RemoteCommunicatorPrx com, java.io.PrintWriter out) + public CloseOnInvocationTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out) { - super("close on invocation", com, out); + super(app, "close on invocation", com, out); setClientACM(1, 2, 0); // Only close on invocation } @@ -416,13 +421,13 @@ public class AllTests test(!_closed); } } - }; + } static class CloseOnIdleAndInvocationTest extends TestCase { - public CloseOnIdleAndInvocationTest(RemoteCommunicatorPrx com, java.io.PrintWriter out) + public CloseOnIdleAndInvocationTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out) { - super("close on idle and invocation", com, out); + super(app, "close on idle and invocation", com, out); setClientACM(1, 3, 0); // Only close on idle and invocation } @@ -462,13 +467,13 @@ public class AllTests test(_closed); // Connection should be closed this time. } } - }; + } static class ForcefulCloseOnIdleAndInvocationTest extends TestCase { - public ForcefulCloseOnIdleAndInvocationTest(RemoteCommunicatorPrx com, java.io.PrintWriter out) + public ForcefulCloseOnIdleAndInvocationTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out) { - super("forceful close on idle and invocation", com, out); + super(app, "forceful close on idle and invocation", com, out); setClientACM(1, 4, 0); // Only close on idle and invocation } @@ -489,13 +494,13 @@ public class AllTests test(_closed); // Connection closed forcefully by ACM } } - }; + } static class HeartbeatOnIdleTest extends TestCase { - public HeartbeatOnIdleTest(RemoteCommunicatorPrx com, java.io.PrintWriter out) + public HeartbeatOnIdleTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out) { - super("heartbeat on idle", com, out); + super(app, "heartbeat on idle", com, out); setServerACM(1, -1, 2); // Enable server heartbeats. } @@ -514,13 +519,13 @@ public class AllTests test(_heartbeat >= 3); } } - }; + } static class HeartbeatAlwaysTest extends TestCase { - public HeartbeatAlwaysTest(RemoteCommunicatorPrx com, java.io.PrintWriter out) + public HeartbeatAlwaysTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out) { - super("heartbeat always", com, out); + super(app, "heartbeat always", com, out); setServerACM(1, -1, 3); // Enable server heartbeats. } @@ -543,13 +548,13 @@ public class AllTests test(_heartbeat >= 3); } } - }; + } static class SetACMTest extends TestCase { - public SetACMTest(RemoteCommunicatorPrx com, java.io.PrintWriter out) + public SetACMTest(Application app, RemoteCommunicatorPrx com, java.io.PrintWriter out) { - super("setACM/getACM", com, out); + super(app, "setACM/getACM", com, out); setClientACM(15, 4, 2); } @@ -576,29 +581,30 @@ public class AllTests test(acm.close == Ice.ACMClose.CloseOnInvocationAndIdle); test(acm.heartbeat == Ice.ACMHeartbeat.HeartbeatOnInvocation); } - }; + } public static void - allTests(Ice.Communicator communicator, PrintWriter out) + allTests(test.Util.Application app, PrintWriter out) { + Ice.Communicator communicator = app.communicator(); String ref = "communicator:default -p 12010"; RemoteCommunicatorPrx com = RemoteCommunicatorPrxHelper.uncheckedCast(communicator.stringToProxy(ref)); java.util.List<TestCase> tests = new java.util.ArrayList<TestCase>(); - tests.add(new InvocationHeartbeatTest(com, out)); - tests.add(new InvocationHeartbeatOnHoldTest(com, out)); - tests.add(new InvocationNoHeartbeatTest(com, out)); - tests.add(new InvocationHeartbeatCloseOnIdleTest(com, out)); + tests.add(new InvocationHeartbeatTest(app, com, out)); + tests.add(new InvocationHeartbeatOnHoldTest(app, com, out)); + tests.add(new InvocationNoHeartbeatTest(app, com, out)); + tests.add(new InvocationHeartbeatCloseOnIdleTest(app, com, out)); - tests.add(new CloseOnIdleTest(com, out)); - tests.add(new CloseOnInvocationTest(com, out)); - tests.add(new CloseOnIdleAndInvocationTest(com, out)); - tests.add(new ForcefulCloseOnIdleAndInvocationTest(com, out)); + tests.add(new CloseOnIdleTest(app, com, out)); + tests.add(new CloseOnInvocationTest(app, com, out)); + tests.add(new CloseOnIdleAndInvocationTest(app, com, out)); + tests.add(new ForcefulCloseOnIdleAndInvocationTest(app, com, out)); - tests.add(new HeartbeatOnIdleTest(com, out)); - tests.add(new HeartbeatAlwaysTest(com, out)); - tests.add(new SetACMTest(com, out)); + tests.add(new HeartbeatOnIdleTest(app, com, out)); + tests.add(new HeartbeatAlwaysTest(app, com, out)); + tests.add(new SetACMTest(app, com, out)); for(TestCase test : tests) { diff --git a/java/test/src/main/java/test/Ice/acm/Client.java b/java/test/src/main/java/test/Ice/acm/Client.java index c6045f9a6ca..192716c7817 100644 --- a/java/test/src/main/java/test/Ice/acm/Client.java +++ b/java/test/src/main/java/test/Ice/acm/Client.java @@ -13,13 +13,13 @@ public class Client extends test.Util.Application { public int run(String[] args) { - AllTests.allTests(communicator(), getWriter()); + AllTests.allTests(this, getWriter()); return 0; } protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.acm"); initData.properties.setProperty("Ice.Warn.Connections", "0"); diff --git a/java/test/src/main/java/test/Ice/acm/Server.java b/java/test/src/main/java/test/Ice/acm/Server.java index e267b9fa498..9b98038e083 100644 --- a/java/test/src/main/java/test/Ice/acm/Server.java +++ b/java/test/src/main/java/test/Ice/acm/Server.java @@ -28,7 +28,7 @@ public class Server extends test.Util.Application protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.acm"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); 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 05cbc8f3d59..09dfee83406 100644 --- a/java/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java +++ b/java/test/src/main/java/test/Ice/adapterDeactivation/AllTests.java @@ -24,8 +24,9 @@ public class AllTests } public static TestIntfPrx - allTests(Ice.Communicator communicator, java.io.PrintWriter out) + allTests(test.Util.Application app, java.io.PrintWriter out) { + Ice.Communicator communicator = app.communicator(); out.print("testing stringToProxy... "); out.flush(); String ref = "test:default -p 12010"; @@ -73,8 +74,9 @@ public class AllTests for(int i = 0; i < 10; ++i) { Ice.InitializationData initData = new Ice.InitializationData(); + initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); initData.properties = communicator.getProperties()._clone(); - Ice.Communicator comm = Ice.Util.initialize(initData); + Ice.Communicator comm = app.initialize(initData); comm.stringToProxy("test:default -p 12010").begin_ice_ping(); comm.destroy(); } diff --git a/java/test/src/main/java/test/Ice/adapterDeactivation/Client.java b/java/test/src/main/java/test/Ice/adapterDeactivation/Client.java index d5e66de93b6..98c362fa1b6 100644 --- a/java/test/src/main/java/test/Ice/adapterDeactivation/Client.java +++ b/java/test/src/main/java/test/Ice/adapterDeactivation/Client.java @@ -14,13 +14,13 @@ public class Client extends test.Util.Application public int run(String[] args) { - AllTests.allTests(communicator(), getWriter()); + AllTests.allTests(this, getWriter()); return 0; } protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.adapterDeactivation"); return initData; diff --git a/java/test/src/main/java/test/Ice/adapterDeactivation/Collocated.java b/java/test/src/main/java/test/Ice/adapterDeactivation/Collocated.java index 2ddd551b6ac..1b440ea3beb 100644 --- a/java/test/src/main/java/test/Ice/adapterDeactivation/Collocated.java +++ b/java/test/src/main/java/test/Ice/adapterDeactivation/Collocated.java @@ -18,7 +18,7 @@ public class Collocated extends test.Util.Application Ice.ServantLocator locator = new ServantLocatorI(); adapter.addServantLocator(locator, ""); - AllTests.allTests(communicator(), getWriter()); + AllTests.allTests(this, getWriter()); adapter.waitForDeactivate(); return 0; @@ -26,9 +26,9 @@ public class Collocated extends test.Util.Application protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); - if(initData.properties.getPropertyAsInt("Ice.ThreadInterruptSafe") > 0) + if(initData.properties.getPropertyAsInt("Ice.ThreadInterruptSafe") > 0 || isAndroid()) { initData.properties.setProperty("Ice.ThreadPool.Server.Size", "2"); } diff --git a/java/test/src/main/java/test/Ice/adapterDeactivation/Server.java b/java/test/src/main/java/test/Ice/adapterDeactivation/Server.java index 56d9ccd5c6b..60cdba6b7c6 100644 --- a/java/test/src/main/java/test/Ice/adapterDeactivation/Server.java +++ b/java/test/src/main/java/test/Ice/adapterDeactivation/Server.java @@ -26,7 +26,7 @@ public class Server extends test.Util.Application protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.adapterDeactivation"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); diff --git a/java/test/src/main/java/test/Ice/admin/AllTests.java b/java/test/src/main/java/test/Ice/admin/AllTests.java index abc85ce0b86..93e72d1ccd0 100644 --- a/java/test/src/main/java/test/Ice/admin/AllTests.java +++ b/java/test/src/main/java/test/Ice/admin/AllTests.java @@ -108,7 +108,7 @@ public class AllTests // // Test: Exercise addAdminFacet, findAdminFacet, removeAdminFacet with a typical configuration. // - Ice.InitializationData init = new Ice.InitializationData(); + Ice.InitializationData init = app.createInitializationData(); init.properties = Ice.Util.createProperties(); init.properties.setProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1"); init.properties.setProperty("Ice.Admin.InstanceName", "Test"); @@ -120,7 +120,7 @@ public class AllTests // // Test: Verify that the operations work correctly in the presence of facet filters. // - Ice.InitializationData init = new Ice.InitializationData(); + Ice.InitializationData init = app.createInitializationData(); init.properties = Ice.Util.createProperties(); init.properties.setProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1"); init.properties.setProperty("Ice.Admin.InstanceName", "Test"); @@ -141,7 +141,7 @@ public class AllTests // // Test: Verify that the operations work correctly when Ice.Admin.Enabled is set // - Ice.InitializationData init = new Ice.InitializationData(); + Ice.InitializationData init = app.createInitializationData(); init.properties = Ice.Util.createProperties(); init.properties.setProperty("Ice.Admin.Enabled", "1"); Ice.Communicator com = Ice.Util.initialize(init); @@ -167,7 +167,7 @@ public class AllTests // // Test: Verify that the operations work correctly when creation of the Admin object is delayed. // - Ice.InitializationData init = new Ice.InitializationData(); + Ice.InitializationData init = app.createInitializationData(); init.properties = Ice.Util.createProperties(); init.properties.setProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1"); init.properties.setProperty("Ice.Admin.InstanceName", "Test"); diff --git a/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java b/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java index 3100081f816..64242e524be 100644 --- a/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java +++ b/java/test/src/main/java/test/Ice/admin/RemoteCommunicatorFactoryI.java @@ -19,16 +19,17 @@ public class RemoteCommunicatorFactoryI extends _RemoteCommunicatorFactoryDisp // // Prepare the property set using the given properties. // - Ice.InitializationData init = new Ice.InitializationData(); - init.properties = Ice.Util.createProperties(); + Ice.InitializationData initData = new Ice.InitializationData(); + initData.classLoader = IceInternal.Util.getInstance(current.adapter.getCommunicator()).getClassLoader(); + initData.properties = Ice.Util.createProperties(); for(java.util.Map.Entry<String, String> e : props.entrySet()) { - init.properties.setProperty(e.getKey(), e.getValue()); + initData.properties.setProperty(e.getKey(), e.getValue()); } - if(init.properties.getPropertyAsInt("NullLogger") > 0) + if(initData.properties.getPropertyAsInt("NullLogger") > 0) { - init.logger = new Ice.Logger() { + initData.logger = new Ice.Logger() { @Override public void print(String message) { } @@ -60,7 +61,7 @@ public class RemoteCommunicatorFactoryI extends _RemoteCommunicatorFactoryDisp // // Initialize a new communicator. // - Ice.Communicator communicator = Ice.Util.initialize(init); + Ice.Communicator communicator = Ice.Util.initialize(initData); // // Install a custom admin facet. diff --git a/java/test/src/main/java/test/Ice/admin/Server.java b/java/test/src/main/java/test/Ice/admin/Server.java index a29e6a6d5a2..0f9b4222509 100644 --- a/java/test/src/main/java/test/Ice/admin/Server.java +++ b/java/test/src/main/java/test/Ice/admin/Server.java @@ -24,7 +24,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.proxy"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); 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 14384350c7f..4b35e6b0363 100644 --- a/java/test/src/main/java/test/Ice/ami/AMI.java +++ b/java/test/src/main/java/test/Ice/ami/AMI.java @@ -23,6 +23,33 @@ import test.Util.Application; public class AMI { + private static class Counter + { + private int _count = 0; + + synchronized void decrement() + { + --_count; + if(_count == 0) + { + notifyAll(); + } + } + + synchronized void increment() + { + ++_count; + } + + synchronized void waitComplete() throws InterruptedException + { + while(_count > 0) + { + wait(); + } + } + } + private static void test(boolean b) { @@ -1145,6 +1172,7 @@ public class AMI if(p.ice_getConnection() != null) { Ice.InitializationData initData = new Ice.InitializationData(); + initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); initData.properties = communicator.getProperties()._clone(); Ice.Communicator ic = app.initialize(initData); Ice.ObjectPrx o = ic.stringToProxy(p.toString()); @@ -1366,146 +1394,146 @@ public class AMI final SentCallback cb = new SentCallback(); p.begin_ice_isA("", new Ice.Callback_Object_ice_isA() + { + @Override + public void + response(boolean r) { - @Override - public void - response(boolean r) - { - cb.isA(r); - } + cb.isA(r); + } - @Override - public void - exception(Ice.LocalException ex) - { - cb.ex(ex); - } + @Override + public void + exception(Ice.LocalException ex) + { + cb.ex(ex); + } - @Override - public void - sent(boolean ss) - { - cb.sent(ss); - } - }); + @Override + public void + sent(boolean ss) + { + cb.sent(ss); + } + }); cb.check(); p.begin_ice_ping(new Ice.Callback_Object_ice_ping() + { + @Override + public void + response() { - @Override - public void - response() - { - cb.ping(); - } + cb.ping(); + } - @Override - public void - exception(Ice.LocalException ex) - { - cb.ex(ex); - } + @Override + public void + exception(Ice.LocalException ex) + { + cb.ex(ex); + } - @Override - public void - sent(boolean ss) - { - cb.sent(ss); - } - }); + @Override + public void + sent(boolean ss) + { + cb.sent(ss); + } + }); cb.check(); p.begin_ice_id(new Ice.Callback_Object_ice_id() + { + @Override + public void + response(String id) { - @Override - public void - response(String id) - { - cb.id(id); - } + cb.id(id); + } - @Override - public void - exception(Ice.LocalException ex) - { - cb.ex(ex); - } + @Override + public void + exception(Ice.LocalException ex) + { + cb.ex(ex); + } - @Override - public void - sent(boolean ss) - { - cb.sent(ss); - } - }); + @Override + public void + sent(boolean ss) + { + cb.sent(ss); + } + }); cb.check(); p.begin_ice_ids(new Ice.Callback_Object_ice_ids() + { + @Override + public void + response(String[] ids) { - @Override - public void - response(String[] ids) - { - cb.ids(ids); - } + cb.ids(ids); + } - @Override - public void - exception(Ice.LocalException ex) - { - cb.ex(ex); - } + @Override + public void + exception(Ice.LocalException ex) + { + cb.ex(ex); + } - @Override - public void - sent(boolean ss) - { - cb.sent(ss); - } - }); + @Override + public void + sent(boolean ss) + { + cb.sent(ss); + } + }); cb.check(); p.begin_op(new Callback_TestIntf_op() + { + @Override + public void + response() { - @Override - public void - response() - { - cb.op(); - } + cb.op(); + } - @Override - public void - exception(Ice.LocalException ex) - { - cb.ex(ex); - } + @Override + public void + exception(Ice.LocalException ex) + { + cb.ex(ex); + } - @Override - public void - sent(boolean ss) - { - cb.sent(ss); - } - }); + @Override + public void + sent(boolean ss) + { + cb.sent(ss); + } + }); cb.check(); p.begin_op(new Ice.Callback() + { + @Override + public void + completed(Ice.AsyncResult result) { - @Override - public void - completed(Ice.AsyncResult result) - { - cb.opAsync(result); - } + cb.opAsync(result); + } - @Override - public void - sent(Ice.AsyncResult result) - { - cb.sent(result); - } - }); + @Override + public void + sent(Ice.AsyncResult result) + { + cb.sent(result); + } + }); cb.check(); java.util.List<SentCallback> cbs = new java.util.ArrayList<SentCallback>(); @@ -1513,33 +1541,38 @@ public class AMI new java.util.Random().nextBytes(seq); // Make sure the request doesn't compress too well. Ice.AsyncResult r; testController.holdAdapter(); + + final Counter counter = new Counter(); try { do { final SentCallback cb2 = new SentCallback(); r = p.begin_opWithPayload(seq, new Callback_TestIntf_opWithPayload() + { + @Override + public void + response() { - @Override - public void - response() - { - } - - @Override - public void - exception(Ice.LocalException ex) - { - cb2.ex(ex); - } + counter.decrement(); + } - @Override - public void - sent(boolean ss) - { - cb2.sent(ss); - } - }); + @Override + public void + exception(Ice.LocalException ex) + { + counter.decrement(); + cb2.ex(ex); + } + + @Override + public void + sent(boolean ss) + { + cb2.sent(ss); + } + }); + counter.increment(); cbs.add(cb2); } while(r.sentSynchronously()); @@ -1552,6 +1585,13 @@ public class AMI { cb3.check(); } + try + { + counter.waitComplete(); + } + catch(InterruptedException e) + { + } } out.println("ok"); diff --git a/java/test/src/main/java/test/Ice/ami/Client.java b/java/test/src/main/java/test/Ice/ami/Client.java index 3e547a17ec0..5aeff920530 100644 --- a/java/test/src/main/java/test/Ice/ami/Client.java +++ b/java/test/src/main/java/test/Ice/ami/Client.java @@ -21,7 +21,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.ami"); initData.properties.setProperty("Ice.Warn.AMICallback", "0"); diff --git a/java/test/src/main/java/test/Ice/ami/Collocated.java b/java/test/src/main/java/test/Ice/ami/Collocated.java index 227ccb25457..ae593ec9cf1 100644 --- a/java/test/src/main/java/test/Ice/ami/Collocated.java +++ b/java/test/src/main/java/test/Ice/ami/Collocated.java @@ -29,7 +29,7 @@ public class Collocated extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.ami"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/ami/Server.java b/java/test/src/main/java/test/Ice/ami/Server.java index b22e052fa06..3a78eb875e7 100644 --- a/java/test/src/main/java/test/Ice/ami/Server.java +++ b/java/test/src/main/java/test/Ice/ami/Server.java @@ -29,7 +29,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.ami"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/background/Client.java b/java/test/src/main/java/test/Ice/background/Client.java index 1955472ebab..98aa68487b8 100644 --- a/java/test/src/main/java/test/Ice/background/Client.java +++ b/java/test/src/main/java/test/Ice/background/Client.java @@ -30,7 +30,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); // For this test, we want to disable retries. @@ -41,7 +41,6 @@ public class Client extends test.Util.Application // This test kills connections, so we don't want warnings. // initData.properties.setProperty("Ice.Warn.Connections", "0"); - initData.properties.setProperty("Ice.MessageSizeMax", "50000"); // diff --git a/java/test/src/main/java/test/Ice/background/Collocated.java b/java/test/src/main/java/test/Ice/background/Collocated.java index 7505dfefd58..74276e20abc 100644 --- a/java/test/src/main/java/test/Ice/background/Collocated.java +++ b/java/test/src/main/java/test/Ice/background/Collocated.java @@ -9,16 +9,29 @@ package test.Ice.background; -public class Collocated +public class Collocated extends test.Util.Application { static Thread _clientThread; static int result; - public static void - main(String[] args) + public static void main(String[] args) + { + Collocated app = new Collocated(); + int result = app.main("Collocated", args); + System.gc(); + System.exit(result); + } + + @Override + public int + run(String[] args) { final Client client = new Client(); + client.setClassLoader(getClassLoader()); + client.setWriter(getWriter()); final Server server = new Server(); + server.setClassLoader(getClassLoader()); + server.setWriter(getWriter()); Thread t = new Thread(new Runnable() { @Override @@ -80,7 +93,7 @@ public class Collocated catch(InterruptedException ex) { } - System.gc(); - System.exit(result); + + return 0; } } diff --git a/java/test/src/main/java/test/Ice/background/Server.java b/java/test/src/main/java/test/Ice/background/Server.java index b93c96e5d07..e6e959c1e46 100644 --- a/java/test/src/main/java/test/Ice/background/Server.java +++ b/java/test/src/main/java/test/Ice/background/Server.java @@ -109,14 +109,13 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); // // This test kills connections, so we don't want warnings. // initData.properties.setProperty("Ice.Warn.Connections", "0"); - initData.properties.setProperty("Ice.MessageSizeMax", "50000"); // 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 88aa196b157..2217fcb247f 100644 --- a/java/test/src/main/java/test/Ice/binding/AllTests.java +++ b/java/test/src/main/java/test/Ice/binding/AllTests.java @@ -906,6 +906,7 @@ public class AllTests for(Ice.Properties p : serverProps) { Ice.InitializationData serverInitData = new Ice.InitializationData(); + serverInitData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); serverInitData.properties = p; Ice.Communicator serverCommunicator = Ice.Util.initialize(serverInitData); Ice.ObjectAdapter oa; @@ -933,6 +934,7 @@ public class AllTests for(Ice.Properties q : clientProps) { Ice.InitializationData clientInitData = new Ice.InitializationData(); + clientInitData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); clientInitData.properties = q; Ice.Communicator clientCommunicator = Ice.Util.initialize(clientInitData); Ice.ObjectPrx prx = clientCommunicator.stringToProxy(strPrx); 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 30d087baac3..e566234255d 100644 --- a/java/test/src/main/java/test/Ice/binding/Client.java +++ b/java/test/src/main/java/test/Ice/binding/Client.java @@ -21,7 +21,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.binding"); return initData; diff --git a/java/test/src/main/java/test/Ice/binding/Server.java b/java/test/src/main/java/test/Ice/binding/Server.java index 9c2926cdc3b..af9d5ad2afa 100644 --- a/java/test/src/main/java/test/Ice/binding/Server.java +++ b/java/test/src/main/java/test/Ice/binding/Server.java @@ -27,7 +27,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.binding"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); diff --git a/java/test/src/main/java/test/Ice/checksum/Client.java b/java/test/src/main/java/test/Ice/checksum/Client.java index 34d4f3ab1b8..44f97f41895 100644 --- a/java/test/src/main/java/test/Ice/checksum/Client.java +++ b/java/test/src/main/java/test/Ice/checksum/Client.java @@ -27,7 +27,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.checksum"); return initData; diff --git a/java/test/src/main/java/test/Ice/checksum/Server.java b/java/test/src/main/java/test/Ice/checksum/Server.java index c64042283e4..a0c0b023379 100644 --- a/java/test/src/main/java/test/Ice/checksum/Server.java +++ b/java/test/src/main/java/test/Ice/checksum/Server.java @@ -27,7 +27,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.checksum.server"); return initData; 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 d0181cff1a6..3259d47e51d 100644 --- a/java/test/src/main/java/test/Ice/classLoader/AllTests.java +++ b/java/test/src/main/java/test/Ice/classLoader/AllTests.java @@ -43,6 +43,10 @@ public class AllTests private static class MyClassLoader extends ClassLoader { + MyClassLoader(ClassLoader parent) { + super(parent); + } + @Override protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException @@ -86,8 +90,9 @@ public class AllTests out.print("testing package... "); out.flush(); Ice.InitializationData initData = new Ice.InitializationData(); + initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); initData.properties = communicator.getProperties()._clone(); - MyClassLoader classLoader = new MyClassLoader(); + MyClassLoader classLoader = new MyClassLoader(initData.classLoader); initData.classLoader = classLoader; Ice.Communicator ic = app.initialize(initData); test(classLoader.check("test.Ice.classLoader.Test._Marker")); @@ -102,9 +107,10 @@ public class AllTests out.print("testing plug-in... "); out.flush(); Ice.InitializationData initData = new Ice.InitializationData(); + initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("Ice.Plugin.Test", "test.Ice.classLoader.PluginFactoryI"); - MyClassLoader classLoader = new MyClassLoader(); + MyClassLoader classLoader = new MyClassLoader(initData.classLoader); initData.classLoader = classLoader; Ice.Communicator ic = app.initialize(initData); test(classLoader.check("test.Ice.classLoader.PluginFactoryI")); @@ -120,10 +126,11 @@ 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(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("IceSSL.CertVerifier", "test.Ice.classLoader.CertificateVerifierI"); initData.properties.setProperty("IceSSL.PasswordCallback", "test.Ice.classLoader.PasswordCallbackI"); - MyClassLoader classLoader = new MyClassLoader(); + MyClassLoader classLoader = new MyClassLoader(initData.classLoader); initData.classLoader = classLoader; Ice.Communicator ic = app.initialize(initData); test(classLoader.check("test.Ice.classLoader.CertificateVerifierI")); @@ -137,8 +144,9 @@ public class AllTests // { Ice.InitializationData initData = new Ice.InitializationData(); + initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); initData.properties = communicator.getProperties()._clone(); - MyClassLoader classLoader = new MyClassLoader(); + MyClassLoader classLoader = new MyClassLoader(initData.classLoader); initData.classLoader = classLoader; Ice.Communicator ic = app.initialize(initData); diff --git a/java/test/src/main/java/test/Ice/classLoader/Client.java b/java/test/src/main/java/test/Ice/classLoader/Client.java index 20152d6b598..1a546da6b9d 100644 --- a/java/test/src/main/java/test/Ice/classLoader/Client.java +++ b/java/test/src/main/java/test/Ice/classLoader/Client.java @@ -21,7 +21,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - _initData = new Ice.InitializationData(); + _initData = createInitializationData(); _initData.properties = Ice.Util.createProperties(argsH); _initData.properties.setProperty("Ice.Package.Test", "test.Ice.classLoader"); return _initData; diff --git a/java/test/src/main/java/test/Ice/classLoader/Server.java b/java/test/src/main/java/test/Ice/classLoader/Server.java index 79abca86364..6041e4b031c 100644 --- a/java/test/src/main/java/test/Ice/classLoader/Server.java +++ b/java/test/src/main/java/test/Ice/classLoader/Server.java @@ -26,7 +26,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.classLoader"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/custom/Client.java b/java/test/src/main/java/test/Ice/custom/Client.java index 17ad54b561f..ab1e8fd6eb8 100644 --- a/java/test/src/main/java/test/Ice/custom/Client.java +++ b/java/test/src/main/java/test/Ice/custom/Client.java @@ -25,7 +25,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.custom"); initData.properties.setProperty("Ice.CacheMessageBuffers", "0"); diff --git a/java/test/src/main/java/test/Ice/custom/Collocated.java b/java/test/src/main/java/test/Ice/custom/Collocated.java index 2d8fd94f500..ce4dba24deb 100644 --- a/java/test/src/main/java/test/Ice/custom/Collocated.java +++ b/java/test/src/main/java/test/Ice/custom/Collocated.java @@ -27,7 +27,7 @@ public class Collocated extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.custom"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/custom/Server.java b/java/test/src/main/java/test/Ice/custom/Server.java index fe959c086ff..db5f69378b8 100644 --- a/java/test/src/main/java/test/Ice/custom/Server.java +++ b/java/test/src/main/java/test/Ice/custom/Server.java @@ -27,7 +27,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.custom"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/dispatcher/Client.java b/java/test/src/main/java/test/Ice/dispatcher/Client.java index 9b490d763c1..66074ff8205 100644 --- a/java/test/src/main/java/test/Ice/dispatcher/Client.java +++ b/java/test/src/main/java/test/Ice/dispatcher/Client.java @@ -23,7 +23,7 @@ public class Client extends test.Util.Application { assert(_dispatcher == null); _dispatcher = new Dispatcher(); - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.dispatcher"); initData.dispatcher = _dispatcher; diff --git a/java/test/src/main/java/test/Ice/dispatcher/Collocated.java b/java/test/src/main/java/test/Ice/dispatcher/Collocated.java index dfeb2f674a8..37e37db8d74 100644 --- a/java/test/src/main/java/test/Ice/dispatcher/Collocated.java +++ b/java/test/src/main/java/test/Ice/dispatcher/Collocated.java @@ -32,7 +32,7 @@ public class Collocated extends test.Util.Application { assert(_dispatcher == null); _dispatcher = new Dispatcher(); - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.dispatcher"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/dispatcher/Server.java b/java/test/src/main/java/test/Ice/dispatcher/Server.java index c4ef87e7451..217823dad85 100644 --- a/java/test/src/main/java/test/Ice/dispatcher/Server.java +++ b/java/test/src/main/java/test/Ice/dispatcher/Server.java @@ -32,7 +32,7 @@ public class Server extends test.Util.Application { assert(_dispatcher == null); _dispatcher = new Dispatcher(); - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.dispatcher"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/echo/Server.java b/java/test/src/main/java/test/Ice/echo/Server.java index 88daf466e01..63bc52202dd 100644 --- a/java/test/src/main/java/test/Ice/echo/Server.java +++ b/java/test/src/main/java/test/Ice/echo/Server.java @@ -54,7 +54,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.echo"); return initData; diff --git a/java/test/src/main/java/test/Ice/enums/Client.java b/java/test/src/main/java/test/Ice/enums/Client.java index f27ee458960..6f7c349a7b2 100644 --- a/java/test/src/main/java/test/Ice/enums/Client.java +++ b/java/test/src/main/java/test/Ice/enums/Client.java @@ -25,7 +25,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.enums"); return initData; diff --git a/java/test/src/main/java/test/Ice/enums/Server.java b/java/test/src/main/java/test/Ice/enums/Server.java index 24ef6d00730..943b65703a5 100644 --- a/java/test/src/main/java/test/Ice/enums/Server.java +++ b/java/test/src/main/java/test/Ice/enums/Server.java @@ -27,7 +27,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.enums"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/exceptions/AMDServer.java b/java/test/src/main/java/test/Ice/exceptions/AMDServer.java index 0ee384ac865..89e6d819db0 100644 --- a/java/test/src/main/java/test/Ice/exceptions/AMDServer.java +++ b/java/test/src/main/java/test/Ice/exceptions/AMDServer.java @@ -31,7 +31,7 @@ public class AMDServer extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); // // For this test, we need a dummy logger, otherwise the // assertion test will print an error message. diff --git a/java/test/src/main/java/test/Ice/exceptions/Client.java b/java/test/src/main/java/test/Ice/exceptions/Client.java index ef66546fa26..d055648d7ca 100644 --- a/java/test/src/main/java/test/Ice/exceptions/Client.java +++ b/java/test/src/main/java/test/Ice/exceptions/Client.java @@ -25,7 +25,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.exceptions"); initData.properties.setProperty("Ice.Warn.Connections", "0"); diff --git a/java/test/src/main/java/test/Ice/exceptions/Collocated.java b/java/test/src/main/java/test/Ice/exceptions/Collocated.java index 2ba65669947..05b34266f0c 100644 --- a/java/test/src/main/java/test/Ice/exceptions/Collocated.java +++ b/java/test/src/main/java/test/Ice/exceptions/Collocated.java @@ -28,7 +28,7 @@ public class Collocated extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); // // For this test, we need a dummy logger, otherwise the // assertion test will print an error message. diff --git a/java/test/src/main/java/test/Ice/exceptions/Server.java b/java/test/src/main/java/test/Ice/exceptions/Server.java index bb0140e0a5d..a999e44e15e 100644 --- a/java/test/src/main/java/test/Ice/exceptions/Server.java +++ b/java/test/src/main/java/test/Ice/exceptions/Server.java @@ -31,7 +31,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; // // For this test, we need a dummy logger, otherwise the // assertion test will print an error message. diff --git a/java/test/src/main/java/test/Ice/facets/Client.java b/java/test/src/main/java/test/Ice/facets/Client.java index 22867839eb7..b18db1e6123 100644 --- a/java/test/src/main/java/test/Ice/facets/Client.java +++ b/java/test/src/main/java/test/Ice/facets/Client.java @@ -25,7 +25,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.binding"); return initData; diff --git a/java/test/src/main/java/test/Ice/facets/Collocated.java b/java/test/src/main/java/test/Ice/facets/Collocated.java index 9503a7e7748..054c870eb90 100644 --- a/java/test/src/main/java/test/Ice/facets/Collocated.java +++ b/java/test/src/main/java/test/Ice/facets/Collocated.java @@ -33,7 +33,7 @@ public class Collocated extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.facets"); return initData; diff --git a/java/test/src/main/java/test/Ice/facets/Server.java b/java/test/src/main/java/test/Ice/facets/Server.java index 0bba8b89cdf..f3fcd0dcad4 100644 --- a/java/test/src/main/java/test/Ice/facets/Server.java +++ b/java/test/src/main/java/test/Ice/facets/Server.java @@ -32,7 +32,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.facets"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/faultTolerance/Client.java b/java/test/src/main/java/test/Ice/faultTolerance/Client.java index 7f2fb23b80e..deae605df01 100644 --- a/java/test/src/main/java/test/Ice/faultTolerance/Client.java +++ b/java/test/src/main/java/test/Ice/faultTolerance/Client.java @@ -84,7 +84,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.faultTolerance"); // diff --git a/java/test/src/main/java/test/Ice/faultTolerance/Server.java b/java/test/src/main/java/test/Ice/faultTolerance/Server.java index 18d113fdeae..efcd3dd29ea 100644 --- a/java/test/src/main/java/test/Ice/faultTolerance/Server.java +++ b/java/test/src/main/java/test/Ice/faultTolerance/Server.java @@ -73,7 +73,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.faultTolerance"); // Two minutes. diff --git a/java/test/src/main/java/test/Ice/hash/Client.java b/java/test/src/main/java/test/Ice/hash/Client.java index 6a01bf62285..dadc30f6644 100644 --- a/java/test/src/main/java/test/Ice/hash/Client.java +++ b/java/test/src/main/java/test/Ice/hash/Client.java @@ -48,7 +48,7 @@ public class Client extends test.Util.Application int maxCollisions = 10; int maxIterations = 10000; - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(args); initData.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL.PluginFactory"); Ice.Communicator communicator = Ice.Util.initialize(args, initData); diff --git a/java/test/src/main/java/test/Ice/hold/AllTests.java b/java/test/src/main/java/test/Ice/hold/AllTests.java index 77d0c84b066..6eeb43704b4 100644 --- a/java/test/src/main/java/test/Ice/hold/AllTests.java +++ b/java/test/src/main/java/test/Ice/hold/AllTests.java @@ -84,8 +84,9 @@ public class AllTests }; public static void - allTests(Ice.Communicator communicator, PrintWriter out) + allTests(test.Util.Application app, PrintWriter out) { + Ice.Communicator communicator = app.communicator(); out.print("testing stringToProxy... "); out.flush(); String ref = "hold:default -p 12010"; @@ -193,7 +194,8 @@ public class AllTests int value = 0; holdSerialized.set(value, 0); Ice.AsyncResult result = null; - for(int i = 0; i < 10000; ++i) + int max = app.isAndroid() ? 5000 : 10000; + for(int i = 0; i < max; ++i) { // Create a new proxy for each request result = ((HoldPrx)holdSerialized.ice_oneway()).begin_setOneway(value + 1, value); diff --git a/java/test/src/main/java/test/Ice/hold/Client.java b/java/test/src/main/java/test/Ice/hold/Client.java index 58e4e1abd32..5e4f2b41d83 100644 --- a/java/test/src/main/java/test/Ice/hold/Client.java +++ b/java/test/src/main/java/test/Ice/hold/Client.java @@ -14,15 +14,14 @@ public class Client extends test.Util.Application @Override public int run(String[] args) { - Ice.Communicator communicator = communicator(); - AllTests.allTests(communicator, getWriter()); + AllTests.allTests(this, getWriter()); return 0; } @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.hold"); return initData; diff --git a/java/test/src/main/java/test/Ice/hold/Server.java b/java/test/src/main/java/test/Ice/hold/Server.java index 97019f8021e..c97b28d3844 100644 --- a/java/test/src/main/java/test/Ice/hold/Server.java +++ b/java/test/src/main/java/test/Ice/hold/Server.java @@ -37,7 +37,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.hold"); initData.properties.setProperty("TestAdapter1.Endpoints", "default -p 12010:udp"); diff --git a/java/test/src/main/java/test/Ice/info/Client.java b/java/test/src/main/java/test/Ice/info/Client.java index 2cd0d5b1f8b..69af1c600fd 100644 --- a/java/test/src/main/java/test/Ice/info/Client.java +++ b/java/test/src/main/java/test/Ice/info/Client.java @@ -21,7 +21,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.info"); return initData; diff --git a/java/test/src/main/java/test/Ice/info/Server.java b/java/test/src/main/java/test/Ice/info/Server.java index ebb4046e721..3baa7a452ad 100644 --- a/java/test/src/main/java/test/Ice/info/Server.java +++ b/java/test/src/main/java/test/Ice/info/Server.java @@ -24,7 +24,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.proxy"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp -p 12010"); diff --git a/java/test/src/main/java/test/Ice/inheritance/Client.java b/java/test/src/main/java/test/Ice/inheritance/Client.java index 1fc5bdb3214..6b929e0d949 100644 --- a/java/test/src/main/java/test/Ice/inheritance/Client.java +++ b/java/test/src/main/java/test/Ice/inheritance/Client.java @@ -25,7 +25,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.inheritance"); return initData; diff --git a/java/test/src/main/java/test/Ice/inheritance/Collocated.java b/java/test/src/main/java/test/Ice/inheritance/Collocated.java index 3c92c35545c..f05f3317d4e 100644 --- a/java/test/src/main/java/test/Ice/inheritance/Collocated.java +++ b/java/test/src/main/java/test/Ice/inheritance/Collocated.java @@ -27,7 +27,7 @@ public class Collocated extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.inheritance"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/inheritance/Server.java b/java/test/src/main/java/test/Ice/inheritance/Server.java index 7ff0278c2a6..9fd81d5329d 100644 --- a/java/test/src/main/java/test/Ice/inheritance/Server.java +++ b/java/test/src/main/java/test/Ice/inheritance/Server.java @@ -25,7 +25,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.inheritance"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/interceptor/Client.java b/java/test/src/main/java/test/Ice/interceptor/Client.java index 12c913296b0..58cb7bb80e4 100644 --- a/java/test/src/main/java/test/Ice/interceptor/Client.java +++ b/java/test/src/main/java/test/Ice/interceptor/Client.java @@ -251,7 +251,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.interceptor"); return initData; 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 14286ea6896..c768ea171da 100644 --- a/java/test/src/main/java/test/Ice/interrupt/AllTests.java +++ b/java/test/src/main/java/test/Ice/interrupt/AllTests.java @@ -337,8 +337,10 @@ public class AllTests testController.holdAdapter(); Ice.AsyncResult r = null; + // The sequence needs to be large enough to fill the write/recv buffers - byte[] seq = new byte[20000000]; + int bufSize = (test.Util.Application.isAndroid()) ? 2500000 : 20000000; + byte[] seq = new byte[bufSize]; r = p.begin_opWithPayload(seq); try { @@ -362,7 +364,10 @@ public class AllTests // The executor is all done. // executor.shutdown(); - executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS); + while(!executor.isTerminated()) + { + executor.awaitTermination(1000, TimeUnit.SECONDS); + } } out.println("ok"); @@ -564,6 +569,7 @@ public class AllTests // Check that CommunicatorDestroyedException is raised directly. // Ice.InitializationData initData = new Ice.InitializationData(); + initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); initData.properties = communicator.getProperties()._clone(); Ice.Communicator ic = app.initialize(initData); @@ -652,7 +658,10 @@ public class AllTests cb.check(); executor.shutdown(); - executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS); + while(!executor.isTerminated()) + { + executor.awaitTermination(1000, TimeUnit.SECONDS); + } } out.println("ok"); @@ -707,6 +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(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("ClientTestAdapter.Endpoints", "default -p 12030"); Ice.Communicator ic = app.initialize(initData); @@ -798,7 +808,10 @@ public class AllTests ic.destroy(); executor.shutdown(); - executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS); + while(!executor.isTerminated()) + { + executor.awaitTermination(1000, TimeUnit.SECONDS); + } } out.println("ok"); 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 edd6dfaa6ae..028e21b7862 100644 --- a/java/test/src/main/java/test/Ice/interrupt/Client.java +++ b/java/test/src/main/java/test/Ice/interrupt/Client.java @@ -29,7 +29,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.interrupt"); // 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 8f82f8de45d..9f72490974c 100644 --- a/java/test/src/main/java/test/Ice/interrupt/Collocated.java +++ b/java/test/src/main/java/test/Ice/interrupt/Collocated.java @@ -38,7 +38,7 @@ public class Collocated extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.interrupt"); // diff --git a/java/test/src/main/java/test/Ice/interrupt/Server.java b/java/test/src/main/java/test/Ice/interrupt/Server.java index 9ec7a725d77..9421572f466 100644 --- a/java/test/src/main/java/test/Ice/interrupt/Server.java +++ b/java/test/src/main/java/test/Ice/interrupt/Server.java @@ -30,7 +30,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.interrupt"); // diff --git a/java/test/src/main/java/test/Ice/invoke/Client.java b/java/test/src/main/java/test/Ice/invoke/Client.java index e589d32075c..1952815d7fc 100644 --- a/java/test/src/main/java/test/Ice/invoke/Client.java +++ b/java/test/src/main/java/test/Ice/invoke/Client.java @@ -52,7 +52,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.invoke"); return initData; diff --git a/java/test/src/main/java/test/Ice/invoke/Server.java b/java/test/src/main/java/test/Ice/invoke/Server.java index a6f315d5cf9..17547c44807 100644 --- a/java/test/src/main/java/test/Ice/invoke/Server.java +++ b/java/test/src/main/java/test/Ice/invoke/Server.java @@ -33,7 +33,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.invoke"); return initData; 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 636376a0253..da933f4cf17 100644 --- a/java/test/src/main/java/test/Ice/location/AllTests.java +++ b/java/test/src/main/java/test/Ice/location/AllTests.java @@ -547,6 +547,7 @@ public class AllTests out.flush(); { Ice.InitializationData initData = new Ice.InitializationData(); + initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); 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/location/Client.java b/java/test/src/main/java/test/Ice/location/Client.java index 4fc8e67893b..93339add7db 100644 --- a/java/test/src/main/java/test/Ice/location/Client.java +++ b/java/test/src/main/java/test/Ice/location/Client.java @@ -40,7 +40,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.location"); initData.properties.setProperty("Ice.Default.Locator", "locator:default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/location/Server.java b/java/test/src/main/java/test/Ice/location/Server.java index 4b09338d2ee..89fece45324 100644 --- a/java/test/src/main/java/test/Ice/location/Server.java +++ b/java/test/src/main/java/test/Ice/location/Server.java @@ -49,7 +49,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.location"); initData.properties.setProperty("Ice.ThreadPool.Server.Size", "2"); diff --git a/java/test/src/main/java/test/Ice/metrics/AMDServer.java b/java/test/src/main/java/test/Ice/metrics/AMDServer.java index dc559764811..e567faed6a6 100644 --- a/java/test/src/main/java/test/Ice/metrics/AMDServer.java +++ b/java/test/src/main/java/test/Ice/metrics/AMDServer.java @@ -30,7 +30,7 @@ public class AMDServer extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/metrics/Client.java b/java/test/src/main/java/test/Ice/metrics/Client.java index 48acc9244b1..edf9767b951 100644 --- a/java/test/src/main/java/test/Ice/metrics/Client.java +++ b/java/test/src/main/java/test/Ice/metrics/Client.java @@ -34,7 +34,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.metrics"); initData.properties.setProperty("Ice.Admin.Endpoints", "tcp"); diff --git a/java/test/src/main/java/test/Ice/metrics/Collocated.java b/java/test/src/main/java/test/Ice/metrics/Collocated.java index ad2446563d1..726f545c05a 100644 --- a/java/test/src/main/java/test/Ice/metrics/Collocated.java +++ b/java/test/src/main/java/test/Ice/metrics/Collocated.java @@ -44,7 +44,7 @@ public class Collocated extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); if(initData.properties.getPropertyAsInt("Ice.ThreadInterruptSafe") > 0) { diff --git a/java/test/src/main/java/test/Ice/metrics/Server.java b/java/test/src/main/java/test/Ice/metrics/Server.java index 70788ea876f..71712c6d021 100644 --- a/java/test/src/main/java/test/Ice/metrics/Server.java +++ b/java/test/src/main/java/test/Ice/metrics/Server.java @@ -30,7 +30,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/networkProxy/Client.java b/java/test/src/main/java/test/Ice/networkProxy/Client.java index 411b276ac9a..0694da90466 100644 --- a/java/test/src/main/java/test/Ice/networkProxy/Client.java +++ b/java/test/src/main/java/test/Ice/networkProxy/Client.java @@ -23,7 +23,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.networkProxy"); return initData; diff --git a/java/test/src/main/java/test/Ice/networkProxy/Server.java b/java/test/src/main/java/test/Ice/networkProxy/Server.java index fe6e7c04ea9..58100d7fb44 100644 --- a/java/test/src/main/java/test/Ice/networkProxy/Server.java +++ b/java/test/src/main/java/test/Ice/networkProxy/Server.java @@ -34,7 +34,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.networkProxy"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/objects/Client.java b/java/test/src/main/java/test/Ice/objects/Client.java index 3d9f3803bc5..73a83143f75 100644 --- a/java/test/src/main/java/test/Ice/objects/Client.java +++ b/java/test/src/main/java/test/Ice/objects/Client.java @@ -84,7 +84,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.objects"); return initData; diff --git a/java/test/src/main/java/test/Ice/objects/Collocated.java b/java/test/src/main/java/test/Ice/objects/Collocated.java index 06d1f4bf5fd..37c67949785 100644 --- a/java/test/src/main/java/test/Ice/objects/Collocated.java +++ b/java/test/src/main/java/test/Ice/objects/Collocated.java @@ -92,7 +92,7 @@ public class Collocated extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.objects"); return initData; diff --git a/java/test/src/main/java/test/Ice/objects/Server.java b/java/test/src/main/java/test/Ice/objects/Server.java index d327e7d5b53..1230290db13 100644 --- a/java/test/src/main/java/test/Ice/objects/Server.java +++ b/java/test/src/main/java/test/Ice/objects/Server.java @@ -62,7 +62,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.objects"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/operations/AMDServer.java b/java/test/src/main/java/test/Ice/operations/AMDServer.java index 063af513e84..23aa19cc091 100644 --- a/java/test/src/main/java/test/Ice/operations/AMDServer.java +++ b/java/test/src/main/java/test/Ice/operations/AMDServer.java @@ -24,7 +24,7 @@ public class AMDServer extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); // // It's possible to have batch oneway requests dispatched diff --git a/java/test/src/main/java/test/Ice/operations/AMDTieServer.java b/java/test/src/main/java/test/Ice/operations/AMDTieServer.java index af88539eb00..b9e2bf066eb 100644 --- a/java/test/src/main/java/test/Ice/operations/AMDTieServer.java +++ b/java/test/src/main/java/test/Ice/operations/AMDTieServer.java @@ -26,7 +26,7 @@ public class AMDTieServer extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); // // It's possible to have batch oneway requests dispatched diff --git a/java/test/src/main/java/test/Ice/operations/Client.java b/java/test/src/main/java/test/Ice/operations/Client.java index f0177c41adb..d6cc946dcd5 100644 --- a/java/test/src/main/java/test/Ice/operations/Client.java +++ b/java/test/src/main/java/test/Ice/operations/Client.java @@ -38,7 +38,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.ThreadPool.Client.Size", "2"); initData.properties.setProperty("Ice.ThreadPool.Client.SizeWarn", "0"); diff --git a/java/test/src/main/java/test/Ice/operations/Collocated.java b/java/test/src/main/java/test/Ice/operations/Collocated.java index 276eed6e03a..2539ffca0e2 100644 --- a/java/test/src/main/java/test/Ice/operations/Collocated.java +++ b/java/test/src/main/java/test/Ice/operations/Collocated.java @@ -33,9 +33,9 @@ public class Collocated extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); - if(initData.properties.getPropertyAsInt("Ice.ThreadInterruptSafe") > 0) + if(initData.properties.getPropertyAsInt("Ice.ThreadInterruptSafe") > 0 || isAndroid()) { initData.properties.setProperty("Ice.ThreadPool.Server.Size", "2"); } diff --git a/java/test/src/main/java/test/Ice/operations/Server.java b/java/test/src/main/java/test/Ice/operations/Server.java index 22dba1da02b..a45912deabd 100644 --- a/java/test/src/main/java/test/Ice/operations/Server.java +++ b/java/test/src/main/java/test/Ice/operations/Server.java @@ -24,7 +24,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); // // It's possible to have batch oneway requests dispatched diff --git a/java/test/src/main/java/test/Ice/operations/TieServer.java b/java/test/src/main/java/test/Ice/operations/TieServer.java index 26bbdc7b7b5..61a6ff50710 100644 --- a/java/test/src/main/java/test/Ice/operations/TieServer.java +++ b/java/test/src/main/java/test/Ice/operations/TieServer.java @@ -26,7 +26,7 @@ public class TieServer extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); // // It's possible to have batch oneway requests dispatched 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 4c99870b32b..0a2fba2ed99 100644 --- a/java/test/src/main/java/test/Ice/operations/Twoways.java +++ b/java/test/src/main/java/test/Ice/operations/Twoways.java @@ -844,6 +844,7 @@ class Twoways for(int i = 0; i < 2; i++) { Ice.InitializationData initData = new Ice.InitializationData(); + initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); 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 4fa98529216..df5a224a008 100644 --- a/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java +++ b/java/test/src/main/java/test/Ice/operations/TwowaysAMI.java @@ -1679,6 +1679,7 @@ class TwowaysAMI for(int i = 0; i < 2; i++) { Ice.InitializationData initData = new Ice.InitializationData(); + initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("Ice.ImplicitContext", impls[i]); diff --git a/java/test/src/main/java/test/Ice/optional/AMDServer.java b/java/test/src/main/java/test/Ice/optional/AMDServer.java index b05e5b28f3c..3dacb84a760 100644 --- a/java/test/src/main/java/test/Ice/optional/AMDServer.java +++ b/java/test/src/main/java/test/Ice/optional/AMDServer.java @@ -24,7 +24,7 @@ public class AMDServer extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.optional.AMD"); return initData; diff --git a/java/test/src/main/java/test/Ice/optional/Client.java b/java/test/src/main/java/test/Ice/optional/Client.java index 22f05e262bc..a9178497d0b 100644 --- a/java/test/src/main/java/test/Ice/optional/Client.java +++ b/java/test/src/main/java/test/Ice/optional/Client.java @@ -25,7 +25,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.optional"); return initData; diff --git a/java/test/src/main/java/test/Ice/optional/Server.java b/java/test/src/main/java/test/Ice/optional/Server.java index 15446ac47b5..e9bfa491ea5 100644 --- a/java/test/src/main/java/test/Ice/optional/Server.java +++ b/java/test/src/main/java/test/Ice/optional/Server.java @@ -24,7 +24,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.optional"); return initData; diff --git a/java/test/src/main/java/test/Ice/packagemd/Client.java b/java/test/src/main/java/test/Ice/packagemd/Client.java index 8081a790e76..7f6bf0cab98 100644 --- a/java/test/src/main/java/test/Ice/packagemd/Client.java +++ b/java/test/src/main/java/test/Ice/packagemd/Client.java @@ -24,7 +24,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Warn.Dispatch", "0"); initData.properties.setProperty("Ice.Package.Test", "test.Ice.packagemd"); diff --git a/java/test/src/main/java/test/Ice/packagemd/Server.java b/java/test/src/main/java/test/Ice/packagemd/Server.java index 61bbb0dd2c6..0e3f61ab09e 100644 --- a/java/test/src/main/java/test/Ice/packagemd/Server.java +++ b/java/test/src/main/java/test/Ice/packagemd/Server.java @@ -25,7 +25,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.packagemd"); initData.properties.setProperty("Ice.Package.Test1", "test.Ice.packagemd"); diff --git a/java/test/src/main/java/test/Ice/plugin/Client.java b/java/test/src/main/java/test/Ice/plugin/Client.java index 19dd8aa30f7..52e1c615250 100644 --- a/java/test/src/main/java/test/Ice/plugin/Client.java +++ b/java/test/src/main/java/test/Ice/plugin/Client.java @@ -16,7 +16,17 @@ public class Client extends test.Util.Application @Override public int run(String[] args) { - String libDir = "../../../../../../../lib/"; + // Under Android the class comes from the communicators classloader which + // is setup in the android test driver. + String jarFile; + if(isAndroid()) + { + jarFile = ""; + } + else + { + jarFile = "../../../../../../../lib/IceTestPlugins.jar"; + } Ice.Communicator communicator = communicator(); PrintWriter printWriter = getWriter(); @@ -24,10 +34,9 @@ public class Client extends test.Util.Application printWriter.flush(); try { - Ice.InitializationData initData = new Ice.InitializationData(); - initData.properties = Ice.Util.createProperties(); + Ice.InitializationData initData = createInitData(); initData.properties.setProperty("Ice.Plugin.Test", - libDir + "IceTestPlugins.jar:test.Ice.plugin.plugins.PluginFactory " + + jarFile + ":test.Ice.plugin.plugins.PluginFactory " + "'C:\\Program Files\\' --DatabasePath 'C:\\Program Files\\Application\\db'"); communicator = Ice.Util.initialize(args, initData); communicator.destroy(); @@ -44,10 +53,9 @@ public class Client extends test.Util.Application communicator = null; try { - Ice.InitializationData initData = new Ice.InitializationData(); - initData.properties = Ice.Util.createProperties(); + Ice.InitializationData initData = createInitData(); initData.properties.setProperty("Ice.Plugin.Test", - libDir + "IceTestPlugins.jar:test.Ice.plugin.plugins.PluginInitializeFailFactory"); + jarFile + ":test.Ice.plugin.plugins.PluginInitializeFailFactory"); communicator = Ice.Util.initialize(args, initData); test(false); } @@ -62,14 +70,13 @@ public class Client extends test.Util.Application printWriter.flush(); try { - Ice.InitializationData initData = new Ice.InitializationData(); - initData.properties = Ice.Util.createProperties(); + Ice.InitializationData initData = createInitData(); initData.properties.setProperty("Ice.Plugin.PluginOne", - libDir + "IceTestPlugins.jar:test.Ice.plugin.plugins.PluginOneFactory"); + jarFile + ":test.Ice.plugin.plugins.PluginOneFactory"); initData.properties.setProperty("Ice.Plugin.PluginTwo", - libDir + "IceTestPlugins.jar:test.Ice.plugin.plugins.PluginTwoFactory"); + jarFile + ":test.Ice.plugin.plugins.PluginTwoFactory"); initData.properties.setProperty("Ice.Plugin.PluginThree", - libDir + "IceTestPlugins.jar:test.Ice.plugin.plugins.PluginThreeFactory"); + jarFile + ":test.Ice.plugin.plugins.PluginThreeFactory"); initData.properties.setProperty("Ice.PluginLoadOrder", "PluginOne, PluginTwo"); // Exclude PluginThree communicator = Ice.Util.initialize(args, initData); communicator.destroy(); @@ -85,14 +92,13 @@ public class Client extends test.Util.Application printWriter.flush(); try { - Ice.InitializationData initData = new Ice.InitializationData(); - initData.properties = Ice.Util.createProperties(); + Ice.InitializationData initData = createInitData(); initData.properties.setProperty("Ice.Plugin.PluginOne", - libDir + "IceTestPlugins.jar:test.Ice.plugin.plugins.PluginOneFactory"); + jarFile + ":test.Ice.plugin.plugins.PluginOneFactory"); initData.properties.setProperty("Ice.Plugin.PluginTwo", - libDir + "IceTestPlugins.jar:test.Ice.plugin.plugins.PluginTwoFactory"); + jarFile + ":test.Ice.plugin.plugins.PluginTwoFactory"); initData.properties.setProperty("Ice.Plugin.PluginThree", - libDir + "IceTestPlugins.jar:test.Ice.plugin.plugins.PluginThreeFactory"); + jarFile + ":test.Ice.plugin.plugins.PluginThreeFactory"); initData.properties.setProperty("Ice.PluginLoadOrder", "PluginOne, PluginTwo"); initData.properties.setProperty("Ice.InitPlugins", "0"); communicator = Ice.Util.initialize(args, initData); @@ -126,14 +132,13 @@ public class Client extends test.Util.Application communicator = null; try { - Ice.InitializationData initData = new Ice.InitializationData(); - initData.properties = Ice.Util.createProperties(); + Ice.InitializationData initData = createInitData(); initData.properties.setProperty("Ice.Plugin.PluginOneFail", - libDir + "IceTestPlugins.jar:test.Ice.plugin.plugins.PluginOneFailFactory"); + jarFile + ":test.Ice.plugin.plugins.PluginOneFailFactory"); initData.properties.setProperty("Ice.Plugin.PluginTwoFail", - libDir + "IceTestPlugins.jar:test.Ice.plugin.plugins.PluginTwoFailFactory"); + jarFile + ":test.Ice.plugin.plugins.PluginTwoFailFactory"); initData.properties.setProperty("Ice.Plugin.PluginThreeFail", - libDir + "IceTestPlugins.jar:test.Ice.plugin.plugins.PluginThreeFailFactory"); + jarFile + ":test.Ice.plugin.plugins.PluginThreeFailFactory"); initData.properties.setProperty("Ice.PluginLoadOrder", "PluginOneFail, PluginTwoFail, PluginThreeFail"); communicator = Ice.Util.initialize(args, initData); } @@ -152,11 +157,22 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); return initData; } + private Ice.InitializationData createInitData() + { + Ice.InitializationData initData = createInitializationData() ; + if(classLoader() != null) + { + initData.classLoader = classLoader(); + } + initData.properties = Ice.Util.createProperties(); + return initData; + } + private static void test(boolean b) { if(!b) diff --git a/java/test/src/main/java/test/Ice/proxy/AMDServer.java b/java/test/src/main/java/test/Ice/proxy/AMDServer.java index 3629cf905b0..0633df18bda 100644 --- a/java/test/src/main/java/test/Ice/proxy/AMDServer.java +++ b/java/test/src/main/java/test/Ice/proxy/AMDServer.java @@ -25,7 +25,7 @@ public class AMDServer extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.proxy.AMD"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); diff --git a/java/test/src/main/java/test/Ice/proxy/Client.java b/java/test/src/main/java/test/Ice/proxy/Client.java index 1ad397216c9..54ab8ae6d1b 100644 --- a/java/test/src/main/java/test/Ice/proxy/Client.java +++ b/java/test/src/main/java/test/Ice/proxy/Client.java @@ -25,7 +25,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.proxy"); return initData; diff --git a/java/test/src/main/java/test/Ice/proxy/Collocated.java b/java/test/src/main/java/test/Ice/proxy/Collocated.java index 103451157d0..d47a3a0a721 100644 --- a/java/test/src/main/java/test/Ice/proxy/Collocated.java +++ b/java/test/src/main/java/test/Ice/proxy/Collocated.java @@ -28,7 +28,7 @@ public class Collocated extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.proxy"); initData.properties.setProperty("Ice.Warn.Dispatch", "0"); diff --git a/java/test/src/main/java/test/Ice/proxy/Server.java b/java/test/src/main/java/test/Ice/proxy/Server.java index ae09627cfe5..0ceaf40550f 100644 --- a/java/test/src/main/java/test/Ice/proxy/Server.java +++ b/java/test/src/main/java/test/Ice/proxy/Server.java @@ -24,7 +24,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.proxy"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); diff --git a/java/test/src/main/java/test/Ice/retry/AllTests.java b/java/test/src/main/java/test/Ice/retry/AllTests.java index 3a0b7b1ceff..8686e56d67b 100644 --- a/java/test/src/main/java/test/Ice/retry/AllTests.java +++ b/java/test/src/main/java/test/Ice/retry/AllTests.java @@ -113,7 +113,7 @@ public class AllTests } public static RetryPrx - allTests(Ice.Communicator communicator, PrintWriter out) + allTests(Ice.Communicator communicator, PrintWriter out, Instrumentation instrumentation) { out.print("testing stringToProxy... "); out.flush(); @@ -139,7 +139,7 @@ public class AllTests retry1.op(false); out.println("ok"); - Instrumentation.testInvocationCount(3); + instrumentation.testInvocationCount(3); out.print("calling operation to kill connection with second proxy... "); out.flush(); @@ -155,17 +155,17 @@ public class AllTests catch(Ice.ConnectionLostException ex) { } - Instrumentation.testInvocationCount(1); - Instrumentation.testFailureCount(1); - Instrumentation.testRetryCount(0); + instrumentation.testInvocationCount(1); + instrumentation.testFailureCount(1); + instrumentation.testRetryCount(0); out.println("ok"); out.print("calling regular operation with first proxy again... "); out.flush(); retry1.op(false); - Instrumentation.testInvocationCount(1); - Instrumentation.testFailureCount(0); - Instrumentation.testRetryCount(0); + instrumentation.testInvocationCount(1); + instrumentation.testFailureCount(0); + instrumentation.testRetryCount(0); out.println("ok"); AMIRegular cb1 = new AMIRegular(); @@ -174,36 +174,36 @@ public class AllTests out.print("calling regular AMI operation with first proxy... "); retry1.begin_op(false, cb1); cb1.check(); - Instrumentation.testInvocationCount(1); - Instrumentation.testFailureCount(0); - Instrumentation.testRetryCount(0); + instrumentation.testInvocationCount(1); + instrumentation.testFailureCount(0); + instrumentation.testRetryCount(0); out.println("ok"); out.print("calling AMI operation to kill connection with second proxy... "); retry2.begin_op(true, cb2); cb2.check(); - Instrumentation.testInvocationCount(1); - Instrumentation.testFailureCount(1); - Instrumentation.testRetryCount(0); + instrumentation.testInvocationCount(1); + instrumentation.testFailureCount(1); + instrumentation.testRetryCount(0); out.println("ok"); out.print("calling regular AMI operation with first proxy again... "); retry1.begin_op(false, cb1); cb1.check(); - Instrumentation.testInvocationCount(1); - Instrumentation.testFailureCount(0); - Instrumentation.testRetryCount(0); + instrumentation.testInvocationCount(1); + instrumentation.testFailureCount(0); + instrumentation.testRetryCount(0); out.println("ok"); out.print("testing idempotent operation... "); test(retry1.opIdempotent(4) == 4); - Instrumentation.testInvocationCount(1); - Instrumentation.testFailureCount(0); - Instrumentation.testRetryCount(4); + instrumentation.testInvocationCount(1); + instrumentation.testFailureCount(0); + instrumentation.testRetryCount(4); test(retry1.end_opIdempotent(retry1.begin_opIdempotent(4)) == 4); - Instrumentation.testInvocationCount(1); - Instrumentation.testFailureCount(0); - Instrumentation.testRetryCount(4); + instrumentation.testInvocationCount(1); + instrumentation.testFailureCount(0); + instrumentation.testRetryCount(4); out.println("ok"); out.print("testing non-idempotent operation... "); @@ -215,9 +215,9 @@ public class AllTests catch(Ice.LocalException ex) { } - Instrumentation.testInvocationCount(1); - Instrumentation.testFailureCount(1); - Instrumentation.testRetryCount(0); + instrumentation.testInvocationCount(1); + instrumentation.testFailureCount(1); + instrumentation.testRetryCount(0); try { retry1.end_opNotIdempotent(retry1.begin_opNotIdempotent()); @@ -226,14 +226,14 @@ public class AllTests catch(Ice.LocalException ex) { } - Instrumentation.testInvocationCount(1); - Instrumentation.testFailureCount(1); - Instrumentation.testRetryCount(0); + instrumentation.testInvocationCount(1); + instrumentation.testFailureCount(1); + instrumentation.testRetryCount(0); out.println("ok"); if(retry1.ice_getConnection() == null) { - Instrumentation.testInvocationCount(1); + instrumentation.testInvocationCount(1); out.print("testing system exception... "); try @@ -244,9 +244,9 @@ public class AllTests catch(SystemFailure ex) { } - Instrumentation.testInvocationCount(1); - Instrumentation.testFailureCount(1); - Instrumentation.testRetryCount(0); + instrumentation.testInvocationCount(1); + instrumentation.testFailureCount(1); + instrumentation.testRetryCount(0); try { retry1.end_opSystemException(retry1.begin_opSystemException()); @@ -255,9 +255,9 @@ public class AllTests catch(SystemFailure ex) { } - Instrumentation.testInvocationCount(1); - Instrumentation.testFailureCount(1); - Instrumentation.testRetryCount(0); + instrumentation.testInvocationCount(1); + instrumentation.testFailureCount(1); + instrumentation.testRetryCount(0); out.println("ok"); } @@ -271,9 +271,9 @@ public class AllTests } catch(Ice.InvocationTimeoutException ex) { - Instrumentation.testRetryCount(2); + instrumentation.testRetryCount(2); retry1.opIdempotent(-1); // Reset the counter - Instrumentation.testRetryCount(-1); + instrumentation.testRetryCount(-1); } try { @@ -284,9 +284,9 @@ public class AllTests } catch(Ice.InvocationTimeoutException ex) { - Instrumentation.testRetryCount(2); + instrumentation.testRetryCount(2); retry1.opIdempotent(-1); // Reset the counter - Instrumentation.testRetryCount(-1); + instrumentation.testRetryCount(-1); } out.println("ok"); 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 0ed2b3c0bfd..f3cc1455550 100644 --- a/java/test/src/main/java/test/Ice/retry/Client.java +++ b/java/test/src/main/java/test/Ice/retry/Client.java @@ -13,11 +13,13 @@ import test.Ice.retry.Test.RetryPrx; public class Client extends test.Util.Application { + private Instrumentation instrumentation = new Instrumentation(); + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); - RetryPrx retry = AllTests.allTests(communicator, getWriter()); + RetryPrx retry = AllTests.allTests(communicator, getWriter(), instrumentation); retry.shutdown(); return 0; } @@ -25,9 +27,9 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); - initData.observer = Instrumentation.getObserver(); + initData.observer = instrumentation.getObserver(); initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry"); 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 481c1f6c661..61f5dcf0f5b 100644 --- a/java/test/src/main/java/test/Ice/retry/Collocated.java +++ b/java/test/src/main/java/test/Ice/retry/Collocated.java @@ -13,6 +13,8 @@ import test.Ice.retry.Test.RetryPrx; public class Collocated extends test.Util.Application { + private Instrumentation instrumentation = new Instrumentation(); + @Override public int run(String[] args) { @@ -21,7 +23,7 @@ public class Collocated extends test.Util.Application adapter.add(new RetryI(), communicator.stringToIdentity("retry")); //adapter.activate(); // Don't activate OA to ensure collocation is used. - RetryPrx retry = AllTests.allTests(communicator, getWriter()); + RetryPrx retry = AllTests.allTests(communicator, getWriter(), instrumentation); retry.shutdown(); return 0; } @@ -29,9 +31,9 @@ public class Collocated extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); - initData.observer = Instrumentation.getObserver(); + initData.observer = instrumentation.getObserver(); initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry"); @@ -51,7 +53,7 @@ public class Collocated extends test.Util.Application public static void main(String[] args) { Collocated app = new Collocated(); - int result = app.main("Client", args); + int result = app.main("Collocated", args); System.gc(); System.exit(result); } diff --git a/java/test/src/main/java/test/Ice/retry/Instrumentation.java b/java/test/src/main/java/test/Ice/retry/Instrumentation.java index 609a8225ef2..2a756d3d34b 100644 --- a/java/test/src/main/java/test/Ice/retry/Instrumentation.java +++ b/java/test/src/main/java/test/Ice/retry/Instrumentation.java @@ -20,7 +20,7 @@ public class Instrumentation } } - static class InvocationObserverI implements Ice.Instrumentation.InvocationObserver + class InvocationObserverI implements Ice.Instrumentation.InvocationObserver { @Override public void @@ -79,9 +79,9 @@ public class Instrumentation } }; - static private Ice.Instrumentation.InvocationObserver invocationObserver = new InvocationObserverI(); + private Ice.Instrumentation.InvocationObserver invocationObserver = new InvocationObserverI(); - static class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver + class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver { @Override public Ice.Instrumentation.Observer @@ -138,9 +138,9 @@ public class Instrumentation } }; - static private Ice.Instrumentation.CommunicatorObserver communicatorObserver = new CommunicatorObserverI(); + private Ice.Instrumentation.CommunicatorObserver communicatorObserver = new CommunicatorObserverI(); - static public Ice.Instrumentation.CommunicatorObserver + public Ice.Instrumentation.CommunicatorObserver getObserver() { return communicatorObserver; @@ -181,25 +181,25 @@ public class Instrumentation value.value = 0; } - static public void + public void testRetryCount(int expected) { testEqual(nRetry, expected); } - static public void + public void testFailureCount(int expected) { testEqual(nFailure, expected); } - static public void + public void testInvocationCount(int expected) { testEqual(nInvocation, expected); } - static private Ice.IntHolder nRetry = new Ice.IntHolder(0); - static private Ice.IntHolder nFailure = new Ice.IntHolder(0); - static private Ice.IntHolder nInvocation = new Ice.IntHolder(0); + private Ice.IntHolder nRetry = new Ice.IntHolder(0); + private Ice.IntHolder nFailure = new Ice.IntHolder(0); + private Ice.IntHolder nInvocation = new Ice.IntHolder(0); }; diff --git a/java/test/src/main/java/test/Ice/retry/Server.java b/java/test/src/main/java/test/Ice/retry/Server.java index 678839b36a5..a744748958b 100644 --- a/java/test/src/main/java/test/Ice/retry/Server.java +++ b/java/test/src/main/java/test/Ice/retry/Server.java @@ -24,7 +24,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java b/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java index 5c3e9bc5fc0..a8649ee3648 100644 --- a/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java +++ b/java/test/src/main/java/test/Ice/seqMapping/AMDServer.java @@ -25,7 +25,7 @@ public class AMDServer extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping.AMD"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); diff --git a/java/test/src/main/java/test/Ice/seqMapping/Client.java b/java/test/src/main/java/test/Ice/seqMapping/Client.java index 2124aefda4d..893a2b13806 100644 --- a/java/test/src/main/java/test/Ice/seqMapping/Client.java +++ b/java/test/src/main/java/test/Ice/seqMapping/Client.java @@ -32,7 +32,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping"); return initData; diff --git a/java/test/src/main/java/test/Ice/seqMapping/Collocated.java b/java/test/src/main/java/test/Ice/seqMapping/Collocated.java index bf83972f114..90cb687b9db 100644 --- a/java/test/src/main/java/test/Ice/seqMapping/Collocated.java +++ b/java/test/src/main/java/test/Ice/seqMapping/Collocated.java @@ -28,7 +28,7 @@ public class Collocated extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/seqMapping/Server.java b/java/test/src/main/java/test/Ice/seqMapping/Server.java index eea5e6536dd..3aacb34f3ba 100644 --- a/java/test/src/main/java/test/Ice/seqMapping/Server.java +++ b/java/test/src/main/java/test/Ice/seqMapping/Server.java @@ -25,7 +25,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); diff --git a/java/test/src/main/java/test/Ice/serialize/Client.java b/java/test/src/main/java/test/Ice/serialize/Client.java index ffa339ba2ca..39b32270c57 100644 --- a/java/test/src/main/java/test/Ice/serialize/Client.java +++ b/java/test/src/main/java/test/Ice/serialize/Client.java @@ -25,7 +25,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.serialize"); return initData; diff --git a/java/test/src/main/java/test/Ice/serialize/Server.java b/java/test/src/main/java/test/Ice/serialize/Server.java index 19346017593..8b786c3280e 100644 --- a/java/test/src/main/java/test/Ice/serialize/Server.java +++ b/java/test/src/main/java/test/Ice/serialize/Server.java @@ -27,7 +27,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.serialize"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java b/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java index 29f8754170a..080dc5452fa 100644 --- a/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java +++ b/java/test/src/main/java/test/Ice/servantLocator/AMDServer.java @@ -27,7 +27,7 @@ public class AMDServer extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator.AMD"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/servantLocator/Client.java b/java/test/src/main/java/test/Ice/servantLocator/Client.java index c781cb5ac50..40a8551aae9 100644 --- a/java/test/src/main/java/test/Ice/servantLocator/Client.java +++ b/java/test/src/main/java/test/Ice/servantLocator/Client.java @@ -24,7 +24,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator"); return initData; diff --git a/java/test/src/main/java/test/Ice/servantLocator/Collocated.java b/java/test/src/main/java/test/Ice/servantLocator/Collocated.java index 612602d933d..d1f9c9cf5df 100644 --- a/java/test/src/main/java/test/Ice/servantLocator/Collocated.java +++ b/java/test/src/main/java/test/Ice/servantLocator/Collocated.java @@ -27,7 +27,7 @@ public class Collocated extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/servantLocator/Server.java b/java/test/src/main/java/test/Ice/servantLocator/Server.java index bd3dfdc7288..053ce4d6648 100644 --- a/java/test/src/main/java/test/Ice/servantLocator/Server.java +++ b/java/test/src/main/java/test/Ice/servantLocator/Server.java @@ -26,7 +26,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java b/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java index acca7cf53e8..ad02ce47c79 100644 --- a/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java +++ b/java/test/src/main/java/test/Ice/slicing/exceptions/AMDServer.java @@ -24,7 +24,7 @@ public class AMDServer extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.slicing.exceptions.serverAMD"); initData.properties.setProperty("Ice.Warn.Dispatch", "0"); diff --git a/java/test/src/main/java/test/Ice/slicing/exceptions/Client.java b/java/test/src/main/java/test/Ice/slicing/exceptions/Client.java index bee392fe3b3..f52615b2901 100644 --- a/java/test/src/main/java/test/Ice/slicing/exceptions/Client.java +++ b/java/test/src/main/java/test/Ice/slicing/exceptions/Client.java @@ -16,7 +16,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.slicing.exceptions.client"); return initData; diff --git a/java/test/src/main/java/test/Ice/slicing/exceptions/Server.java b/java/test/src/main/java/test/Ice/slicing/exceptions/Server.java index 0844dd92275..899aedfa165 100644 --- a/java/test/src/main/java/test/Ice/slicing/exceptions/Server.java +++ b/java/test/src/main/java/test/Ice/slicing/exceptions/Server.java @@ -24,7 +24,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.slicing.exceptions.server"); initData.properties.setProperty("Ice.Warn.Dispatch", "0"); diff --git a/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java b/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java index c905976b193..37cc88cfb47 100644 --- a/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java +++ b/java/test/src/main/java/test/Ice/slicing/objects/AMDServer.java @@ -25,7 +25,7 @@ public class AMDServer extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.slicing.objects.serverAMD"); initData.properties.setProperty("Ice.Warn.Dispatch", "0"); diff --git a/java/test/src/main/java/test/Ice/slicing/objects/Client.java b/java/test/src/main/java/test/Ice/slicing/objects/Client.java index e725c725339..c0cd30ccaab 100644 --- a/java/test/src/main/java/test/Ice/slicing/objects/Client.java +++ b/java/test/src/main/java/test/Ice/slicing/objects/Client.java @@ -25,7 +25,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.slicing.objects.client"); return initData; diff --git a/java/test/src/main/java/test/Ice/slicing/objects/Server.java b/java/test/src/main/java/test/Ice/slicing/objects/Server.java index fded6895de1..82f1d71e73f 100644 --- a/java/test/src/main/java/test/Ice/slicing/objects/Server.java +++ b/java/test/src/main/java/test/Ice/slicing/objects/Server.java @@ -25,7 +25,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.slicing.objects.server"); initData.properties.setProperty("Ice.Warn.Dispatch", "0"); diff --git a/java/test/src/main/java/test/Ice/stream/Client.java b/java/test/src/main/java/test/Ice/stream/Client.java index 5d88f303e5d..b43c3de47f1 100644 --- a/java/test/src/main/java/test/Ice/stream/Client.java +++ b/java/test/src/main/java/test/Ice/stream/Client.java @@ -944,7 +944,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.stream"); return initData; diff --git a/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java b/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java index a1bdc6a0a31..f311b3f3b61 100644 --- a/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java +++ b/java/test/src/main/java/test/Ice/threadPoolPriority/Server.java @@ -19,14 +19,13 @@ public class Server extends test.Util.Application adapter.add(new PriorityI(), communicator().stringToIdentity("test")); adapter.activate(); - communicator().waitForShutdown(); - return 0; + return WAIT; } @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.ThreadPool.Server.ThreadPriority", "10"); return initData; diff --git a/java/test/src/main/java/test/Ice/throughput/Client.java b/java/test/src/main/java/test/Ice/throughput/Client.java index b508b11bc96..cf6b390d085 100644 --- a/java/test/src/main/java/test/Ice/throughput/Client.java +++ b/java/test/src/main/java/test/Ice/throughput/Client.java @@ -476,7 +476,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Demo", "test.Ice.throughput"); initData.properties.setProperty("Throughput.Proxy", "throughput:default -p 10000 -h 127.0.0.1"); diff --git a/java/test/src/main/java/test/Ice/throughput/Server.java b/java/test/src/main/java/test/Ice/throughput/Server.java index 95737f3dc10..6d2df86a930 100644 --- a/java/test/src/main/java/test/Ice/throughput/Server.java +++ b/java/test/src/main/java/test/Ice/throughput/Server.java @@ -24,7 +24,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Demo", "test.Ice.throughput"); initData.properties.setProperty("Throughput.Endpoints", "default -p 10000 -h 127.0.0.1"); 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 7f0239f32c5..eb9a2c94e99 100644 --- a/java/test/src/main/java/test/Ice/timeout/AllTests.java +++ b/java/test/src/main/java/test/Ice/timeout/AllTests.java @@ -189,8 +189,9 @@ public class AllTests } out.println("ok"); - // The sequence needs to be large enough to fill the write/recv buffers - byte[] seq = new byte[20000000]; + // The sequence needs to be large enough to fill the write/recv buffers + int bufSize = (test.Util.Application.isAndroid()) ? 10000000 : 20000000; + byte[] seq = new byte[bufSize]; out.print("testing connection timeout... "); out.flush(); @@ -363,6 +364,7 @@ public class AllTests // endpoint timeouts. // Ice.InitializationData initData = new Ice.InitializationData(); + initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("Ice.Override.Timeout", "250"); Ice.Communicator comm = app.initialize(initData); @@ -399,6 +401,7 @@ public class AllTests // Test Ice.Override.ConnectTimeout. // Ice.InitializationData initData = new Ice.InitializationData(); + initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("Ice.Override.ConnectTimeout", "250"); @@ -452,6 +455,7 @@ public class AllTests // Test Ice.Override.CloseTimeout. // Ice.InitializationData initData = new Ice.InitializationData(); + initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("Ice.Override.CloseTimeout", "200"); Ice.Communicator comm = app.initialize(initData); diff --git a/java/test/src/main/java/test/Ice/timeout/Client.java b/java/test/src/main/java/test/Ice/timeout/Client.java index 7476eb5c0e8..f963c6bf0c6 100644 --- a/java/test/src/main/java/test/Ice/timeout/Client.java +++ b/java/test/src/main/java/test/Ice/timeout/Client.java @@ -24,7 +24,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.timeout"); diff --git a/java/test/src/main/java/test/Ice/timeout/Server.java b/java/test/src/main/java/test/Ice/timeout/Server.java index b4006770863..8451ab4c5fa 100644 --- a/java/test/src/main/java/test/Ice/timeout/Server.java +++ b/java/test/src/main/java/test/Ice/timeout/Server.java @@ -24,7 +24,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.timeout"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); diff --git a/java/test/src/main/java/test/Ice/udp/AllTests.java b/java/test/src/main/java/test/Ice/udp/AllTests.java index 49e8b91de29..2db68f5f54a 100644 --- a/java/test/src/main/java/test/Ice/udp/AllTests.java +++ b/java/test/src/main/java/test/Ice/udp/AllTests.java @@ -11,6 +11,8 @@ package test.Ice.udp; import test.Ice.udp.Test.*; +import java.io.PrintWriter; + public class AllTests { private static void @@ -67,8 +69,11 @@ public class AllTests } public static void - allTests(Ice.Communicator communicator) + allTests(test.Util.Application app) { + Ice.Communicator communicator = app.communicator(); + PrintWriter out = app.getWriter(); + communicator.getProperties().setProperty("ReplyAdapter.Endpoints", "udp -p 12030"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ReplyAdapter"); PingReplyI replyI = new PingReplyI(); @@ -77,8 +82,8 @@ public class AllTests (PingReplyPrx)PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI)).ice_datagram(); adapter.activate(); - System.out.print("testing udp... "); - System.out.flush(); + out.print("testing udp... "); + out.flush(); Ice.ObjectPrx base = communicator.stringToProxy("test -d:udp -p 12010"); TestIntfPrx obj = TestIntfPrxHelper.uncheckedCast(base); @@ -141,72 +146,75 @@ public class AllTests } } - System.out.println("ok"); + out.println("ok"); - System.out.print("testing udp multicast... "); - System.out.flush(); - String endpoint; - if(communicator.getProperties().getProperty("Ice.IPv6").equals("1")) + if(!app.isAndroid()) { - if(System.getProperty("os.name").contains("OS X")) + out.print("testing udp multicast... "); + out.flush(); + String endpoint; + if(communicator.getProperties().getProperty("Ice.IPv6").equals("1")) { - endpoint = "udp -h \"ff15::1:1\" -p 12020 --interface \"::1\""; + if(System.getProperty("os.name").contains("OS X")) + { + endpoint = "udp -h \"ff02::1:1\" -p 12020 --interface \"lo0\""; + } + else + { + endpoint = "udp -h \"ff01::1:1\" -p 12020"; + } } else { - endpoint = "udp -h \"ff15::1:1\" -p 12020"; + endpoint = "udp -h 239.255.1.1 -p 12020"; } - } - else - { - endpoint = "udp -h 239.255.1.1 -p 12020"; - } - base = communicator.stringToProxy("test -d:" + endpoint); - TestIntfPrx objMcast = TestIntfPrxHelper.uncheckedCast(base); + base = communicator.stringToProxy("test -d:" + endpoint); + TestIntfPrx objMcast = TestIntfPrxHelper.uncheckedCast(base); - nRetry = 5; - while(nRetry-- > 0) - { - replyI.reset(); - objMcast.ping(reply); - ret = replyI.waitReply(5, 2000); - if(ret) + nRetry = 5; + while(nRetry-- > 0) { - break; // Success + replyI.reset(); + objMcast.ping(reply); + ret = replyI.waitReply(5, 2000); + if(ret) + { + break; // Success + } + replyI = new PingReplyI(); + reply = (PingReplyPrx) PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI)).ice_datagram(); + } + if(!ret) + { + out.println("failed (is a firewall enabled?)"); + } + else + { + out.println("ok"); } - replyI = new PingReplyI(); - reply = (PingReplyPrx)PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI)).ice_datagram(); - } - if(!ret) - { - System.out.println("failed (is a firewall enabled?)"); - } - else - { - System.out.println("ok"); - } - System.out.print("testing udp bi-dir connection... "); - System.out.flush(); - obj.ice_getConnection().setAdapter(adapter); - objMcast.ice_getConnection().setAdapter(adapter); - nRetry = 5; - while(nRetry-- > 0) - { - replyI.reset(); - obj.pingBiDir(reply.ice_getIdentity()); - obj.pingBiDir(reply.ice_getIdentity()); - obj.pingBiDir(reply.ice_getIdentity()); - ret = replyI.waitReply(3, 2000); - if(ret) + out.print("testing udp bi-dir connection... "); + out.flush(); + obj.ice_getConnection().setAdapter(adapter); + objMcast.ice_getConnection().setAdapter(adapter); + nRetry = 5; + while(nRetry-- > 0) { - break; // Success + replyI.reset(); + obj.pingBiDir(reply.ice_getIdentity()); + obj.pingBiDir(reply.ice_getIdentity()); + obj.pingBiDir(reply.ice_getIdentity()); + ret = replyI.waitReply(3, 2000); + if(ret) + { + break; // Success + } + replyI = new PingReplyI(); + reply = (PingReplyPrx) PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI)).ice_datagram(); } - replyI = new PingReplyI(); - reply = (PingReplyPrx)PingReplyPrxHelper.uncheckedCast(adapter.addWithUUID(replyI)).ice_datagram(); + test(ret); + out.println("ok"); } - test(ret); - System.out.println("ok"); // // Sending the replies back on the multicast UDP connection doesn't work for most @@ -214,7 +222,7 @@ public class AllTests // Windows...). For Windows, see UdpTransceiver constructor for the details. So // we don't run this test. // -// System.out.print("testing udp bi-dir connection... "); +// out.print("testing udp bi-dir connection... "); // nRetry = 5; // while(nRetry-- > 0) // { @@ -231,11 +239,11 @@ public class AllTests // if(!ret) // { -// System.out.println("failed (is a firewall enabled?)"); +// out.println("failed (is a firewall enabled?)"); // } // else // { -// System.out.println("ok"); +// out.println("ok"); // } } } diff --git a/java/test/src/main/java/test/Ice/udp/Client.java b/java/test/src/main/java/test/Ice/udp/Client.java index afd4927a470..8f787b40751 100644 --- a/java/test/src/main/java/test/Ice/udp/Client.java +++ b/java/test/src/main/java/test/Ice/udp/Client.java @@ -16,16 +16,16 @@ public class Client extends test.Util.Application @Override public int run(String[] args) { - AllTests.allTests(communicator()); + AllTests.allTests(this); int num; try { - num = args.length == 1 ? Integer.parseInt(args[0]) : 0; + num = args.length == 1 ? Integer.parseInt(args[0]) : 1; } catch(NumberFormatException ex) { - num = 0; + num = 1; } for(int i = 0; i < num; ++i) { @@ -37,7 +37,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.udp"); initData.properties.setProperty("Ice.Warn.Connections", "0"); diff --git a/java/test/src/main/java/test/Ice/udp/Server.java b/java/test/src/main/java/test/Ice/udp/Server.java index 2664d3147bf..b7aecab21b8 100644 --- a/java/test/src/main/java/test/Ice/udp/Server.java +++ b/java/test/src/main/java/test/Ice/udp/Server.java @@ -37,9 +37,12 @@ public class Server extends test.Util.Application adapter2.activate(); } - Ice.ObjectAdapter mcastAdapter = communicator().createObjectAdapter("McastTestAdapter"); - mcastAdapter.add(new TestIntfI(), communicator().stringToIdentity("test")); - mcastAdapter.activate(); + if(!isAndroid()) + { + Ice.ObjectAdapter mcastAdapter = communicator().createObjectAdapter("McastTestAdapter"); + mcastAdapter.add(new TestIntfI(), communicator().stringToIdentity("test")); + mcastAdapter.activate(); + } return WAIT; } @@ -47,30 +50,33 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.udp"); initData.properties.setProperty("Ice.Warn.Connections", "0"); initData.properties.setProperty("Ice.UDP.RcvSize", "16384"); initData.properties.setProperty("Ice.UDP.SndSize", "16384"); - String endpoint; - if(initData.properties.getProperty("Ice.IPv6").equals("1")) + if(!isAndroid()) { - if(System.getProperty("os.name").contains("OS X")) + String endpoint; + if(initData.properties.getProperty("Ice.IPv6").equals("1")) { - endpoint = "udp -h \"ff15::1:1\" -p 12020 --interface \"::1\""; + if(System.getProperty("os.name").contains("OS X")) + { + endpoint = "udp -h \"ff15::1:1\" -p 12020 --interface \"::1\""; + } + else + { + endpoint = "udp -h \"ff15::1:1\" -p 12020"; + } } else { - endpoint = "udp -h \"ff15::1:1\" -p 12020"; + endpoint = "udp -h 239.255.1.1 -p 12020"; } + initData.properties.setProperty("McastTestAdapter.Endpoints", endpoint); } - else - { - endpoint = "udp -h 239.255.1.1 -p 12020"; - } - initData.properties.setProperty("McastTestAdapter.Endpoints", endpoint); return initData; } diff --git a/java/test/src/main/java/test/IceBox/configuration/Client.java b/java/test/src/main/java/test/IceBox/configuration/Client.java index 39785e9de8a..c693f2ad179 100644 --- a/java/test/src/main/java/test/IceBox/configuration/Client.java +++ b/java/test/src/main/java/test/IceBox/configuration/Client.java @@ -28,7 +28,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.IceBox.configuration"); return 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 d18a5da35fa..0288b56a179 100644 --- a/java/test/src/main/java/test/IceGrid/simple/AllTests.java +++ b/java/test/src/main/java/test/IceGrid/simple/AllTests.java @@ -84,6 +84,7 @@ public class AllTests // registries and make sure locator requests are forwarded. // Ice.InitializationData initData = new Ice.InitializationData(); + initData.classLoader = IceInternal.Util.getInstance(communicator).getClassLoader(); 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 0da92bbeffe..9fd18b7967e 100644 --- a/java/test/src/main/java/test/IceGrid/simple/Client.java +++ b/java/test/src/main/java/test/IceGrid/simple/Client.java @@ -40,7 +40,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.IceGrid.simple"); return initData; diff --git a/java/test/src/main/java/test/IceGrid/simple/Server.java b/java/test/src/main/java/test/IceGrid/simple/Server.java index 1b349a70773..67c58c19479 100644 --- a/java/test/src/main/java/test/IceGrid/simple/Server.java +++ b/java/test/src/main/java/test/IceGrid/simple/Server.java @@ -38,7 +38,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); // // Its possible to have batch oneway requests dispatched diff --git a/java/test/src/main/java/test/IceSSL/configuration/AllTests.java b/java/test/src/main/java/test/IceSSL/configuration/AllTests.java index 1e955c8c1f5..c19dbe0f2e5 100644 --- a/java/test/src/main/java/test/IceSSL/configuration/AllTests.java +++ b/java/test/src/main/java/test/IceSSL/configuration/AllTests.java @@ -32,21 +32,21 @@ public class AllTests private static Ice.InitializationData createClientProps(Ice.Properties defaultProperties, String defaultDir, String defaultHost) { - Ice.InitializationData result = new Ice.InitializationData(); - result.properties = Ice.Util.createProperties(); - result.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL.PluginFactory"); + Ice.InitializationData initData = new Ice.InitializationData(); + initData.properties = Ice.Util.createProperties(); + initData.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL.PluginFactory"); if(defaultProperties.getProperty("Ice.IPv6").length() > 0) { - result.properties.setProperty("Ice.IPv6", defaultProperties.getProperty("Ice.IPv6")); + initData.properties.setProperty("Ice.IPv6", defaultProperties.getProperty("Ice.IPv6")); } - result.properties.setProperty("Ice.RetryIntervals", "-1"); - result.properties.setProperty("IceSSL.DefaultDir", defaultDir); - result.properties.setProperty("IceSSL.Random", "seed.dat"); + initData.properties.setProperty("Ice.RetryIntervals", "-1"); + initData.properties.setProperty("IceSSL.DefaultDir", defaultDir); + initData.properties.setProperty("IceSSL.Random", "seed.dat"); if(defaultHost.length() > 0) { - result.properties.setProperty("Ice.Default.Host", defaultHost); + initData.properties.setProperty("Ice.Default.Host", defaultHost); } - return result; + return initData; } private static java.util.Map<String, String> diff --git a/java/test/src/main/java/test/IceSSL/configuration/Client.java b/java/test/src/main/java/test/IceSSL/configuration/Client.java index 36ecfde860d..3894ec17ef7 100644 --- a/java/test/src/main/java/test/IceSSL/configuration/Client.java +++ b/java/test/src/main/java/test/IceSSL/configuration/Client.java @@ -34,7 +34,7 @@ public class Client extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.IceSSL.configuration"); return initData; diff --git a/java/test/src/main/java/test/IceSSL/configuration/Server.java b/java/test/src/main/java/test/IceSSL/configuration/Server.java index 9438f73d419..60de476a19a 100644 --- a/java/test/src/main/java/test/IceSSL/configuration/Server.java +++ b/java/test/src/main/java/test/IceSSL/configuration/Server.java @@ -29,7 +29,7 @@ public class Server extends test.Util.Application @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - Ice.InitializationData initData = new Ice.InitializationData(); + Ice.InitializationData initData = createInitializationData() ; initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.IceSSL.configuration"); return initData; diff --git a/java/test/src/main/java/test/Util/Application.java b/java/test/src/main/java/test/Util/Application.java index 07c7d28b54e..97e39644391 100644 --- a/java/test/src/main/java/test/Util/Application.java +++ b/java/test/src/main/java/test/Util/Application.java @@ -9,17 +9,14 @@ package test.Util; -import Ice.Communicator; -import Ice.InitializationData; -import Ice.LocalException; -import Ice.LoggerI; -import Ice.StringSeqHolder; -import Ice.Util; +import Ice.*; public abstract class Application { public final int WAIT = 2; + + public interface ServerReadyListener { void serverReady(); @@ -48,6 +45,7 @@ public abstract class Application { Ice.StringSeqHolder argsH = new Ice.StringSeqHolder(args); Ice.InitializationData initData = getInitData(argsH); + initData.classLoader = _classLoader; return main(appName, argsH.value, initData); } @@ -181,6 +179,16 @@ public abstract class Application return communicator; } + public Ice.Communicator initialize() + { + Ice.Communicator communicator = Util.initialize(); + if(_communicatorListener != null) + { + _communicatorListener.communicatorInitialized(communicator); + } + return communicator; + } + public abstract int run(String[] args); // @@ -190,7 +198,7 @@ public abstract class Application // protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { - return null; + return createInitializationData(); } public java.io.PrintWriter getWriter() @@ -203,6 +211,11 @@ public abstract class Application _printWriter = new java.io.PrintWriter(writer); } + public void setLogger(Ice.Logger logger) + { + _logger = logger; + } + public void setServerReadyListener(ServerReadyListener cb) { _cb = cb; @@ -221,23 +234,50 @@ public abstract class Application } } + static public boolean isAndroid() + { + return IceInternal.Util.isAndroid(); + } // // Return the application name, i.e., argv[0]. // - public String - appName() + public String appName() { return _testName; } - public Communicator - communicator() + public Communicator communicator() { return _communicator; } + public void setClassLoader(ClassLoader c) + { + _classLoader = c; + } + + public ClassLoader getClassLoader() + { + return _classLoader; + } + + public InitializationData createInitializationData() + { + Ice.InitializationData initData = new Ice.InitializationData(); + initData.classLoader = _classLoader; + initData.logger = _logger; + return initData; + } + + public ClassLoader classLoader() + { + return _classLoader; + } + + private ClassLoader _classLoader; private String _testName; private Communicator _communicator; + private Ice.Logger _logger = null; private java.io.PrintWriter _printWriter = new java.io.PrintWriter(new java.io.OutputStreamWriter(System.out)); private ServerReadyListener _cb = null; private CommunicatorListener _communicatorListener = null; |