Chanced nullable implementation

Author: eranboudjnah

Diff for: app/src/main/java/com/mitteloupe/testit/generator/formatting/DataType.kt

@@ -2,6 +2,16 @@ package com.mitteloupe.testit.generator.formatting
 
 import com.mitteloupe.testit.model.DataType
 
+fun DataType.toNonNullableKotlinString() = when (this) {
+    is DataType.Specific -> name
+    is DataType.Generic -> "$name<${genericTypes.toNonNullableKotlinString()}>"
+}
+
+private fun Array<out DataType>.toNonNullableKotlinString(): String =
+    joinToString(", ") { dataType ->
+        dataType.toNonNullableKotlinString()
+    }
+
 fun DataType.toKotlinString() = when (this) {
     is DataType.Specific -> name
     is DataType.Generic -> "$name<${genericTypes.toKotlinString()}>"
@@ -17,4 +27,4 @@ private fun String.makeNullableIfTrue(isNullable: Boolean) =
         "$this?"
     } else {
         this
-    }
+    }

Diff for: app/src/main/java/com/mitteloupe/testit/generator/mocking/MockKCodeGenerator.kt

@@ -2,6 +2,7 @@ package com.mitteloupe.testit.generator.mocking
 
 import com.mitteloupe.testit.generator.formatting.Formatting
 import com.mitteloupe.testit.generator.formatting.toKotlinString
+import com.mitteloupe.testit.generator.formatting.toNonNullableKotlinString
 import com.mitteloupe.testit.model.ClassMetadata
 import com.mitteloupe.testit.model.DataType
 import com.mitteloupe.testit.model.concreteFunctions
@@ -36,7 +37,7 @@ class MockKCodeGenerator(
 
     override fun getConstructorMock(parameterName: String, parameterType: DataType) =
         "${indent()}@MockK\n" +
-                "${indent()}lateinit var $parameterName: ${parameterType.toKotlinString()}"
+                "${indent()}lateinit var $parameterName: ${parameterType.toNonNullableKotlinString()}"
 
     override fun getAbstractClassUnderTest(classUnderTest: ClassMetadata): String {
         val arguments =
@@ -55,7 +56,8 @@ class MockKCodeGenerator(
         return stringBuilder.toString()
     }
 
-    override fun getMockedInstance(variableType: DataType) = "mockk<${variableType.toKotlinString()}>()"
+    override fun getMockedInstance(variableType: DataType) =
+        "mockk<${variableType.toKotlinString()}>()"
 
     override fun setHasMockedConstructorParameters(classUnderTest: ClassMetadata) {
         _hasMockedConstructorParameters = true

Diff for: app/src/main/java/com/mitteloupe/testit/generator/mocking/MockitoCodeGenerator.kt

@@ -1,7 +1,7 @@
 package com.mitteloupe.testit.generator.mocking
 
 import com.mitteloupe.testit.generator.formatting.Formatting
-import com.mitteloupe.testit.generator.formatting.toKotlinString
+import com.mitteloupe.testit.generator.formatting.toNonNullableKotlinString
 import com.mitteloupe.testit.model.ClassMetadata
 import com.mitteloupe.testit.model.DataType
 
@@ -35,9 +35,10 @@ class MockitoCodeGenerator(
 
     override fun getConstructorMock(parameterName: String, parameterType: DataType) =
         "${indent()}@Mock\n" +
-                "${indent()}lateinit var $parameterName: ${parameterType.toKotlinString()}"
+                "${indent()}lateinit var $parameterName: ${parameterType.toNonNullableKotlinString()}"
 
-    override fun getMockedInstance(variableType: DataType) = "mock<${variableType.toKotlinString()}>()"
+    override fun getMockedInstance(variableType: DataType) =
+        "mock<${variableType.toNonNullableKotlinString()}>()"
 
     override fun getAbstractClassUnderTest(classUnderTest: ClassMetadata) =
         "mock(defaultAnswer = Mockito.CALLS_REAL_METHODS${getConstructorArgumentsForAbstract(

Diff for: app/src/test/java/com/mitteloupe/testit/generator/mocking/MockitoCodeGeneratorTest.kt

@@ -237,7 +237,7 @@ class MockitoCodeGeneratorTest {
     }
 
     @Test
-    fun `Given _ when setIsAbstractClassUnderTest then _`() {
+    fun `When setIsAbstractClassUnderTest then adds expected imports`() {
         // Given
         val expected1 = "mock"
         val expected2 = "Mockito"
@@ -278,7 +278,7 @@ class MockitoCodeGeneratorTest {
             ),
             DataType.Specific("another type", false)
         )
-        val expected = "mock<data type<nested type<deeply nested>?, another type>>()"
+        val expected = "mock<data type<nested type<deeply nested>, another type>>()"
         given { mockableTypeQualifier.getNonMockableType(variableType.name) }
             .willReturn(null)