201: IdeaTestApplication -> TestApplicationManager in tests

This commit is contained in:
Nikolay Krasko
2020-01-28 21:55:22 +03:00
committed by Nikolay Krasko
parent 3eb4d46c3d
commit ae1cfff5d2
4 changed files with 24 additions and 7 deletions
@@ -5,14 +5,14 @@
package org.jetbrains.kotlin.idea.perf 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.DaemonCodeAnalyzerImpl
import com.intellij.codeInsight.daemon.impl.HighlightInfo import com.intellij.codeInsight.daemon.impl.HighlightInfo
import com.intellij.codeInsight.daemon.impl.IdentifierHighlighterPassFactory import com.intellij.codeInsight.daemon.impl.IdentifierHighlighterPassFactory
import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.lookup.LookupElement
import com.intellij.ide.highlighter.ModuleFileType import com.intellij.ide.highlighter.ModuleFileType
import com.intellij.ide.startup.impl.StartupManagerImpl import com.intellij.ide.startup.impl.StartupManagerImpl
import com.intellij.idea.IdeaTestApplication
import com.intellij.openapi.actionSystem.IdeActions import com.intellij.openapi.actionSystem.IdeActions
import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.runWriteAction import com.intellij.openapi.application.runWriteAction
@@ -67,7 +67,7 @@ abstract class AbstractPerformanceProjectsTest : UsefulTestCase() {
// myProject is not required for all potential perf test cases // myProject is not required for all potential perf test cases
protected var myProject: Project? = null protected var myProject: Project? = null
private lateinit var jdk18: Sdk private lateinit var jdk18: Sdk
private lateinit var myApplication: IdeaTestApplication private lateinit var myApplication: TestApplicationManager
override fun isStressTest(): Boolean = true override fun isStressTest(): Boolean = true
@@ -76,7 +76,7 @@ abstract class AbstractPerformanceProjectsTest : UsefulTestCase() {
override fun setUp() { override fun setUp() {
super.setUp() super.setUp()
myApplication = IdeaTestApplication.getInstance() myApplication = TestApplicationManager.getInstance()
runWriteAction { runWriteAction {
val jdkTableImpl = JavaAwareProjectJdkTableImpl.getInstanceEx() val jdkTableImpl = JavaAwareProjectJdkTableImpl.getInstanceEx()
val homePath = if (jdkTableImpl.internalJdk.homeDirectory!!.name == "jre") { val homePath = if (jdkTableImpl.internalJdk.homeDirectory!!.name == "jre") {
@@ -10,7 +10,6 @@ import com.intellij.codeInsight.daemon.ImplicitUsageProvider
import com.intellij.codeInsight.daemon.ProblemHighlightFilter import com.intellij.codeInsight.daemon.ProblemHighlightFilter
import com.intellij.codeInsight.intention.IntentionManager import com.intellij.codeInsight.intention.IntentionManager
import com.intellij.ide.impl.ProjectUtil import com.intellij.ide.impl.ProjectUtil
import com.intellij.idea.IdeaTestApplication
import com.intellij.lang.ExternalAnnotatorsFilter import com.intellij.lang.ExternalAnnotatorsFilter
import com.intellij.lang.LanguageAnnotators import com.intellij.lang.LanguageAnnotators
import com.intellij.lang.StdLanguages 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.tcSuite
import org.jetbrains.kotlin.idea.perf.Stats.Companion.tcTest import org.jetbrains.kotlin.idea.perf.Stats.Companion.tcTest
import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe
import java.io.* import java.io.File
abstract class WholeProjectPerformanceTest : DaemonAnalyzerTestCase(), WholeProjectFileProvider { abstract class WholeProjectPerformanceTest : DaemonAnalyzerTestCase(), WholeProjectFileProvider {
@@ -44,7 +43,7 @@ abstract class WholeProjectPerformanceTest : DaemonAnalyzerTestCase(), WholeProj
override fun setUp() { override fun setUp() {
IdeaTestApplication.getInstance() TestApplicationManager.getInstance()
// to prevent leaked SDKs: 1.8 and Kotlin SDK // to prevent leaked SDKs: 1.8 and Kotlin SDK
runWriteAction { runWriteAction {
val jdkTableImpl = JavaAwareProjectJdkTableImpl.getInstanceEx() val jdkTableImpl = JavaAwareProjectJdkTableImpl.getInstanceEx()
@@ -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
@@ -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