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

[Gradle][MPP] Correctly rename test for KT-50952

Browse Source
This commit is contained in:
sebastian.sellmair
2022-01-26 09:42:56 +01:00
committed by Space
parent abed5b98ac
commit af61ea9cb7
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppCInteropDependencyTransformationIT.kt
+14 -13
View File
@@ -24,24 +24,25 @@ import org.junit.Test
* - dependency-mode=project: In this case p2 will just declare a regular project dependency on p1 * - dependency-mode=project: In this case p2 will just declare a regular project dependency on p1
* - dependency-mode=repository: In this case p2 will rely on a previously published version of p1 * - dependency-mode=repository: In this case p2 will rely on a previously published version of p1
*/ */
open class MppCInteropDependencyTransformationIT : BaseGradleIT() { abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() {
protected val baseBuildOptions override fun defaultBuildOptions(): BuildOptions = super.defaultBuildOptions().run {
get() = defaultBuildOptions().copy( copy(
forceOutputToStdout = true, forceOutputToStdout = true,
warningMode = WarningMode.Fail, warningMode = WarningMode.Fail,
parallelTasksInProject = true, parallelTasksInProject = true,
freeCommandLineArgs = defaultBuildOptions().freeCommandLineArgs + "-s" freeCommandLineArgs = freeCommandLineArgs + "-s"
) )
}
protected val projectDependencyOptions protected val projectDependencyOptions
get() = baseBuildOptions.copy( get() = defaultBuildOptions().copy(
freeCommandLineArgs = baseBuildOptions.freeCommandLineArgs + "-PdependencyMode=project" freeCommandLineArgs = defaultBuildOptions().freeCommandLineArgs + "-PdependencyMode=project"
) )
protected val repositoryDependencyOptions protected val repositoryDependencyOptions
get() = baseBuildOptions.copy( get() = defaultBuildOptions().copy(
freeCommandLineArgs = baseBuildOptions.freeCommandLineArgs + "-PdependencyMode=repository" freeCommandLineArgs = defaultBuildOptions().freeCommandLineArgs + "-PdependencyMode=repository"
) )
class ComplexProject : MppCInteropDependencyTransformationIT() { class ComplexProject : MppCInteropDependencyTransformationIT() {
@@ -178,9 +179,9 @@ open class MppCInteropDependencyTransformationIT : BaseGradleIT() {
private fun WithSourceSetCommonizerDependencies.assertP3SourceSetDependencies() { private fun WithSourceSetCommonizerDependencies.assertP3SourceSetDependencies() {
/* /*
windowsAndLinuxMain / windowsAndLinuxTest will not have a 'perfect target match' in p1. windowsAndLinuxMain / windowsAndLinuxTest will not have a 'perfect target match' in p1.
They will choose cinterops associated with 'nativeMain' They will choose cinterops associated with 'nativeMain'
*/ */
listOf("nativeMain", "nativeTest", "windowsAndLinuxMain", "windowsAndLinuxTest").forEach { sourceSetName -> listOf("nativeMain", "nativeTest", "windowsAndLinuxMain", "windowsAndLinuxTest").forEach { sourceSetName ->
getCommonizerDependencies(sourceSetName).withoutNativeDistributionDependencies() getCommonizerDependencies(sourceSetName).withoutNativeDistributionDependencies()
.assertDependencyFilesMatches(".*cinterop-simple.*", ".*cinterop-withPosix.*") .assertDependencyFilesMatches(".*cinterop-simple.*", ".*cinterop-withPosix.*")
@@ -266,7 +267,7 @@ open class MppCInteropDependencyTransformationIT : BaseGradleIT() {
} }
@Test @Test
private fun `test - transformation - UP-TO-DATE behaviour - on removing and adding targets - on p2 - dependencyMode=project`() { fun `test - transformation - UP-TO-DATE behaviour - on removing and adding targets - on p2 - dependencyMode=project`() {
`test - transformation - UP-TO-DATE behaviour - on removing and adding targets - on p2`(projectDependencyOptions) `test - transformation - UP-TO-DATE behaviour - on removing and adding targets - on p2`(projectDependencyOptions)
} }
@@ -283,7 +284,7 @@ open class MppCInteropDependencyTransformationIT : BaseGradleIT() {
private fun publishP1ToBuildRepository() = project.publishP1ToBuildRepository() private fun publishP1ToBuildRepository() = project.publishP1ToBuildRepository()
} }
class KT46198 : MppCInteropDependencyTransformationIT() { class KT50952 : MppCInteropDependencyTransformationIT() {
private val project by lazy { Project("cinterop-MetadataDependencyTransformation-kt-50952") } private val project by lazy { Project("cinterop-MetadataDependencyTransformation-kt-50952") }
@Test @Test