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

202: Fix KotlinMavenImporterTest#testJDKImport test

Browse Source 
Test failure was caused by 8e1ab882641db695e3b70085d14a59e1e8e9f579 +
b79ca6e3a855b9d74dba129583d7ed25ecd2f552 in intellij
This commit is contained in:
Nikita Bobko
2020-06-17 19:56:48 +03:00
parent 5c95c48c90
commit 3187bb2aa4
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt
+7 -3
View File
@@ -12,6 +12,7 @@ import com.intellij.openapi.projectRoots.JavaSdk
import com.intellij.openapi.roots.CompilerModuleExtension
import com.intellij.openapi.roots.LibraryOrderEntry
import com.intellij.openapi.roots.ModuleRootManager
import com.intellij.openapi.roots.ProjectRootManager
import com.intellij.openapi.roots.impl.libraries.LibraryEx
import com.intellij.util.PathUtil
import junit.framework.TestCase
@@ -2526,10 +2527,12 @@ class KotlinMavenImporterTest : MavenImportingTestCase() {
}
fun testJDKImport() {
val mockJdkPath = "compiler/testData/mockJDK"
object : WriteAction<Unit>() {
override fun run(result: Result<Unit>) {
val jdk = JavaSdk.getInstance().createJdk("myJDK", "my/path/to/jdk")
val jdk = JavaSdk.getInstance().createJdk("myJDK", mockJdkPath)
getProjectJdkTableSafe().addJdk(jdk)
ProjectRootManager.getInstance(myProject).projectSdk = jdk
}
}.execute()
@@ -2568,7 +2571,7 @@ class KotlinMavenImporterTest : MavenImportingTestCase() {
</execution>
</executions>
<configuration>
<jdkHome>my/path/to/jdk</jdkHome>
<jdkHome>${mockJdkPath}</jdkHome>
</configuration>
</plugin>
</plugins>
@@ -2582,12 +2585,13 @@ class KotlinMavenImporterTest : MavenImportingTestCase() {
val moduleSDK = ModuleRootManager.getInstance(getModule("project")).sdk!!
Assert.assertTrue(moduleSDK.sdkType is JavaSdk)
Assert.assertEquals("myJDK", moduleSDK.name)
Assert.assertEquals("my/path/to/jdk", moduleSDK.homePath)
Assert.assertEquals(mockJdkPath, moduleSDK.homePath)
} finally {
object : WriteAction<Unit>() {
override fun run(result: Result<Unit>) {
val jdkTable = getProjectJdkTableSafe()
jdkTable.removeJdk(jdkTable.findJdk("myJDK")!!)
ProjectRootManager.getInstance(myProject).projectSdk = null
}
}.execute()
}