Refactored unit tests a bit making fixtures inner classes

Author: oliemansm

src/test/groovy/com/coxautodev/graphql/tools/GenericResolverSpec.groovy

@@ -24,23 +24,22 @@ class GenericResolverSpec extends Specification {
             noExceptionThrown()
     }
 
-}
-
-class QueryResolver implements GraphQLQueryResolver {
-    Bar getBar() {
-        return new Bar()
+    class QueryResolver implements GraphQLQueryResolver {
+        Bar getBar() {
+            return new Bar()
+        }
     }
-}
 
-class Bar {
-}
+    class Bar {
+    }
 
-abstract class FooResolver<T> {
-    String getValue(T foo) {
-        return "value"
+    abstract class FooResolver<T> {
+        String getValue(T foo) {
+            return "value"
+        }
     }
-}
 
-class BarResolver extends FooResolver<Bar> implements GraphQLResolver<Bar> {
+    class BarResolver extends FooResolver<Bar> implements GraphQLResolver<Bar> {
 
+    }
 }

src/test/groovy/com/coxautodev/graphql/tools/MethodFieldResolverDataFetcherSpec.groovy

@@ -237,19 +237,19 @@ class MethodFieldResolverDataFetcherSpec extends Specification {
             .subscriptionStrategy(executionStrategy)
             .build()
     }
-}
 
-class DataClass {
-    private static final String name = "Data Class Name"
+    class DataClass {
+        private static final String name = "Data Class Name"
 
-    String getName() {
-        name
+        String getName() {
+            name
+        }
     }
-}
 
-class InputClass {
-    String name
-}
+    static class InputClass {
+        String name
+    }
 
-class ContextClass {
+    class ContextClass {
+    }
 }

src/test/groovy/com/coxautodev/graphql/tools/MultiResolverSpec.groovy

@@ -51,30 +51,30 @@ class MultiResolverSpec extends Specification {
         then:
             data.person
     }
-}
 
-class QueryWithPersonResolver implements GraphQLQueryResolver {
-    Person getPerson() {
-        new Person()
+    class QueryWithPersonResolver implements GraphQLQueryResolver {
+        Person getPerson() {
+            new Person()
+        }
     }
-}
 
-class Person {
+    class Person {
 
-}
+    }
 
-class Friend {
-    String name
-}
+    class Friend {
+        String name
+    }
 
-class PersonFriendResolver implements GraphQLResolver<Person> {
-    List<Friend> friends(Person person, String friendName) {
-        Collections.emptyList()
+    class PersonFriendResolver implements GraphQLResolver<Person> {
+        List<Friend> friends(Person person, String friendName) {
+            Collections.emptyList()
+        }
     }
-}
 
-class PersonNameResolver implements GraphQLResolver<Person> {
-    String name(Person person) {
-        "name"
+    class PersonNameResolver implements GraphQLResolver<Person> {
+        String name(Person person) {
+            "name"
+        }
     }
 }

src/test/groovy/com/coxautodev/graphql/tools/SchemaParserSpec.groovy

@@ -367,40 +367,40 @@ class SchemaParserSpec extends Specification {
             noExceptionThrown()
     }
 
-}
-
-enum EnumType { TEST }
+    enum EnumType { TEST }
 
-class QueryWithIdResolver implements GraphQLQueryResolver {
-    String getId() { null }
-}
+    class QueryWithIdResolver implements GraphQLQueryResolver {
+        String getId() { null }
+    }
 
-class Filter {
-    String filter() { null }
-}
+    class Filter {
+        String filter() { null }
+    }
 
-class CustomGenericWrapper<T, V> {}
+    class CustomGenericWrapper<T, V> {}
 
-class Obj {
-    def name() { null }
-}
+    class Obj {
+        def name() { null }
+    }
 
-class AnotherObj {
-    def key() { null }
-}
+    class AnotherObj {
+        def key() { null }
+    }
 
-class RootObj {
-}
+    class RootObj {
+    }
 
-class ProxiedResolver implements GraphQLQueryResolver {
-    List<String> test() { [] }
-}
+    class ProxiedResolver implements GraphQLQueryResolver {
+        List<String> test() { [] }
+    }
 
-enum CustomEnum {
-    FOO{
-        @Override
-        String toString() {
-            return "Bar"
+    enum CustomEnum {
+        FOO{
+            @Override
+            String toString() {
+                return "Bar"
+            }
         }
     }
+
 }

src/test/groovy/com/coxautodev/graphql/tools/SuperclassResolverSpec.groovy

@@ -0,0 +1,45 @@
+package com.coxautodev.graphql.tools
+
+
+import spock.lang.Specification
+
+class SuperclassResolverSpec extends Specification {
+
+    def "methods from generic resolvers are resolved"() {
+        when:
+            SchemaParser.newParser().schemaString('''\
+                        type Query {
+                            bar: Bar!
+                        }
+                        
+                        type Bar {
+                            value: String
+                        }
+                        ''')
+                    .resolvers(new QueryResolver(), new BarResolver())
+                    .build()
+                    .makeExecutableSchema()
+
+        then:
+            noExceptionThrown()
+    }
+
+    class QueryResolver implements GraphQLQueryResolver {
+        Bar getBar() {
+            return new Bar()
+        }
+    }
+
+    class Bar {
+    }
+
+    abstract class FooResolver<T> implements GraphQLResolver<Bar> {
+        String getValue(T foo) {
+            return "value"
+        }
+    }
+
+    class BarResolver extends FooResolver<Bar> {
+
+    }
+}