azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle][MPP] Implement additional MultiplatformAndroidSourceSetLayoutV2DiagnosticsTest

Browse Source 
KT-53709
This commit is contained in:
Sebastian Sellmair
2022-08-25 12:27:40 +02:00
committed by Space
parent 7df34011ec
commit 979ec77f53
2 changed files with 55 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/sources/android/checker/MultiplatformLayoutV2MultiplatformLayoutV1StyleSourceDirUsageChecker.kt
+2 -2
View File
@@ -55,8 +55,8 @@ internal object MultiplatformLayoutV2MultiplatformLayoutV1StyleSourceDirUsageChe
data class V1StyleSourceDirUsageDiagnostic(
private val layout: KotlinAndroidSourceSetLayout,
private val v1StyleSourceDirInUse: File,
private val v2StyleSourceDirToUse: File
val v1StyleSourceDirInUse: File,
val v2StyleSourceDirToUse: File
) : KotlinAndroidSourceSetLayoutChecker.Diagnostic {
override val message: String
get() = """
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/sources/android/MultiplatformAndroidSourceSetLayoutV2DiagnosticsTest.kt
+53 -1
View File
@@ -13,10 +13,12 @@ import org.gradle.api.internal.project.ProjectInternal
import org.jetbrains.kotlin.gradle.*
import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension
import org.jetbrains.kotlin.gradle.plugin.sources.android.checker.MultiplatformLayoutV2AndroidStyleSourceDirUsageChecker.AndroidStyleSourceDirUsageDiagnostic
import org.jetbrains.kotlin.gradle.plugin.sources.android.checker.MultiplatformLayoutV2MultiplatformLayoutV1StyleSourceDirUsageChecker.V1StyleSourceDirUsageDiagnostic
import org.jetbrains.kotlin.gradle.plugin.sources.android.findAndroidSourceSet
import org.jetbrains.kotlin.gradle.plugin.sources.android.multiplatformAndroidSourceSetLayoutV2
import org.junit.Test
import kotlin.test.assertEquals
import kotlin.test.fail
class MultiplatformAndroidSourceSetLayoutV2DiagnosticsTest {
@@ -51,7 +53,6 @@ class MultiplatformAndroidSourceSetLayoutV2DiagnosticsTest {
@Test
fun `test - KT-53709 - androidTest_kotlin in use`() {
val project = buildMinimalAndroidMultiplatformProject()
/* Ensure that the problematic androidTest/kotlin source dir is 'in use' */
@@ -66,4 +67,55 @@ class MultiplatformAndroidSourceSetLayoutV2DiagnosticsTest {
assertEquals(androidTestKotlinSourceDir, diagnostic.androidStyleSourceDirInUse)
assertEquals(project.file("src/androidInstrumentedTest/kotlin"), diagnostic.kotlinStyleSourceDirToUse)
}
@Test
fun `test - android style source dir usage checker`() {
val project = buildMinimalAndroidMultiplatformProject()
val androidStyleMain = project.file("src/main/kotlin")
val androidStyleUnitTest = project.file("src/test/kotlin")
androidStyleMain.mkdirs()
androidStyleUnitTest.mkdirs()
project.evaluate()
project.checkCreatedSourceSets()
val warnings = diagnosticsReporter.warnings
if (warnings.size != 2) fail("Expected exactly two warnings emitted. Found $warnings")
val androidMainWarning = warnings.filterIsInstance<AndroidStyleSourceDirUsageDiagnostic>()
.find { warning -> warning.androidStyleSourceDirInUse == androidStyleMain }
?: fail("Missing warning for '$androidStyleMain'. Found $warnings")
assertEquals(
project.file("src/androidMain/kotlin"), androidMainWarning.kotlinStyleSourceDirToUse
)
val androidUnitTestWarning = warnings.filterIsInstance<AndroidStyleSourceDirUsageDiagnostic>()
.find { warning -> warning.androidStyleSourceDirInUse == androidStyleUnitTest }
?: fail("Missing warning for '$androidStyleUnitTest'. Found $warnings")
assertEquals(
project.file("src/androidUnitTest/kotlin"), androidUnitTestWarning.kotlinStyleSourceDirToUse
)
}
@Test
fun `test - v1 style source dir usage checker`() {
val project = buildMinimalAndroidMultiplatformProject()
val v1StyleInstrumentedTest = project.file("src/androidAndroidTest/kotlin")
v1StyleInstrumentedTest.mkdirs()
project.evaluate()
project.checkCreatedSourceSets()
val warning = assertIsInstance<V1StyleSourceDirUsageDiagnostic>(diagnosticsReporter.assertSingleWarning())
assertEquals(
v1StyleInstrumentedTest, warning.v1StyleSourceDirInUse,
)
assertEquals(
project.file("src/androidInstrumentedTest/kotlin"), warning.v2StyleSourceDirToUse
)
}
}