Fix CloudWatch UI tests (#2793)

* Also make the ui tests run better outside of CI by disabling coverage

Author: abrooksv

buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts

@@ -6,8 +6,8 @@ import org.jetbrains.intellij.tasks.DownloadRobotServerPluginTask
 import org.jetbrains.intellij.tasks.RunIdeForUiTestTask
 import software.aws.toolkits.gradle.ciOnly
 import software.aws.toolkits.gradle.findFolders
-import software.aws.toolkits.gradle.intellij.IdeVersions
 import software.aws.toolkits.gradle.intellij.IdeFlavor
+import software.aws.toolkits.gradle.intellij.IdeVersions
 import software.aws.toolkits.gradle.intellij.ToolkitIntelliJExtension
 import software.aws.toolkits.gradle.isCi
 
@@ -118,7 +118,9 @@ tasks.withType<DownloadRobotServerPluginTask> {
 }
 
 // Enable coverage for the UI test target IDE
-extensions.getByType<JacocoPluginExtension>().applyTo(tasks.withType<RunIdeForUiTestTask>())
+ciOnly {
+    extensions.getByType<JacocoPluginExtension>().applyTo(tasks.withType<RunIdeForUiTestTask>())
+}
 tasks.withType<RunIdeForUiTestTask>().all {
     systemProperty("robot-server.port", remoteRobotPort)
     systemProperty("ide.mac.file.chooser.native", "false")
@@ -143,9 +145,9 @@ tasks.withType<RunIdeForUiTestTask>().all {
         suspend.set(false)
     }
 
-    configure<JacocoTaskExtension> {
-        includes = listOf("software.aws.toolkits.*")
-        ciOnly {
+    ciOnly {
+        configure<JacocoTaskExtension> {
+            includes = listOf("software.aws.toolkits.*")
             output = Output.TCP_CLIENT // Dump to our jacoco server instead of to a file
         }
     }

ui-tests/build.gradle.kts

@@ -1,3 +1,4 @@
+import software.aws.toolkits.gradle.ciOnly
 import software.aws.toolkits.gradle.jacoco.RemoteCoverage.Companion.enableRemoteCoverage
 
 // Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
@@ -67,5 +68,7 @@ tasks.register<Test>("uiTestCore") {
         isEnabled = false
     }
 
-    enableRemoteCoverage(this)
+    ciOnly {
+        enableRemoteCoverage(this)
+    }
 }

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

@@ -28,6 +28,7 @@ import software.aws.toolkits.jetbrains.uitests.extensions.uiTest
 import software.aws.toolkits.jetbrains.uitests.fixtures.IdeaFrame
 import software.aws.toolkits.jetbrains.uitests.fixtures.JTreeFixture
 import software.aws.toolkits.jetbrains.uitests.fixtures.awsExplorer
+import software.aws.toolkits.jetbrains.uitests.fixtures.dialog
 import software.aws.toolkits.jetbrains.uitests.fixtures.findAndClick
 import software.aws.toolkits.jetbrains.uitests.fixtures.findByXpath
 import software.aws.toolkits.jetbrains.uitests.fixtures.idea
@@ -175,16 +176,19 @@ class InsightsQueryTest {
 
                 step("Verify new query settings have persisted") {
                     openInsightsQueryDialogFromResults()
-                    find<JTextFieldFixture>(byXpath("//div[@class='JFormattedTextField' and @visible_text='$testRelativeTimeAmount']"))
-                    assertThat(find<ComboBoxFixture>(byXpath("//div[@class='ComboBox']")).selectedText()).isEqualTo("Hours")
+
+                    dialog("Query Log Groups") {
+                        find<JTextFieldFixture>(byXpath("//div[@class='JFormattedTextField' and @visible_text='$testRelativeTimeAmount']"))
+                        assertThat(find<ComboBoxFixture>(byXpath("//div[@class='ComboBox']")).selectedText()).isEqualTo("Hours")
+                        close()
+                    }
                 }
             }
             step("Open query from log group") {
                 step("Open log group") {
                     awsExplorer {
                         doubleClickExplorer(cloudWatchExplorerLabel, logGroupName)
                     }
-                    find<ComponentFixture>(byXpath("//div[@accessiblename='View Log Streams']")).click()
                 }
                 step("Click query button") {
                     findAndClick("//div[@accessiblename='Query']")