4971 - BuiltinSequences.ice not compiled with --stream in .NET

2 files changed, 42 insertions, 48 deletions

diff --git a/java/test/Ice/stream/Client.java b/java/test/Ice/stream/Client.java
index e1d91bc279f..38a5ad63815 100644
--- a/java/test/Ice/stream/Client.java
+++ b/java/test/Ice/stream/Client.java
@@ -11,14 +11,14 @@ package test.Ice.stream;
 
 import java.io.PrintWriter;
 
-import test.Ice.stream.Test.BoolSHelper;
-import test.Ice.stream.Test.ByteSHelper;
-import test.Ice.stream.Test.DoubleSHelper;
-import test.Ice.stream.Test.FloatSHelper;
-import test.Ice.stream.Test.ShortSHelper;
-import test.Ice.stream.Test.IntSHelper;
-import test.Ice.stream.Test.LongSHelper;
-import test.Ice.stream.Test.StringSHelper;
+import Ice.BoolSeqHelper;
+import Ice.ByteSeqHelper;
+import Ice.DoubleSeqHelper;
+import Ice.FloatSeqHelper;
+import Ice.ShortSeqHelper;
+import Ice.IntSeqHelper;
+import Ice.LongSeqHelper;
+import Ice.StringSeqHelper;
 import test.Ice.stream.Test.BoolSSHelper;
 import test.Ice.stream.Test.ByteSSHelper;
 import test.Ice.stream.Test.DoubleSSHelper;
@@ -347,10 +347,10 @@ public class Client extends test.Util.Application
                 false
             };
             out = Ice.Util.createOutputStream(comm);
-            BoolSHelper.write(out, arr);
+            BoolSeqHelper.write(out, arr);
             byte[] data = out.finished();
             in = Ice.Util.createInputStream(comm, data);
-            boolean[] arr2 = BoolSHelper.read(in);
+            boolean[] arr2 = BoolSeqHelper.read(in);
             test(java.util.Arrays.equals(arr2, arr));
             out.destroy();
             in.destroy();
@@ -380,10 +380,10 @@ public class Client extends test.Util.Application
                 (byte)0x22
             };
             out = Ice.Util.createOutputStream(comm);
-            ByteSHelper.write(out, arr);
+            ByteSeqHelper.write(out, arr);
             byte[] data = out.finished();
             in = Ice.Util.createInputStream(comm, data);
-            byte[] arr2 = ByteSHelper.read(in);
+            byte[] arr2 = ByteSeqHelper.read(in);
             test(java.util.Arrays.equals(arr2, arr));
             out.destroy();
             in.destroy();
@@ -426,10 +426,10 @@ public class Client extends test.Util.Application
                 (short)0x22
             };
             out = Ice.Util.createOutputStream(comm);
-            ShortSHelper.write(out, arr);
+            ShortSeqHelper.write(out, arr);
             byte[] data = out.finished();
             in = Ice.Util.createInputStream(comm, data);
-            short[] arr2 = ShortSHelper.read(in);
+            short[] arr2 = ShortSeqHelper.read(in);
             test(java.util.Arrays.equals(arr2, arr));
             out.destroy();
             in.destroy();
@@ -459,10 +459,10 @@ public class Client extends test.Util.Application
                 0x22
             };
             out = Ice.Util.createOutputStream(comm);
-            IntSHelper.write(out, arr);
+            IntSeqHelper.write(out, arr);
             byte[] data = out.finished();
             in = Ice.Util.createInputStream(comm, data);
-            int[] arr2 = IntSHelper.read(in);
+            int[] arr2 = IntSeqHelper.read(in);
             test(java.util.Arrays.equals(arr2, arr));
             out.destroy();
             in.destroy();
@@ -492,10 +492,10 @@ public class Client extends test.Util.Application
                 0x22
             };
             out = Ice.Util.createOutputStream(comm);
-            LongSHelper.write(out, arr);
+            LongSeqHelper.write(out, arr);
             byte[] data = out.finished();
             in = Ice.Util.createInputStream(comm, data);
-            long[] arr2 = LongSHelper.read(in);
+            long[] arr2 = LongSeqHelper.read(in);
             test(java.util.Arrays.equals(arr2, arr));
             out.destroy();
             in.destroy();
@@ -525,10 +525,10 @@ public class Client extends test.Util.Application
                 (float)4
             };
             out = Ice.Util.createOutputStream(comm);
-            FloatSHelper.write(out, arr);
+            FloatSeqHelper.write(out, arr);
             byte[] data = out.finished();
             in = Ice.Util.createInputStream(comm, data);
-            float[] arr2 = FloatSHelper.read(in);
+            float[] arr2 = FloatSeqHelper.read(in);
             test(java.util.Arrays.equals(arr2, arr));
             out.destroy();
             in.destroy();
@@ -558,10 +558,10 @@ public class Client extends test.Util.Application
                 (double)4
             };
             out = Ice.Util.createOutputStream(comm);
-            DoubleSHelper.write(out, arr);
+            DoubleSeqHelper.write(out, arr);
             byte[] data = out.finished();
             in = Ice.Util.createInputStream(comm, data);
-            double[] arr2 = DoubleSHelper.read(in);
+            double[] arr2 = DoubleSeqHelper.read(in);
             test(java.util.Arrays.equals(arr2, arr));
             out.destroy();
             in.destroy();
@@ -591,10 +591,10 @@ public class Client extends test.Util.Application
                 "string4"
             };
             out = Ice.Util.createOutputStream(comm);
-            StringSHelper.write(out, arr);
+            StringSeqHelper.write(out, arr);
             byte[] data = out.finished();
             in = Ice.Util.createInputStream(comm, data);
-            String[] arr2 = StringSHelper.read(in);
+            String[] arr2 = StringSeqHelper.read(in);
             test(java.util.Arrays.equals(arr2, arr));
             out.destroy();
             in.destroy();
diff --git a/java/test/Ice/stream/Test.ice b/java/test/Ice/stream/Test.ice
index 32c8e47a7db..f1efebf1da0 100644
--- a/java/test/Ice/stream/Test.ice
+++ b/java/test/Ice/stream/Test.ice
@@ -10,6 +10,8 @@
 #ifndef TEST_ICE
 #define TEST_ICE
 
+#include <Ice/BuiltinSequences.ice>
+
 [["java:package:test.Ice.stream"]]
 module Test
 {
@@ -40,25 +42,17 @@ struct SmallStruct
     SerialSmall ss;
 };
 
-sequence<bool> BoolS;
-sequence<byte> ByteS;
-sequence<short> ShortS;
-sequence<int> IntS;
-sequence<long> LongS;
-sequence<float> FloatS;
-sequence<double> DoubleS;
-sequence<string> StringS;
 sequence<MyEnum> MyEnumS;
 sequence<MyClass> MyClassS;
 
-sequence<BoolS> BoolSS;
-sequence<ByteS> ByteSS;
-sequence<ShortS> ShortSS;
-sequence<IntS> IntSS;
-sequence<LongS> LongSS;
-sequence<FloatS> FloatSS;
-sequence<DoubleS> DoubleSS;
-sequence<StringS> StringSS;
+sequence<Ice::BoolSeq> BoolSS;
+sequence<Ice::ByteSeq> ByteSS;
+sequence<Ice::ShortSeq> ShortSS;
+sequence<Ice::IntSeq> IntSS;
+sequence<Ice::LongSeq> LongSS;
+sequence<Ice::FloatSeq> FloatSS;
+sequence<Ice::DoubleSeq> DoubleSS;
+sequence<Ice::StringSeq> StringSS;
 sequence<MyEnumS> MyEnumSS;
 sequence<MyClassS> MyClassSS;
 
@@ -73,14 +67,14 @@ class MyClass
     MyClass c;
     Object o;
     SmallStruct s;
-    BoolS seq1;
-    ByteS seq2;
-    ShortS seq3;
-    IntS seq4;
-    LongS seq5;
-    FloatS seq6;
-    DoubleS seq7;
-    StringS seq8;
+    Ice::BoolSeq seq1;
+    Ice::ByteSeq seq2;
+    Ice::ShortSeq seq3;
+    Ice::IntSeq seq4;
+    Ice::LongSeq seq5;
+    Ice::FloatSeq seq6;
+    Ice::DoubleSeq seq7;
+    Ice::StringSeq seq8;
     MyEnumS seq9;
     MyClassS seq10;
     StringMyClassD d;