Reconfigure surefire plugin to be sure that all the unit tests are executed properly (#70)

gscheibel · dariuszkuc · commit f8b68d8bf568 · 2018-11-16T09:08:48.000-06:00
diff --git a/pom.xml b/pom.xml
@@ -74,8 +74,9 @@
         <kotlin.version>1.2.71</kotlin.version>
         <kotlin-ktlint.version>0.29.0</kotlin-ktlint.version>
         <kotlin-detekt.version>1.0.0.RC8</kotlin-detekt.version>
-        <junit.version>4.12</junit.version>
         <mockk.version>1.8.9.kotlin13</mockk.version>
+        <surefire-plugin.version>2.22.1</surefire-plugin.version>
+        <junit-jupiter.version>5.3.1</junit-jupiter.version>
     </properties>
 
     <pluginRepositories>
@@ -124,6 +125,37 @@
                     </execution>
                 </executions>
             </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>${surefire-plugin.version}</version>
+            <configuration>
+              <failIfNoTests>true</failIfNoTests>
+              <includes>
+                <include>**/*Test.java</include>
+                <include>**/*Test.kt</include>
+                <include>**/*Tests.java</include>
+                <include>**/*Tests.kt</include>
+              </includes>
+              <properties>
+                <excludeTags>integration-test</excludeTags>
+              </properties>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-api</artifactId>
+                <version>${junit-jupiter.version}</version>
+                <scope>runtime</scope>
+              </dependency>
+              <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter-engine</artifactId>
+                <version>${junit-jupiter.version}</version>
+                <scope>runtime</scope>
+              </dependency>
+            </dependencies>
+          </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
@@ -245,6 +277,18 @@
             <version>2.1.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>org.junit.jupiter</groupId>
+          <artifactId>junit-jupiter-api</artifactId>
+          <version>${junit-jupiter.version}</version>
+          <scope>test</scope>
+        </dependency>
+      <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-engine</artifactId>
+        <version>${junit-jupiter.version}</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
 
     <profiles>
diff --git a/src/main/kotlin/com/expedia/graphql/schema/extensions/annotationExtensions.kt b/src/main/kotlin/com/expedia/graphql/schema/extensions/annotationExtensions.kt
@@ -15,7 +15,7 @@ import kotlin.reflect.full.findAnnotation
 import com.expedia.graphql.annotations.GraphQLDirective as DirectiveAnnotation
 
 internal fun KAnnotatedElement.graphQLDescription(): String? {
-    val directiveNames = listOfDirectives().map { normalizeDirectiveName(it) }
+    val directiveNames = listOfDirectives().map { it.normalizeDirectiveName() }
 
     val description = this.findAnnotation<GraphQLDescription>()?.value
 
@@ -36,13 +36,8 @@ private fun KAnnotatedElement.listOfDirectives(): List<String> {
 
     return this.annotations.asSequence()
         .mapNotNull { it.getDirectiveInfo() }
-        .map {
-            val directiveName = it.getDirectiveInfo()?.name
-            val simpleName = it.annotationClass.simpleName
-
-            when {
-                directiveName.isNullOrEmpty().not() -> "@$directiveName"
-                simpleName.isNullOrEmpty().not() -> "@$simpleName"
+        .map { when {
+                it.effectiveName != null -> "@${it.effectiveName}"
                 else -> null
             }
         }
@@ -66,8 +61,13 @@ internal fun KAnnotatedElement.isGraphQLIgnored() = this.findAnnotation<GraphQLI
 
 internal fun KAnnotatedElement.isGraphQLID() = this.findAnnotation<GraphQLID>() != null
 
-internal fun Annotation.getDirectiveInfo(): DirectiveAnnotation? =
-    this.annotationClass.annotations.find { it is DirectiveAnnotation } as? DirectiveAnnotation
+private fun Annotation.getDirectiveInfo(): DirectiveInfo? {
+    val directiveAnnotation = this.annotationClass.annotations.find { it is DirectiveAnnotation } as? DirectiveAnnotation
+    return when {
+        directiveAnnotation != null -> DirectiveInfo(this.annotationClass.simpleName ?: "", directiveAnnotation)
+        else -> null
+    }
+}
 
 internal fun KAnnotatedElement.directives() =
     this.annotations.asSequence()
@@ -76,19 +76,16 @@ internal fun KAnnotatedElement.directives() =
         .toList()
 
 @Throws(CouldNotGetNameOfAnnotationException::class)
-private fun DirectiveAnnotation.getGraphQLDirective(): GraphQLDirective {
-    val kClass: KClass<out DirectiveAnnotation> = this.annotationClass
+private fun DirectiveInfo.getGraphQLDirective(): GraphQLDirective {
+    val kClass: KClass<out DirectiveAnnotation> = this.annotation.annotationClass
     val builder = GraphQLDirective.newDirective()
-    val name: String = if (this.name.isNotEmpty()) {
-        this.name
-    } else {
-        kClass.simpleName ?: throw CouldNotGetNameOfAnnotationException(kClass)
-    }
+    val name: String = this.effectiveName ?: throw CouldNotGetNameOfAnnotationException(kClass)
 
     @Suppress("Detekt.SpreadOperator")
-    builder.name(normalizeDirectiveName(name))
-        .validLocations(*this.locations)
-        .description(this.description)
+
+    builder.name(name.normalizeDirectiveName())
+        .validLocations(*this.annotation.locations)
+        .description(this.annotation.description)
 
     kClass.getValidFunctions().forEach { kFunction ->
         val propertyName = kFunction.name
@@ -106,4 +103,12 @@ private fun DirectiveAnnotation.getGraphQLDirective(): GraphQLDirective {
     return builder.build()
 }
 
-private fun normalizeDirectiveName(string: String) = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, string)
+private fun String.normalizeDirectiveName() = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, this)
+
+private data class DirectiveInfo(private val name: String, val annotation: DirectiveAnnotation) {
+    val effectiveName: String? = when {
+        annotation.name.isNotEmpty() -> annotation.name
+        name.isNotEmpty() -> name
+        else -> null
+    }
+}
diff --git a/src/test/kotlin/com/expedia/graphql/schema/generator/DirectiveTests.kt b/src/test/kotlin/com/expedia/graphql/schema/generator/DirectiveTests.kt
@@ -70,7 +70,10 @@ class DirectiveTests {
         assertNotNull(schema.getDirective("renamedDirective"))
         val directiveOnFunction = schema.getDirective("directiveOnFunction")
         assertNotNull(directiveOnFunction)
-        assertEquals(directiveOnFunction.validLocations()?.toSet(), setOf(Introspection.DirectiveLocation.FIELD_DEFINITION, Introspection.DirectiveLocation.FIELD))
+        assertEquals(
+            directiveOnFunction.validLocations()?.toSet(),
+            setOf(Introspection.DirectiveLocation.FIELD_DEFINITION, Introspection.DirectiveLocation.FIELD)
+        )
     }
 }
 
diff --git a/src/test/kotlin/com/expedia/graphql/schema/generator/SchemaGeneratorTest.kt b/src/test/kotlin/com/expedia/graphql/schema/generator/SchemaGeneratorTest.kt
@@ -269,7 +269,7 @@ class SchemaGeneratorTest {
 
     @Test
     fun `SchemaGenerator supports Scalar GraphQLID for input types`() {
-        val schema = toSchema(queries = emptyList(), mutations = listOf(TopLevelObjectDef(MutationWithId())), config = testSchemaConfig)
+        val schema = toSchema(queries = listOf(TopLevelObjectDef(QueryObject())), mutations = listOf(TopLevelObjectDef(MutationWithId())), config = testSchemaConfig)
 
         val furnitureType = schema.getObjectType("Furniture")
         val serialField = furnitureType.getFieldDefinition("serial").type as? GraphQLNonNull
diff --git a/src/test/kotlin/com/expedia/graphql/schema/hooks/SchemaGeneratorHooksTest.kt b/src/test/kotlin/com/expedia/graphql/schema/hooks/SchemaGeneratorHooksTest.kt
@@ -198,7 +198,7 @@ class SchemaGeneratorHooksTest {
 
         val hooks = MockSchemaGeneratorHooks()
         val schema = toSchema(
-            queries = emptyList(),
+            queries = listOf(TopLevelObjectDef(TestQuery())),
             mutations = listOf(TopLevelObjectDef(TestQuery())),
             config = getTestSchemaConfigWithHooks(hooks)
         )

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,10 @@ class DirectiveTests {`
`70`	`70`	`assertNotNull(schema.getDirective("renamedDirective"))`
`71`	`71`	`val directiveOnFunction = schema.getDirective("directiveOnFunction")`
`72`	`72`	`assertNotNull(directiveOnFunction)`
`73`		`- assertEquals(directiveOnFunction.validLocations()?.toSet(), setOf(Introspection.DirectiveLocation.FIELD_DEFINITION, Introspection.DirectiveLocation.FIELD))`
	`73`	`+ assertEquals(`
	`74`	`+ directiveOnFunction.validLocations()?.toSet(),`
	`75`	`+ setOf(Introspection.DirectiveLocation.FIELD_DEFINITION, Introspection.DirectiveLocation.FIELD)`
	`76`	`+ )`
`74`	`77`	`}`
`75`	`78`	`}`
`76`	`79`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ class SchemaGeneratorHooksTest {`
`198`	`198`
`199`	`199`	`val hooks = MockSchemaGeneratorHooks()`
`200`	`200`	`val schema = toSchema(`
`201`		`- queries = emptyList(),`
	`201`	`+ queries = listOf(TopLevelObjectDef(TestQuery())),`
`202`	`202`	`mutations = listOf(TopLevelObjectDef(TestQuery())),`
`203`	`203`	`config = getTestSchemaConfigWithHooks(hooks)`
`204`	`204`	`)`