MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

[sdk-tests] use testRootDisposable to dispose components after test

Browse Source 
GitOrigin-RevId: fa57b8a0f1952c8a63af495639fdc20a42591698
This commit is contained in:
Sergei Vorobyov
2020-01-20 14:49:06 +03:00
committed by intellij-monorepo-bot
parent cd65d2eca2
commit aefdbada51
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/lang-impl/testSources/com/intellij/openapi/roots/ui/configuration/SdkComboBoxTestCase.kt
View File

@@ -18,7 +18,7 @@ abstract class SdkComboBoxTestCase : SdkTestCase() {
fun createJdkComboBox(): SdkComboBox {
val sdksModel = TestProjectSdksModel()
sdksModel.reset(project)
Disposer.register(project, sdksModel)
Disposer.register(testRootDisposable, sdksModel)
val model = createJdkComboBoxModel(project, sdksModel, Predicate { it is TestSdkType })
return SdkComboBox(model)
}

17
platform/lang-impl/testSources/com/intellij/openapi/roots/ui/configuration/SdkTestCase.kt
View File

@@ -10,7 +10,6 @@ import com.intellij.openapi.projectRoots.impl.MockSdk
import com.intellij.openapi.roots.ProjectRootManager
import com.intellij.openapi.roots.ui.configuration.projectRoot.SdkDownload
import com.intellij.openapi.roots.ui.configuration.projectRoot.SdkDownloadTask
import com.intellij.openapi.util.Disposer
import com.intellij.openapi.util.io.FileUtil
import com.intellij.testFramework.LightPlatformTestCase
import com.intellij.util.containers.MultiMap
@@ -28,18 +27,11 @@ abstract class SdkTestCase : LightPlatformTestCase() {
TestSdkGenerator.reset()
SdkType.EP_NAME.getPoint(null)
.registerExtension(TestSdkType, project)
.registerExtension(TestSdkType, testRootDisposable)
SdkType.EP_NAME.getPoint(null)
.registerExtension(DependentTestSdkType, project)
.registerExtension(DependentTestSdkType, testRootDisposable)
SdkDownload.EP_NAME.getPoint(null)
.registerExtension(TestSdkDownloader, project)
}
override fun tearDown() {
Disposer.disposeChildren(project)
closeAndDeleteProject()
super.tearDown()
.registerExtension(TestSdkDownloader, testRootDisposable)
}
fun createAndRegisterSdk(isProjectSdk: Boolean = false): TestSdk {
@@ -66,7 +58,7 @@ abstract class SdkTestCase : LightPlatformTestCase() {
invokeAndWaitIfNeeded {
runWriteAction {
val jdkTable = ProjectJdkTable.getInstance()
jdkTable.addJdk(sdk, project)
jdkTable.addJdk(sdk, testRootDisposable)
}
}
}
@@ -150,7 +142,6 @@ abstract class SdkTestCase : LightPlatformTestCase() {
object TestSdkGenerator {
private var createdSdkCounter = 0
private lateinit var createdSdks: MutableMap<String, TestSdk>
private lateinit var parentSdks: MutableMap<TestSdk, TestSdk>
fun findTestSdk(sdk: Sdk): TestSdk? = createdSdks[sdk.name]