Fix cross tests (#2070)

Closes #2064
zeroc-ice · Apr 24, 2024 · f89166e · f89166e
1 parent 320c695
commit f89166e
Show file tree

Hide file tree

Showing 21 changed files with 19 additions and 115 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -78,8 +78,7 @@ jobs:
           # Cross tests
           - os: ubuntu-22.04
             config: "cross"
-            # These cross tests are currently failing
-            test_flags: "--all-cross --rfilter Ice/invoke --rfilter Ice/optional --rfilter Ice/slicing"
+            test_flags: "--all-cross"
 
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/cpp/test/Ice/invoke/BlobjectI.cpp b/cpp/test/Ice/invoke/BlobjectI.cpp
@@ -58,7 +58,7 @@ invokeInternal(InputStream& in, vector<byte>& outEncaps, const Current& current)
         in.startEncapsulation();
         in.read(s);
         in.endEncapsulation();
-        if (s == "::MyClass")
+        if (s == "::Test::MyClass")
         {
             out.write(true);
         }

diff --git a/cpp/test/Ice/optional/TestAMDI.cpp b/cpp/test/Ice/optional/TestAMDI.cpp
@@ -553,5 +553,5 @@ InitialI::supportsCsharpSerializableAsync(
 void
 InitialI::supportsNullOptionalAsync(function<void(bool)> response, function<void(exception_ptr)>, const Ice::Current&)
 {
-    response(true);
+    response(false);
 }
diff --git a/cpp/test/Ice/optional/TestI.cpp b/cpp/test/Ice/optional/TestI.cpp
@@ -436,5 +436,5 @@ InitialI::supportsCsharpSerializable(const Ice::Current&)
 bool
 InitialI::supportsNullOptional(const Ice::Current&)
 {
-    return true;
+    return false;
 }
diff --git a/csharp/test/Ice/optional/AllTests.cs b/csharp/test/Ice/optional/AllTests.cs
@@ -305,12 +305,9 @@ public class AllTests : global::Test.AllTests
                     owc1.l.Value.Add(new Test.SmallStruct(5));
                     owc1.l.Value.Add(new Test.SmallStruct(6));
                     owc1.l.Value.Add(new Test.SmallStruct(7));
-                    owc1.s = new Test.ClassVarStruct(5);
                     Test.OptionalWithCustom owc2 = (Test.OptionalWithCustom)initial.pingPong(owc1);
                     test(owc2.l.HasValue);
                     test(ListsEqual(owc1.l.Value, owc2.l.Value));
-                    test(owc2.s.HasValue);
-                    test(owc2.s.Value.a == 5);
                 }
 
                 //

diff --git a/csharp/test/Ice/optional/Test.ice b/csharp/test/Ice/optional/Test.ice
@@ -39,12 +39,6 @@ struct VarStruct
     string m;
 }
 
-["cs:class"]
-struct ClassVarStruct
-{
-    int a;
-}
-
 sequence<byte> ByteSeq;
 sequence<bool> BoolSeq;
 sequence<short> ShortSeq;
@@ -159,7 +153,6 @@ class OptionalWithCustom
 {
     optional(1) SmallStructList l;
     ["protected"] optional(2) SmallStructList lp;
-    optional(3) ClassVarStruct s;
 }
 
 class E

diff --git a/csharp/test/Ice/optional/TestAMD.ice b/csharp/test/Ice/optional/TestAMD.ice
@@ -39,12 +39,6 @@ struct VarStruct
     string m;
 }
 
-["cs:class"]
-struct ClassVarStruct
-{
-    int a;
-}
-
 sequence<byte> ByteSeq;
 sequence<bool> BoolSeq;
 sequence<short> ShortSeq;
@@ -159,7 +153,6 @@ class OptionalWithCustom
 {
     optional(1) SmallStructList l;
     ["protected"] optional(2) SmallStructList lp;
-    optional(3) ClassVarStruct s;
 }
 
 class E

diff --git a/csharp/test/Ice/slicing/objects/AllTests.cs b/csharp/test/Ice/slicing/objects/AllTests.cs
@@ -2168,26 +2168,19 @@ public static TestIntfPrx allTests(Test.TestHelper helper, bool collocated)
             //
             // ex.slicedData_.obj.iceSlicedData_.obj
             //
+            test(PreservedI.counter == 0);
+
             try
             {
-                test(PreservedI.counter == 0);
-
-                try
-                {
-                    testPrx.throwPreservedException();
-                }
-                catch (PreservedException)
-                {
-                    test(PreservedI.counter == 1);
-                }
-
-                PreservedI.counter = 0;
+                testPrx.throwPreservedException();
             }
-            catch (Exception ex)
+            catch (PreservedException)
             {
-                output.WriteLine(ex.ToString());
-                test(false);
+                test(PreservedI.counter == 1);
             }
+
+            PreservedI.counter = 0;
+
         }
         catch (Ice.OperationNotExistException)
         {

diff --git a/java/test/src/main/java/test/Ice/optional/AllTests.java b/java/test/src/main/java/test/Ice/optional/AllTests.java
@@ -343,12 +343,9 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) {
       l.add(new SmallStruct((byte) 6));
       l.add(new SmallStruct((byte) 7));
       owc1.setL(l);
-      owc1.setS(new ClassVarStruct(5));
       OptionalWithCustom owc2 = (OptionalWithCustom) initial.pingPong(owc1);
       test(owc2.hasL());
       test(owc2.getL().equals(l));
-      test(owc2.hasS());
-      test(owc2.getS().a == 5);
     }
 
     //

diff --git a/java/test/src/main/java/test/Ice/optional/Test.ice b/java/test/src/main/java/test/Ice/optional/Test.ice
@@ -38,11 +38,6 @@ struct VarStruct
     string m;
 }
 
-struct ClassVarStruct
-{
-    int a;
-}
-
 sequence<byte> ByteSeq;
 sequence<bool> BoolSeq;
 sequence<short> ShortSeq;
@@ -160,7 +155,6 @@ class OptionalWithCustom
 {
     optional(1) SmallStructList l;
     ["protected"] optional(2) SmallStructList lp;
-    optional(3) ClassVarStruct s;
 }
 
 class E

diff --git a/java/test/src/main/java/test/Ice/optional/TestAMD.ice b/java/test/src/main/java/test/Ice/optional/TestAMD.ice
@@ -38,11 +38,6 @@ struct VarStruct
     string m;
 }
 
-struct ClassVarStruct
-{
-    int a;
-}
-
 sequence<byte> ByteSeq;
 sequence<bool> BoolSeq;
 sequence<short> ShortSeq;
@@ -160,7 +155,6 @@ class OptionalWithCustom
 {
     optional(1) SmallStructList l;
     ["protected"] optional(2) SmallStructList lp;
-    optional(3) ClassVarStruct s;
 }
 
 class E

diff --git a/java/test/src/main/java/test/Ice/slicing/objects/AllTests.java b/java/test/src/main/java/test/Ice/slicing/objects/AllTests.java
@@ -2165,19 +2165,15 @@ public static TestIntfPrx allTests(test.TestHelper helper, boolean collocated) {
       //
       // ex.slicedData.obj.slicedData.obj
       //
-      try {
-        test(PreservedI.counter == 0);
+      test(PreservedI.counter == 0);
 
-        try {
-          test.throwPreservedException();
-        } catch (PreservedException ex) {
-          test(PreservedI.counter == 1);
-        }
-
-        PreservedI.counter = 0;
-      } catch (Exception ex) {
-        test(false);
+      try {
+        test.throwPreservedException();
+      } catch (PreservedException ex) {
+        test(PreservedI.counter == 1);
       }
+
+      PreservedI.counter = 0;
     } catch (com.zeroc.Ice.OperationNotExistException ex) {
     }
 

diff --git a/js/test/Ice/optional/Test.ice b/js/test/Ice/optional/Test.ice
@@ -37,11 +37,6 @@ struct VarStruct
     string m;
 }
 
-struct ClassVarStruct
-{
-    int a;
-}
-
 sequence<byte> ByteSeq;
 sequence<bool> BoolSeq;
 sequence<short> ShortSeq;
@@ -159,7 +154,6 @@ class OptionalWithCustom
 {
     optional(1) SmallStructList l;
     ["protected"] optional(2) SmallStructList lp;
-    optional(3) ClassVarStruct s;
 }
 
 class E

diff --git a/js/test/typescript/Ice/optional/Test.ice b/js/test/typescript/Ice/optional/Test.ice
@@ -39,11 +39,6 @@ struct VarStruct
     string m;
 }
 
-struct ClassVarStruct
-{
-    int a;
-}
-
 sequence<byte> ByteSeq;
 sequence<bool> BoolSeq;
 sequence<short> ShortSeq;
@@ -161,7 +156,6 @@ class OptionalWithCustom
 {
     optional(1) SmallStructList l;
     ["protected"] optional(2) SmallStructList lp;
-    optional(3) ClassVarStruct s;
 }
 
 class E

diff --git a/matlab/test/Ice/optional/Test.ice b/matlab/test/Ice/optional/Test.ice
@@ -37,11 +37,6 @@ struct VarStruct
     string m;
 }
 
-struct ClassVarStruct
-{
-    int a;
-}
-
 sequence<byte> ByteSeq;
 sequence<bool> BoolSeq;
 sequence<short> ShortSeq;
@@ -160,7 +155,6 @@ class OptionalWithCustom
 {
     optional(1) SmallStructList l;
     ["protected"] optional(2) SmallStructList lp;
-    optional(3) ClassVarStruct s;
 }
 
 class E

diff --git a/php/test/Ice/optional/Test.ice b/php/test/Ice/optional/Test.ice
@@ -37,11 +37,6 @@ struct VarStruct
     string m;
 }
 
-struct ClassVarStruct
-{
-    int a;
-}
-
 sequence<byte> ByteSeq;
 sequence<bool> BoolSeq;
 sequence<short> ShortSeq;
@@ -159,7 +154,6 @@ class OptionalWithCustom
 {
     optional(1) SmallStructList l;
     ["protected"] optional(2) SmallStructList lp;
-    optional(3) ClassVarStruct s;
 }
 
 class E

diff --git a/python/test/Ice/optional/Test.ice b/python/test/Ice/optional/Test.ice
@@ -37,11 +37,6 @@ struct VarStruct
     string m;
 }
 
-struct ClassVarStruct
-{
-    int a;
-}
-
 sequence<byte> ByteSeq;
 sequence<bool> BoolSeq;
 sequence<short> ShortSeq;
@@ -159,7 +154,6 @@ class OptionalWithCustom
 {
     optional(1) SmallStructList l;
     ["protected"] optional(2) SmallStructList lp;
-    optional(3) ClassVarStruct s;
 }
 
 class E

diff --git a/ruby/test/Ice/optional/Test.ice b/ruby/test/Ice/optional/Test.ice
@@ -37,11 +37,6 @@ struct VarStruct
     string m;
 }
 
-struct ClassVarStruct
-{
-    int a;
-}
-
 sequence<byte> ByteSeq;
 sequence<bool> BoolSeq;
 sequence<short> ShortSeq;
@@ -159,7 +154,6 @@ class OptionalWithCustom
 {
     optional(1) SmallStructList l;
     ["protected"] optional(2) SmallStructList lp;
-    optional(3) ClassVarStruct s;
 }
 
 class E

diff --git a/swift/test/Ice/optional/AllTests.swift b/swift/test/Ice/optional/AllTests.swift
@@ -498,12 +498,9 @@ func allTests(_ helper: TestHelper) throws -> InitialPrx {
   do {
     let owc1 = OptionalWithCustom()
     owc1.l = [SmallStruct(m: 5), SmallStruct(m: 6), SmallStruct(m: 7)]
-    owc1.s = ClassVarStruct(a: 5)
     if let owc2 = try initial.pingPong(owc1) as? OptionalWithCustom {
       try test(owc2.l != nil)
       try test(owc1.l == owc2.l)
-      try test(owc2.s != nil)
-      try test(owc2.s!.a == 5)
     } else {
       try test(false)
     }

diff --git a/swift/test/Ice/optional/Test.ice b/swift/test/Ice/optional/Test.ice
@@ -39,11 +39,6 @@ struct VarStruct
     string m;
 }
 
-struct ClassVarStruct
-{
-    int a;
-}
-
 sequence<byte> ByteSeq;
 sequence<bool> BoolSeq;
 sequence<short> ShortSeq;
@@ -163,7 +158,6 @@ class OptionalWithCustom
 {
     optional(1) SmallStructList l;
     ["protected"] optional(2) SmallStructList lp;
-    optional(3) ClassVarStruct s;
 }
 
 class E

diff --git a/swift/test/Ice/optional/TestAMD.ice b/swift/test/Ice/optional/TestAMD.ice
@@ -39,12 +39,6 @@ struct VarStruct
     string m;
 }
 
-["cs:class"]
-struct ClassVarStruct
-{
-    int a;
-}
-
 sequence<byte> ByteSeq;
 sequence<bool> BoolSeq;
 sequence<short> ShortSeq;
@@ -164,7 +158,6 @@ class OptionalWithCustom
 {
     optional(1) SmallStructList l;
     ["protected"] optional(2) SmallStructList lp;
-    optional(3) ClassVarStruct s;
 }
 
 class E