From 3934fe7ca9d879affd200a60c95fd2d3b487fff5 Mon Sep 17 00:00:00 2001 From: Artem Gainanov Date: Fri, 9 Feb 2018 09:32:43 +0700 Subject: [PATCH] [gui-test] removed while true loop --- .../fixtures/RunConfigurationListFixture.kt | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/RunConfigurationListFixture.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/RunConfigurationListFixture.kt index 53ce2b6b6c21..88d3c784030d 100644 --- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/RunConfigurationListFixture.kt +++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/RunConfigurationListFixture.kt @@ -16,7 +16,7 @@ import javax.swing.JList class RunConfigurationListFixture(val myRobot: Robot, val myIde: IdeFrameFixture) { private val EDIT_CONFIGURATIONS: String = "Edit Configurations..." - var button = JButtonFixture(myRobot, getRunConfigurationListButton()) + var entryButton = JButtonFixture(myRobot, getRunConfigurationListButton()) companion object { fun createRCListFixture(robot: Robot, ideFrame: IdeFrameFixture): RunConfigurationListFixture { @@ -30,14 +30,14 @@ class RunConfigurationListFixture(val myRobot: Robot, val myIde: IdeFrameFixture * except for "Edit configuration" and "save configuration" */ fun getRunConfigurationList(): List { - button.click() + entryButton.click() val list = myRobot.finder() .find(myIde.target()) { it is JList<*> } as JList<*> val returnList: MutableList = mutableListOf() for (i in 0 until list.model.size) { returnList.add(i, list.model.getElementAt(i).toString()) } - button.click() + entryButton.click() return returnList.filter { it != EDIT_CONFIGURATIONS && !it.contains("Save ") } } @@ -47,20 +47,20 @@ class RunConfigurationListFixture(val myRobot: Robot, val myIde: IdeFrameFixture * @param name */ fun configuration(name: String): RunAction { - button.click() + entryButton.click() JBListPopupFixture.clickPopupMenuItem(name, false, null, myRobot, GuiTestUtil.SHORT_TIMEOUT) setConfigurationButton() return RunAction() } - fun editConfigurations() { - while (true) { - button.click() + fun editConfigurations(attempts: Int = 5) { + for (i in 0 until attempts) { + entryButton.click() Pause.pause(1000) - if (getConfigurationState()) { + if (getEditConfigurationsState()) { break } - button.click() + entryButton.click() } JBListPopupFixture.clickPopupMenuItem(EDIT_CONFIGURATIONS, false, null, myRobot, GuiTestUtil.THIRTY_SEC_TIMEOUT) } @@ -93,11 +93,11 @@ class RunConfigurationListFixture(val myRobot: Robot, val myIde: IdeFrameFixture } private fun setConfigurationButton() { - button = JButtonFixture(myRobot, getRunConfigurationListButton()) + entryButton = JButtonFixture(myRobot, getRunConfigurationListButton()) } - private fun getConfigurationState(): Boolean { + private fun getEditConfigurationsState(): Boolean { val list = myRobot.finder() .find(myIde.target()) { it is JList<*> } as JList<*> val actionItem = list.model.getElementAt(0) as PopupFactoryImpl.ActionItem