Skip to content

Remove Testing of Recursively Optional Classes #2008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions cpp/test/Ice/optional/AllTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Recursive>());
RecursiveSeq recursive2;
recursive2.push_back(make_shared<Recursive>());
recursive1[0]->value = recursive2;
RecursivePtr outer = make_shared<Recursive>();
outer->value = recursive1;
initial->pingPong(outer);

GPtr g = make_shared<G>();
g->gg1Opt = make_shared<G1>("gg1Opt");
g->gg2 = make_shared<G2>(10);
Expand Down
8 changes: 0 additions & 8 deletions cpp/test/Ice/optional/Test.ice
Original file line number Diff line number Diff line change
Expand Up @@ -188,14 +188,6 @@ class G
G1 gg1;
}

class Recursive;
sequence<Recursive> RecursiveSeq;

class Recursive
{
optional(0) RecursiveSeq value;
}

interface Initial
{
void shutdown();
Expand Down
8 changes: 0 additions & 8 deletions cpp/test/Ice/optional/TestAMD.ice
Original file line number Diff line number Diff line change
Expand Up @@ -188,14 +188,6 @@ class G
G1 gg1;
}

class Recursive;
sequence<Recursive> RecursiveSeq;

class Recursive
{
optional(0) RecursiveSeq value;
}

["amd"]
interface Initial
{
Expand Down
9 changes: 0 additions & 9 deletions csharp/test/Ice/optional/AllTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<Test.G1>(new Test.G1("gg1Opt"));
g.gg2 = new Test.G2(10);
Expand Down
8 changes: 0 additions & 8 deletions csharp/test/Ice/optional/Test.ice
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,6 @@ class G
G1 gg1;
}

class Recursive;
sequence<Recursive> RecursiveSeq;

class Recursive
{
optional(0) RecursiveSeq value;
}

interface Initial
{
void shutdown();
Expand Down
7 changes: 0 additions & 7 deletions csharp/test/Ice/optional/TestAMD.ice
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,6 @@ class G
G1 gg1;
}

class Recursive;
sequence<Recursive> RecursiveSeq;

class Recursive {
optional(0) RecursiveSeq value;
}

["amd"]
interface Initial
{
Expand Down
9 changes: 0 additions & 9 deletions java/test/src/main/java/test/Ice/optional/AllTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
7 changes: 0 additions & 7 deletions java/test/src/main/java/test/Ice/optional/Test.ice
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,6 @@ class G
G1 gg1;
}

class Recursive;
sequence<Recursive> RecursiveSeq;

class Recursive {
optional(0) RecursiveSeq value;
}

interface Initial
{
void shutdown();
Expand Down
7 changes: 0 additions & 7 deletions java/test/src/main/java/test/Ice/optional/TestAMD.ice
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,6 @@ class G
G1 gg1;
}

class Recursive;
sequence<Recursive> RecursiveSeq;

class Recursive {
optional(0) RecursiveSeq value;
}

["amd"]
interface Initial
{
Expand Down
7 changes: 0 additions & 7 deletions js/test/Ice/optional/Client.js
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
8 changes: 0 additions & 8 deletions js/test/Ice/optional/Test.ice
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,6 @@ class G
G1 gg1;
}

class Recursive;
sequence<Recursive> RecursiveSeq;

class Recursive
{
optional(0) RecursiveSeq value;
}

interface Initial
{
void shutdown();
Expand Down
7 changes: 0 additions & 7 deletions js/test/typescript/Ice/optional/Client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
8 changes: 0 additions & 8 deletions js/test/typescript/Ice/optional/Test.ice
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,6 @@ class G
G1 gg1;
}

class Recursive;
sequence<Recursive> RecursiveSeq;

class Recursive
{
optional(0) RecursiveSeq value;
}

interface Initial
{
void shutdown();
Expand Down
12 changes: 0 additions & 12 deletions matlab/test/Ice/optional/AllTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 0 additions & 8 deletions matlab/test/Ice/optional/Test.ice
Original file line number Diff line number Diff line change
Expand Up @@ -191,14 +191,6 @@ class G
G1 gg1;
}

class Recursive;
sequence<Recursive> RecursiveSeq;

class Recursive
{
optional(0) RecursiveSeq value;
}

interface Initial
{
void shutdown();
Expand Down
8 changes: 0 additions & 8 deletions python/test/Ice/optional/AllTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 0 additions & 7 deletions python/test/Ice/optional/Test.ice
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,6 @@ class G
G1 gg1;
}

class Recursive;
sequence<Recursive> RecursiveSeq;

class Recursive {
optional(0) RecursiveSeq value;
}

interface Initial
{
void shutdown();
Expand Down
8 changes: 0 additions & 8 deletions ruby/test/Ice/optional/AllTests.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 0 additions & 8 deletions ruby/test/Ice/optional/Test.ice
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,6 @@ class G
G1 gg1;
}

class Recursive;
sequence<Recursive> RecursiveSeq;

class Recursive
{
optional(0) RecursiveSeq value;
}

interface Initial
{
void shutdown();
Expand Down
7 changes: 0 additions & 7 deletions swift/test/Ice/optional/AllTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 0 additions & 8 deletions swift/test/Ice/optional/Test.ice
Original file line number Diff line number Diff line change
Expand Up @@ -194,14 +194,6 @@ class G
G1 gg1;
}

class Recursive;
sequence<Recursive> RecursiveSeq;

class Recursive
{
optional(0) RecursiveSeq value;
}

interface Initial
{
void shutdown();
Expand Down
7 changes: 0 additions & 7 deletions swift/test/Ice/optional/TestAMD.ice
Original file line number Diff line number Diff line change
Expand Up @@ -195,13 +195,6 @@ class G
G1 gg1;
}

class Recursive;
sequence<Recursive> RecursiveSeq;

class Recursive {
optional(0) RecursiveSeq value;
}

["amd"]
interface Initial
{
Expand Down