summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/exceptions/AllTests.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2014-07-10 16:51:36 -0400
committerBernard Normier <bernard@zeroc.com>2014-07-10 16:51:36 -0400
commit7f767642e79e2775a958781011f13e3d1710c7bd (patch)
treefdb3eb1f826305d0bf3dd659d70c3930001f80c0 /cpp/test/Ice/exceptions/AllTests.cpp
parentICE-5573 - .NET TimeoutException ignores Dispatcher (diff)
downloadice-7f767642e79e2775a958781011f13e3d1710c7bd.tar.bz2
ice-7f767642e79e2775a958781011f13e3d1710c7bd.tar.xz
ice-7f767642e79e2775a958781011f13e3d1710c7bd.zip
Fixed ICE-5379, Object Adapter should reject null servant, in C++, Java, C# and JS
Diffstat (limited to 'cpp/test/Ice/exceptions/AllTests.cpp')
-rw-r--r--cpp/test/Ice/exceptions/AllTests.cpp18
1 files changed, 18 insertions, 0 deletions
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index 605d1f5f9a7..81a093f5c2c 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -1024,6 +1024,24 @@ allTests(const Ice::CommunicatorPtr& communicator)
{
}
+ try
+ {
+ adapter->add(obj, communicator->stringToIdentity(""));
+ }
+ catch(const Ice::IllegalIdentityException& ex)
+ {
+ test(ex.id.name == "");
+ }
+
+ try
+ {
+ adapter->add(0, communicator->stringToIdentity("x"));
+ }
+ catch(const Ice::IllegalServantException&)
+ {
+ }
+
+
adapter->remove(communicator->stringToIdentity("x"));
try
{