ICE-6485 enums tests fails with --cross=objective-c

3 files changed, 104 insertions, 0 deletions

diff --git a/java/test/src/main/java/test/Ice/enums/AllTests.java b/java/test/src/main/java/test/Ice/enums/AllTests.java
index 4f7ac04054c..3ece2a3f784 100644
--- a/java/test/src/main/java/test/Ice/enums/AllTests.java
+++ b/java/test/src/main/java/test/Ice/enums/AllTests.java
@@ -179,6 +179,69 @@ public class AllTests
 
         out.println("ok");
 
+        out.print("testing enum sequences operations... ");
+        out.flush();
+
+        {
+            ByteEnum b1[] = { ByteEnum.benum1, ByteEnum.benum2, ByteEnum.benum3, ByteEnum.benum4, ByteEnum.benum5,
+                              ByteEnum.benum6, ByteEnum.benum7, ByteEnum.benum8, ByteEnum.benum9, ByteEnum.benum10,
+                              ByteEnum.benum11};
+
+            ByteEnumSeqHolder b2 = new ByteEnumSeqHolder();
+            ByteEnum b3[] = proxy.opByteSeq(b1, b2);
+
+            for(int i = 0; i < b1.length; ++i)
+            {
+                test(b1[i] == b2.value[i]);
+                test(b1[i] == b3[i]);
+            }
+        }
+
+        {
+            ShortEnum s1[] = { ShortEnum.senum1, ShortEnum.senum2, ShortEnum.senum3, ShortEnum.senum4, ShortEnum.senum5,
+                               ShortEnum.senum6, ShortEnum.senum7, ShortEnum.senum8, ShortEnum.senum9, ShortEnum.senum10,
+                               ShortEnum.senum11};
+
+            ShortEnumSeqHolder s2 = new ShortEnumSeqHolder();
+            ShortEnum s3[] = proxy.opShortSeq(s1, s2);
+
+            for(int i = 0; i < s1.length; ++i)
+            {
+                test(s1[i] == s2.value[i]);
+                test(s1[i] == s3[i]);
+            }
+        }
+
+        {
+            IntEnum i1[] = { IntEnum.ienum1, IntEnum.ienum2, IntEnum.ienum3, IntEnum.ienum4, IntEnum.ienum5,
+                             IntEnum.ienum6, IntEnum.ienum7, IntEnum.ienum8, IntEnum.ienum9, IntEnum.ienum10,
+                             IntEnum.ienum11};
+
+            IntEnumSeqHolder i2 = new IntEnumSeqHolder();
+            IntEnum i3[] = proxy.opIntSeq(i1, i2);
+
+            for(int i = 0; i < i1.length; ++i)
+            {
+                test(i1[i] == i2.value[i]);
+                test(i1[i] == i3[i]);
+            }
+        }
+
+        {
+            SimpleEnum s1[] = { SimpleEnum.red, SimpleEnum.green, SimpleEnum.blue };
+
+            SimpleEnumSeqHolder s2 = new SimpleEnumSeqHolder();
+            SimpleEnum s3[] = proxy.opSimpleSeq(s1, s2);
+
+            for(int i = 0; i < s1.length; ++i)
+            {
+                test(s1[i] == s2.value[i]);
+                test(s1[i] == s3[i]);
+            }
+        }
+
+        out.println("ok");
+
         out.print("testing enum exceptions... ");
         out.flush();
 
diff --git a/java/test/src/main/java/test/Ice/enums/Test.ice b/java/test/src/main/java/test/Ice/enums/Test.ice
index 39fed6194c4..aa3d20845cb 100644
--- a/java/test/src/main/java/test/Ice/enums/Test.ice
+++ b/java/test/src/main/java/test/Ice/enums/Test.ice
@@ -37,6 +37,7 @@ enum ByteEnum
     benum10,
     benum11 = ByteConst2
 };
+sequence<ByteEnum> ByteEnumSeq;
 
 enum ShortEnum
 {
@@ -52,6 +53,7 @@ enum ShortEnum
     senum10,
     senum11 = ShortConst2
 };
+sequence<ShortEnum> ShortEnumSeq;
 
 enum IntEnum
 {
@@ -68,6 +70,7 @@ enum IntEnum
     ienum11 = IntConst2,
     ienum12 = LongConst2
 };
+sequence<IntEnum> IntEnumSeq;
 
 enum SimpleEnum
 {
@@ -75,6 +78,7 @@ enum SimpleEnum
     green,
     blue
 };
+sequence<SimpleEnum> SimpleEnumSeq;
 
 interface TestIntf
 {
@@ -83,6 +87,11 @@ interface TestIntf
     IntEnum opInt(IntEnum i1, out IntEnum i2);
     SimpleEnum opSimple(SimpleEnum s1, out SimpleEnum s2);
 
+    ByteEnumSeq opByteSeq(ByteEnumSeq b1, out ByteEnumSeq b2);
+    ShortEnumSeq opShortSeq(ShortEnumSeq s1, out ShortEnumSeq s2);
+    IntEnumSeq opIntSeq(IntEnumSeq i1, out IntEnumSeq i2);
+    SimpleEnumSeq opSimpleSeq(SimpleEnumSeq s1, out SimpleEnumSeq s2);
+
     void shutdown();
 };
 
diff --git a/java/test/src/main/java/test/Ice/enums/TestIntfI.java b/java/test/src/main/java/test/Ice/enums/TestIntfI.java
index c3cd28f758d..7a5b0e1c303 100644
--- a/java/test/src/main/java/test/Ice/enums/TestIntfI.java
+++ b/java/test/src/main/java/test/Ice/enums/TestIntfI.java
@@ -46,6 +46,38 @@ public final class TestIntfI extends _TestIntfDisp
     }
 
     @Override
+    public ByteEnum[]
+    opByteSeq(ByteEnum[] b1, ByteEnumSeqHolder b2, Ice.Current current)
+    {
+        b2.value = b1;
+        return b1;
+    }
+
+    @Override
+    public ShortEnum[]
+    opShortSeq(ShortEnum[] s1, ShortEnumSeqHolder s2, Ice.Current current)
+    {
+        s2.value = s1;
+        return s1;
+    }
+
+    @Override
+    public IntEnum[]
+    opIntSeq(IntEnum[] i1, IntEnumSeqHolder i2, Ice.Current current)
+    {
+        i2.value = i1;
+        return i1;
+    }
+
+    @Override
+    public SimpleEnum[]
+    opSimpleSeq(SimpleEnum[] s1, SimpleEnumSeqHolder s2, Ice.Current current)
+    {
+        s2.value = s1;
+        return s1;
+    }
+
+    @Override
     public void
     shutdown(Ice.Current current)
     {