diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-05-23 18:47:34 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-05-23 18:47:34 +0200 |
| commit | 0593db2ff6438f0c259144822c6f0ada1f7b79df (patch) | |
| tree | 8400faa0d5bbdd95fcfe03fb9adfb8e117f9da07 /cpp/test/Ice/proxy | |
| parent | Fix whitespace (diff) | |
| download | ice-0593db2ff6438f0c259144822c6f0ada1f7b79df.tar.bz2 ice-0593db2ff6438f0c259144822c6f0ada1f7b79df.tar.xz ice-0593db2ff6438f0c259144822c6f0ada1f7b79df.zip | |
Fixed ICE-7884 - TwowayOnlyException is now raised for twoway invocations on oneway proxies
Diffstat (limited to 'cpp/test/Ice/proxy')
| -rw-r--r-- | cpp/test/Ice/proxy/AllTests.cpp | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp index d3785ad6eef..8c04095bc86 100644 --- a/cpp/test/Ice/proxy/AllTests.cpp +++ b/cpp/test/Ice/proxy/AllTests.cpp @@ -600,7 +600,11 @@ allTests(const Ice::CommunicatorPtr& communicator) base->ice_timeout(0); test(false); } +#ifdef ICE_CPP11_MAPPING + catch(const invalid_argument&) +#else catch(const IceUtil::IllegalArgumentException&) +#endif { } @@ -608,7 +612,11 @@ allTests(const Ice::CommunicatorPtr& communicator) { base->ice_timeout(-1); } +#ifdef ICE_CPP11_MAPPING + catch(const invalid_argument&) +#else catch(const IceUtil::IllegalArgumentException&) +#endif { test(false); } @@ -618,7 +626,11 @@ allTests(const Ice::CommunicatorPtr& communicator) base->ice_timeout(-2); test(false); } +#ifdef ICE_CPP11_MAPPING + catch(const invalid_argument&) +#else catch(const IceUtil::IllegalArgumentException&) +#endif { } @@ -627,7 +639,11 @@ allTests(const Ice::CommunicatorPtr& communicator) base->ice_invocationTimeout(0); test(false); } +#ifdef ICE_CPP11_MAPPING + catch(const invalid_argument&) +#else catch(const IceUtil::IllegalArgumentException&) +#endif { } @@ -636,7 +652,11 @@ allTests(const Ice::CommunicatorPtr& communicator) base->ice_invocationTimeout(-1); base->ice_invocationTimeout(-2); } +#ifdef ICE_CPP11_MAPPING + catch(const invalid_argument&) +#else catch(const IceUtil::IllegalArgumentException&) +#endif { test(false); } @@ -646,7 +666,11 @@ allTests(const Ice::CommunicatorPtr& communicator) base->ice_invocationTimeout(-3); test(false); } +#ifdef ICE_CPP11_MAPPING + catch(const invalid_argument&) +#else catch(const IceUtil::IllegalArgumentException&) +#endif { } @@ -654,7 +678,11 @@ allTests(const Ice::CommunicatorPtr& communicator) { base->ice_locatorCacheTimeout(0); } +#ifdef ICE_CPP11_MAPPING + catch(const invalid_argument&) +#else catch(const IceUtil::IllegalArgumentException&) +#endif { test(false); } @@ -663,7 +691,11 @@ allTests(const Ice::CommunicatorPtr& communicator) { base->ice_locatorCacheTimeout(-1); } +#ifdef ICE_CPP11_MAPPING + catch(const invalid_argument&) +#else catch(const IceUtil::IllegalArgumentException&) +#endif { test(false); } @@ -673,7 +705,11 @@ allTests(const Ice::CommunicatorPtr& communicator) base->ice_locatorCacheTimeout(-2); test(false); } +#ifdef ICE_CPP11_MAPPING + catch(const invalid_argument&) +#else catch(const IceUtil::IllegalArgumentException&) +#endif { } |