summaryrefslogtreecommitdiff
path: root/csharp/test
diff options
context:
space:
mode:
Diffstat (limited to 'csharp/test')
-rw-r--r--csharp/test/Ice/slicing/exceptions/AllTests.cs223
-rw-r--r--csharp/test/Ice/slicing/exceptions/TestAMDI.cs12
-rw-r--r--csharp/test/Ice/slicing/exceptions/TestI.cs12
3 files changed, 126 insertions, 121 deletions
diff --git a/csharp/test/Ice/slicing/exceptions/AllTests.cs b/csharp/test/Ice/slicing/exceptions/AllTests.cs
index 46942a0b730..c579618f4e5 100644
--- a/csharp/test/Ice/slicing/exceptions/AllTests.cs
+++ b/csharp/test/Ice/slicing/exceptions/AllTests.cs
@@ -1112,126 +1112,123 @@ public class AllTests : TestCommon.AllTests
}
WriteLine("ok");
- string defaultHost = communicator.getProperties().getProperty("Ice.Default.Host");
- if(defaultHost.Equals("127.0.0.1") || defaultHost.Equals("::1"))
+ Write("preserved exceptions... ");
+ Flush();
{
- Write("preserved exceptions... ");
- Flush();
- {
- Ice.ObjectAdapter adapter = communicator.createObjectAdapterWithEndpoints("Relay", "default");
- RelayPrx relay = RelayPrxHelper.uncheckedCast(adapter.addWithUUID(new RelayI()));
- adapter.activate();
-
- try
- {
- testPrx.relayKnownPreservedAsBase(relay);
- test(false);
- }
- catch(KnownPreservedDerived ex)
- {
- test(ex.b.Equals("base"));
- test(ex.kp.Equals("preserved"));
- test(ex.kpd.Equals("derived"));
- }
- catch(Ice.OperationNotExistException)
- {
- }
- catch(Exception)
- {
- test(false);
- }
+ Ice.ObjectAdapter adapter = communicator.createObjectAdapter("");
+ RelayPrx relay = RelayPrxHelper.uncheckedCast(adapter.addWithUUID(new RelayI()));
+ adapter.activate();
+ testPrx.ice_getConnection().setAdapter(adapter);
- try
- {
- testPrx.relayKnownPreservedAsKnownPreserved(relay);
- test(false);
- }
- catch(KnownPreservedDerived ex)
- {
- test(ex.b.Equals("base"));
- test(ex.kp.Equals("preserved"));
- test(ex.kpd.Equals("derived"));
- }
- catch(Ice.OperationNotExistException)
- {
- }
- catch(Exception)
- {
- test(false);
- }
+ try
+ {
+ testPrx.relayKnownPreservedAsBase(relay);
+ test(false);
+ }
+ catch(KnownPreservedDerived ex)
+ {
+ test(ex.b.Equals("base"));
+ test(ex.kp.Equals("preserved"));
+ test(ex.kpd.Equals("derived"));
+ }
+ catch(Ice.OperationNotExistException)
+ {
+ }
+ catch(Exception)
+ {
+ test(false);
+ }
- try
- {
- testPrx.relayUnknownPreservedAsBase(relay);
- test(false);
- }
- catch(Preserved2 ex)
- {
- test(ex.b.Equals("base"));
- test(ex.kp.Equals("preserved"));
- test(ex.kpd.Equals("derived"));
- test(ex.p1.ice_id().Equals(PreservedClass.ice_staticId()));
- PreservedClass pc = ex.p1 as PreservedClass;
- test(pc.bc.Equals("bc"));
- test(pc.pc.Equals("pc"));
- test(ex.p2 == ex.p1);
- }
- catch(KnownPreservedDerived ex)
- {
- //
- // For the 1.0 encoding, the unknown exception is sliced to KnownPreserved.
- //
- test(testPrx.ice_getEncodingVersion().Equals(Ice.Util.Encoding_1_0));
- test(ex.b.Equals("base"));
- test(ex.kp.Equals("preserved"));
- test(ex.kpd.Equals("derived"));
- }
- catch(Ice.OperationNotExistException)
- {
- }
- catch(Exception)
- {
- test(false);
- }
+ try
+ {
+ testPrx.relayKnownPreservedAsKnownPreserved(relay);
+ test(false);
+ }
+ catch(KnownPreservedDerived ex)
+ {
+ test(ex.b.Equals("base"));
+ test(ex.kp.Equals("preserved"));
+ test(ex.kpd.Equals("derived"));
+ }
+ catch(Ice.OperationNotExistException)
+ {
+ }
+ catch(Exception)
+ {
+ test(false);
+ }
- try
- {
- testPrx.relayUnknownPreservedAsKnownPreserved(relay);
- test(false);
- }
- catch(Preserved2 ex)
- {
- test(ex.b.Equals("base"));
- test(ex.kp.Equals("preserved"));
- test(ex.kpd.Equals("derived"));
- test(ex.p1.ice_id().Equals(PreservedClass.ice_staticId()));
- PreservedClass pc = ex.p1 as PreservedClass;
- test(pc.bc.Equals("bc"));
- test(pc.pc.Equals("pc"));
- test(ex.p2 == ex.p1);
- }
- catch(KnownPreservedDerived ex)
- {
- //
- // For the 1.0 encoding, the unknown exception is sliced to KnownPreserved.
- //
- test(testPrx.ice_getEncodingVersion().Equals(Ice.Util.Encoding_1_0));
- test(ex.b.Equals("base"));
- test(ex.kp.Equals("preserved"));
- test(ex.kpd.Equals("derived"));
- }
- catch(Ice.OperationNotExistException)
- {
- }
- catch(Exception)
- {
- test(false);
- }
+ try
+ {
+ testPrx.relayUnknownPreservedAsBase(relay);
+ test(false);
+ }
+ catch(Preserved2 ex)
+ {
+ test(ex.b.Equals("base"));
+ test(ex.kp.Equals("preserved"));
+ test(ex.kpd.Equals("derived"));
+ test(ex.p1.ice_id().Equals(PreservedClass.ice_staticId()));
+ PreservedClass pc = ex.p1 as PreservedClass;
+ test(pc.bc.Equals("bc"));
+ test(pc.pc.Equals("pc"));
+ test(ex.p2 == ex.p1);
+ }
+ catch(KnownPreservedDerived ex)
+ {
+ //
+ // For the 1.0 encoding, the unknown exception is sliced to KnownPreserved.
+ //
+ test(testPrx.ice_getEncodingVersion().Equals(Ice.Util.Encoding_1_0));
+ test(ex.b.Equals("base"));
+ test(ex.kp.Equals("preserved"));
+ test(ex.kpd.Equals("derived"));
+ }
+ catch(Ice.OperationNotExistException)
+ {
+ }
+ catch(Exception)
+ {
+ test(false);
+ }
- adapter.destroy();
+ try
+ {
+ testPrx.relayUnknownPreservedAsKnownPreserved(relay);
+ test(false);
+ }
+ catch(Preserved2 ex)
+ {
+ test(ex.b.Equals("base"));
+ test(ex.kp.Equals("preserved"));
+ test(ex.kpd.Equals("derived"));
+ test(ex.p1.ice_id().Equals(PreservedClass.ice_staticId()));
+ PreservedClass pc = ex.p1 as PreservedClass;
+ test(pc.bc.Equals("bc"));
+ test(pc.pc.Equals("pc"));
+ test(ex.p2 == ex.p1);
}
- WriteLine("ok");
+ catch(KnownPreservedDerived ex)
+ {
+ //
+ // For the 1.0 encoding, the unknown exception is sliced to KnownPreserved.
+ //
+ test(testPrx.ice_getEncodingVersion().Equals(Ice.Util.Encoding_1_0));
+ test(ex.b.Equals("base"));
+ test(ex.kp.Equals("preserved"));
+ test(ex.kpd.Equals("derived"));
+ }
+ catch(Ice.OperationNotExistException)
+ {
+ }
+ catch(Exception)
+ {
+ test(false);
+ }
+
+ adapter.destroy();
}
+ WriteLine("ok");
return testPrx;
}
diff --git a/csharp/test/Ice/slicing/exceptions/TestAMDI.cs b/csharp/test/Ice/slicing/exceptions/TestAMDI.cs
index 60ce36cbd85..2713b4a10c8 100644
--- a/csharp/test/Ice/slicing/exceptions/TestAMDI.cs
+++ b/csharp/test/Ice/slicing/exceptions/TestAMDI.cs
@@ -122,7 +122,8 @@ public sealed class TestI : TestIntfDisp_
public override Task
relayKnownPreservedAsBaseAsync(RelayPrx r, Ice.Current current)
{
- r.knownPreservedAsBase();
+ RelayPrx p = RelayPrxHelper.uncheckedCast(current.con.createProxy(r.ice_getIdentity()));
+ p.knownPreservedAsBase();
test(false);
return null;
}
@@ -130,7 +131,8 @@ public sealed class TestI : TestIntfDisp_
public override Task
relayKnownPreservedAsKnownPreservedAsync(RelayPrx r, Ice.Current current)
{
- r.knownPreservedAsKnownPreserved();
+ RelayPrx p = RelayPrxHelper.uncheckedCast(current.con.createProxy(r.ice_getIdentity()));
+ p.knownPreservedAsKnownPreserved();
test(false);
return null;
}
@@ -161,7 +163,8 @@ public sealed class TestI : TestIntfDisp_
public override Task
relayUnknownPreservedAsBaseAsync(RelayPrx r, Ice.Current current)
{
- r.unknownPreservedAsBase();
+ RelayPrx p = RelayPrxHelper.uncheckedCast(current.con.createProxy(r.ice_getIdentity()));
+ p.unknownPreservedAsBase();
test(false);
return null;
}
@@ -169,7 +172,8 @@ public sealed class TestI : TestIntfDisp_
public override Task
relayUnknownPreservedAsKnownPreservedAsync(RelayPrx r, Ice.Current current)
{
- r.unknownPreservedAsKnownPreserved();
+ RelayPrx p = RelayPrxHelper.uncheckedCast(current.con.createProxy(r.ice_getIdentity()));
+ p.unknownPreservedAsKnownPreserved();
test(false);
return null;
}
diff --git a/csharp/test/Ice/slicing/exceptions/TestI.cs b/csharp/test/Ice/slicing/exceptions/TestI.cs
index 60655af4e2a..6896f7a7618 100644
--- a/csharp/test/Ice/slicing/exceptions/TestI.cs
+++ b/csharp/test/Ice/slicing/exceptions/TestI.cs
@@ -162,13 +162,15 @@ public sealed class TestI : TestIntfDisp_
public override void relayKnownPreservedAsBase(RelayPrx r, Ice.Current current)
{
- r.knownPreservedAsBase();
+ RelayPrx p = RelayPrxHelper.uncheckedCast(current.con.createProxy(r.ice_getIdentity()));
+ p.knownPreservedAsBase();
test(false);
}
public override void relayKnownPreservedAsKnownPreserved(RelayPrx r, Ice.Current current)
{
- r.knownPreservedAsKnownPreserved();
+ RelayPrx p = RelayPrxHelper.uncheckedCast(current.con.createProxy(r.ice_getIdentity()));
+ p.knownPreservedAsKnownPreserved();
test(false);
}
@@ -196,13 +198,15 @@ public sealed class TestI : TestIntfDisp_
public override void relayUnknownPreservedAsBase(RelayPrx r, Ice.Current current)
{
- r.unknownPreservedAsBase();
+ RelayPrx p = RelayPrxHelper.uncheckedCast(current.con.createProxy(r.ice_getIdentity()));
+ p.unknownPreservedAsBase();
test(false);
}
public override void relayUnknownPreservedAsKnownPreserved(RelayPrx r, Ice.Current current)
{
- r.unknownPreservedAsKnownPreserved();
+ RelayPrx p = RelayPrxHelper.uncheckedCast(current.con.createProxy(r.ice_getIdentity()));
+ p.unknownPreservedAsKnownPreserved();
test(false);
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 22:49:07 +0000