Objective-c AMI test updates to sync with C++/Java/...

5 files changed, 34 insertions, 0 deletions

diff --git a/objective-c/test/Ice/ami/AMITest.ice b/objective-c/test/Ice/ami/AMITest.ice
index 2c47356f107..8f947030073 100644
--- a/objective-c/test/Ice/ami/AMITest.ice
+++ b/objective-c/test/Ice/ami/AMITest.ice
@@ -61,4 +61,20 @@ interface TestIntfController
     void resumeAdapter();
 }
 
+module Outer
+{
+
+["objc:prefix:TestAMITestOuterInner"]
+module Inner
+{
+
+interface TestIntf
+{
+    int op(int i, out int j);
+}
+
+}
+
+}
+
 }
diff --git a/objective-c/test/Ice/ami/Collocated.m b/objective-c/test/Ice/ami/Collocated.m
index fa80a604c87..c79bcf44e09 100644
--- a/objective-c/test/Ice/ami/Collocated.m
+++ b/objective-c/test/Ice/ami/Collocated.m
@@ -25,6 +25,7 @@ run(id<ICECommunicator> communicator)
         = ICE_AUTORELEASE([[TestAMITestIntfControllerI alloc] initWithAdapter:adapter]);
 
     [adapter add:[TestAMITestIntfI testIntf] identity:[ICEUtil stringToIdentity:@"test"]];
+    [adapter add:[TestAMITestOuterInnerTestIntfI testIntf] identity:[ICEUtil stringToIdentity:@"test2"]];
     //[adapter activate]; // Collocated test doesn't need to activate the OA
 
     [adapter2 add:testController identity:[ICEUtil stringToIdentity:@"testController"]];
diff --git a/objective-c/test/Ice/ami/Server.m b/objective-c/test/Ice/ami/Server.m
index 84475f03aab..4665e7eb1ca 100644
--- a/objective-c/test/Ice/ami/Server.m
+++ b/objective-c/test/Ice/ami/Server.m
@@ -25,6 +25,7 @@ run(id<ICECommunicator> communicator)
         = ICE_AUTORELEASE([[TestAMITestIntfControllerI alloc] initWithAdapter:adapter]);
 
     [adapter add:[TestAMITestIntfI testIntf] identity:[ICEUtil stringToIdentity:@"test"]];
+    [adapter add:[TestAMITestOuterInnerTestIntfI testIntf] identity:[ICEUtil stringToIdentity:@"test2"]];
     [adapter activate];
 
     [adapter2 add:testController identity:[ICEUtil stringToIdentity:@"testController"]];
diff --git a/objective-c/test/Ice/ami/TestI.h b/objective-c/test/Ice/ami/TestI.h
index 3480e453a9a..cd74cdc467a 100644
--- a/objective-c/test/Ice/ami/TestI.h
+++ b/objective-c/test/Ice/ami/TestI.h
@@ -21,6 +21,14 @@
 }
 @end
 
+//
+// Servant implementation
+//
+@interface TestAMITestOuterInnerTestIntfI : TestAMITestOuterInnerTestIntf<TestAMITestOuterInnerTestIntf>
+{
+}
+@end
+
 @interface TestAMITestIntfControllerI : TestAMITestIntfController<TestAMITestIntfController>
 {
     id<ICEObjectAdapter> _adapter;
diff --git a/objective-c/test/Ice/ami/TestI.m b/objective-c/test/Ice/ami/TestI.m
index ab67a1fefc9..7f9f0daf286 100644
--- a/objective-c/test/Ice/ami/TestI.m
+++ b/objective-c/test/Ice/ami/TestI.m
@@ -144,6 +144,14 @@
 }
 @end
 
+@implementation TestAMITestOuterInnerTestIntfI
+-(int) op:(ICEInt)i j:(ICEInt*)j current:(ICECurrent*)current
+{
+    *j = i;
+    return i;
+}
+@end
+
 @implementation TestAMITestIntfControllerI
 -(id) initWithAdapter:(id<ICEObjectAdapter>)adapter
 {