diff --git a/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/installKotlinPlugin/CreateSdksGuiTest.kt b/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/installKotlinPlugin/CreateSdksGuiTest.kt index e97d1c33da86..336da4b513e3 100644 --- a/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/installKotlinPlugin/CreateSdksGuiTest.kt +++ b/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/installKotlinPlugin/CreateSdksGuiTest.kt @@ -17,13 +17,13 @@ class CreateSdksGuiTest : KotlinGuiTestCase() { logTestStep("Create a JDK on the path `${KotlinTestProperties.jdk_path}`") welcomeFrame { actionLink("Configure").click() - popupClick("Project Defaults") - popupClick("Project Structure") + popupMenu("Project Defaults").clickSearchedItem() + popupMenu("Project Structure").clickSearchedItem() logUIStep("Open `$dialogName` dialog") dialog(dialogName) { jList("SDKs").clickItem("SDKs") actionButton("Add New SDK").click() - popupClick("JDK") + popupMenu("JDK").clickSearchedItem() logUIStep("Open `Select Home Directory for JDK` dialog") dialog("Select Home Directory for JDK") { actionButton("Refresh").click() @@ -43,8 +43,8 @@ class CreateSdksGuiTest : KotlinGuiTestCase() { logTestStep("Create a Kotlin SDK") welcomeFrame { actionLink("Configure").click() - popupClick("Project Defaults") - popupClick("Project Structure") + popupMenu("Project Defaults").clickSearchedItem() + popupMenu("Project Structure").clickSearchedItem() logUIStep("Open `$dialogName` dialog") dialog(dialogName) { jList("SDKs").clickItem("SDKs") @@ -56,7 +56,7 @@ class CreateSdksGuiTest : KotlinGuiTestCase() { catch (e: ComponentLookupException){ logUIStep("Going to create $kotlinSdk") actionButton("Add New SDK").click() - popupClick(kotlinSdk) + popupMenu(kotlinSdk).clickSearchedItem() logUIStep("Going to check whether $kotlinSdk created") jTree(kotlinSdk, timeout = 1L) } diff --git a/community-guitests/testSrc/com/intellij/testGuiFramework/tests/community/focus/TypeAheadTest.kt b/community-guitests/testSrc/com/intellij/testGuiFramework/tests/community/focus/TypeAheadTest.kt index b8325beaf2cc..f6bbdbe2079c 100644 --- a/community-guitests/testSrc/com/intellij/testGuiFramework/tests/community/focus/TypeAheadTest.kt +++ b/community-guitests/testSrc/com/intellij/testGuiFramework/tests/community/focus/TypeAheadTest.kt @@ -41,6 +41,6 @@ class TypeAheadTest : GuiTestCase() { val actionName = "Add New Configuration" GuiTestUtilKt.waitUntil("action button will be visible") { actionButton(actionName).target().isShowing } actionButton(actionName).click() - popupClick("JUnit") + popupMenu("JUnit").clickSearchedItem() } } \ No newline at end of file diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/PluginDialogFixture.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/PluginDialogFixture.kt index f80532cab074..e57e46a3b620 100644 --- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/PluginDialogFixture.kt +++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/PluginDialogFixture.kt @@ -10,10 +10,7 @@ import com.intellij.testGuiFramework.framework.GuiTestUtil.defaultTimeout import com.intellij.testGuiFramework.framework.GuiTestUtil.findAndClickButtonWhenEnabled import com.intellij.testGuiFramework.framework.GuiTestUtil.findAndClickCancelButton import com.intellij.testGuiFramework.framework.GuiTestUtil.findAndClickOkButton -import com.intellij.testGuiFramework.impl.GuiTestUtilKt -import com.intellij.testGuiFramework.impl.popupClick -import com.intellij.testGuiFramework.impl.waitUntilFound -import com.intellij.testGuiFramework.impl.waitUntilFoundList +import com.intellij.testGuiFramework.impl.* import com.intellij.ui.components.BasicOptionButtonUI.ArrowButton import com.intellij.ui.components.JBOptionButton import org.fest.swing.core.Robot @@ -48,7 +45,7 @@ class PluginDialogFixture(robot: Robot, pluginDialog: JDialog): JDialogFixture(r fun showInstallPluginFromDiskDialog() { val actionButton: ActionButton = waitUntilFound(findTabHeader(), ActionButton::class.java, defaultTimeout) { true } robot().click(actionButton) - popupClick("Install Plugin from Disk...") + popupMenu("Install Plugin from Disk...").clickSearchedItem() } fun installPluginFromDiskDialog(func: InstallPluginFromDiskFixture.() -> Unit) { diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/WelcomeFrameFixture.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/WelcomeFrameFixture.kt index 606810dac0fa..cc694f54df9f 100644 --- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/WelcomeFrameFixture.kt +++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/WelcomeFrameFixture.kt @@ -3,9 +3,7 @@ package com.intellij.testGuiFramework.fixtures import com.intellij.openapi.wm.impl.welcomeScreen.FlatWelcomeFrame import com.intellij.testGuiFramework.framework.GuiTestUtil -import com.intellij.testGuiFramework.impl.GuiRobotHolder -import com.intellij.testGuiFramework.impl.actionLink -import com.intellij.testGuiFramework.impl.popupClick +import com.intellij.testGuiFramework.impl.* import org.fest.swing.core.Robot import org.fest.swing.exception.ComponentLookupException import org.fest.swing.timing.Condition @@ -41,7 +39,7 @@ class WelcomeFrameFixture private constructor(robot: Robot, fun openPluginsDialog()/*: JDialogFixture*/{ actionLink("Configure").click() - popupClick("Plugins") + popupMenu("Plugins").clickSearchedItem() // TODO: make return JDialogFixture object of Plugins dialog // need to rework PluginsDialogModel to get rid of GuiTestCase object } diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/ComponentFixtureUtils.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/ComponentFixtureUtils.kt index b3a5f9ef6bc4..d80e8d483eaf 100644 --- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/ComponentFixtureUtils.kt +++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/ComponentFixtureUtils.kt @@ -311,16 +311,6 @@ fun ComponentFixture.table(cellText: String, timeout: L } else throw unableToFindComponent("""JTable with cell text "$cellText"""") - -/** - * Finds popup on screen with item (itemName) and clicks on it item - * - * @timeout timeout in seconds to find JTextComponent component - * @throws ComponentLookupException if component has not been found or timeout exceeded - */ -fun ComponentFixture.popupClick(itemName: String, timeout: Long = defaultTimeout) = - popupMenu(itemName, timeout = timeout.toFestTimeout()).clickSearchedItem() - fun popupMenu( item: String, robot: Robot, diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/PluginInstaller.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/PluginInstaller.kt index 3cada09112a2..7597968c3211 100644 --- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/PluginInstaller.kt +++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/PluginInstaller.kt @@ -34,7 +34,7 @@ class PluginInstaller: GuiTestCase() { welcomeFrame { actionLink("Configure").click() - popupClick("Plugins") + popupMenu("Plugins").clickSearchedItem() dialog("Plugins") { button("Install JetBrains plugin...").click() dialog("Browse JetBrains Plugins ") { diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/testCases/PluginTestCase.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/testCases/PluginTestCase.kt index b316de95c2a7..9f86097bd1e5 100644 --- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/testCases/PluginTestCase.kt +++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/testCases/PluginTestCase.kt @@ -58,7 +58,7 @@ open class PluginTestCase : GuiTestCase() { fun installPlugins(vararg pluginNames: String) { welcomeFrame { actionLink("Configure").click() - popupClick("Plugins") + popupMenu("Plugins").clickSearchedItem() dialog("Plugins") { button("Install JetBrains plugin...").click() dialog("Browse JetBrains Plugins ") browsePlugins@ { @@ -77,7 +77,7 @@ open class PluginTestCase : GuiTestCase() { fun installPluginFromDisk(pluginPath: String, pluginName: String) { welcomeFrame { actionLink("Configure").click() - popupClick("Plugins") + popupMenu("Plugins").clickSearchedItem() dialog("Plugins") { //Check if plugin has already been installed try { diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/util/scenarios/NewProjectDialogModel.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/util/scenarios/NewProjectDialogModel.kt index 0453ffa6255b..706e4b1bd870 100644 --- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/util/scenarios/NewProjectDialogModel.kt +++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/util/scenarios/NewProjectDialogModel.kt @@ -538,7 +538,7 @@ fun NewProjectDialogModel.createAppServer(serverKind: String, serverInstallPath: guiTestCase.logUIStep("Add a new application server") combobox(textApplicationServer) buttons(buttonNew)[1].click() - popupClick(serverKind) + popupMenu(serverKind).clickSearchedItem() guiTestCase.dialog(serverKind) { typeText(serverInstallPath) button(buttonOk).click() diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/util/scenarios/PluginsDialogModel.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/util/scenarios/PluginsDialogModel.kt index 99fdc0007842..8d1c494cb794 100644 --- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/util/scenarios/PluginsDialogModel.kt +++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/util/scenarios/PluginsDialogModel.kt @@ -99,7 +99,7 @@ fun PluginsDialogModel.installPluginFromDisk(pluginFileName: String){ with(connectDialog()){ guiTestCase.logUIStep("Press `Install plugin from disk`") actionButtonByClass("").click() - popupClick("Install Plugin from Disk...") + popupMenu("Install Plugin from Disk...").clickSearchedItem() guiTestCase.chooseFileInFileChooser(pluginFileName) pressOk() ensureButtonOkHasPressed()