[hydra-commits] beagles: branch ice/preserve-graphs r643 - in /ice/branches/preserve-graphs: ...
SVN commits to the Hydra project
hydra-commits at lists.digium.com
Tue May 25 11:31:46 CDT 2010
Author: beagles
Date: Tue May 25 11:31:45 2010
New Revision: 643
URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=643
Log:
adding missing amd implementations of test suite
Modified:
ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/AllTests.cs
ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/TestAMD.ice
ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/TestAMDI.cs
ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/AMDTestI.java
ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
Modified: ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/AllTests.cs
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/AllTests.cs?view=diff&rev=643&r1=642&r2=643
==============================================================================
--- ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/AllTests.cs (original)
+++ ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/AllTests.cs Tue May 25 11:31:45 2010
@@ -790,8 +790,9 @@
test(b.b.Equals("Base"));
test(b.ice_name().Equals("Test::Base"));
}
- catch(Exception)
- {
+ catch(Exception ex)
+ {
+ Console.Out.WriteLine(ex);
test(false);
}
}
Modified: ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/TestAMD.ice
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/TestAMD.ice?view=diff&rev=643&r1=642&r2=643
==============================================================================
--- ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/TestAMD.ice (original)
+++ ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/TestAMD.ice Tue May 25 11:31:45 2010
@@ -33,6 +33,25 @@
string kmd;
};
+["preserve"]
+exception BaseUnsliceable extends Base
+{
+};
+
+["preserve"]
+class InnerClass
+{
+ string ic;
+};
+
+interface ClientIntf
+{
+ void baseAsBase() throws Base;
+ void unknownDerivedAsBase() throws Base;
+ void unsliceableDerivedAsBase() throws Base;
+ void unsliceableWithInnerClass() throws Base;
+};
+
["amd"] interface TestIntf
{
void baseAsBase() throws Base;
@@ -51,6 +70,14 @@
void unknownMostDerived1AsKnownIntermediate() throws KnownIntermediate;
void unknownMostDerived2AsBase() throws Base;
+ void clientBaseAsBasePass(ClientIntf* client) throws Base;
+ void clientUnknownDerivedAsBasePass(ClientIntf* client) throws Base;
+ void clientUnsliceableDerivedAsBasePass(ClientIntf* client) throws Base;
+ 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/preserve-graphs/cs/test/Ice/slicing/exceptions/TestAMDI.cs
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/TestAMDI.cs?view=diff&rev=643&r1=642&r2=643
==============================================================================
--- ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/TestAMDI.cs (original)
+++ ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/TestAMDI.cs Tue May 25 11:31:45 2010
@@ -135,4 +135,95 @@
umd2.umd2 = "UnknownMostDerived2.umd2";
cb.ice_exception(umd2);
}
+
+ public override void
+ clientBaseAsBasePass_async(AMD_TestIntf_clientBaseAsBasePass cb, ClientIntfPrx client, Ice.Current current)
+ {
+ try
+ {
+ client.baseAsBase();
+ }
+ catch(Base b)
+ {
+ cb.ice_exception(b);
+ }
+ }
+
+ public override void
+ clientUnknownDerivedAsBasePass_async(AMD_TestIntf_clientUnknownDerivedAsBasePass cb, ClientIntfPrx client, Ice.Current current)
+ {
+ try
+ {
+ client.unknownDerivedAsBase();
+ }
+ catch(Base b)
+ {
+ cb.ice_exception(b);
+ }
+ }
+
+ public override void
+ clientUnsliceableDerivedAsBasePass_async(AMD_TestIntf_clientUnsliceableDerivedAsBasePass cb, ClientIntfPrx client, Ice.Current current)
+ {
+ try
+ {
+ client.unsliceableDerivedAsBase();
+ }
+ catch(Base b)
+ {
+ cb.ice_exception(b);
+ }
+ }
+
+ public override void
+ clientBaseAsBaseRethrow_async(AMD_TestIntf_clientBaseAsBaseRethrow cb, ClientIntfPrx client, Ice.Current current)
+ {
+ try
+ {
+ client.baseAsBase();
+ }
+ catch(Base ex)
+ {
+ cb.ice_exception(ex);
+ }
+ }
+
+ public override void
+ clientUnknownDerivedAsBaseRethrow_async(AMD_TestIntf_clientUnknownDerivedAsBaseRethrow cb, ClientIntfPrx client, Ice.Current current)
+ {
+ try
+ {
+ client.unknownDerivedAsBase();
+ }
+ catch(Base ex)
+ {
+ cb.ice_exception(ex);
+ }
+ }
+
+ public override void
+ clientUnsliceableDerivedAsBaseRethrow_async(AMD_TestIntf_clientUnsliceableDerivedAsBaseRethrow cb, ClientIntfPrx client, Ice.Current current)
+ {
+ try
+ {
+ client.unsliceableDerivedAsBase();
+ }
+ catch(Base ex)
+ {
+ cb.ice_exception(ex);
+ }
+ }
+
+ public override void
+ clientUnsliceableInnerClassRethrow_async(AMD_TestIntf_clientUnsliceableInnerClassRethrow cb, ClientIntfPrx client, Ice.Current current)
+ {
+ try
+ {
+ client.unsliceableWithInnerClass();
+ }
+ catch(Base ex)
+ {
+ cb.ice_exception(ex);
+ }
+ }
}
Modified: ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/AMDTestI.java
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/AMDTestI.java?view=diff&rev=643&r1=642&r2=643
==============================================================================
--- ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/AMDTestI.java (original)
+++ ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/AMDTestI.java Tue May 25 11:31:45 2010
@@ -23,6 +23,13 @@
import test.Ice.slicing.exceptions.serverAMD.Test.AMD_TestIntf_unknownMostDerived1AsBase;
import test.Ice.slicing.exceptions.serverAMD.Test.AMD_TestIntf_unknownMostDerived1AsKnownIntermediate;
import test.Ice.slicing.exceptions.serverAMD.Test.AMD_TestIntf_unknownMostDerived2AsBase;
+import test.Ice.slicing.exceptions.serverAMD.Test.AMD_TestIntf_clientBaseAsBasePass;
+import test.Ice.slicing.exceptions.serverAMD.Test.AMD_TestIntf_clientUnknownDerivedAsBasePass;
+import test.Ice.slicing.exceptions.serverAMD.Test.AMD_TestIntf_clientUnsliceableDerivedAsBasePass;
+import test.Ice.slicing.exceptions.serverAMD.Test.AMD_TestIntf_clientBaseAsBaseRethrow;
+import test.Ice.slicing.exceptions.serverAMD.Test.AMD_TestIntf_clientUnknownDerivedAsBaseRethrow;
+import test.Ice.slicing.exceptions.serverAMD.Test.AMD_TestIntf_clientUnsliceableDerivedAsBaseRethrow;
+import test.Ice.slicing.exceptions.serverAMD.Test.AMD_TestIntf_clientUnsliceableInnerClassRethrow;
import test.Ice.slicing.exceptions.serverAMD.Test.Base;
import test.Ice.slicing.exceptions.serverAMD.Test.KnownDerived;
import test.Ice.slicing.exceptions.serverAMD.Test.KnownIntermediate;
@@ -31,6 +38,8 @@
import test.Ice.slicing.exceptions.serverAMD.Test.UnknownIntermediate;
import test.Ice.slicing.exceptions.serverAMD.Test.UnknownMostDerived1;
import test.Ice.slicing.exceptions.serverAMD.Test.UnknownMostDerived2;
+import test.Ice.slicing.exceptions.serverAMD.Test.ClientIntfPrx;
+import test.Ice.slicing.exceptions.serverAMD.Test.ClientIntfPrxHelper;
import test.Ice.slicing.exceptions.serverAMD.Test._TestIntfDisp;
public final class AMDTestI extends _TestIntfDisp
@@ -185,4 +194,102 @@
umd2.umd2 = "UnknownMostDerived2.umd2";
cb.ice_exception(umd2);
}
+
+ public void
+ clientBaseAsBasePass_async(AMD_TestIntf_clientBaseAsBasePass cb, ClientIntfPrx client, Ice.Current current)
+ throws Base
+ {
+ try
+ {
+ client.baseAsBase();
+ }
+ catch(Base b)
+ {
+ cb.ice_exception(b);
+ }
+ }
+
+ public void
+ clientUnknownDerivedAsBasePass_async(AMD_TestIntf_clientUnknownDerivedAsBasePass cb, ClientIntfPrx client, Ice.Current current)
+ throws Base
+ {
+ try
+ {
+ client.unknownDerivedAsBase();
+ }
+ catch(Base b)
+ {
+ cb.ice_exception(b);
+ }
+ }
+
+ public void
+ clientUnsliceableDerivedAsBasePass_async(AMD_TestIntf_clientUnsliceableDerivedAsBasePass cb, ClientIntfPrx client, Ice.Current current)
+ throws Base
+ {
+ try
+ {
+ client.unsliceableDerivedAsBase();
+ }
+ catch(Base b)
+ {
+ cb.ice_exception(b);
+ }
+ }
+
+ public void
+ clientBaseAsBaseRethrow_async(AMD_TestIntf_clientBaseAsBaseRethrow cb, ClientIntfPrx client, Ice.Current current)
+ throws Base
+ {
+ try
+ {
+ client.baseAsBase();
+ }
+ catch(Base ex)
+ {
+ cb.ice_exception(ex);
+ }
+ }
+
+ public void
+ clientUnknownDerivedAsBaseRethrow_async(AMD_TestIntf_clientUnknownDerivedAsBaseRethrow cb, ClientIntfPrx client, Ice.Current current)
+ throws Base
+ {
+ try
+ {
+ client.unknownDerivedAsBase();
+ }
+ catch(Base ex)
+ {
+ cb.ice_exception(ex);
+ }
+ }
+
+ public void
+ clientUnsliceableDerivedAsBaseRethrow_async(AMD_TestIntf_clientUnsliceableDerivedAsBaseRethrow cb, ClientIntfPrx client, Ice.Current current)
+ throws Base
+ {
+ try
+ {
+ client.unsliceableDerivedAsBase();
+ }
+ catch(Base ex)
+ {
+ cb.ice_exception(ex);
+ }
+ }
+
+ public void
+ clientUnsliceableInnerClassRethrow_async(AMD_TestIntf_clientUnsliceableInnerClassRethrow cb, ClientIntfPrx client, Ice.Current current)
+ throws Base
+ {
+ try
+ {
+ client.unsliceableWithInnerClass();
+ }
+ catch(Base ex)
+ {
+ cb.ice_exception(ex);
+ }
+ }
}
Modified: ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice?view=diff&rev=643&r1=642&r2=643
==============================================================================
--- ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice (original)
+++ ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/ServerPrivateAMD.ice Tue May 25 11:31:45 2010
@@ -36,6 +36,25 @@
string kmd;
};
+["preserve"]
+exception BaseUnsliceable extends Base
+{
+};
+
+["preserve"]
+class InnerClass
+{
+ string ic;
+};
+
+interface ClientIntf
+{
+ void baseAsBase() throws Base;
+ void unknownDerivedAsBase() throws Base;
+ void unsliceableDerivedAsBase() throws Base;
+ void unsliceableWithInnerClass() throws Base;
+};
+
["amd"] interface TestIntf
{
void baseAsBase() throws Base;
@@ -53,6 +72,14 @@
void unknownMostDerived1AsBase() throws Base;
void unknownMostDerived1AsKnownIntermediate() throws KnownIntermediate;
void unknownMostDerived2AsBase() throws Base;
+
+ void clientBaseAsBasePass(ClientIntf* client) throws Base;
+ void clientUnknownDerivedAsBasePass(ClientIntf* client) throws Base;
+ void clientUnsliceableDerivedAsBasePass(ClientIntf* client) throws Base;
+ 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();
};
More information about the asterisk-scf-commits
mailing list