From 219fb92387ac418ffe1969cd59262015b41f0470 Mon Sep 17 00:00:00 2001 From: Eugene Nizienko Date: Thu, 26 Jul 2018 14:08:50 +0300 Subject: [PATCH] [gui-test] GUI-139 Failed test leaks running IDEA instance GuiTestSuite send kill signal to Idea after suite is finished --- .../kotlin/createProject/KotlinCreateProjectGuiTestSuite.kt | 5 ++--- .../testGuiFramework/tests/community/CommunityTestSuite.kt | 6 ++---- .../tests/community/focus/FocusIssuesSuite.kt | 6 ++---- .../com/intellij/testGuiFramework/framework/GuiTestSuite.kt | 4 +++- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/createProject/KotlinCreateProjectGuiTestSuite.kt b/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/createProject/KotlinCreateProjectGuiTestSuite.kt index 3c20e87f0b7c..391facc1ef3a 100644 --- a/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/createProject/KotlinCreateProjectGuiTestSuite.kt +++ b/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/createProject/KotlinCreateProjectGuiTestSuite.kt @@ -4,7 +4,7 @@ package com.intellij.ide.projectWizard.kotlin.createProject import com.intellij.ide.projectWizard.kotlin.installKotlinPlugin.CreateSdksGuiTest import com.intellij.ide.projectWizard.kotlin.installKotlinPlugin.InstallPluginGuiTest import com.intellij.testGuiFramework.framework.FirstStartWith -import com.intellij.testGuiFramework.framework.GuiTestSuiteRunner +import com.intellij.testGuiFramework.framework.GuiTestSuite import com.intellij.testGuiFramework.framework.RunWithIde import com.intellij.testGuiFramework.launcher.ide.CommunityIde import com.intellij.testGuiFramework.launcher.ide.CommunityIdeFirstStart @@ -18,14 +18,13 @@ import org.junit.runners.Suite ) class KotlinCreateProjectGuiTestSuite{ - @RunWith(GuiTestSuiteRunner::class) @RunWithIde(CommunityIde::class) @FirstStartWith(CommunityIdeFirstStart::class) @Suite.SuiteClasses( InstallPluginGuiTest::class , CreateSdksGuiTest::class ) - class PreparationSteps + class PreparationSteps: GuiTestSuite() @RunWith(Suite::class) @RunWithIde(CommunityIde::class) diff --git a/community-guitests/testSrc/com/intellij/testGuiFramework/tests/community/CommunityTestSuite.kt b/community-guitests/testSrc/com/intellij/testGuiFramework/tests/community/CommunityTestSuite.kt index f48c1913048e..06bb174da2ac 100644 --- a/community-guitests/testSrc/com/intellij/testGuiFramework/tests/community/CommunityTestSuite.kt +++ b/community-guitests/testSrc/com/intellij/testGuiFramework/tests/community/CommunityTestSuite.kt @@ -17,17 +17,15 @@ package com.intellij.testGuiFramework.tests.community import com.intellij.ide.projectWizard.CommandLineProjectGuiTest import com.intellij.testGuiFramework.framework.FirstStartWith -import com.intellij.testGuiFramework.framework.GuiTestSuiteRunner +import com.intellij.testGuiFramework.framework.GuiTestSuite import com.intellij.testGuiFramework.framework.RunWithIde import com.intellij.testGuiFramework.launcher.ide.CommunityIde import com.intellij.testGuiFramework.launcher.ide.CommunityIdeFirstStart import com.intellij.testGuiFramework.tests.community.toolWindow.DockedModeGuiTest -import org.junit.runner.RunWith import org.junit.runners.Suite -@RunWith(GuiTestSuiteRunner::class) @RunWithIde(CommunityIde::class) @FirstStartWith(CommunityIdeFirstStart::class) @Suite.SuiteClasses(CommandLineProjectGuiTest::class, DockedModeGuiTest::class) -class CommunityTestSuite \ No newline at end of file +class CommunityTestSuite : GuiTestSuite() \ No newline at end of file diff --git a/community-guitests/testSrc/com/intellij/testGuiFramework/tests/community/focus/FocusIssuesSuite.kt b/community-guitests/testSrc/com/intellij/testGuiFramework/tests/community/focus/FocusIssuesSuite.kt index b1c52d10cc7b..39b0f996b73d 100644 --- a/community-guitests/testSrc/com/intellij/testGuiFramework/tests/community/focus/FocusIssuesSuite.kt +++ b/community-guitests/testSrc/com/intellij/testGuiFramework/tests/community/focus/FocusIssuesSuite.kt @@ -2,14 +2,12 @@ package com.intellij.testGuiFramework.tests.community.focus import com.intellij.testGuiFramework.framework.FirstStartWith -import com.intellij.testGuiFramework.framework.GuiTestSuiteRunner +import com.intellij.testGuiFramework.framework.GuiTestSuite import com.intellij.testGuiFramework.framework.RunWithIde import com.intellij.testGuiFramework.launcher.ide.CommunityIde import com.intellij.testGuiFramework.launcher.ide.CommunityIdeFirstStart -import org.junit.runner.RunWith import org.junit.runners.Suite -@RunWith(GuiTestSuiteRunner::class) @RunWithIde(CommunityIde::class) @FirstStartWith(CommunityIdeFirstStart::class) @Suite.SuiteClasses(CompletionFocusTest::class, @@ -20,4 +18,4 @@ import org.junit.runners.Suite KeyMapSettingsTestFocusTest::class, SearchEverywhereFocusTest::class, ReplaceInPathFocusTest::class) -class FocusIssuesSuite \ No newline at end of file +class FocusIssuesSuite: GuiTestSuite() \ No newline at end of file diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/framework/GuiTestSuite.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/framework/GuiTestSuite.kt index cc149f013dbe..9d5af1af82e9 100644 --- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/framework/GuiTestSuite.kt +++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/framework/GuiTestSuite.kt @@ -1,6 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.testGuiFramework.framework +import com.intellij.testGuiFramework.remote.IdeProcessControlManager import org.junit.AfterClass import org.junit.BeforeClass import org.junit.runner.RunWith @@ -17,7 +18,8 @@ open class GuiTestSuite { @AfterClass @JvmStatic fun tearDown() { + // todo: GUI-142 GuiTestRunner needs refactoring + IdeProcessControlManager.killIdeProcess() } } - }