diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-04-26 09:00:57 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-04-26 09:00:57 +0200 |
| commit | c2ce37b7b0f6fc033cac4d52d460ee2f389d7737 (patch) | |
| tree | dab204bc1dfd9298c7acb13b9493a210f8c4e978 /objective-c/test | |
| parent | Add jquery-cookie to bower dependency (diff) | |
| download | ice-c2ce37b7b0f6fc033cac4d52d460ee2f389d7737.tar.bz2 ice-c2ce37b7b0f6fc033cac4d52d460ee2f389d7737.tar.xz ice-c2ce37b7b0f6fc033cac4d52d460ee2f389d7737.zip | |
Fixed ICE-7115 - unmarshalling bug with optional parameters
Diffstat (limited to 'objective-c/test')
| -rw-r--r-- | objective-c/test/Ice/optional/AllTests.m | 8 | ||||
| -rw-r--r-- | objective-c/test/Ice/optional/OptionalTest.ice | 4 | ||||
| -rw-r--r-- | objective-c/test/Ice/optional/TestI.m | 3 |
3 files changed, 14 insertions, 1 deletions
diff --git a/objective-c/test/Ice/optional/AllTests.m b/objective-c/test/Ice/optional/AllTests.m index 6ab72db77ca..178fbb61ffb 100644 --- a/objective-c/test/Ice/optional/AllTests.m +++ b/objective-c/test/Ice/optional/AllTests.m @@ -637,6 +637,14 @@ optionalAllTests(id<ICECommunicator> communicator) test(r.gg2.a == 10); test(r.gg2Opt.a == 20); + os = [ICEUtil createOutputStream:communicator]; + [os startEncapsulation]; + [ICEIntHelper writeOpt:@15 stream:os tag:1]; + [ICEStringHelper writeOpt:@"test" stream:os tag:2]; + [os endEncapsulation]; + inEncaps = [os finished]; + test([initial ice_invoke:@"opVoid" mode:ICENormal inEncaps:inEncaps outEncaps:&outEncaps]); + tprintf("ok\n"); tprintf("testing marshalling of large containers with fixed size elements..."); diff --git a/objective-c/test/Ice/optional/OptionalTest.ice b/objective-c/test/Ice/optional/OptionalTest.ice index b8411fde1f5..d1748c5d47b 100644 --- a/objective-c/test/Ice/optional/OptionalTest.ice +++ b/objective-c/test/Ice/optional/OptionalTest.ice @@ -295,7 +295,9 @@ class Initial void returnOptionalClass(bool req, out optional(1) OneOptional o); G opG(G g); - + + void opVoid(); + bool supportsRequiredParams(); bool supportsJavaSerializable(); diff --git a/objective-c/test/Ice/optional/TestI.m b/objective-c/test/Ice/optional/TestI.m index 6cb522c55b7..2a7df650f51 100644 --- a/objective-c/test/Ice/optional/TestI.m +++ b/objective-c/test/Ice/optional/TestI.m @@ -227,6 +227,9 @@ { return g; } +-(void) opVoid:(ICECurrent*)current +{ +} -(BOOL) supportsRequiredParams:(ICECurrent*)current { |