Skip to content

Fix gh-2702 and add Introspection.__DirectiveLocation regression tests #2703

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.

Sign up for GitHub

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
bbakerman merged 2 commits into from
Jan 31, 2022
Merged

Fix gh-2702 and add Introspection.__DirectiveLocation regression tests #2703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5270250
Fix gh-2702 and add `Introspection.__DirectiveLocation` regression tests
jord1e Jan 30, 2022
f337767
Code deduplication
jord1e Jan 30, 2022
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
2 changes: 1 addition & 1 deletion src/main/java/graphql/introspection/Introspection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ public enum DirectiveLocation {
.value("FRAGMENT_DEFINITION", DirectiveLocation.FRAGMENT_DEFINITION, "Indicates the directive is valid on fragment definitions.")
.value("FRAGMENT_SPREAD", DirectiveLocation.FRAGMENT_SPREAD, "Indicates the directive is valid on fragment spreads.")
.value("INLINE_FRAGMENT", DirectiveLocation.INLINE_FRAGMENT, "Indicates the directive is valid on inline fragments.")
.value("VARIABLE_DEFINITION", DirectiveLocation.INPUT_FIELD_DEFINITION, "Indicates the directive is valid on variable definitions.")
.value("VARIABLE_DEFINITION", DirectiveLocation.VARIABLE_DEFINITION, "Indicates the directive is valid on variable definitions.")
//
// from schema SDL PR https://github.com/facebook/graphql/pull/90
//
Expand Down
39 changes: 39 additions & 0 deletions src/test/groovy/graphql/introspection/IntrospectionTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import graphql.schema.FieldCoordinates
import graphql.schema.GraphQLCodeRegistry
import graphql.schema.GraphQLFieldsContainer
import graphql.schema.GraphQLNamedType
import spock.lang.Issue
import spock.lang.See
import spock.lang.Specification

import static graphql.GraphQL.newGraphQL
Expand Down Expand Up @@ -64,6 +66,43 @@ class IntrospectionTest extends Specification {
]
}

@Issue("https://github.com/graphql-java/graphql-java/issues/2702")
def "Introspection#__DirectiveLocation(GraphQLEnumType) `name` should match `value`'s DirectiveLocation#name() #2702"() {
given:
def directiveLocationValues = Introspection.__DirectiveLocation.values

expect:
directiveLocationValues.each {
def value = it.value
assert value instanceof Introspection.DirectiveLocation
assert it.name == (value as Introspection.DirectiveLocation).name()
}
}

@See("https://spec.graphql.org/October2021/#sec-Schema-Introspection.Schema-Introspection-Schema")
def "Introspection#__DirectiveLocation(GraphQLEnumType) should have 19 distinct values"() {
given:
def directiveLocationValues = Introspection.__DirectiveLocation.values
def numValues = 19

expect:
directiveLocationValues.size() == numValues
directiveLocationValues.unique(false).size() == numValues
}

def "Introspection#__DirectiveLocation(GraphQLEnumType) should contain all Introspection.DirectiveLocation"() {
given:
def directiveLocationValues = new ArrayList<>(Introspection.__DirectiveLocation.values)
def possibleLocations = new ArrayList<>(Introspection.DirectiveLocation.values().toList()).iterator()

expect:
while (possibleLocations.hasNext()) {
def nextPossibleLocation = possibleLocations.next()
assert directiveLocationValues.retainAll { (it.value != nextPossibleLocation) }
}
assert directiveLocationValues.isEmpty()
}

def "schema description can be defined in SDL and queried via introspection"() {
given:
def sdl = '''
Expand Down