rename StaticEnumValuesProvider to NaturalEnumProvider

andimarek · andimarek · commit 4007e99b2881 · 2017-05-24T09:53:31.000+02:00
diff --git a/src/main/java/graphql/schema/idl/NaturalEnumValuesProvider.java b/src/main/java/graphql/schema/idl/NaturalEnumValuesProvider.java
@@ -9,12 +9,12 @@
  * @param <T>
  */
 @PublicApi
-public class StaticEnumValuesProvider<T extends Enum<T>> implements EnumValuesProvider {
+public class NaturalEnumValuesProvider<T extends Enum<T>> implements EnumValuesProvider {
 
 
     private final Class<T> enumType;
 
-    public StaticEnumValuesProvider(Class<T> enumType) {
+    public NaturalEnumValuesProvider(Class<T> enumType) {
         Assert.assertNotNull(enumType, "enumType can't be null");
         this.enumType = enumType;
     }
diff --git a/src/test/groovy/graphql/schema/DataFetcherSelectionTest.groovy b/src/test/groovy/graphql/schema/DataFetcherSelectionTest.groovy
@@ -8,7 +8,6 @@ import graphql.language.Field
 import graphql.schema.idl.RuntimeWiring
 import graphql.schema.idl.SchemaGenerator
 import graphql.schema.idl.SchemaParser
-import spock.lang.Ignore
 import spock.lang.Specification
 
 import java.util.stream.Collectors
@@ -74,7 +73,6 @@ class DataFetcherSelectionTest extends Specification {
         return new SelectionCapturingDataFetcher(delegate, captureList)
     }
 
-
     RuntimeWiring wiring = RuntimeWiring.newRuntimeWiring()
             .type(newTypeWiring("QueryType")
             .dataFetchers(
@@ -98,8 +96,6 @@ class DataFetcherSelectionTest extends Specification {
 
     def executableStarWarsSchema = load("starWarsSchema.graphqls", wiring)
 
-    //TODO: fix me later
-    @Ignore
     def "field selection can be captured via data environment"() {
 
         captureList.clear()
diff --git a/src/test/groovy/graphql/schema/idl/SchemaGeneratorTest.groovy b/src/test/groovy/graphql/schema/idl/SchemaGeneratorTest.groovy
@@ -813,7 +813,7 @@ class SchemaGeneratorTest extends Specification {
             query: Query
         }
         """
-        def enumValuesProvider = new StaticEnumValuesProvider<ExampleEnum>(ExampleEnum.class);
+        def enumValuesProvider = new NaturalEnumValuesProvider<ExampleEnum>(ExampleEnum.class);
         when:
 
         def wiring = RuntimeWiring.newRuntimeWiring()

Original file line number	Diff line number	Diff line change
`@@ -813,7 +813,7 @@ class SchemaGeneratorTest extends Specification {`
`813`	`813`	`query: Query`
`814`	`814`	`}`
`815`	`815`	`"""`
`816`		`- def enumValuesProvider = new StaticEnumValuesProvider<ExampleEnum>(ExampleEnum.class);`
	`816`	`+ def enumValuesProvider = new NaturalEnumValuesProvider<ExampleEnum>(ExampleEnum.class);`
`817`	`817`	`when:`
`818`	`818`
`819`	`819`	`def wiring = RuntimeWiring.newRuntimeWiring()`