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
idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformProjectImportingTest.kt
+6 -6
View File
@@ -27,11 +27,11 @@ import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleI
import org.jetbrains.kotlin.idea.codeInsight.gradle.facetSettings
import org.jetbrains.kotlin.idea.codeInsight.gradle.legacyMppImportTestMinVersionForMaster
import org.jetbrains.kotlin.idea.facet.KotlinFacet
import org.jetbrains.kotlin.idea.util.application.runReadAction
import org.jetbrains.kotlin.idea.util.rootManager
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.util.KtTestUtil
import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions
import org.junit.Test
import org.jetbrains.kotlin.idea.util.application.runReadAction
class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTestCase() {
@@ -237,7 +237,7 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
createProjectSubFile(
"local.properties", """
sdk.dir=/${KotlinTestUtils.getAndroidSdkSystemIndependentPath()}
sdk.dir=/${KtTestUtil.getAndroidSdkSystemIndependentPath()}
"""
)
@@ -268,7 +268,7 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
createProjectSubFile(
"local.properties", """
sdk.dir=/${KotlinTestUtils.getAndroidSdkSystemIndependentPath()}
sdk.dir=/${KtTestUtil.getAndroidSdkSystemIndependentPath()}
"""
)
@@ -330,7 +330,7 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
configureByFiles()
createProjectSubFile(
"local.properties", """
sdk.dir=/${KotlinTestUtils.getAndroidSdkSystemIndependentPath()}
sdk.dir=/${KtTestUtil.getAndroidSdkSystemIndependentPath()}
"""
)
@@ -345,4 +345,4 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
override fun testDataDirName(): String {
return "multiplatform"
}
}
}
idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/NewMultiplatformProjectImportingTest.kt
+8 -5
View File
@@ -9,14 +9,17 @@ import com.intellij.openapi.roots.DependencyScope
import com.intellij.util.text.VersionComparatorUtil
import org.jetbrains.jps.model.java.JavaResourceRootType
import org.jetbrains.jps.model.java.JavaSourceRootType
import org.jetbrains.kotlin.config.*
import org.jetbrains.kotlin.config.ResourceKotlinRootType
import org.jetbrains.kotlin.config.SourceKotlinRootType
import org.jetbrains.kotlin.config.TestResourceKotlinRootType
import org.jetbrains.kotlin.config.TestSourceKotlinRootType
import org.jetbrains.kotlin.idea.codeInsight.gradle.MultiplePluginVersionGradleImportingTestCase
import org.jetbrains.kotlin.idea.codeInsight.gradle.mppImportTestMinVersionForMaster
import org.jetbrains.kotlin.konan.target.HostManager
import org.jetbrains.kotlin.platform.CommonPlatforms
import org.jetbrains.kotlin.platform.js.JsPlatforms
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.util.KtTestUtil
import org.jetbrains.plugins.gradle.tooling.annotation.PluginTargetVersions
import org.junit.After
import org.junit.Before
@@ -267,7 +270,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
configureByFiles()
createProjectSubFile(
"local.properties",
"sdk.dir=/${KotlinTestUtils.getAndroidSdkSystemIndependentPath()}"
"sdk.dir=/${KtTestUtil.getAndroidSdkSystemIndependentPath()}"
)
importProject()
@@ -631,7 +634,7 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
configureByFiles()
createProjectSubFile(
"local.properties",
"sdk.dir=/${KotlinTestUtils.getAndroidSdkSystemIndependentPath()}"
"sdk.dir=/${KtTestUtil.getAndroidSdkSystemIndependentPath()}"
)
importProject(true)
checkProjectStructure(exhaustiveModuleList = false, exhaustiveDependencyList = false, exhaustiveSourceSourceRootList = false) {
@@ -1041,4 +1044,4 @@ class NewMultiplatformProjectImportingTest : MultiplePluginVersionGradleImportin
override fun testDataDirName(): String {
return "newMultiplatformImport"
}
}
}
idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
+8 -7
View File
@@ -49,13 +49,14 @@ import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe
import org.jetbrains.kotlin.idea.util.projectStructure.allModules
import org.jetbrains.kotlin.idea.util.projectStructure.sdk
import org.jetbrains.kotlin.platform.TargetPlatform
import org.jetbrains.kotlin.platform.js.JsPlatforms
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
import org.jetbrains.kotlin.platform.js.isJs
import org.jetbrains.kotlin.platform.isCommon
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.platform.js.JsPlatforms
import org.jetbrains.kotlin.platform.js.isJs
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
import org.jetbrains.kotlin.test.util.KtTestUtil
import org.jetbrains.plugins.gradle.tooling.annotation.TargetVersions
import org.junit.*
import org.junit.Assert
import org.junit.Test
internal fun GradleImportingTestCase.facetSettings(moduleName: String) = KotlinFacet.get(getModule(moduleName))!!.configuration.settings
@@ -576,7 +577,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
configureByFiles()
createProjectSubFile(
"local.properties", """
sdk.dir=/${KotlinTestUtils.getAndroidSdkSystemIndependentPath()}
sdk.dir=/${KtTestUtil.getAndroidSdkSystemIndependentPath()}
"""
)
importProject()
@@ -600,7 +601,7 @@ class GradleFacetImportTest : GradleImportingTestCase() {
configureByFiles()
createProjectSubFile(
"local.properties", """
sdk.dir=/${KotlinTestUtils.getAndroidSdkSystemIndependentPath()}
sdk.dir=/${KtTestUtil.getAndroidSdkSystemIndependentPath()}
"""
)
importProject()
idea/idea-gradle/tests/org/jetbrains/kotlin/idea/configuration/klib/KlibInfoProviderTest.kt
+1 -1
View File
@@ -9,7 +9,7 @@ import com.intellij.testFramework.PlatformTestUtil.getTestName
import junit.framework.TestCase
import org.jetbrains.kotlin.konan.library.*
import org.jetbrains.kotlin.konan.target.KonanTarget
import org.jetbrains.kotlin.test.KotlinTestUtils.getHomeDirectory
import org.jetbrains.kotlin.test.util.KtTestUtil.getHomeDirectory
import java.io.File
class KlibInfoProviderTest : TestCase() {