Don't write optionals with 1.0 encoding, added UnknownSlicedObject test, fixed exception un-marhsalling to raise UnkownUserException for unknown exceptions.

1 files changed, 18 insertions, 0 deletions

diff --git a/cpp/test/Ice/slicing/objects/TestAMDI.cpp b/cpp/test/Ice/slicing/objects/TestAMDI.cpp
index b8ce7b87b22..6c4582bf053 100644
--- a/cpp/test/Ice/slicing/objects/TestAMDI.cpp
+++ b/cpp/test/Ice/slicing/objects/TestAMDI.cpp
@@ -80,6 +80,24 @@ TestI::SUnknownAsObject_async(const AMD_TestIntf_SUnknownAsObjectPtr& cb, const
 }
 
 void
+TestI::checkSUnknown_async(const AMD_TestIntf_checkSUnknownPtr& cb,
+                           const Ice::ObjectPtr& obj,
+                           const ::Ice::Current& current)
+{
+    SUnknownPtr su = SUnknownPtr::dynamicCast(obj);
+    if(current.encoding == Ice::Encoding_1_0)
+    {
+        test(!su);
+    }
+    else
+    {
+        test(su);
+        test(su->su == "SUnknown.su");
+    }
+    cb->ice_response();
+}
+
+void
 TestI::oneElementCycle_async(const AMD_TestIntf_oneElementCyclePtr& cb, const ::Ice::Current&)
 {
     BPtr b = new B;