Added standard collections to builtins (fix #35)

kosi-libs · Sep 15, 2022 · 5f238a2 · 5f238a2
1 parent f9e7fa0
commit 5f238a2
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 8 deletions.
diff --git a/mockmp-processor/src/main/kotlin/org/kodein/mock/ksp/MocKMPProcessor.kt b/mockmp-processor/src/main/kotlin/org/kodein/mock/ksp/MocKMPProcessor.kt
@@ -27,8 +27,20 @@ public class MocKMPProcessor(
             "kotlin.Double" to ("%L" to "0.0"),
             "kotlin.String" to ("%L" to "\"\""),
             "kotlin.collections.List" to ("%M()" to MemberName("kotlin.collections", "emptyList")),
+            "kotlin.collections.ArrayList" to ("%M()" to MemberName("kotlin.collections", "ArrayList")),
+            "java.util.ArrayList" to ("%M()" to MemberName("kotlin.collections", "ArrayList")),
+            "kotlin.collections.ArrayDeque" to ("%M()" to MemberName("kotlin.collections", "ArrayDeque")),
             "kotlin.collections.Set" to ("%M()" to MemberName("kotlin.collections", "emptySet")),
+            "kotlin.collections.HashSet" to ("%M()" to MemberName("kotlin.collections", "HashSet")),
+            "java.util.HashSet" to ("%M()" to MemberName("kotlin.collections", "HashSet")),
+            "kotlin.collections.LinkedHashSet" to ("%M()" to MemberName("kotlin.collections", "LinkedHashSet")),
+            "java.util.LinkedHashSet" to ("%M()" to MemberName("kotlin.collections", "LinkedHashSet")),
             "kotlin.collections.Map" to ("%M()" to MemberName("kotlin.collections", "emptyMap")),
+            "kotlin.collections.HashMap" to ("%M()" to MemberName("kotlin.collections", "HashMap")),
+            "java.util.HashMap" to ("%M()" to MemberName("kotlin.collections", "HashMap")),
+            "kotlin.collections.LinkedHashMap" to ("%M()" to MemberName("kotlin.collections", "LinkedHashMap")),
+            "java.util.LinkedHashMap" to ("%M()" to MemberName("kotlin.collections", "LinkedHashMap")),
+            "kotlin.Array" to ("%M()" to MemberName("kotlin", "emptyArray"))
         )
     }
 
@@ -56,7 +68,6 @@ public class MocKMPProcessor(
         else -> (parent?.let { it.asString() + "." } ?: "") + toString()
     }
 
-    @Suppress("NOTHING_TO_INLINE")
     private fun error(node: KSNode, message: String): Nothing {
         val prefix = when (val loc = node.location) {
             is FileLocation -> "$node (${loc.filePath}:${loc.lineNumber})"
@@ -256,7 +267,10 @@ public class MocKMPProcessor(
             val vCls = vType.realDeclaration() as KSClassDeclaration
             val filesDeps = HashSet(process.files)
             val mockFunName = "fake${vType.toFunName()}"
-            val gFile = FileSpec.builder(vCls.packageName.asString(), mockFunName)
+            val mockPkg =
+                if (vCls.packageName.isKotlinStdlib()) "fake." + vCls.packageName.asString()
+                else vCls.packageName.asString()
+            val gFile = FileSpec.builder(mockPkg, mockFunName)
             val gFun = FunSpec.builder(mockFunName)
                 .addModifiers(KModifier.INTERNAL)
                 .returns(vType.toRealTypeName(vCls.typeParameters.toTypeParameterResolver()))
@@ -289,7 +303,12 @@ public class MocKMPProcessor(
                                         f.containingFile?.let { filesDeps += it }
                                         "%M()" to MemberName(f.packageName.asString(), f.simpleName.asString())
                                     }
-                                    else -> "%M()" to MemberName(vParamTypeToFakeDecl.packageName.asString(), "fake${vParamTypeToFake.toFunName()}")
+                                    else -> {
+                                        val pkg =
+                                            if (vParamTypeToFakeDecl.packageName.isKotlinStdlib()) "fake." + vParamTypeToFakeDecl.packageName.asString()
+                                            else vParamTypeToFakeDecl.packageName.asString()
+                                        "%M()" to MemberName(pkg, "fake${vParamTypeToFake.toFunName()}")
+                                    }
                                 }
                                 if (vParamType.isAnyFunctionType) {
                                     args.add("${vParam.name!!.asString()} = { ${"_, ".repeat(vParamType.arguments.size - 1)}-> $template }" to value)

diff --git a/mockmp-processor/src/main/kotlin/org/kodein/mock/ksp/utils.kt b/mockmp-processor/src/main/kotlin/org/kodein/mock/ksp/utils.kt
@@ -11,7 +11,11 @@ import com.squareup.kotlinpoet.ksp.toTypeParameterResolver
 
 internal fun String.withNonEmptyPrefix(p: String) = if (isEmpty()) "" else "$p$this"
 
-internal fun KSClassDeclaration.firstPublicConstructor() = (sequenceOf(primaryConstructor) + getConstructors()).firstOrNull { it?.isPublic() ?: false }
+internal fun KSClassDeclaration.firstPublicConstructor() = (sequenceOf(primaryConstructor) + getConstructors())
+    .filterNotNull()
+    .filter { it.isPublic() }
+    .sortedBy { it.parameters.size }
+    .firstOrNull()
 
 
 internal fun KSTypeReference.toRealTypeName(typeParamResolver: TypeParameterResolver = TypeParameterResolver.EMPTY): TypeName {
@@ -50,4 +54,6 @@ internal fun KSType.realDeclaration(): KSDeclaration {
         is KSTypeAlias -> decl.type.resolve().realDeclaration()
         else -> decl
     }
-}
+}
+
+internal fun KSName.isKotlinStdlib() = asString().let { it == "kotlin" || it.startsWith("kotlin.") }
diff --git a/tests/tests-junit4/src/commonMain/kotlin/data/Data.kt b/tests/tests-junit4/src/commonMain/kotlin/data/Data.kt
@@ -24,7 +24,19 @@ data class Data(
     val dir2: SomeDirection,
     val special: Instant,
     val list: List<String>,
-    val map: NamesMap<Int>
+    val arrayList: ArrayList<String>,
+    val arrayDeque: ArrayDeque<String>,
+    val set: Set<String>,
+    val hashSet: HashSet<String>,
+    val linkedHashSet: LinkedHashSet<String>,
+    val map: NamesMap<Int>,
+    val hashMap: HashMap<String, Long>,
+    val linkedHashMap: LinkedHashMap<String, Long>,
+)
+
+class Arrays(
+    val bytes: ByteArray,
+    val strings: Array<String>
 )
 
 class Funs(

diff --git a/tests/tests-junit4/src/commonTest/kotlin/tests/InjectionTests.kt b/tests/tests-junit4/src/commonTest/kotlin/tests/InjectionTests.kt
@@ -19,6 +19,9 @@ class InjectionTests : TestsWithMocks() {
     @Fake
     lateinit var data: Data
 
+    @Fake
+    lateinit var arrays: Arrays
+
     @Fake
     lateinit var funs: Funs
 
@@ -35,7 +38,7 @@ class InjectionTests : TestsWithMocks() {
     }
 
     @Test
-    fun testFake() {
+    fun testFakeData() {
         assertEquals(
             Data(
                 SubData("", 0),
@@ -46,12 +49,25 @@ class InjectionTests : TestsWithMocks() {
                 SomeDirection(Direction.LEFT),
                 Instant.fromEpochSeconds(0),
                 emptyList(),
-                emptyMap()
+                ArrayList(),
+                ArrayDeque(),
+                emptySet(),
+                HashSet(),
+                LinkedHashSet(),
+                emptyMap(),
+                HashMap(),
+                LinkedHashMap(),
             ),
             data
         )
     }
 
+    @Test
+    fun testFakeArray() {
+        assertEquals(0, arrays.bytes.size)
+        assertEquals(0, arrays.strings.size)
+    }
+
     @Test
     fun testDeferred() {
         every { bar.doData(isAny()) } returns Unit