bugfix getAllTypes and star wars introspection test

andimarek · andimarek · commit 87ea6842cf78 · 2015-07-24T09:08:24.000+02:00
diff --git a/src/main/java/graphql/schema/SchemaUtil.java b/src/main/java/graphql/schema/SchemaUtil.java
@@ -2,6 +2,7 @@
 
 
 import graphql.GraphQLException;
+import graphql.introspection.Introspection;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -101,6 +102,7 @@ public Map<String, GraphQLType> allTypes(GraphQLSchema schema) {
         if (schema.isSupportingMutations()) {
             collectTypes(schema.getMutationType(), typesByName);
         }
+        collectTypes(Introspection.__Schema, typesByName);
         return typesByName;
     }
 
diff --git a/src/test/groovy/graphql/StarWarsIntrospectionTests.groovy b/src/test/groovy/graphql/StarWarsIntrospectionTests.groovy
@@ -0,0 +1,47 @@
+package graphql
+
+import spock.lang.Specification
+
+
+class StarWarsIntrospectionTests extends Specification {
+
+    def "Allows querying the schema for types"() {
+        given:
+        def query = """
+        query IntrospectionTypeQuery {
+            __schema {
+                types {
+                    name
+                }
+            }
+        }
+        """
+        def expected = [
+                __schema: [types:
+                                   [[name: 'QueryType'],
+                                    [name: 'Character'],
+                                    [name: 'String'],
+                                    [name: 'Episode'],
+                                    [name: 'Human'],
+                                    [name: 'Droid'],
+                                    [name: '__Schema'],
+                                    [name: '__Type'],
+                                    [name: '__TypeKind'],
+                                    [name: '__Field'],
+                                    [name: '__InputValue'],
+                                    [name: 'Boolean'],
+                                    [name: '__EnumValue'],
+                                    [name: '__Directive']]
+                ]
+
+        ];
+
+        when:
+        def result = new GraphQL(StarWarsSchema.starWarsSchema).execute(query).result
+
+        then:
+        result == expected
+    }
+
+
+}
diff --git a/src/test/groovy/graphql/schema/IntrospectionUtilTest.groovy b/src/test/groovy/graphql/schema/IntrospectionUtilTest.groovy
diff --git a/src/test/groovy/graphql/schema/SchemaUtilTest.groovy b/src/test/groovy/graphql/schema/SchemaUtilTest.groovy
@@ -0,0 +1,31 @@
+package graphql.schema
+
+import graphql.introspection.Introspection
+import spock.lang.Specification
+
+import static graphql.Scalars.GraphQLBoolean
+import static graphql.Scalars.GraphQLString
+import static graphql.StarWarsSchema.*
+
+class SchemaUtilTest extends Specification {
+
+    def "collectAllTypes"() {
+        when:
+        Map<String, GraphQLType> types = new SchemaUtil().allTypes(starWarsSchema)
+        then:
+        types == [(droidType.name)                 : droidType,
+                  (humanType.name)                 : humanType,
+                  (queryType.name)                 : queryType,
+                  (characterInterface.name)        : characterInterface,
+                  (episodeEnum.name)               : episodeEnum,
+                  (GraphQLString.name)             : GraphQLString,
+                  (Introspection.__Schema.name)    : Introspection.__Schema,
+                  (Introspection.__Type.name)      : Introspection.__Type,
+                  (Introspection.__TypeKind.name)  : Introspection.__TypeKind,
+                  (Introspection.__Field.name)     : Introspection.__Field,
+                  (Introspection.__InputValue.name): Introspection.__InputValue,
+                  (Introspection.__EnumValue.name) : Introspection.__EnumValue,
+                  (Introspection.__Directive.name) : Introspection.__Directive,
+                  (GraphQLBoolean.name)            : GraphQLBoolean]
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`
`4`	`4`	`import graphql.GraphQLException;`
	`5`	`+import graphql.introspection.Introspection;`
`5`	`6`
`6`	`7`	`import java.util.ArrayList;`
`7`	`8`	`import java.util.LinkedHashMap;`
`@@ -101,6 +102,7 @@ public Map<String, GraphQLType> allTypes(GraphQLSchema schema) {`
`101`	`102`	`if (schema.isSupportingMutations()) {`
`102`	`103`	`collectTypes(schema.getMutationType(), typesByName);`
`103`	`104`	`}`
	`105`	`+ collectTypes(Introspection.__Schema, typesByName);`
`104`	`106`	`return typesByName;`
`105`	`107`	`}`
`106`	`108`