[hydra-commits] beagles: branch ice/slice-preserving-translators r613 - /ice/branches/slice-p...

[SVN commits to the Hydra project]

Author: beagles
Date: Wed May  5 11:53:22 2010
New Revision: 613

URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=613
Log:
add missing test implementation to the AMD side

Modified:
    ice/branches/slice-preserving-translators/cpp/test/Ice/slicing/exceptions/TestAMD.ice
    ice/branches/slice-preserving-translators/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
    ice/branches/slice-preserving-translators/cpp/test/Ice/slicing/exceptions/TestAMDI.h

Modified: ice/branches/slice-preserving-translators/cpp/test/Ice/slicing/exceptions/TestAMD.ice
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/slice-preserving-translators/cpp/test/Ice/slicing/exceptions/TestAMD.ice?view=diff&rev=613&r1=612&r2=613
==============================================================================
--- ice/branches/slice-preserving-translators/cpp/test/Ice/slicing/exceptions/TestAMD.ice (original)
+++ ice/branches/slice-preserving-translators/cpp/test/Ice/slicing/exceptions/TestAMD.ice Wed May  5 11:53:22 2010
@@ -38,11 +38,17 @@
 {
 };
 
+class InnerClass 
+{
+    string ic;
+};
+
 interface ClientIntf
 {
     void baseAsBase() throws Base;
     void unknownDerivedAsBase() throws Base;
     void unsliceableDerivedAsBase() throws Base;
+    void unsliceableWithInnerClass() throws Base;
 };
 
 ["ami", "amd"] interface TestIntf
@@ -69,6 +75,7 @@
     void clientBaseAsBaseRethrow(ClientIntf* client) throws Base;
     void clientUnknownDerivedAsBaseRethrow(ClientIntf* client) throws Base;
     void clientUnsliceableDerivedAsBaseRethrow(ClientIntf* client) throws Base;
+    void clientUnsliceableInnerClassRethrow(ClientIntf* client) throws Base;
 
     void shutdown();
 };

Modified: ice/branches/slice-preserving-translators/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/slice-preserving-translators/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp?view=diff&rev=613&r1=612&r2=613
==============================================================================
--- ice/branches/slice-preserving-translators/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp (original)
+++ ice/branches/slice-preserving-translators/cpp/test/Ice/slicing/exceptions/TestAMDI.cpp Wed May  5 11:53:22 2010
@@ -219,6 +219,22 @@
 }
 
 void
+TestI::clientUnsliceableInnerClassRethrow_async(
+    const Test::AMD_TestIntf_clientUnsliceableInnerClassRethrowPtr& cb,
+    const Test::ClientIntfPrx& client,
+    const ::Ice::Current&)
+{
+    try
+    {
+        client->unsliceableWithInnerClass();
+    }
+    catch (const Base& ex)
+    {
+        cb->ice_exception(ex);
+    }
+}
+
+void
 TestI::shutdown_async(const AMD_TestIntf_shutdownPtr& cb, const ::Ice::Current& current)
 {
     current.adapter->getCommunicator()->shutdown();

Modified: ice/branches/slice-preserving-translators/cpp/test/Ice/slicing/exceptions/TestAMDI.h
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/slice-preserving-translators/cpp/test/Ice/slicing/exceptions/TestAMDI.h?view=diff&rev=613&r1=612&r2=613
==============================================================================
--- ice/branches/slice-preserving-translators/cpp/test/Ice/slicing/exceptions/TestAMDI.h (original)
+++ ice/branches/slice-preserving-translators/cpp/test/Ice/slicing/exceptions/TestAMDI.h Wed May  5 11:53:22 2010
@@ -81,6 +81,10 @@
         const Test::AMD_TestIntf_clientUnsliceableDerivedAsBaseRethrowPtr&,
         const Test::ClientIntfPrx&,
         const ::Ice::Current&);
+    virtual void clientUnsliceableInnerClassRethrow_async(
+      const Test::AMD_TestIntf_clientUnsliceableInnerClassRethrowPtr&,
+      const Test::ClientIntfPrx&,
+      const ::Ice::Current&);
 
     virtual void shutdown_async(const ::Test::AMD_TestIntf_shutdownPtr&, const ::Ice::Current&);
 };