Fix UI tests running wrong IDE variant (#3042)

Author: rli

ui-tests/build.gradle.kts

@@ -5,6 +5,7 @@ import software.aws.toolkits.gradle.jacoco.RemoteCoverage.Companion.enableRemote
 // SPDX-License-Identifier: Apache-2.0
 
 val remoteRobotPort: String by project
+val ideProfileName: String by project
 
 repositories {
     maven { url = uri("https://cache-redirector.jetbrains.com/intellij-dependencies") }
@@ -44,6 +45,7 @@ tasks.register<Test>("uiTestCore") {
     dependsOn(":jetbrains-core:buildPlugin")
     inputs.files(":jetbrains-core:buildPlugin")
 
+    systemProperty("org.gradle.project.ideProfileName", ideProfileName)
     systemProperty("robot-server.port", remoteRobotPort)
     systemProperty("junit.jupiter.extensions.autodetection.enabled", true)
 

ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/AwsExplorer.kt

@@ -38,7 +38,7 @@ open class AwsExplorer(
     remoteRobot: RemoteRobot,
     remoteComponent: RemoteComponent
 ) : CommonContainerFixture(remoteRobot, remoteComponent) {
-    fun explorerTree() = find<JTreeFixture>(byXpath("//div[@class='Tree']")).also { it.waitUntilLoaded() }
+    fun explorerTree() = find<JTreeFixture>(byXpath("//div[@class='Tree']"), timeout = Duration.ofSeconds(5)).also { it.waitUntilLoaded() }
 
     fun openExplorerActionMenu(vararg path: String) {
         explorerTree().rightClickPath(*path)

ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/FixtureExtensions.kt

@@ -11,17 +11,24 @@ import com.intellij.remoterobot.fixtures.JTextFieldFixture
 import com.intellij.remoterobot.search.locators.byXpath
 import com.intellij.remoterobot.stepsProcessing.step
 import com.intellij.remoterobot.utils.keyboard
+import org.intellij.lang.annotations.Language
 import java.time.Duration
 
 fun ContainerFixture.pressOk() = findAndClick("//div[@text='OK']")
 fun ContainerFixture.pressDelete() = findAndClick("//div[@text='Delete']")
 fun ContainerFixture.pressCancel() = findAndClick("//div[@text='Cancel']")
 
-fun ContainerFixture.findAndClick(xPath: String) = findByXpath(xPath).click()
+fun ContainerFixture.findAndClick(@Language("XPath") xPath: String) = findByXpath(xPath).click()
 fun ContainerFixture.findByXpath(xPath: String) = find<ComponentFixture>(byXpath(xPath), Duration.ofSeconds(5))
 
 fun ContainerFixture.fillSingleTextField(text: String) = step("Fill single text field with $text") {
-    find<JTextFieldFixture>(byXpath("//div[@class='JTextField']"), Duration.ofSeconds(5)).text = text
+    find<JTextFieldFixture>(byXpath("//div[@class='JTextField']"), Duration.ofSeconds(5)).setTextWithoutFocus(text)
+}
+
+// swing robot appears to have issues acquiring focus on MATE desktop with some dialog windows
+// org.assertj.swing.exception.ActionFailedException: Focus change to javax.swing.JTextField[name=null, text='', enabled=true, visible=true, showing=true] failed focus owner: Null Component (js#8)
+fun JTextFieldFixture.setTextWithoutFocus(text: String) = apply {
+    runJs("component.setText('$text')")
 }
 
 fun ContainerFixture.fillSearchTextField(text: String) = step("Fill search text field with $text") {
@@ -46,7 +53,7 @@ fun ContainerFixture.clearSearchTextField() = step("Clear search text field") {
 }
 
 fun ContainerFixture.fillDeletionAndConfirm() = step("Fill in delete me and delete") {
-    find<JTextFieldFixture>(byXpath("//div[@accessiblename='Delete confirmation box']"), Duration.ofSeconds(5)).text = "delete me"
+    find<JTextFieldFixture>(byXpath("//div[@accessiblename='Delete confirmation box']"), Duration.ofSeconds(5)).setTextWithoutFocus("delete me")
     pressOk()
 }
 

ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/JTreeFixture.kt

@@ -211,8 +211,8 @@ fun JTreeFixture.waitUntilLoaded() {
     step("waiting for loading text to go away...") {
         Pause.pause(100)
         waitFor(duration = Duration.ofMinutes(1)) {
-            // Do not use hasText(String) https://github.com/JetBrains/intellij-ui-test-robot/issues/10
-            !hasText { txt -> txt.text == "loading..." }
+            // FIX_WHEN_MIN_IS_213: changed to unicode ellipses in IDEA-270680
+            !hasText("loading...") && !hasText("loading…")
         }
         Pause.pause(100)
     }

ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/WelcomeFrame.kt

@@ -37,7 +37,13 @@ class WelcomeFrame(remoteRobot: RemoteRobot, remoteComponent: RemoteComponent) :
     }
 
     fun selectTab(tabName: String) {
-        jList(byXpath("//div[@accessiblename='Welcome screen categories']")).clickItem(tabName)
+        // TODO: FIX_WHEN_MIN_IS_213
+        try {
+            find<JTreeFixture>(JTreeFixture.byType()).clickRowWithText(tabName, fullMatch = false)
+        } catch (e: Exception) {
+            // <2021.3
+            jList(byXpath("//div[@accessiblename='Welcome screen categories']")).clickItem(tabName)
+        }
     }
 
     fun openFolder(path: Path) {

ui-tests/tst/software/aws/toolkits/jetbrains/uitests/tests/SamRunConfigTest.kt

@@ -4,6 +4,7 @@
 package software.aws.toolkits.jetbrains.uitests.tests
 
 import com.intellij.remoterobot.fixtures.ComboBoxFixture
+import com.intellij.remoterobot.fixtures.ComponentFixture
 import com.intellij.remoterobot.fixtures.ContainerFixture
 import com.intellij.remoterobot.fixtures.JListFixture
 import com.intellij.remoterobot.search.locators.byXpath
@@ -53,7 +54,7 @@ class SamRunConfigTest {
 
             idea {
                 waitForBackgroundTasks()
-                findAndClick("//div[@accessiblename='Add Configuration...']")
+                findAndClick("//div[contains(@accessiblename,'Add Configuration')]")
                 step("Create and populate template based run configuration") {
                     addRunConfig()
                     step("Populate run configuration") {
@@ -75,7 +76,7 @@ class SamRunConfigTest {
                 step("Validate template run configuration was saved and loads properly") {
                     step("Reopen the run configuration") {
                         findAndClick("//div[@accessiblename='[Local] SomeFunction']")
-                        find<JListFixture>(byXpath("//div[@class='MyList']")).clickItem("Edit Configurations...")
+                        find<JListFixture>(byXpath("//div[@class='MyList']")).clickItem("Edit Configurations", fullMatch = false)
                     }
                     step("Assert the same function is selected") {
                         assertThat(functionModel().selectedText()).isEqualTo("SomeFunction")
@@ -94,10 +95,13 @@ class SamRunConfigTest {
                 step("Setup handler based run configuration") {
                     step("Reopen the run configuration menu") {
                         findAndClick("//div[@accessiblename='[Local] SomeFunction']")
-                        find<JListFixture>(byXpath("//div[@class='MyList']")).clickItem("Edit Configurations...")
+                        find<JListFixture>(byXpath("//div[@class='MyList']")).clickItem("Edit Configurations", fullMatch = false)
                     }
                     addRunConfig()
-                    find<ComboBoxFixture>(byXpath("(//div[@text='Runtime:']/following-sibling::div[@class='ComboBox'])[1]")).selectItem("java11")
+                    find<ComboBoxFixture>(
+                        byXpath("(//div[@text='Runtime:']/following-sibling::div[@class='ComboBox'])[1]"),
+                        Duration.ofSeconds(10)
+                    ).selectItem("java11")
                     findAndClick("//div[@class='HandlerPanel']")
                     keyboard { enterText("helloworld.App::handleRequest") }
                     findAndClick("//div[@class='MyEditorTextField']")
@@ -107,10 +111,11 @@ class SamRunConfigTest {
                 step("Validate handler run configuration was saved and loads properly") {
                     step("Reopen the run configuration") {
                         findAndClick("//div[@accessiblename='[Local] App.handleRequest']")
-                        find<JListFixture>(byXpath("//div[@class='MyList']")).clickItem("Edit Configurations...")
+                        find<JListFixture>(byXpath("//div[@class='MyList']")).clickItem("Edit Configurations", fullMatch = false)
+                        waitForConfigurationLoad()
                     }
                     step("Assert the same handler is selected") {
-                        val fixture = findRunDialog().find<ContainerFixture>(byXpath("//div[@class='HandlerPanel']"))
+                        val fixture = find<ContainerFixture>(byXpath("//div[@class='HandlerPanel']"))
                         assertThat(fixture.findAllText().joinToString("") { it.text }).isEqualTo("helloworld.App::handleRequest")
                     }
                     // We might want to assert no errors here in the future. However, since we do not import the project, we don't
@@ -121,15 +126,21 @@ class SamRunConfigTest {
         }
     }
 
-    private fun ContainerFixture.functionModel(): ComboBoxFixture =
-        find(byXpath("//div[@class='TextFieldWithBrowseButton']/following-sibling::div[@class='ComboBox']"))
+    private fun ContainerFixture.waitForConfigurationLoad() = find<ComponentFixture>(byXpath("//div[@text='Configuration']"), Duration.ofSeconds(10))
 
-    private fun ContainerFixture.findRunDialog() = find<DialogFixture>(DialogFixture.byTitleContains("Run"), Duration.ofSeconds(5))
+    private fun ContainerFixture.functionModel(): ComboBoxFixture {
+        waitForConfigurationLoad()
+        return find(byXpath("//div[@class='TextFieldWithBrowseButton']/following-sibling::div[@class='ComboBox']"))
+    }
+
+    private fun ContainerFixture.findRunDialog() = find<DialogFixture>(DialogFixture.byTitleContains("Run"), Duration.ofSeconds(10))
 
     private fun ContainerFixture.addRunConfig() {
         step("Add a local run configuration") {
             findRunDialog().findAndClick("//div[@accessiblename='Add New Configuration']")
             find<JTreeFixture>(byXpath("//div[@accessiblename='WizardTree' and @class='MyTree']")).clickPath("AWS Lambda", "Local")
+            // wait for run config panel to render
+            waitForConfigurationLoad()
         }
     }
 }