summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/exceptions/AllTests.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-08-25 11:28:20 +0200
committerBenoit Foucher <benoit@zeroc.com>2016-08-25 11:28:20 +0200
commit4fa256d3d27adffcc6529136cad904f0fbd490b0 (patch)
tree7250a0b630cfc8400745be4bdf7dde6891943b8c /cpp/test/Ice/exceptions/AllTests.cpp
parentremoving JavaCompat.ice (diff)
downloadice-4fa256d3d27adffcc6529136cad904f0fbd490b0.tar.bz2
ice-4fa256d3d27adffcc6529136cad904f0fbd490b0.tar.xz
ice-4fa256d3d27adffcc6529136cad904f0fbd490b0.zip
C++ dispatching code fixes
- removed user exception check on the server side (ICE-6980) - C++11 dipatch interceptor async callback (ICE-7263) - Fixed slicing/objects test in various mapping (removed Forward.ice)
Diffstat (limited to 'cpp/test/Ice/exceptions/AllTests.cpp')
-rw-r--r--cpp/test/Ice/exceptions/AllTests.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index 990f735a805..46c3ce7ae9a 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -1137,6 +1137,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
try
{
thrower->throwAfterException();
+ test(false);
}
catch(const A&)
{
@@ -1170,7 +1171,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
test(false);
}
}
-
+
{
auto f = thrower->throwAorDasAorDAsync(1);
try
@@ -1187,7 +1188,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
test(false);
}
}
-
+
{
auto f = thrower->throwAorDasAorDAsync(-1);
try
@@ -1260,7 +1261,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
test(false);
}
}
-
+
//
// repeat with callback API and no exception callback
//
@@ -1278,7 +1279,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
});
sent.get_future().get(); // Wait for sent
}
-
+
{
promise<bool> sent;
thrower->throwAorDasAorDAsync(1,
@@ -1293,7 +1294,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
});
sent.get_future().get(); // Wait for sent
}
-
+
{
promise<bool> sent;
thrower->throwAorDasAorDAsync(-1,