Long test execution on 201: remove repeating calls to startup activities (KTI-185)
Method was refactored in https://github.com/JetBrains/intellij-community/commit/735c98d153779997b208c2c600c07a12a79ad0de #KTI-185 Fixed
This commit is contained in:
+1
-3
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.idea.test
|
|||||||
|
|
||||||
import com.intellij.application.options.CodeStyle
|
import com.intellij.application.options.CodeStyle
|
||||||
import com.intellij.ide.highlighter.JavaFileType
|
import com.intellij.ide.highlighter.JavaFileType
|
||||||
import com.intellij.ide.startup.impl.StartupManagerImpl
|
|
||||||
import com.intellij.openapi.actionSystem.ActionPlaces
|
import com.intellij.openapi.actionSystem.ActionPlaces
|
||||||
import com.intellij.openapi.actionSystem.AnActionEvent
|
import com.intellij.openapi.actionSystem.AnActionEvent
|
||||||
import com.intellij.openapi.actionSystem.Presentation
|
import com.intellij.openapi.actionSystem.Presentation
|
||||||
@@ -17,7 +16,6 @@ import com.intellij.openapi.editor.ex.EditorEx
|
|||||||
import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsProviderImpl
|
import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsProviderImpl
|
||||||
import com.intellij.openapi.module.Module
|
import com.intellij.openapi.module.Module
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.openapi.startup.StartupManager
|
|
||||||
import com.intellij.openapi.util.io.FileUtil
|
import com.intellij.openapi.util.io.FileUtil
|
||||||
import com.intellij.openapi.util.registry.Registry
|
import com.intellij.openapi.util.registry.Registry
|
||||||
import com.intellij.openapi.util.text.StringUtil
|
import com.intellij.openapi.util.text.StringUtil
|
||||||
@@ -87,7 +85,7 @@ abstract class KotlinLightCodeInsightFixtureTestCase : KotlinLightCodeInsightFix
|
|||||||
// when done lazily
|
// when done lazily
|
||||||
UnusedSymbolInspection()
|
UnusedSymbolInspection()
|
||||||
|
|
||||||
(StartupManager.getInstance(project) as StartupManagerImpl).runPostStartupActivities()
|
runPostStartupActivitiesOnce(project)
|
||||||
VfsRootAccess.allowRootAccess(project, KotlinTestUtils.getHomeDirectory())
|
VfsRootAccess.allowRootAccess(project, KotlinTestUtils.getHomeDirectory())
|
||||||
|
|
||||||
editorTrackerProjectOpened(project)
|
editorTrackerProjectOpened(project)
|
||||||
|
|||||||
+1
-3
@@ -5,8 +5,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.idea.test
|
package org.jetbrains.kotlin.idea.test
|
||||||
|
|
||||||
import com.intellij.ide.startup.impl.StartupManagerImpl
|
|
||||||
import com.intellij.openapi.startup.StartupManager
|
|
||||||
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
|
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
|
||||||
import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase
|
import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase
|
||||||
import com.intellij.util.ThrowableRunnable
|
import com.intellij.util.ThrowableRunnable
|
||||||
@@ -19,7 +17,7 @@ abstract class KotlinLightPlatformCodeInsightFixtureTestCase : LightPlatformCode
|
|||||||
override fun setUp() {
|
override fun setUp() {
|
||||||
super.setUp()
|
super.setUp()
|
||||||
enableKotlinOfficialCodeStyle(project)
|
enableKotlinOfficialCodeStyle(project)
|
||||||
(StartupManager.getInstance(project) as StartupManagerImpl).runPostStartupActivities()
|
runPostStartupActivitiesOnce(project)
|
||||||
VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory())
|
VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory())
|
||||||
invalidateLibraryCache(project)
|
invalidateLibraryCache(project)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,9 +6,16 @@
|
|||||||
package org.jetbrains.kotlin.idea.test
|
package org.jetbrains.kotlin.idea.test
|
||||||
|
|
||||||
import com.intellij.codeInsight.daemon.impl.EditorTracker
|
import com.intellij.codeInsight.daemon.impl.EditorTracker
|
||||||
|
import com.intellij.ide.startup.impl.StartupManagerImpl
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
|
import com.intellij.openapi.startup.StartupManager
|
||||||
|
|
||||||
// BUNCH: 192
|
// BUNCH: 192
|
||||||
fun editorTrackerProjectOpened(project: Project) {
|
fun editorTrackerProjectOpened(project: Project) {
|
||||||
EditorTracker.getInstance(project)
|
EditorTracker.getInstance(project)
|
||||||
|
}
|
||||||
|
|
||||||
|
// BUNCH: 193
|
||||||
|
fun runPostStartupActivitiesOnce(project: Project) {
|
||||||
|
(StartupManager.getInstance(project) as StartupManagerImpl).runPostStartupActivities()
|
||||||
}
|
}
|
||||||
@@ -6,9 +6,16 @@
|
|||||||
package org.jetbrains.kotlin.idea.test
|
package org.jetbrains.kotlin.idea.test
|
||||||
|
|
||||||
import com.intellij.codeInsight.daemon.impl.EditorTracker
|
import com.intellij.codeInsight.daemon.impl.EditorTracker
|
||||||
|
import com.intellij.ide.startup.impl.StartupManagerImpl
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
|
import com.intellij.openapi.startup.StartupManager
|
||||||
|
|
||||||
// BUNCH: 192
|
// BUNCH: 192
|
||||||
fun editorTrackerProjectOpened(project: Project) {
|
fun editorTrackerProjectOpened(project: Project) {
|
||||||
project.getComponent(EditorTracker::class.java)?.projectOpened()
|
project.getComponent(EditorTracker::class.java)?.projectOpened()
|
||||||
|
}
|
||||||
|
|
||||||
|
// BUNCH: 193
|
||||||
|
fun runPostStartupActivitiesOnce(project: Project) {
|
||||||
|
(StartupManager.getInstance(project) as StartupManagerImpl).runPostStartupActivities()
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
/*
|
||||||
|
* 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.test
|
||||||
|
|
||||||
|
import com.intellij.codeInsight.daemon.impl.EditorTracker
|
||||||
|
import com.intellij.ide.startup.impl.StartupManagerImpl
|
||||||
|
import com.intellij.openapi.project.Project
|
||||||
|
import com.intellij.openapi.startup.StartupManager
|
||||||
|
|
||||||
|
// BUNCH: 192
|
||||||
|
fun editorTrackerProjectOpened(project: Project) {
|
||||||
|
EditorTracker.getInstance(project)
|
||||||
|
}
|
||||||
|
|
||||||
|
// BUNCH: 193
|
||||||
|
fun runPostStartupActivitiesOnce(project: Project) {
|
||||||
|
(StartupManager.getInstance(project) as StartupManagerImpl).runPostStartupActivitiesRegisteredDynamically()
|
||||||
|
}
|
||||||
+2
-1
@@ -22,6 +22,7 @@ import com.intellij.testFramework.ExtensionTestUtil
|
|||||||
import com.intellij.testFramework.runInEdtAndWait
|
import com.intellij.testFramework.runInEdtAndWait
|
||||||
import com.intellij.util.ui.UIUtil
|
import com.intellij.util.ui.UIUtil
|
||||||
import org.jetbrains.kotlin.idea.parameterInfo.HintType
|
import org.jetbrains.kotlin.idea.parameterInfo.HintType
|
||||||
|
import org.jetbrains.kotlin.idea.test.runPostStartupActivitiesOnce
|
||||||
import java.io.PrintWriter
|
import java.io.PrintWriter
|
||||||
import java.io.StringWriter
|
import java.io.StringWriter
|
||||||
import java.nio.file.Paths
|
import java.nio.file.Paths
|
||||||
@@ -79,8 +80,8 @@ fun runStartupActivities(project: Project) {
|
|||||||
with(StartupManager.getInstance(project) as StartupManagerImpl) {
|
with(StartupManager.getInstance(project) as StartupManagerImpl) {
|
||||||
//scheduleInitialVfsRefresh()
|
//scheduleInitialVfsRefresh()
|
||||||
runStartupActivities()
|
runStartupActivities()
|
||||||
runPostStartupActivities()
|
|
||||||
}
|
}
|
||||||
|
runPostStartupActivitiesOnce(project)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun waitForAllEditorsFinallyLoaded(project: Project) {
|
fun waitForAllEditorsFinallyLoaded(project: Project) {
|
||||||
|
|||||||
+2
-1
@@ -25,6 +25,7 @@ import com.intellij.testFramework.PlatformTestUtil
|
|||||||
import com.intellij.testFramework.runInEdtAndWait
|
import com.intellij.testFramework.runInEdtAndWait
|
||||||
import com.intellij.util.ui.UIUtil
|
import com.intellij.util.ui.UIUtil
|
||||||
import org.jetbrains.kotlin.idea.parameterInfo.HintType
|
import org.jetbrains.kotlin.idea.parameterInfo.HintType
|
||||||
|
import org.jetbrains.kotlin.idea.test.runPostStartupActivitiesOnce
|
||||||
import java.util.concurrent.TimeUnit
|
import java.util.concurrent.TimeUnit
|
||||||
import java.util.concurrent.TimeoutException
|
import java.util.concurrent.TimeoutException
|
||||||
import java.io.PrintWriter
|
import java.io.PrintWriter
|
||||||
@@ -83,8 +84,8 @@ fun runStartupActivities(project: Project) {
|
|||||||
with(StartupManager.getInstance(project) as StartupManagerImpl) {
|
with(StartupManager.getInstance(project) as StartupManagerImpl) {
|
||||||
scheduleInitialVfsRefresh()
|
scheduleInitialVfsRefresh()
|
||||||
runStartupActivities()
|
runStartupActivities()
|
||||||
runPostStartupActivities()
|
|
||||||
}
|
}
|
||||||
|
runPostStartupActivitiesOnce(project)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun waitForAllEditorsFinallyLoaded(project: Project) {
|
fun waitForAllEditorsFinallyLoaded(project: Project) {
|
||||||
|
|||||||
+2
-1
@@ -22,6 +22,7 @@ import com.intellij.testFramework.PlatformTestUtil
|
|||||||
import com.intellij.testFramework.runInEdtAndWait
|
import com.intellij.testFramework.runInEdtAndWait
|
||||||
import com.intellij.util.ui.UIUtil
|
import com.intellij.util.ui.UIUtil
|
||||||
import org.jetbrains.kotlin.idea.parameterInfo.HintType
|
import org.jetbrains.kotlin.idea.parameterInfo.HintType
|
||||||
|
import org.jetbrains.kotlin.idea.test.runPostStartupActivitiesOnce
|
||||||
import java.io.PrintWriter
|
import java.io.PrintWriter
|
||||||
import java.io.StringWriter
|
import java.io.StringWriter
|
||||||
|
|
||||||
@@ -78,8 +79,8 @@ fun runStartupActivities(project: Project) {
|
|||||||
with(StartupManager.getInstance(project) as StartupManagerImpl) {
|
with(StartupManager.getInstance(project) as StartupManagerImpl) {
|
||||||
scheduleInitialVfsRefresh()
|
scheduleInitialVfsRefresh()
|
||||||
runStartupActivities()
|
runStartupActivities()
|
||||||
runPostStartupActivities()
|
|
||||||
}
|
}
|
||||||
|
runPostStartupActivitiesOnce(project)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun waitForAllEditorsFinallyLoaded(project: Project) {
|
fun waitForAllEditorsFinallyLoaded(project: Project) {
|
||||||
|
|||||||
@@ -6,11 +6,10 @@
|
|||||||
package org.jetbrains.kotlin.idea.kdoc;
|
package org.jetbrains.kotlin.idea.kdoc;
|
||||||
|
|
||||||
import com.intellij.codeInsight.TargetElementUtil;
|
import com.intellij.codeInsight.TargetElementUtil;
|
||||||
import com.intellij.ide.startup.impl.StartupManagerImpl;
|
|
||||||
import com.intellij.openapi.startup.StartupManager;
|
|
||||||
import com.intellij.psi.PsiElement;
|
import com.intellij.psi.PsiElement;
|
||||||
import com.intellij.refactoring.rename.RenameProcessor;
|
import com.intellij.refactoring.rename.RenameProcessor;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.kotlin.idea.test.CompatKt;
|
||||||
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightTestCase;
|
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightTestCase;
|
||||||
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
|
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
|
||||||
import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner;
|
import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner;
|
||||||
@@ -40,7 +39,7 @@ public class KdocRenameTest extends KotlinLightCodeInsightTestCase {
|
|||||||
@Override
|
@Override
|
||||||
protected void setUp() throws Exception {
|
protected void setUp() throws Exception {
|
||||||
super.setUp();
|
super.setUp();
|
||||||
((StartupManagerImpl) StartupManager.getInstance(getProject())).runPostStartupActivities();
|
CompatKt.runPostStartupActivitiesOnce(getProject());
|
||||||
}
|
}
|
||||||
|
|
||||||
private void doTest(String newName) {
|
private void doTest(String newName) {
|
||||||
|
|||||||
Reference in New Issue
Block a user