[603][620]Fix java-kotlin conversion issue (#622)

* Fix java-kotlin conversion issue which derives from KotlinPoet.

* Update mockito dependency.

* Fix to use old mockito for test module.

Author: hotchemi

gradle.properties

@@ -24,8 +24,8 @@ ANDROIDX_LIBRARY_VERSION= 1.0.0
 JAVAPOET_VERSION        = 1.9.0
 KOTLINPOET_VERSION      = 1.0.1
 JUNIT_VERSION           = 4.12
-MOCKITO_VERSION         = 1.10.19
-POWERMOCK_VERSION       = 1.6.4
+MOCKITO_VERSION         = 2.28.2
+POWERMOCK_VERSION       = 2.0.2
 COMPILE_TESTING_VERSION = 0.12
 LINT_VERSION            = 26.2.0-alpha06
 ROBOLECTRIC_VERSION     = 3.3.2

library/build.gradle

@@ -38,7 +38,7 @@ dependencies {
 
     testImplementation "junit:junit:$JUNIT_VERSION"
     testImplementation "org.mockito:mockito-core:$MOCKITO_VERSION"
-    testImplementation "org.powermock:powermock-api-mockito:$POWERMOCK_VERSION"
+    testImplementation "org.powermock:powermock-api-mockito2:$POWERMOCK_VERSION"
     testImplementation "org.powermock:powermock-module-junit4:$POWERMOCK_VERSION"
 
     api project(path: ':annotation')

processor/build.gradle

@@ -41,6 +41,7 @@ dependencies {
     testCompile androidJar()
     testCompile files(Jvm.current().getToolsJar())
     testCompile "junit:junit:$JUNIT_VERSION"
+    testCompile "org.mockito:mockito-core:$MOCKITO_VERSION"
     testCompile "com.google.testing.compile:compile-testing:$COMPILE_TESTING_VERSION"
     testCompile "commons-io:commons-io:$COMMONS_IO_VERSION"
     testCompile "com.squareup.okio:okio:2.1.0"

processor/src/main/kotlin/permissions/dispatcher/processor/util/Extensions.kt

@@ -67,9 +67,7 @@ fun VariableElement.isNullable(): Boolean =
 fun VariableElement.asPreparedType(): TypeName =
         this.asType()
                 .asTypeName()
-                .correctStringType()
-                .correctParameterStringType()
-                .correctAnyType()
+                .correctJavaTypeToKotlinType()
                 .mapToNullableTypeIf(this.isNullable())
 
 /**
@@ -118,30 +116,22 @@ fun FileSpec.Builder.addTypes(types: List<TypeSpec>): FileSpec.Builder {
 }
 
 /**
- * To avoid KotlinPoet bug that returns java.lang.String when type name is kotlin.String.
- * This method should be removed after addressing on KotlinPoet side.
+ * To avoid KotlinPoet bugs return java.lang.class when type name is in kotlin package.
+ * TODO: Remove this method after being addressed on KotlinPoet side.
  */
-fun TypeName.correctStringType() =
-        if (this.toString() == "java.lang.String") ClassName("kotlin", "String") else this
-
-/**
- * Convert [java.lang.String] to [kotlin.String] in a parameter.
- * ref: https://github.com/permissions-dispatcher/PermissionsDispatcher/issues/427
- */
-fun TypeName.correctParameterStringType(): TypeName {
-    if (this is ParameterizedTypeName) {
-        val typeArguments = this.typeArguments.map { it.correctStringType() }.toTypedArray()
+fun TypeName.correctJavaTypeToKotlinType(): TypeName {
+    return if (this is ParameterizedTypeName) {
+        val typeArguments = this.typeArguments.map { it.correctJavaTypeToKotlinType() }.toTypedArray()
         return this.rawType.parameterizedBy(*typeArguments)
+    } else when (toString()) {
+        "java.lang.Byte" -> ClassName("kotlin", "Byte")
+        "java.lang.Double" -> ClassName("kotlin", "Double")
+        "java.lang.Object" -> ClassName("kotlin", "Any")
+        "java.lang.String" -> ClassName("kotlin", "String")
+        else -> this
     }
-    return this
 }
 
-/**
- * https://github.com/permissions-dispatcher/PermissionsDispatcher/issues/545
- */
-fun TypeName.correctAnyType() =
-        if (this.toString() == "java.lang.Object") ClassName("kotlin", "Any") else this
-
 /**
  * Returns this TypeName as nullable or non-nullable based on the given condition.
  */

processor/src/test/java/permissions/dispatcher/processor/util/ExtensionsTest.kt

@@ -0,0 +1,56 @@
+package permissions.dispatcher.processor.util
+
+import com.squareup.kotlinpoet.ClassName
+import com.squareup.kotlinpoet.ParameterizedTypeName
+import com.squareup.kotlinpoet.TypeName
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.mockito.Mockito.`when`
+import org.mockito.Mockito.mock
+
+class ExtensionsTest {
+    @Test
+    fun `java Byte is converted into kotlin Byte`() {
+        val typeName = mock(TypeName::class.java)
+        `when`(typeName.toString()).thenReturn("java.lang.Byte")
+        val expected = typeName.correctJavaTypeToKotlinType().toString()
+        assertEquals(expected, "kotlin.Byte")
+    }
+
+    @Test
+    fun `java Double is converted into kotlin Double`() {
+        val typeName = mock(TypeName::class.java)
+        `when`(typeName.toString()).thenReturn("java.lang.Double")
+        val expected = typeName.correctJavaTypeToKotlinType().toString()
+        assertEquals(expected, "kotlin.Double")
+    }
+
+    @Test
+    fun `java Object is converted into kotlin Any`() {
+        val typeName = mock(TypeName::class.java)
+        `when`(typeName.toString()).thenReturn("java.lang.Object")
+        val expected = typeName.correctJavaTypeToKotlinType().toString()
+        assertEquals(expected, "kotlin.Any")
+    }
+
+    @Test
+    fun `java String is converted into kotlin String`() {
+        val typeName = mock(TypeName::class.java)
+        `when`(typeName.toString()).thenReturn("java.lang.String")
+        val expected = typeName.correctJavaTypeToKotlinType().toString()
+        assertEquals(expected, "kotlin.String")
+    }
+
+    @Test
+    fun `java String in List is converted into kotlin String`() {
+        val parameterizedTypeName = mock(ParameterizedTypeName::class.java)
+        val typeName = mock(TypeName::class.java)
+        `when`(typeName.toString()).thenReturn("java.lang.String")
+        `when`(parameterizedTypeName.rawType).thenReturn(ClassName.bestGuess("kotlin.collections.List"))
+        `when`(parameterizedTypeName.typeArguments).thenReturn(listOf(typeName))
+
+        val expected = parameterizedTypeName.correctJavaTypeToKotlinType() as ParameterizedTypeName
+        expected.typeArguments.first().toString()
+        assertEquals( expected.typeArguments.first().toString(), "kotlin.String")
+    }
+}

processor/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

@@ -0,0 +1 @@
+mock-maker-inline

test/build.gradle

@@ -46,10 +46,11 @@ dependencies {
 
     testImplementation "junit:junit:$JUNIT_VERSION"
     testImplementation "org.jetbrains.kotlin:kotlin-reflect:1.3.11"
-    testImplementation "org.mockito:mockito-core:$MOCKITO_VERSION"
-    testImplementation "org.powermock:powermock-api-mockito:$POWERMOCK_VERSION"
-    testImplementation "org.powermock:powermock-module-junit4:$POWERMOCK_VERSION"
-    testImplementation "org.powermock:powermock-module-junit4-rule:$POWERMOCK_VERSION"
-    testImplementation "org.powermock:powermock-classloading-xstream:$POWERMOCK_VERSION"
+    // TODO: update mockito and powermock
+    testImplementation "org.mockito:mockito-core:1.10.19"
+    testImplementation "org.powermock:powermock-api-mockito:1.6.4"
+    testImplementation "org.powermock:powermock-module-junit4:1.6.4"
+    testImplementation "org.powermock:powermock-module-junit4-rule:1.6.4"
+    testImplementation "org.powermock:powermock-classloading-xstream:1.6.4"
     testImplementation "org.robolectric:robolectric:$ROBOLECTRIC_VERSION"
 }