added test for transforming nullability

dpnolte · Nov 4, 2018 · 3a49336 · 3a49336
1 parent 9475575
commit 3a49336
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/annotation/out/production/classes/com/laidpack/annotation/TypeScript.class b/annotation/out/production/classes/com/laidpack/annotation/TypeScript.class
diff --git a/codegen-impl/src/main/kotlin/com/laidpack/typescript/codegen/BaseTypeScriptProcessor.kt b/codegen-impl/src/main/kotlin/com/laidpack/typescript/codegen/BaseTypeScriptProcessor.kt
@@ -1,8 +1,9 @@
 package com.laidpack.typescript.codegen
 
-import com.laidpack.annotation.TypeScript
+import com.laidpack.typescript.annotation.TypeScript
 import com.laidpack.typescript.codegen.moshi.ITargetType
 import com.squareup.kotlinpoet.ClassName
+import com.squareup.kotlinpoet.asTypeName
 import me.eugeniomarletti.kotlin.metadata.*
 import me.eugeniomarletti.kotlin.processing.KotlinAbstractProcessor
 import java.io.File

diff --git a/...gen-impl/src/test/kotlin/com/laidpack/typescript/codegen/TypeScriptTypeTransformerTest.kt b/...gen-impl/src/test/kotlin/com/laidpack/typescript/codegen/TypeScriptTypeTransformerTest.kt
@@ -79,19 +79,35 @@ internal class TypeScriptTypeTransformerTest {
     }
 
     @Test
-    fun `transformType - given int annotated with Test, return custom value transformed any`() {
+    fun `transformType - given int annotated with Test, return custom value transformed string`() {
         // Assemble
         Mockito.`when`(mockedBodyType.canonicalName).`it returns`(Int::class.java.canonicalName)
         Mockito.`when`(mockedBodyType.isPrimitiveOrStringType).`it returns`(true)
         Mockito.`when`(mockedBodyType.annotationNames).`it returns`(setOf("Test"))
 
         // Act
-        val customValueTransformer = TypeTransformer({ t -> t.annotationNames.contains("Test")}, "string")
+        val customValueTransformer = TypeTransformer({ t -> t.annotationNames.contains("Test")}, "string", Nullability.NoTransform)
         val transformer = TypeScriptTypeTransformer(listOf(customValueTransformer))
         val result = transformer.transformType(mockedBodyType, setOf(), mapOf())
 
         // Assert
         result shouldEqual "string"
     }
 
+    @Test
+    fun `transformType - given non-nullable int annotated with Test, return transformed nullability as null`() {
+        // Assemble
+        Mockito.`when`(mockedBodyType.canonicalName).`it returns`(Int::class.java.canonicalName)
+        Mockito.`when`(mockedBodyType.isPrimitiveOrStringType).`it returns`(true)
+        Mockito.`when`(mockedBodyType.annotationNames).`it returns`(setOf("Test"))
+
+        // Act
+        val customValueTransformer = TypeTransformer({ t -> t.annotationNames.contains("Test")}, "string", Nullability.Null)
+        val transformer = TypeScriptTypeTransformer(listOf(customValueTransformer))
+        val result = transformer.isNullable(mockedBodyType)
+
+        // Assert
+        result shouldEqual true
+    }
+
 }