diff --git a/cpp/test/Ice/optional/AllTests.cpp b/cpp/test/Ice/optional/AllTests.cpp index 51db5ab609f..4a133cf611d 100644 --- a/cpp/test/Ice/optional/AllTests.cpp +++ b/cpp/test/Ice/optional/AllTests.cpp @@ -675,15 +675,6 @@ allTests(Test::TestHelper* helper, bool) initial->ice_encodingVersion(Ice::Encoding_1_0)->returnOptionalClass(true, oo); test(!oo); - RecursiveSeq recursive1; - recursive1.push_back(make_shared()); - RecursiveSeq recursive2; - recursive2.push_back(make_shared()); - recursive1[0]->value = recursive2; - RecursivePtr outer = make_shared(); - outer->value = recursive1; - initial->pingPong(outer); - GPtr g = make_shared(); g->gg1Opt = make_shared("gg1Opt"); g->gg2 = make_shared(10); diff --git a/cpp/test/Ice/optional/Test.ice b/cpp/test/Ice/optional/Test.ice index 6e5e020be36..14567bae9ae 100644 --- a/cpp/test/Ice/optional/Test.ice +++ b/cpp/test/Ice/optional/Test.ice @@ -188,14 +188,6 @@ class G G1 gg1; } -class Recursive; -sequence RecursiveSeq; - -class Recursive -{ - optional(0) RecursiveSeq value; -} - interface Initial { void shutdown(); diff --git a/cpp/test/Ice/optional/TestAMD.ice b/cpp/test/Ice/optional/TestAMD.ice index 464f231b1d6..ca74e61d749 100644 --- a/cpp/test/Ice/optional/TestAMD.ice +++ b/cpp/test/Ice/optional/TestAMD.ice @@ -188,14 +188,6 @@ class G G1 gg1; } -class Recursive; -sequence RecursiveSeq; - -class Recursive -{ - optional(0) RecursiveSeq value; -} - ["amd"] interface Initial { diff --git a/csharp/test/Ice/optional/AllTests.cs b/csharp/test/Ice/optional/AllTests.cs index 01ccf3318dd..92761035389 100644 --- a/csharp/test/Ice/optional/AllTests.cs +++ b/csharp/test/Ice/optional/AllTests.cs @@ -365,15 +365,6 @@ public class AllTests : global::Test.AllTests initial2.returnOptionalClass(true, out oo); test(!oo.HasValue); - Test.Recursive[] recursive1 = new Test.Recursive[1]; - recursive1[0] = new Test.Recursive(); - Test.Recursive[] recursive2 = new Test.Recursive[1]; - recursive2[0] = new Test.Recursive(); - recursive1[0].value = recursive2; - Test.Recursive outer = new Test.Recursive(); - outer.value = recursive1; - initial.pingPong(outer); - Test.G g = new Test.G(); g.gg1Opt = new Ice.Optional(new Test.G1("gg1Opt")); g.gg2 = new Test.G2(10); diff --git a/csharp/test/Ice/optional/Test.ice b/csharp/test/Ice/optional/Test.ice index 42537003a21..a44167786d9 100644 --- a/csharp/test/Ice/optional/Test.ice +++ b/csharp/test/Ice/optional/Test.ice @@ -190,14 +190,6 @@ class G G1 gg1; } -class Recursive; -sequence RecursiveSeq; - -class Recursive -{ - optional(0) RecursiveSeq value; -} - interface Initial { void shutdown(); diff --git a/csharp/test/Ice/optional/TestAMD.ice b/csharp/test/Ice/optional/TestAMD.ice index 031fd95e291..c2fcfb0d216 100644 --- a/csharp/test/Ice/optional/TestAMD.ice +++ b/csharp/test/Ice/optional/TestAMD.ice @@ -190,13 +190,6 @@ class G G1 gg1; } -class Recursive; -sequence RecursiveSeq; - -class Recursive { - optional(0) RecursiveSeq value; -} - ["amd"] interface Initial { 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 4c694b76693..05111923922 100644 --- a/java/test/src/main/java/test/Ice/optional/AllTests.java +++ b/java/test/src/main/java/test/Ice/optional/AllTests.java @@ -399,15 +399,6 @@ public static InitialPrx allTests(test.TestHelper helper, boolean collocated) { oo = initial2.returnOptionalClass(true); test(!oo.isPresent()); - Recursive[] recursive1 = new Recursive[1]; - recursive1[0] = new Recursive(); - Recursive[] recursive2 = new Recursive[1]; - recursive2[0] = new Recursive(); - recursive1[0].setValue(recursive2); - Recursive outer = new Recursive(); - outer.setValue(recursive1); - initial.pingPong(outer); - G g = new G(); g.setGg1Opt(new G1("gg1Opt")); g.gg2 = new G2(10); 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 b43b3bbdc5b..2d2cec19e4b 100644 --- a/java/test/src/main/java/test/Ice/optional/Test.ice +++ b/java/test/src/main/java/test/Ice/optional/Test.ice @@ -191,13 +191,6 @@ class G G1 gg1; } -class Recursive; -sequence RecursiveSeq; - -class Recursive { - optional(0) RecursiveSeq value; -} - interface Initial { void shutdown(); 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 715d8031b22..7d1832c657b 100644 --- a/java/test/src/main/java/test/Ice/optional/TestAMD.ice +++ b/java/test/src/main/java/test/Ice/optional/TestAMD.ice @@ -191,13 +191,6 @@ class G G1 gg1; } -class Recursive; -sequence RecursiveSeq; - -class Recursive { - optional(0) RecursiveSeq value; -} - ["amd"] interface Initial { diff --git a/js/test/Ice/optional/Client.js b/js/test/Ice/optional/Client.js index 0e3856851f9..9fa4ccb0b39 100644 --- a/js/test/Ice/optional/Client.js +++ b/js/test/Ice/optional/Client.js @@ -272,13 +272,6 @@ oo1 = await initial2.returnOptionalClass(true); test(oo1 === undefined); - const recursive1 = [new Test.Recursive()]; - const recursive2 = [new Test.Recursive()]; - recursive1[0].value = recursive2; - const outer = new Test.Recursive(); - outer.value = recursive1; - await initial.pingPong(outer); - let g = new Test.G(); g.gg1Opt = new Test.G1("gg1Opt"); g.gg2 = new Test.G2(new Ice.Long(0, 10)); diff --git a/js/test/Ice/optional/Test.ice b/js/test/Ice/optional/Test.ice index 86562a93947..820d241db03 100644 --- a/js/test/Ice/optional/Test.ice +++ b/js/test/Ice/optional/Test.ice @@ -190,14 +190,6 @@ class G G1 gg1; } -class Recursive; -sequence RecursiveSeq; - -class Recursive -{ - optional(0) RecursiveSeq value; -} - interface Initial { void shutdown(); diff --git a/js/test/typescript/Ice/optional/Client.ts b/js/test/typescript/Ice/optional/Client.ts index fc23b4168d2..fb4dc00c0c8 100644 --- a/js/test/typescript/Ice/optional/Client.ts +++ b/js/test/typescript/Ice/optional/Client.ts @@ -269,13 +269,6 @@ export class Client extends TestHelper oo1 = await initial2.returnOptionalClass(true); test(oo1 === undefined); - const recursive1 = [new Test.Recursive()]; - const recursive2 = [new Test.Recursive()]; - recursive1[0].value = recursive2; - const outer = new Test.Recursive(); - outer.value = recursive1; - await initial.pingPong(outer); - let g = new Test.G(); g.gg1Opt = new Test.G1("gg1Opt"); g.gg2 = new Test.G2(new Ice.Long(0, 10)); diff --git a/js/test/typescript/Ice/optional/Test.ice b/js/test/typescript/Ice/optional/Test.ice index fa5b9e2155e..5e0383d8e48 100644 --- a/js/test/typescript/Ice/optional/Test.ice +++ b/js/test/typescript/Ice/optional/Test.ice @@ -192,14 +192,6 @@ class G G1 gg1; } -class Recursive; -sequence RecursiveSeq; - -class Recursive -{ - optional(0) RecursiveSeq value; -} - interface Initial { void shutdown(); diff --git a/matlab/test/Ice/optional/AllTests.m b/matlab/test/Ice/optional/AllTests.m index 9a27c9a47b6..59dcf1865c5 100644 --- a/matlab/test/Ice/optional/AllTests.m +++ b/matlab/test/Ice/optional/AllTests.m @@ -318,18 +318,6 @@ r = initial.ice_encodingVersion(Ice.EncodingVersion(1, 0)).returnOptionalClass(true); assert(r == Ice.Unset); - recursive1 = {}; - recursive2 = {}; - r1 = Recursive(); - r2 = Recursive(); - r1.value = recursive2; - recursive1{1} = r1; - recursive2{1} = r2; - - outer = Recursive(); - outer.value = recursive1; - initial.pingPong(outer); - g = G(); g.gg1Opt = G1('gg1Opt'); g.gg2 = G2(10); diff --git a/matlab/test/Ice/optional/Test.ice b/matlab/test/Ice/optional/Test.ice index 3c3b52e23f9..7cce977f54b 100644 --- a/matlab/test/Ice/optional/Test.ice +++ b/matlab/test/Ice/optional/Test.ice @@ -191,14 +191,6 @@ class G G1 gg1; } -class Recursive; -sequence RecursiveSeq; - -class Recursive -{ - optional(0) RecursiveSeq value; -} - interface Initial { void shutdown(); diff --git a/python/test/Ice/optional/AllTests.py b/python/test/Ice/optional/AllTests.py index 8f8fe70e571..9caee1ce387 100644 --- a/python/test/Ice/optional/AllTests.py +++ b/python/test/Ice/optional/AllTests.py @@ -353,14 +353,6 @@ def allTests(helper, communicator): r = initial.ice_encodingVersion(Ice.Encoding_1_0).returnOptionalClass(True) test(r is Ice.Unset) - recursive1 = [Test.Recursive()] - recursive2 = [Test.Recursive()] - recursive1[0].value = recursive2 - - outer = Test.Recursive() - outer.value = recursive1 - initial.pingPong(outer) - g = Test.G() g.gg1Opt = Test.G1("gg1Opt") g.gg2 = Test.G2(10) diff --git a/python/test/Ice/optional/Test.ice b/python/test/Ice/optional/Test.ice index 73e35dfe6a7..90e8f5861fb 100644 --- a/python/test/Ice/optional/Test.ice +++ b/python/test/Ice/optional/Test.ice @@ -190,13 +190,6 @@ class G G1 gg1; } -class Recursive; -sequence RecursiveSeq; - -class Recursive { - optional(0) RecursiveSeq value; -} - interface Initial { void shutdown(); diff --git a/ruby/test/Ice/optional/AllTests.rb b/ruby/test/Ice/optional/AllTests.rb index 0ffed65d13f..fb2e6cb4016 100644 --- a/ruby/test/Ice/optional/AllTests.rb +++ b/ruby/test/Ice/optional/AllTests.rb @@ -313,14 +313,6 @@ def allTests(helper, communicator) r = initial.ice_encodingVersion(Ice::Encoding_1_0).returnOptionalClass(true) test(r == Ice::Unset) - recursive1 = [ Test::Recursive.new ] - recursive2 = [ Test::Recursive.new ] - recursive1[0].value = recursive2; - - outer = Test::Recursive.new - outer.value = recursive1 - initial.pingPong(outer) - g = Test::G.new g.gg1Opt = Test::G1.new("gg1Opt") g.gg2 = Test::G2.new(10) diff --git a/ruby/test/Ice/optional/Test.ice b/ruby/test/Ice/optional/Test.ice index 123bd1452da..c7ac441de88 100644 --- a/ruby/test/Ice/optional/Test.ice +++ b/ruby/test/Ice/optional/Test.ice @@ -190,14 +190,6 @@ class G G1 gg1; } -class Recursive; -sequence RecursiveSeq; - -class Recursive -{ - optional(0) RecursiveSeq value; -} - interface Initial { void shutdown(); diff --git a/swift/test/Ice/optional/AllTests.swift b/swift/test/Ice/optional/AllTests.swift index 25f94a804cb..16e0e3426ed 100644 --- a/swift/test/Ice/optional/AllTests.swift +++ b/swift/test/Ice/optional/AllTests.swift @@ -570,13 +570,6 @@ func allTests(_ helper: TestHelper) throws -> InitialPrx { oo = try initial2.returnOptionalClass(true) try test(oo == nil) - let recursive1 = [Recursive()] - let recursive2 = [Recursive()] - recursive1[0].value = recursive2 - let outer = Recursive() - outer.value = recursive1 - _ = try initial.pingPong(outer) - var g: G! = G() g.gg1Opt = G1(a: "gg1Opt") g.gg2 = G2(a: 10) diff --git a/swift/test/Ice/optional/Test.ice b/swift/test/Ice/optional/Test.ice index 6a2445240e2..6c0fb15c9ba 100644 --- a/swift/test/Ice/optional/Test.ice +++ b/swift/test/Ice/optional/Test.ice @@ -194,14 +194,6 @@ class G G1 gg1; } -class Recursive; -sequence RecursiveSeq; - -class Recursive -{ - optional(0) RecursiveSeq value; -} - interface Initial { void shutdown(); diff --git a/swift/test/Ice/optional/TestAMD.ice b/swift/test/Ice/optional/TestAMD.ice index b893476529a..bc01fe12837 100644 --- a/swift/test/Ice/optional/TestAMD.ice +++ b/swift/test/Ice/optional/TestAMD.ice @@ -195,13 +195,6 @@ class G G1 gg1; } -class Recursive; -sequence RecursiveSeq; - -class Recursive { - optional(0) RecursiveSeq value; -} - ["amd"] interface Initial {