Skip to content

Commit 95bfe86

Browse files
committed
UAST tests no longer leave a disposed application around
1 parent 5d65e6b commit 95bfe86

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ protected void tearDown() throws Exception {
136136
application = null;
137137
}
138138

139-
protected void resetApplicationToNull() {
139+
public static void resetApplicationToNull() {
140140
try {
141141
Field ourApplicationField = ApplicationManager.class.getDeclaredField("ourApplication");
142142
ourApplicationField.setAccessible(true);

plugins/uast-kotlin/tests/AbstractKotlinUastTest.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package org.jetbrains.uast.test.kotlin
22

33
import com.intellij.mock.MockProject
44
import com.intellij.openapi.Disposable
5+
import com.intellij.openapi.application.ApplicationManager
56
import com.intellij.openapi.extensions.Extensions
67
import com.intellij.openapi.util.Disposer
78
import com.intellij.openapi.vfs.VirtualFile
@@ -21,6 +22,7 @@ import org.jetbrains.kotlin.config.CompilerConfiguration
2122
import org.jetbrains.kotlin.config.addKotlinSourceRoot
2223
import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM
2324
import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension
25+
import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
2426
import org.jetbrains.kotlin.utils.PathUtil
2527
import org.jetbrains.uast.UastLanguagePlugin
2628
import org.jetbrains.uast.evaluation.UEvaluatorExtension
@@ -135,6 +137,7 @@ abstract class AbstractKotlinUastTest : AbstractUastTest() {
135137

136138
override fun dispose() {
137139
Disposer.dispose(parentDisposable)
140+
KtUsefulTestCase.resetApplicationToNull()
138141
}
139142
}
140143
}

0 commit comments

Comments
 (0)