diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-03-23 15:29:25 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-03-23 15:29:25 +0100 |
| commit | 1597a75419cd8049252cfbca6fce6ae95ef8b2c7 (patch) | |
| tree | 2b2c858df1dbe68c1d576cae06c4713fd2ad5c40 /cpp/test/Ice/exceptions/AllTests.cpp | |
| parent | Use Ice\None with PHP namespace mapping (diff) | |
| download | ice-1597a75419cd8049252cfbca6fce6ae95ef8b2c7.tar.bz2 ice-1597a75419cd8049252cfbca6fce6ae95ef8b2c7.tar.xz ice-1597a75419cd8049252cfbca6fce6ae95ef8b2c7.zip | |
Fix for ICE-7125 - Added support for Ice.ClassGraphDepthMax
Diffstat (limited to 'cpp/test/Ice/exceptions/AllTests.cpp')
| -rw-r--r-- | cpp/test/Ice/exceptions/AllTests.cpp | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index 7fb9c1a930a..32302c5c6d8 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -988,32 +988,42 @@ allTests(const Ice::CommunicatorPtr& communicator) catch(const Ice::ConnectionLostException&) { } + catch(const Ice::UnknownLocalException&) + { + // Expected with JS bidir server + } catch(const Ice::LocalException& ex) { cerr << ex << endl; test(false); } - ThrowerPrxPtr thrower2 = - ICE_UNCHECKED_CAST(ThrowerPrx, communicator->stringToProxy("thrower:" + getTestEndpoint(communicator, 1))); - try - { - thrower2->throwMemoryLimitException(Ice::ByteSeq(2 * 1024 * 1024)); // 2MB (no limits) - } - catch(const Ice::MemoryLimitException&) - { - } - ThrowerPrxPtr thrower3 = - ICE_UNCHECKED_CAST(ThrowerPrx, communicator->stringToProxy("thrower:" + getTestEndpoint(communicator, 2))); try { - thrower3->throwMemoryLimitException(Ice::ByteSeq(1024)); // 1KB limit - test(false); + ThrowerPrxPtr thrower2 = + ICE_UNCHECKED_CAST(ThrowerPrx, communicator->stringToProxy("thrower:" + getTestEndpoint(communicator, 1))); + try + { + thrower2->throwMemoryLimitException(Ice::ByteSeq(2 * 1024 * 1024)); // 2MB (no limits) + } + catch(const Ice::MemoryLimitException&) + { + } + ThrowerPrxPtr thrower3 = + ICE_UNCHECKED_CAST(ThrowerPrx, communicator->stringToProxy("thrower:" + getTestEndpoint(communicator, 2))); + try + { + thrower3->throwMemoryLimitException(Ice::ByteSeq(1024)); // 1KB limit + test(false); + } + catch(const Ice::ConnectionLostException&) + { + } } - catch(const Ice::ConnectionLostException&) + catch(const Ice::ConnectionRefusedException&) { + // Expected with JS bidir server } - cout << "ok" << endl; } |