diff --git a/idea/performanceTests/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt b/idea/performanceTests/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt index 6501d275700..095afac1254 100644 --- a/idea/performanceTests/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt +++ b/idea/performanceTests/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt @@ -5,14 +5,14 @@ package org.jetbrains.kotlin.idea.perf -import com.intellij.codeInsight.daemon.* +import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer +import com.intellij.codeInsight.daemon.DaemonCodeAnalyzerSettings import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl import com.intellij.codeInsight.daemon.impl.HighlightInfo import com.intellij.codeInsight.daemon.impl.IdentifierHighlighterPassFactory import com.intellij.codeInsight.lookup.LookupElement import com.intellij.ide.highlighter.ModuleFileType import com.intellij.ide.startup.impl.StartupManagerImpl -import com.intellij.idea.IdeaTestApplication import com.intellij.openapi.actionSystem.IdeActions import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.runWriteAction @@ -67,7 +67,7 @@ abstract class AbstractPerformanceProjectsTest : UsefulTestCase() { // myProject is not required for all potential perf test cases protected var myProject: Project? = null private lateinit var jdk18: Sdk - private lateinit var myApplication: IdeaTestApplication + private lateinit var myApplication: TestApplicationManager override fun isStressTest(): Boolean = true @@ -76,7 +76,7 @@ abstract class AbstractPerformanceProjectsTest : UsefulTestCase() { override fun setUp() { super.setUp() - myApplication = IdeaTestApplication.getInstance() + myApplication = TestApplicationManager.getInstance() runWriteAction { val jdkTableImpl = JavaAwareProjectJdkTableImpl.getInstanceEx() val homePath = if (jdkTableImpl.internalJdk.homeDirectory!!.name == "jre") { diff --git a/idea/performanceTests/org/jetbrains/kotlin/idea/perf/WholeProjectPerformanceTest.kt b/idea/performanceTests/org/jetbrains/kotlin/idea/perf/WholeProjectPerformanceTest.kt index 475447b346c..94d5a3b91c9 100644 --- a/idea/performanceTests/org/jetbrains/kotlin/idea/perf/WholeProjectPerformanceTest.kt +++ b/idea/performanceTests/org/jetbrains/kotlin/idea/perf/WholeProjectPerformanceTest.kt @@ -10,7 +10,6 @@ import com.intellij.codeInsight.daemon.ImplicitUsageProvider import com.intellij.codeInsight.daemon.ProblemHighlightFilter import com.intellij.codeInsight.intention.IntentionManager import com.intellij.ide.impl.ProjectUtil -import com.intellij.idea.IdeaTestApplication import com.intellij.lang.ExternalAnnotatorsFilter import com.intellij.lang.LanguageAnnotators import com.intellij.lang.StdLanguages @@ -32,7 +31,7 @@ import org.jetbrains.kotlin.idea.framework.KotlinSdkType import org.jetbrains.kotlin.idea.perf.Stats.Companion.tcSuite import org.jetbrains.kotlin.idea.perf.Stats.Companion.tcTest import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe -import java.io.* +import java.io.File abstract class WholeProjectPerformanceTest : DaemonAnalyzerTestCase(), WholeProjectFileProvider { @@ -44,7 +43,7 @@ abstract class WholeProjectPerformanceTest : DaemonAnalyzerTestCase(), WholeProj override fun setUp() { - IdeaTestApplication.getInstance() + TestApplicationManager.getInstance() // to prevent leaked SDKs: 1.8 and Kotlin SDK runWriteAction { val jdkTableImpl = JavaAwareProjectJdkTableImpl.getInstanceEx() diff --git a/idea/performanceTests/org/jetbrains/kotlin/idea/perf/compat.kt b/idea/performanceTests/org/jetbrains/kotlin/idea/perf/compat.kt new file mode 100644 index 00000000000..988329c546f --- /dev/null +++ b/idea/performanceTests/org/jetbrains/kotlin/idea/perf/compat.kt @@ -0,0 +1,9 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea.perf + +// BUNCH: 193 +typealias TestApplicationManager = com.intellij.idea.IdeaTestApplication \ No newline at end of file diff --git a/idea/performanceTests/org/jetbrains/kotlin/idea/perf/compat.kt.201 b/idea/performanceTests/org/jetbrains/kotlin/idea/perf/compat.kt.201 new file mode 100644 index 00000000000..0ae93fddca0 --- /dev/null +++ b/idea/performanceTests/org/jetbrains/kotlin/idea/perf/compat.kt.201 @@ -0,0 +1,9 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea.perf + +// BUNCH: 193 +typealias TestApplicationManager = com.intellij.testFramework.TestApplicationManager \ No newline at end of file