From b7e67736ab8a37e7744f9926d1e84f92f270bc91 Mon Sep 17 00:00:00 2001 From: Franklin Wang Date: Thu, 2 Jan 2025 14:47:25 +1100 Subject: [PATCH] Fix tests after NeverWiringFactory revert --- .../graphql/nadel/tests/hooks/scalar-transforms.kt | 9 +++------ .../legacy/scalars/date time scalar as input type.kt | 8 ++++++++ .../basic/service-types-are-completely-filtered.yml | 4 +++- .../deep-rename-not-asked-for-with-unions.yml | 3 --- .../deep renames/deep-rename-with-more-interfaces.yml | 3 --- .../deep renames/deep-rename-with-more-unions.yml | 3 --- .../fixtures/deep renames/deep-rename-with-unions.yml | 3 --- .../lower-level-interface-fields-get-typename-added.yml | 4 ---- ...rface-fields-which-are-renamed-get-typename-added.yml | 2 -- 9 files changed, 14 insertions(+), 25 deletions(-) diff --git a/test/src/test/kotlin/graphql/nadel/tests/hooks/scalar-transforms.kt b/test/src/test/kotlin/graphql/nadel/tests/hooks/scalar-transforms.kt index 914793c44..48a7e486c 100644 --- a/test/src/test/kotlin/graphql/nadel/tests/hooks/scalar-transforms.kt +++ b/test/src/test/kotlin/graphql/nadel/tests/hooks/scalar-transforms.kt @@ -1,17 +1,14 @@ package graphql.nadel.tests.hooks -import graphql.nadel.Nadel import graphql.nadel.tests.EngineTestHook import graphql.nadel.tests.GatewaySchemaWiringFactory import graphql.nadel.tests.UseHook +import graphql.schema.idl.WiringFactory import java.io.File interface GatewayScalarEngineHook : EngineTestHook { - override fun makeNadel(builder: Nadel.Builder): Nadel.Builder { - return super.makeNadel(builder) - .overallWiringFactory(GatewaySchemaWiringFactory()) - .underlyingWiringFactory(GatewaySchemaWiringFactory()) - } + override val wiringFactory: WiringFactory + get() = GatewaySchemaWiringFactory() } /** diff --git a/test/src/test/kotlin/graphql/nadel/tests/legacy/scalars/date time scalar as input type.kt b/test/src/test/kotlin/graphql/nadel/tests/legacy/scalars/date time scalar as input type.kt index 973555184..d3d97887f 100644 --- a/test/src/test/kotlin/graphql/nadel/tests/legacy/scalars/date time scalar as input type.kt +++ b/test/src/test/kotlin/graphql/nadel/tests/legacy/scalars/date time scalar as input type.kt @@ -1,5 +1,7 @@ package graphql.nadel.tests.legacy.scalars +import graphql.nadel.NadelSchemas +import graphql.nadel.tests.GatewaySchemaWiringFactory import graphql.nadel.tests.legacy.NadelLegacyIntegrationTest import graphql.scalars.ExtendedScalars import graphql.scalars.alias.AliasedScalar @@ -58,6 +60,12 @@ class `date time scalar as input type` : NadelLegacyIntegrationTest( ), ), ) { + override fun makeNadelSchemas(): NadelSchemas.Builder { + return super.makeNadelSchemas() + .overallWiringFactory(GatewaySchemaWiringFactory()) + .underlyingWiringFactory(GatewaySchemaWiringFactory()) + } + private data class Service_Foo( val thing: Any? = null, ) diff --git a/test/src/test/resources/fixtures/basic/service-types-are-completely-filtered.yml b/test/src/test/resources/fixtures/basic/service-types-are-completely-filtered.yml index 682c25c83..f71ef3060 100644 --- a/test/src/test/resources/fixtures/basic/service-types-are-completely-filtered.yml +++ b/test/src/test/resources/fixtures/basic/service-types-are-completely-filtered.yml @@ -142,7 +142,9 @@ response: |- { "data": { "test": { - "extensions": {} + "extensions": [ + {} + ] } }, "extensions": {} diff --git a/test/src/test/resources/fixtures/deep renames/deep-rename-not-asked-for-with-unions.yml b/test/src/test/resources/fixtures/deep renames/deep-rename-not-asked-for-with-unions.yml index 5be30b943..71b7b7da4 100644 --- a/test/src/test/resources/fixtures/deep renames/deep-rename-not-asked-for-with-unions.yml +++ b/test/src/test/resources/fixtures/deep renames/deep-rename-not-asked-for-with-unions.yml @@ -82,15 +82,12 @@ serviceCalls: "data": { "names": [ { - "__typename": "Issue", "name": "GQLGW-001" }, { - "__typename": "Issue", "name": "GQLGW-1102" }, { - "__typename": "Edible", "name": "Spaghetti" } ] diff --git a/test/src/test/resources/fixtures/deep renames/deep-rename-with-more-interfaces.yml b/test/src/test/resources/fixtures/deep renames/deep-rename-with-more-interfaces.yml index 708887aff..e68ab9165 100644 --- a/test/src/test/resources/fixtures/deep renames/deep-rename-with-more-interfaces.yml +++ b/test/src/test/resources/fixtures/deep renames/deep-rename-with-more-interfaces.yml @@ -98,11 +98,9 @@ serviceCalls: "data": { "names": [ { - "__typename": "Issue", "name": "GQLGW-001" }, { - "__typename": "Issue", "name": "GQLGW-1102" }, { @@ -120,7 +118,6 @@ serviceCalls: } }, { - "__typename": "Edible", "name": "Spaghetti" } ] diff --git a/test/src/test/resources/fixtures/deep renames/deep-rename-with-more-unions.yml b/test/src/test/resources/fixtures/deep renames/deep-rename-with-more-unions.yml index e07538165..0c0d0adb3 100644 --- a/test/src/test/resources/fixtures/deep renames/deep-rename-with-more-unions.yml +++ b/test/src/test/resources/fixtures/deep renames/deep-rename-with-more-unions.yml @@ -102,11 +102,9 @@ serviceCalls: "data": { "names": [ { - "__typename": "Issue", "name": "GQLGW-001" }, { - "__typename": "Issue", "name": "GQLGW-1102" }, { @@ -124,7 +122,6 @@ serviceCalls: } }, { - "__typename": "Edible", "name": "Spaghetti" } ] diff --git a/test/src/test/resources/fixtures/deep renames/deep-rename-with-unions.yml b/test/src/test/resources/fixtures/deep renames/deep-rename-with-unions.yml index fc8b3eafb..bdde39b75 100644 --- a/test/src/test/resources/fixtures/deep renames/deep-rename-with-unions.yml +++ b/test/src/test/resources/fixtures/deep renames/deep-rename-with-unions.yml @@ -102,11 +102,9 @@ serviceCalls: "data": { "names": [ { - "__typename" : "Issue", "name": "GQLGW-001" }, { - "__typename" : "Issue", "name": "GQLGW-1102" }, { @@ -124,7 +122,6 @@ serviceCalls: } }, { - "__typename" : "Edible", "name": "Spaghetti" } ] diff --git a/test/src/test/resources/fixtures/polymorphism/lower-level-interface-fields-get-typename-added.yml b/test/src/test/resources/fixtures/polymorphism/lower-level-interface-fields-get-typename-added.yml index 988948592..b8ac5bd48 100644 --- a/test/src/test/resources/fixtures/polymorphism/lower-level-interface-fields-get-typename-added.yml +++ b/test/src/test/resources/fixtures/polymorphism/lower-level-interface-fields-get-typename-added.yml @@ -157,18 +157,14 @@ serviceCalls: "data": { "pets": [ { - "__typename": "Dog", "name": "Sparky", "collar": { - "__typename": "DogCollar", "color": "blue" } }, { - "__typename": "Cat", "name": "Whiskers", "collar": { - "__typename": "CatCollar", "color": "red" } } diff --git a/test/src/test/resources/fixtures/polymorphism/lower-level-interface-fields-which-are-renamed-get-typename-added.yml b/test/src/test/resources/fixtures/polymorphism/lower-level-interface-fields-which-are-renamed-get-typename-added.yml index b3f51efaf..f3536432a 100644 --- a/test/src/test/resources/fixtures/polymorphism/lower-level-interface-fields-which-are-renamed-get-typename-added.yml +++ b/test/src/test/resources/fixtures/polymorphism/lower-level-interface-fields-which-are-renamed-get-typename-added.yml @@ -167,7 +167,6 @@ serviceCalls: { "name": "Sparky", "rename__collarToRenamed__collar": { - "__typename": "DogCollar", "color": "blue" }, "__typename__rename__collarToRenamed": "Dog" @@ -175,7 +174,6 @@ serviceCalls: { "name": "Whiskers", "rename__collarToRenamed__collar": { - "__typename": "CatCollar", "color": "red" }, "__typename__rename__collarToRenamed": "Cat"