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

[TEST] Introduce test-infrastructure-utils module and extract common test utilities here

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-12-02 16:00:43 +03:00
parent 1c91b74ff0
commit c8f3a4802e
189 changed files with 791 additions and 630 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/AbstractKotlinAndroidGradleTests.kt
+2 -1
View File
@@ -3,6 +3,7 @@ package org.jetbrains.kotlin.gradle
import org.gradle.api.logging.LogLevel
import org.jetbrains.kotlin.gradle.util.*
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.util.KtTestUtil
import org.junit.Assume
import org.junit.Test
import java.io.File
@@ -548,7 +549,7 @@ abstract class AbstractKotlinAndroidGradleTests : BaseGradleIT() {
override fun defaultBuildOptions() =
super.defaultBuildOptions().copy(
androidHome = KotlinTestUtils.findAndroidSdk(),
androidHome = KtTestUtil.findAndroidSdk(),
androidGradlePluginVersion = androidGradlePluginVersion
)
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt
+4 -4
View File
@@ -17,13 +17,13 @@
package org.jetbrains.kotlin.gradle
import org.jetbrains.kotlin.gradle.util.AGPVersion
import org.jetbrains.kotlin.gradle.util.createTempDir
import org.jetbrains.kotlin.gradle.util.modify
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.util.KtTestUtil
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
import java.io.File
import org.jetbrains.kotlin.gradle.util.createTempDir
import kotlin.test.assertEquals
private val DEFAULT_GRADLE_VERSION = GradleVersionRequired.AtLeast("5.6.4")
@@ -37,7 +37,7 @@ class BuildCacheRelocationIT : BaseGradleIT() {
override fun defaultBuildOptions(): BuildOptions =
super.defaultBuildOptions().copy(
withBuildCache = true,
androidHome = KotlinTestUtils.findAndroidSdk()
androidHome = KtTestUtil.findAndroidSdk()
)
@Parameterized.Parameter
@@ -205,4 +205,4 @@ class BuildCacheRelocationIT : BaseGradleIT() {
.map { it.relativeTo(dir) to it.readBytes().contentHashCode() }
.toList()
}
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheForAndroidIT.kt
+2 -2
View File
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.gradle
import org.gradle.api.logging.configuration.WarningMode
import org.jetbrains.kotlin.gradle.util.AGPVersion
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.util.KtTestUtil
import org.junit.Test
class ConfigurationCacheForAndroidIT : AbstractConfigurationCacheIT() {
@@ -16,7 +16,7 @@ class ConfigurationCacheForAndroidIT : AbstractConfigurationCacheIT() {
override fun defaultBuildOptions() =
super.defaultBuildOptions().copy(
androidHome = KotlinTestUtils.findAndroidSdk(),
androidHome = KtTestUtil.findAndroidSdk(),
androidGradlePluginVersion = androidGradlePluginVersion,
configurationCache = true,
configurationCacheProblems = ConfigurationCacheProblems.FAIL
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt
+3 -3
View File
@@ -1,7 +1,7 @@
package org.jetbrains.kotlin.gradle
import org.jetbrains.kotlin.gradle.util.*
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.util.KtTestUtil
import org.junit.Assert
import org.junit.Test
import java.io.File
@@ -95,7 +95,7 @@ abstract class Kapt3AndroidIT : Kapt3BaseIT() {
override fun defaultBuildOptions() =
super.defaultBuildOptions().copy(
androidHome = KotlinTestUtils.findAndroidSdk(),
androidHome = KtTestUtil.findAndroidSdk(),
androidGradlePluginVersion = androidGradlePluginVersion
)
@@ -263,4 +263,4 @@ abstract class Kapt3AndroidIT : Kapt3BaseIT() {
""".trimIndent()
}
}
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
+2 -2
View File
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.gradle.plugin.MULTIPLE_KOTLIN_PLUGINS_SPECIFIC_PROJE
import org.jetbrains.kotlin.gradle.scripting.internal.ScriptingGradleSubplugin
import org.jetbrains.kotlin.gradle.tasks.USING_JVM_INCREMENTAL_COMPILATION_MESSAGE
import org.jetbrains.kotlin.gradle.util.*
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.util.KtTestUtil
import org.junit.Test
import java.io.File
import java.nio.file.FileSystemException
@@ -1053,7 +1053,7 @@ class KotlinGradleIT : BaseGradleIT() {
":lib1:compileDebugUnitTestKotlin",
options = defaultBuildOptions().copy(
androidGradlePluginVersion = AGPVersion.v3_2_0,
androidHome = KotlinTestUtils.findAndroidSdk(),
androidHome = KtTestUtil.findAndroidSdk(),
),
) {
assertSuccessful()
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt
+3 -3
View File
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.gradle
import org.jetbrains.kotlin.gradle.internals.KOTLIN_TEST_MULTIPLATFORM_MODULE_NAME
import org.jetbrains.kotlin.gradle.util.AGPVersion
import org.jetbrains.kotlin.gradle.util.modify
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.util.KtTestUtil
import kotlin.test.Test
import kotlin.test.assertFalse
import kotlin.test.assertTrue
@@ -19,7 +19,7 @@ class KotlinSpecificDependenciesIT : BaseGradleIT() {
get() = GradleVersionRequired.FOR_MPP_SUPPORT
override fun defaultBuildOptions(): BuildOptions =
super.defaultBuildOptions().copy(androidGradlePluginVersion = AGPVersion.v3_6_0, androidHome = KotlinTestUtils.findAndroidSdk())
super.defaultBuildOptions().copy(androidGradlePluginVersion = AGPVersion.v3_6_0, androidHome = KtTestUtil.findAndroidSdk())
private fun Project.prepare() { // call this when reusing a project after a test, too, in order to remove any added dependencies
setupWorkingDir()
@@ -326,4 +326,4 @@ private fun BaseGradleIT.Project.checkPrintedItems(
checkAnyItemsContains.forEach { pattern -> assertTrue { items.any { pattern in it } } }
checkNoItemContains.forEach { pattern -> assertFalse { items.any { pattern in it } } }
}
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt
+3 -3
View File
@@ -9,7 +9,7 @@ import org.gradle.api.logging.configuration.WarningMode
import org.jetbrains.kotlin.gradle.util.AGPVersion
import org.jetbrains.kotlin.gradle.util.checkBytecodeContains
import org.jetbrains.kotlin.gradle.util.modify
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.util.KtTestUtil
import org.junit.Test
import java.io.File
import kotlin.test.assertTrue
@@ -222,7 +222,7 @@ class SubpluginsIT : BaseGradleIT() {
":app:compileDebugKotlin",
options = defaultBuildOptions().copy(
androidGradlePluginVersion = AGPVersion.v3_4_1,
androidHome = KotlinTestUtils.findAndroidSdk()
androidHome = KtTestUtil.findAndroidSdk()
)
) {
assertSuccessful()
@@ -263,4 +263,4 @@ class SubpluginsIT : BaseGradleIT() {
}
}
}
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtensionIT.kt
+3 -4
View File
@@ -6,9 +6,8 @@
package org.jetbrains.kotlin.gradle.model
import org.jetbrains.kotlin.gradle.BaseGradleIT
import org.jetbrains.kotlin.gradle.GradleVersionRequired
import org.jetbrains.kotlin.gradle.util.AGPVersion
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.util.KtTestUtil
import org.junit.Test
import kotlin.test.assertEquals
import kotlin.test.assertFalse
@@ -19,7 +18,7 @@ class KotlinAndroidExtensionIT : BaseGradleIT() {
override fun defaultBuildOptions(): BuildOptions {
return super.defaultBuildOptions().copy(
androidGradlePluginVersion = AGPVersion.v3_1_0,
androidHome = KotlinTestUtils.findAndroidSdk()
androidHome = KtTestUtil.findAndroidSdk()
)
}
@@ -52,4 +51,4 @@ class KotlinAndroidExtensionIT : BaseGradleIT() {
assertNull(model)
}
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt
+3 -4
View File
@@ -6,9 +6,8 @@
package org.jetbrains.kotlin.gradle.model
import org.jetbrains.kotlin.gradle.BaseGradleIT
import org.jetbrains.kotlin.gradle.GradleVersionRequired
import org.jetbrains.kotlin.gradle.util.AGPVersion
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.util.KtTestUtil
import org.junit.Test
import kotlin.test.assertEquals
import kotlin.test.assertFalse
@@ -19,7 +18,7 @@ class KotlinProjectIT : BaseGradleIT() {
override fun defaultBuildOptions(): BuildOptions {
return super.defaultBuildOptions().copy(
androidGradlePluginVersion = AGPVersion.v3_1_0,
androidHome = KotlinTestUtils.findAndroidSdk()
androidHome = KtTestUtil.findAndroidSdk()
)
}
@@ -294,4 +293,4 @@ class KotlinProjectIT : BaseGradleIT() {
assertEquals(expectedFriendSourceSets.toList(), friendSourceSets.toList())
}
}
}
}
libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts
+6 -3
View File
@@ -13,9 +13,12 @@ plugins { `java` }
val packedJars by configurations.creating
val projectsToInclude = listOf(":compiler:tests-common",
":compiler:incremental-compilation-impl",
":kotlin-build-common")
val projectsToInclude = listOf(
":compiler:test-infrastructure-utils",
":compiler:tests-common",
":compiler:incremental-compilation-impl",
":kotlin-build-common"
)
dependencies {
for (projectName in projectsToInclude) {
libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpCompilerTestDataTest.kt
+2 -2
View File
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.kotlinp.test
import com.intellij.openapi.Disposable
import com.intellij.openapi.util.Disposer
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.util.KtTestUtil
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
@@ -21,7 +21,7 @@ class KotlinpCompilerTestDataTest(private val file: File) {
@Test
fun doTest() {
val tmpdir = KotlinTestUtils.tmpDirForTest(this::class.java.simpleName, file.nameWithoutExtension)
val tmpdir = KtTestUtil.tmpDirForTest(this::class.java.simpleName, file.nameWithoutExtension)
val disposable = TestDisposable()
try {
libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt
+2 -1
View File
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.test.ConfigurationKind
import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.TestJdkKind
import org.jetbrains.kotlin.test.util.KtTestUtil
import java.io.File
import kotlin.test.fail
@@ -76,7 +77,7 @@ private fun compile(file: File, disposable: Disposable, tmpdir: File, forEachOut
AbstractLoadJavaTest.updateConfigurationWithDirectives(content, configuration)
val environment = KotlinCoreEnvironment.createForTests(disposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
setupLanguageVersionSettingsForCompilerTests(content, environment)
val ktFile = KotlinTestUtils.createFile(file.name, content, environment.project)
val ktFile = KtTestUtil.createFile(file.name, content, environment.project)
GenerationUtils.compileFileTo(ktFile, environment, tmpdir)
for (outputFile in tmpdir.walkTopDown().sortedBy { it.nameWithoutExtension }) {