diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-06-21 18:34:37 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-06-21 18:34:37 +0200 |
| commit | ec78a48c45fece921fb3219a27a3e2b1ab87819d (patch) | |
| tree | d0c1cc9d379fa5cb102277fb99a2dadc88ccfff6 /objective-c | |
| parent | Windows UWP build instructions updates (diff) | |
| download | ice-ec78a48c45fece921fb3219a27a3e2b1ab87819d.tar.bz2 ice-ec78a48c45fece921fb3219a27a3e2b1ab87819d.tar.xz ice-ec78a48c45fece921fb3219a27a3e2b1ab87819d.zip | |
Fixed ICE-8132 - Ice/slicing/exceptions failure with UWP/SSL
Diffstat (limited to 'objective-c')
| -rw-r--r-- | objective-c/test/Ice/slicing/exceptions/AllTests.m | 4 | ||||
| -rw-r--r-- | objective-c/test/Ice/slicing/exceptions/TestI.m | 16 |
2 files changed, 14 insertions, 6 deletions
diff --git a/objective-c/test/Ice/slicing/exceptions/AllTests.m b/objective-c/test/Ice/slicing/exceptions/AllTests.m index 719a2d0b12d..41af9beedef 100644 --- a/objective-c/test/Ice/slicing/exceptions/AllTests.m +++ b/objective-c/test/Ice/slicing/exceptions/AllTests.m @@ -685,11 +685,11 @@ slicingExceptionsAllTests(id<ICECommunicator> communicator) tprintf("preserved exceptions... "); { - id<ICEObjectAdapter> adapter = [communicator createObjectAdapterWithEndpoints:@"Relay" endpoints:@"default"]; + id<ICEObjectAdapter> adapter = [communicator createObjectAdapter:@""]; TestSlicingExceptionsClientRelayPrx* relay = [TestSlicingExceptionsClientRelayPrx uncheckedCast:[adapter addWithUUID:[RelayI relay]]]; [adapter activate]; - + [[test ice_getConnection] setAdapter:adapter]; @try { [test relayKnownPreservedAsBase:relay]; diff --git a/objective-c/test/Ice/slicing/exceptions/TestI.m b/objective-c/test/Ice/slicing/exceptions/TestI.m index c77d4a7c1bd..d9587ee8e8d 100644 --- a/objective-c/test/Ice/slicing/exceptions/TestI.m +++ b/objective-c/test/Ice/slicing/exceptions/TestI.m @@ -104,13 +104,17 @@ -(void) relayKnownPreservedAsBase:(TestSlicingExceptionsServerRelayPrx*)relay current:(ICECurrent*)current { - [relay knownPreservedAsBase]; + TestSlicingExceptionsServerRelayPrx* p = + [TestSlicingExceptionsServerRelayPrx uncheckedCast:[current.con createProxy:[relay ice_getIdentity]]]; + [p knownPreservedAsBase]; test(NO); } -(void) relayKnownPreservedAsKnownPreserved:(TestSlicingExceptionsServerRelayPrx*)relay current:(ICECurrent*)current { - [relay knownPreservedAsKnownPreserved]; + TestSlicingExceptionsServerRelayPrx* p = + [TestSlicingExceptionsServerRelayPrx uncheckedCast:[current.con createProxy:[relay ice_getIdentity]]]; + [p knownPreservedAsKnownPreserved]; test(NO); } @@ -138,13 +142,17 @@ -(void) relayUnknownPreservedAsBase:(TestSlicingExceptionsServerRelayPrx*)relay current:(ICECurrent*)current { - [relay unknownPreservedAsBase]; + TestSlicingExceptionsServerRelayPrx* p = + [TestSlicingExceptionsServerRelayPrx uncheckedCast:[current.con createProxy:[relay ice_getIdentity]]]; + [p unknownPreservedAsBase]; test(NO); } -(void) relayUnknownPreservedAsKnownPreserved:(TestSlicingExceptionsServerRelayPrx*)relay current:(ICECurrent*)current { - [relay unknownPreservedAsKnownPreserved]; + TestSlicingExceptionsServerRelayPrx* p = + [TestSlicingExceptionsServerRelayPrx uncheckedCast:[current.con createProxy:[relay ice_getIdentity]]]; + [p unknownPreservedAsKnownPreserved]; test(NO); } |