test: add more hook tests (#133)

* test: add more hook tests * fix: drop test helper * Delete DataFetcherExecutionPredicateTest.kt
ExpediaGroup · Jan 7, 2019 · d6159d5 · d6159d5
1 parent b715ed9
commit d6159d5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/main/kotlin/com/expedia/graphql/hooks/SchemaGeneratorHooks.kt b/src/main/kotlin/com/expedia/graphql/hooks/SchemaGeneratorHooks.kt
@@ -1,5 +1,6 @@
 package com.expedia.graphql.hooks
 
+import com.expedia.graphql.generator.extensions.getTypeOfFirstArgument
 import graphql.schema.DataFetcher
 import graphql.schema.GraphQLFieldDefinition
 import graphql.schema.GraphQLSchema
@@ -35,7 +36,7 @@ interface SchemaGeneratorHooks {
      */
     fun willResolveMonad(type: KType): KType =
         if (type.classifier == CompletableFuture::class) {
-            type.arguments.firstOrNull()?.type ?: type
+            type.getTypeOfFirstArgument()
         } else {
             type
         }

diff --git a/src/test/kotlin/com/expedia/graphql/hooks/SchemaGeneratorHooksTest.kt b/src/test/kotlin/com/expedia/graphql/hooks/SchemaGeneratorHooksTest.kt
@@ -2,6 +2,7 @@ package com.expedia.graphql.hooks
 
 import com.expedia.graphql.TopLevelObject
 import com.expedia.graphql.extensions.deepName
+import com.expedia.graphql.generator.extensions.getSimpleName
 import com.expedia.graphql.getTestSchemaConfigWithHooks
 import com.expedia.graphql.toSchema
 import graphql.GraphQL
@@ -11,6 +12,7 @@ import graphql.schema.GraphQLFieldDefinition
 import graphql.schema.GraphQLObjectType
 import graphql.schema.GraphQLSchema
 import graphql.schema.GraphQLType
+import java.util.concurrent.CompletableFuture
 import kotlin.reflect.KFunction
 import kotlin.reflect.KProperty
 import kotlin.reflect.KType
@@ -207,10 +209,30 @@ class SchemaGeneratorHooksTest {
         assertEquals("Hijacked Description", query.description)
     }
 
+    @Test
+    fun `willResolveMonad returns CompletableFuture wrapped type`() {
+        val hooks = NoopSchemaGeneratorHooks()
+        val type = TestQueryFuture::comepletableFutre.returnType
+
+        assertEquals(expected = "SomeData", actual = hooks.willResolveMonad(type).getSimpleName())
+    }
+
+    @Test
+    fun `willResolveMonad returns basic type`() {
+        val hooks = NoopSchemaGeneratorHooks()
+        val type = TestQuery::query.returnType
+
+        assertEquals(expected = "SomeData", actual = hooks.willResolveMonad(type).getSimpleName())
+    }
+
     class TestQuery {
         fun query(): SomeData = SomeData(0)
     }
 
+    class TestQueryFuture {
+        fun comepletableFutre(): CompletableFuture<SomeData> = CompletableFuture.completedFuture(SomeData(1))
+    }
+
     data class SomeData(val someNumber: Int)
 
     private class WrappingDataFetcher(private val dataFetcher: DataFetcher<*>) : DataFetcher<Any> {