202: Fix KotlinMavenImporterTest#testJDKImport test
Test failure was caused by 8e1ab882641db695e3b70085d14a59e1e8e9f579 + b79ca6e3a855b9d74dba129583d7ed25ecd2f552 in intellij
This commit is contained in:
@@ -12,6 +12,7 @@ import com.intellij.openapi.projectRoots.JavaSdk
|
|||||||
import com.intellij.openapi.roots.CompilerModuleExtension
|
import com.intellij.openapi.roots.CompilerModuleExtension
|
||||||
import com.intellij.openapi.roots.LibraryOrderEntry
|
import com.intellij.openapi.roots.LibraryOrderEntry
|
||||||
import com.intellij.openapi.roots.ModuleRootManager
|
import com.intellij.openapi.roots.ModuleRootManager
|
||||||
|
import com.intellij.openapi.roots.ProjectRootManager
|
||||||
import com.intellij.openapi.roots.impl.libraries.LibraryEx
|
import com.intellij.openapi.roots.impl.libraries.LibraryEx
|
||||||
import com.intellij.util.PathUtil
|
import com.intellij.util.PathUtil
|
||||||
import junit.framework.TestCase
|
import junit.framework.TestCase
|
||||||
@@ -2526,10 +2527,12 @@ class KotlinMavenImporterTest : MavenImportingTestCase() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun testJDKImport() {
|
fun testJDKImport() {
|
||||||
|
val mockJdkPath = "compiler/testData/mockJDK"
|
||||||
object : WriteAction<Unit>() {
|
object : WriteAction<Unit>() {
|
||||||
override fun run(result: Result<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)
|
getProjectJdkTableSafe().addJdk(jdk)
|
||||||
|
ProjectRootManager.getInstance(myProject).projectSdk = jdk
|
||||||
}
|
}
|
||||||
}.execute()
|
}.execute()
|
||||||
|
|
||||||
@@ -2568,7 +2571,7 @@ class KotlinMavenImporterTest : MavenImportingTestCase() {
|
|||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
<configuration>
|
<configuration>
|
||||||
<jdkHome>my/path/to/jdk</jdkHome>
|
<jdkHome>${mockJdkPath}</jdkHome>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
@@ -2582,12 +2585,13 @@ class KotlinMavenImporterTest : MavenImportingTestCase() {
|
|||||||
val moduleSDK = ModuleRootManager.getInstance(getModule("project")).sdk!!
|
val moduleSDK = ModuleRootManager.getInstance(getModule("project")).sdk!!
|
||||||
Assert.assertTrue(moduleSDK.sdkType is JavaSdk)
|
Assert.assertTrue(moduleSDK.sdkType is JavaSdk)
|
||||||
Assert.assertEquals("myJDK", moduleSDK.name)
|
Assert.assertEquals("myJDK", moduleSDK.name)
|
||||||
Assert.assertEquals("my/path/to/jdk", moduleSDK.homePath)
|
Assert.assertEquals(mockJdkPath, moduleSDK.homePath)
|
||||||
} finally {
|
} finally {
|
||||||
object : WriteAction<Unit>() {
|
object : WriteAction<Unit>() {
|
||||||
override fun run(result: Result<Unit>) {
|
override fun run(result: Result<Unit>) {
|
||||||
val jdkTable = getProjectJdkTableSafe()
|
val jdkTable = getProjectJdkTableSafe()
|
||||||
jdkTable.removeJdk(jdkTable.findJdk("myJDK")!!)
|
jdkTable.removeJdk(jdkTable.findJdk("myJDK")!!)
|
||||||
|
ProjectRootManager.getInstance(myProject).projectSdk = null
|
||||||
}
|
}
|
||||||
}.execute()
|
}.execute()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user