Fix unit test configuration allowing testng dependency

Author: oliemansm

pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.graphql-java-kickstart</groupId>
@@ -119,12 +120,6 @@
             <version>1.0-groovy-2.4</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
@@ -142,12 +137,6 @@
             <artifactId>reactive-streams-tck</artifactId>
             <version>1.0.2</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.testng</groupId>
-                    <artifactId>testng</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 
@@ -226,17 +215,18 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.2</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit4</artifactId>
+                        <version>2.22.2</version>
+                    </dependency>
+                </dependencies>
                 <configuration>
                     <includes>
                         <include>**/*Spec.*</include>
                         <include>**/*Test.*</include>
                     </includes>
-                    <properties>
-                        <property>
-                            <name>junit</name>
-                            <value>true</value>
-                        </property>
-                    </properties>
                 </configuration>
             </plugin>
             <plugin>
@@ -331,7 +321,8 @@
     </distributionManagement>
     <scm>
         <connection>scm:git:https://github.com/graphql-java-kickstart/graphql-java-tools.git</connection>
-        <developerConnection>scm:git:https://github.com/graphql-java-kickstart/graphql-java-tools.git</developerConnection>
+        <developerConnection>scm:git:https://github.com/graphql-java-kickstart/graphql-java-tools.git
+        </developerConnection>
         <url>https://github.com/graphql-java-kickstart/graphql-java-tools</url>
         <tag>HEAD</tag>
     </scm>

src/main/kotlin/com/coxautodev/graphql/tools/MethodFieldResolver.kt

@@ -91,8 +91,7 @@ internal class MethodFieldResolver(field: FieldDefinition, search: FieldResolver
 
         // Add DataFetchingEnvironment/Context argument
         if (this.additionalLastArgument) {
-            val lastArgumentType = this.method.parameterTypes.last()
-            when (lastArgumentType) {
+            when (this.method.parameterTypes.last()) {
                 null -> throw ResolverError("Expected at least one argument but got none, this is most likely a bug with graphql-java-tools")
                 options.contextClass -> args.add { environment -> environment.getContext() }
                 else -> args.add { environment -> environment }

src/main/kotlin/com/coxautodev/graphql/tools/SchemaParserBuilder.kt

@@ -57,7 +57,7 @@ class SchemaParserBuilder constructor(private val dictionary: SchemaParserDictio
      * Add a GraphQL schema string directly.
      */
     fun schemaString(string: String) = this.apply {
-        if (!schemaString.isEmpty()) {
+        if (schemaString.isNotEmpty()) {
             schemaString.append("\n")
         }
         schemaString.append(string)
@@ -180,7 +180,7 @@ class SchemaParserBuilder constructor(private val dictionary: SchemaParserDictio
         try {
             files.forEach { documents.add(parser.parseDocument(readFile(it), it)) }
 
-            if (!schemaString.isEmpty()) {
+            if (schemaString.isNotEmpty()) {
                 documents.add(parser.parseDocument(this.schemaString.toString()))
             }
         } catch (pce: ParseCancellationException) {

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

@@ -197,7 +197,11 @@ class MethodFieldResolverDataFetcherSpec extends Specification {
     }
 
     private static DataFetcher createFetcher(SchemaParserOptions options, String methodName, List<InputValueDefinition> arguments = [], GraphQLResolver<?> resolver) {
-        def field = new FieldDefinition(methodName, new TypeName('Boolean')).with { getInputValueDefinitions().addAll(arguments); it }
+        def field = FieldDefinition.newFieldDefinition()
+                .name(methodName)
+                .type(new TypeName('Boolean'))
+                .inputValueDefinitions(arguments)
+                .build()
 
         new FieldResolverScanner(options).findFieldResolver(field, resolver instanceof GraphQLQueryResolver ? new RootResolverInfo([resolver], options) : new NormalResolverInfo(resolver, options)).createDataFetcher()
     }
@@ -227,12 +231,12 @@ class MethodFieldResolverDataFetcherSpec extends Specification {
         }
         ExecutionId executionId = ExecutionId.from("executionId123")
         ExecutionContextBuilder.newExecutionContextBuilder()
-            .instrumentation(SimpleInstrumentation.INSTANCE)
-            .executionId(executionId)
-            .queryStrategy(executionStrategy)
-            .mutationStrategy(executionStrategy)
-            .subscriptionStrategy(executionStrategy)
-            .build()
+                .instrumentation(SimpleInstrumentation.INSTANCE)
+                .executionId(executionId)
+                .queryStrategy(executionStrategy)
+                .mutationStrategy(executionStrategy)
+                .subscriptionStrategy(executionStrategy)
+                .build()
     }
 
     class DataClass {

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

@@ -1,5 +1,6 @@
 package com.coxautodev.graphql.tools
 
+import graphql.parser.InvalidSyntaxException
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -16,12 +17,12 @@ class SchemaParserBuilderSpec extends Specification {
                 .build()
 
         then:
-            def e = thrown(InvalidSchemaError)
+            def e = thrown(InvalidSyntaxException)
             e.toString().contains(error)
 
         where:
             schema | error
-            "invalid"                   | "0,0:6='invalid'"
-            "type Query {\ninvalid!\n}" | "4,20:20='!'"
+            "invalid"                   | "offending token 'invalid' at line 1 column 1"
+            "type Query {\ninvalid!\n}" | "offending token '!' at line 2 column 8"
     }
 }