summaryrefslogtreecommitdiff
path: root/objective-c
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2015-05-07 10:45:06 -0230
committerDwayne Boone <dwayne@zeroc.com>2015-05-07 10:45:06 -0230
commit32484736115808adb9c5d046fd1f08c6284b4fd1 (patch)
treeec00dbc4c67f92b1e5497b0dc2128b6f8f96367f /objective-c
parentICE-6488 ObjC test/Ice/exceptions fails with --cross=js and --cross=java (diff)
downloadice-32484736115808adb9c5d046fd1f08c6284b4fd1.tar.bz2
ice-32484736115808adb9c5d046fd1f08c6284b4fd1.tar.xz
ice-32484736115808adb9c5d046fd1f08c6284b4fd1.zip
ICE-6487 ObjC test/Ice/objects fails with --cross=js
Diffstat (limited to 'objective-c')
-rw-r--r--objective-c/test/Ice/objects/ObjectsTest.ice36
-rw-r--r--objective-c/test/Ice/objects/TestI.m20
2 files changed, 56 insertions, 0 deletions
diff --git a/objective-c/test/Ice/objects/ObjectsTest.ice b/objective-c/test/Ice/objects/ObjectsTest.ice
index afe41d9d904..ed7a6fc866f 100644
--- a/objective-c/test/Ice/objects/ObjectsTest.ice
+++ b/objective-c/test/Ice/objects/ObjectsTest.ice
@@ -99,6 +99,36 @@ class CompactExt(CompactExtId) extends Compact
{
};
+module Inner
+{
+
+class A
+{
+ ::Test::A theA;
+};
+
+exception Ex
+{
+ string reason;
+};
+
+module Sub
+{
+
+class A
+{
+ ::Test::Inner::A theA;
+};
+
+exception Ex
+{
+ string reason;
+};
+
+};
+
+};
+
sequence<Object> ObjectSeq; // For Objective-C only
sequence<Object*> ObjectPrxSeq; // For Objective-C only
sequence<Base> BaseSeq; // For Objective-C only
@@ -131,6 +161,12 @@ class Initial
Compact getCompact();
+ Inner::A getInnerA();
+ Inner::Sub::A getInnerSubA();
+
+ void throwInnerEx() throws Inner::Ex;
+ void throwInnerSubEx() throws Inner::Sub::Ex;
+
//
// Remaining operations are here only for Objective-C and are not implemented by other language mappings.
//
diff --git a/objective-c/test/Ice/objects/TestI.m b/objective-c/test/Ice/objects/TestI.m
index 3b3b10a69d9..9c0ad2602fd 100644
--- a/objective-c/test/Ice/objects/TestI.m
+++ b/objective-c/test/Ice/objects/TestI.m
@@ -247,6 +247,26 @@
return (TestObjectsCompact*)[TestObjectsCompactExt compactExt];
}
+-(TestInnerA*) getInnerA:(ICECurrent *)current
+{
+ return [TestInnerA a:_b1];
+}
+
+-(TestInnerSubA*) getInnerSubA:(ICECurrent *)current
+{
+ return [TestInnerSubA a:[TestInnerA a:_b1]];
+}
+
+-(void) throwInnerEx:(ICECurrent *)current
+{
+ @throw [TestInnerEx ex:@"Inner::Ex"];
+}
+
+-(void) throwInnerSubEx:(ICECurrent *)current
+{
+ @throw [TestInnerSubEx ex:@"Inner::Sub::Ex"];
+}
+
-(void) setI:(TestObjectsI*)i current:(ICECurrent*)current
{
}