Revert "202: Fix GradleFacetImportTest#testJDKImport test" for 193 bunch
This fixes test in 193 and 192 bunch
This commit is contained in:
+2
-5
@@ -731,12 +731,10 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
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", mockJdkPath)
|
val jdk = JavaSdk.getInstance().createJdk("myJDK", "my/path/to/jdk")
|
||||||
getProjectJdkTableSafe().addJdk(jdk)
|
getProjectJdkTableSafe().addJdk(jdk)
|
||||||
ProjectRootManager.getInstance(myProject).projectSdk = jdk
|
|
||||||
}
|
}
|
||||||
}.execute()
|
}.execute()
|
||||||
|
|
||||||
@@ -747,13 +745,12 @@ class GradleFacetImportTest : GradleImportingTestCase() {
|
|||||||
val moduleSDK = ModuleRootManager.getInstance(getModule("project_main")).sdk!!
|
val moduleSDK = ModuleRootManager.getInstance(getModule("project_main")).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(mockJdkPath, moduleSDK.homePath)
|
Assert.assertEquals("my/path/to/jdk", 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