From 6d47d7af9c4527b3d70ac1966dfad9feb01a2730 Mon Sep 17 00:00:00 2001 From: Joe George Date: Tue, 23 Apr 2024 11:59:22 -0400 Subject: [PATCH] Fix cross tests Closes #2064 --- .github/workflows/ci.yml | 2 +- cpp/test/Ice/invoke/BlobjectI.cpp | 2 +- cpp/test/Ice/optional/TestAMDI.cpp | 2 +- cpp/test/Ice/optional/TestI.cpp | 2 +- csharp/test/Ice/optional/AllTests.cs | 3 --- csharp/test/Ice/optional/Test.ice | 7 ------ csharp/test/Ice/optional/TestAMD.ice | 7 ------ csharp/test/Ice/slicing/objects/AllTests.cs | 23 +++++++------------ .../main/java/test/Ice/optional/AllTests.java | 3 --- .../src/main/java/test/Ice/optional/Test.ice | 6 ----- .../main/java/test/Ice/optional/TestAMD.ice | 6 ----- .../test/Ice/slicing/objects/AllTests.java | 18 ++++++--------- js/test/Ice/optional/Test.ice | 6 ----- js/test/typescript/Ice/optional/Test.ice | 6 ----- matlab/test/Ice/optional/Test.ice | 6 ----- php/test/Ice/optional/Test.ice | 6 ----- python/test/Ice/optional/Test.ice | 6 ----- ruby/test/Ice/optional/Test.ice | 6 ----- swift/test/Ice/optional/AllTests.swift | 3 --- swift/test/Ice/optional/Test.ice | 6 ----- swift/test/Ice/optional/TestAMD.ice | 7 ------ 21 files changed, 19 insertions(+), 114 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9993143e6d8..edeaa88c051 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,7 +79,7 @@ jobs: - 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 index ebe82684f40..31046bf0d45 100644 --- a/cpp/test/Ice/invoke/BlobjectI.cpp +++ b/cpp/test/Ice/invoke/BlobjectI.cpp @@ -58,7 +58,7 @@ invokeInternal(InputStream& in, vector& 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 index 23fd4453e94..77bd02ceece 100644 --- a/cpp/test/Ice/optional/TestAMDI.cpp +++ b/cpp/test/Ice/optional/TestAMDI.cpp @@ -553,5 +553,5 @@ InitialI::supportsCsharpSerializableAsync( void InitialI::supportsNullOptionalAsync(function response, function, const Ice::Current&) { - response(true); + response(false); } diff --git a/cpp/test/Ice/optional/TestI.cpp b/cpp/test/Ice/optional/TestI.cpp index 9311204ce95..1ed123d3460 100644 --- 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 index b371dc1ffa0..3be91185680 100644 --- 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 index a44167786d9..c1c4dfc4f3c 100644 --- 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 ByteSeq; sequence BoolSeq; sequence 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 index c2fcfb0d216..c409db60a4c 100644 --- 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 ByteSeq; sequence BoolSeq; sequence 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 index 84639c94741..b774fc823d8 100644 --- 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 index 88c8f78617f..1b2ea758038 100644 --- 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 index 2d2cec19e4b..3fd2cb5dcde 100644 --- 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 ByteSeq; sequence BoolSeq; sequence 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 index 7d1832c657b..1cf37a24c35 100644 --- 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 ByteSeq; sequence BoolSeq; sequence 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 index f9c5f4738eb..ea94df9d451 100644 --- 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 index 820d241db03..f7b06a00325 100644 --- 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 ByteSeq; sequence BoolSeq; sequence 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 index 5e0383d8e48..ec5ded89c90 100644 --- 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 ByteSeq; sequence BoolSeq; sequence 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 index 81fe31d9ad3..500d72f820b 100644 --- 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 ByteSeq; sequence BoolSeq; sequence 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 index 9b3180295fb..fe1423579ff 100644 --- 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 ByteSeq; sequence BoolSeq; sequence 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 index 90e8f5861fb..a3440f1b0bc 100644 --- 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 ByteSeq; sequence BoolSeq; sequence 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 index c7ac441de88..da72d7d8722 100644 --- 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 ByteSeq; sequence BoolSeq; sequence 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 index 90f7eb17c18..a4a64c204ba 100644 --- 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 index bdfd355d695..1aecd524627 100644 --- 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 ByteSeq; sequence BoolSeq; sequence 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 index bc01fe12837..db3b4c6a3e3 100644 --- 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 ByteSeq; sequence BoolSeq; sequence ShortSeq; @@ -164,7 +158,6 @@ class OptionalWithCustom { optional(1) SmallStructList l; ["protected"] optional(2) SmallStructList lp; - optional(3) ClassVarStruct s; } class E