Fix UI test input target (#4179)

UI tests should also use final toolkit build artifact instead of :jetbrains-core

Author: rli

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

@@ -19,7 +19,6 @@ val toolkitIntelliJ = project.extensions.create<ToolkitIntelliJExtension>("intel
 
 val ideProfile = IdeVersions.ideProfile(project)
 val toolkitVersion: String by project
-val remoteRobotPort: String by project
 
 // please check changelog generation logic if this format is changed
 version = "$toolkitVersion-${ideProfile.shortName}"
@@ -30,6 +29,9 @@ plugins {
     id("org.jetbrains.intellij")
 }
 
+// TODO: https://github.com/gradle/gradle/issues/15383
+val versionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
+
 // Add our source sets per IDE profile version (i.e. src-211)
 sourceSets {
     main {
@@ -125,10 +127,7 @@ tasks.buildSearchableOptions {
 }
 
 // https://github.com/JetBrains/gradle-intellij-plugin/blob/829786d5d196ab942d7e6eb3e472ac0af776d3fa/src/main/kotlin/org/jetbrains/intellij/tasks/RunIdeBase.kt#L315
-val openedPackages = OpenedPackages + listOf(
-    // very noisy in UI tests
-    "--add-opens=java.desktop/javax.swing.text=ALL-UNNAMED",
-) + with(OperatingSystem.current()) {
+val openedPackages = OpenedPackages + with(OperatingSystem.current()) {
     when {
         isWindows -> listOf(
             "--add-opens=java.base/sun.nio.fs=ALL-UNNAMED",
@@ -194,59 +193,6 @@ tasks.runIde {
     }
 }
 
-// TODO: https://github.com/gradle/gradle/issues/15383
-val versionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
-tasks.withType<DownloadRobotServerPluginTask> {
-    version.set(versionCatalog.findVersion("intellijRemoteRobot").get().requiredVersion)
-}
-
-// Enable coverage for the UI test target IDE
-ciOnly {
-    extensions.getByType<JacocoPluginExtension>().applyTo(tasks.withType<RunIdeForUiTestTask>())
-}
-tasks.withType<RunIdeForUiTestTask>().all {
-    systemProperty("robot-server.port", remoteRobotPort)
-    // mac magic
-    systemProperty("ide.mac.message.dialogs.as.sheets", "false")
-    systemProperty("jbScreenMenuBar.enabled", "false")
-    systemProperty("apple.laf.useScreenMenuBar", "false")
-    systemProperty("ide.mac.file.chooser.native", "false")
-
-    systemProperty("jb.consents.confirmation.enabled", "false")
-    // This does some magic in EndUserAgreement.java to make it not show the privacy policy
-    systemProperty("jb.privacy.policy.text", "<!--999.999-->")
-    systemProperty("ide.show.tips.on.startup.default.value", false)
-
-    systemProperty("aws.telemetry.skip_prompt", "true")
-    systemProperty("aws.suppress_deprecation_prompt", true)
-    systemProperty("idea.trust.all.projects", "true")
-
-    // These are experiments to enable for UI tests
-    systemProperty("aws.experiment.connectedLocalTerminal", true)
-    systemProperty("aws.experiment.dynamoDb", true)
-
-    debugOptions {
-        enabled.set(true)
-        suspend.set(false)
-    }
-
-    jvmArgs(openedPackages)
-
-    ciOnly {
-        configure<JacocoTaskExtension> {
-            // sync with testing-subplugin
-            // don't instrument sdk, icons, etc.
-            includes = listOf("software.aws.toolkits.*")
-            excludes = listOf("software.aws.toolkits.telemetry.*")
-
-            // 221+ uses a custom classloader and jacoco fails to find classes
-            isIncludeNoLocationClasses = true
-
-            output = Output.TCP_CLIENT // Dump to our jacoco server instead of to a file
-        }
-    }
-}
-
 configurations.instrumentedJar.configure {
     // when the "instrumentedJar" configuration is selected, gradle is unable to resolve configurations needed by jacoco
     // to calculate coverage, so we declare these as seconary artifacts on the primary "instrumentedJar" implicit variant

buildspec/linuxUiTests.yml

@@ -45,7 +45,7 @@ phases:
         credential_source=EcsContainer"
         
       - chmod +x gradlew
-      - ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME buildPlugin --console plain --info
+      - ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME :plugin-toolkit:intellij:buildPlugin --console plain --info
 
       - ffmpeg -loglevel quiet -nostdin -f x11grab -video_size ${SCREEN_WIDTH}x${SCREEN_HEIGHT} -i ${DISPLAY} -codec:v libx264 -pix_fmt yuv420p -vf drawtext="fontsize=48:box=1:[email protected]:boxborderw=5:fontcolor=white:x=0:y=h-text_h:text='%{gmtime\:%H\\\\\:%M\\\\\:%S}'" -framerate 12 -g 12 /tmp/screen_recording.mp4 &
       - ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME uiTestCore coverageReport --console plain --info

plugins/toolkit/intellij/build.gradle.kts

@@ -1,6 +1,10 @@
 // Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import org.jetbrains.intellij.tasks.DownloadRobotServerPluginTask
+import org.jetbrains.intellij.tasks.RunIdeForUiTestTask
+import org.jetbrains.intellij.utils.OpenedPackages
+import software.aws.toolkits.gradle.ciOnly
 import software.aws.toolkits.gradle.intellij.IdeFlavor
 import software.aws.toolkits.gradle.intellij.IdeVersions
 import software.aws.toolkits.gradle.intellij.ToolkitIntelliJExtension
@@ -16,6 +20,7 @@ val toolkitIntelliJ = project.extensions.create<ToolkitIntelliJExtension>("intel
     ideFlavor.set(IdeFlavor.values().firstOrNull { it.name == runIdeVariant.orNull } ?: IdeFlavor.IC)
 }
 
+val remoteRobotPort: String by project
 val ideProfile = IdeVersions.ideProfile(project)
 
 val toolkitVersion: String by project
@@ -91,3 +96,59 @@ configurations {
         exclude(group = "software.amazon.awssdk", module = "netty-nio-client")
     }
 }
+
+// Enable coverage for the UI test target IDE
+ciOnly {
+    extensions.getByType<JacocoPluginExtension>().applyTo(tasks.withType<RunIdeForUiTestTask>())
+}
+tasks.withType<DownloadRobotServerPluginTask> {
+    // TODO: https://github.com/gradle/gradle/issues/15383
+    version.set(versionCatalogs.named("libs").findVersion("intellijRemoteRobot").get().requiredVersion)
+}
+tasks.withType<RunIdeForUiTestTask>().all {
+    systemProperty("robot-server.port", remoteRobotPort)
+    // mac magic
+    systemProperty("ide.mac.message.dialogs.as.sheets", "false")
+    systemProperty("jbScreenMenuBar.enabled", "false")
+    systemProperty("apple.laf.useScreenMenuBar", "false")
+    systemProperty("ide.mac.file.chooser.native", "false")
+
+    systemProperty("jb.consents.confirmation.enabled", "false")
+    // This does some magic in EndUserAgreement.java to make it not show the privacy policy
+    systemProperty("jb.privacy.policy.text", "<!--999.999-->")
+    systemProperty("ide.show.tips.on.startup.default.value", false)
+
+    systemProperty("aws.telemetry.skip_prompt", "true")
+    systemProperty("aws.suppress_deprecation_prompt", true)
+    systemProperty("idea.trust.all.projects", "true")
+
+    // These are experiments to enable for UI tests
+    systemProperty("aws.experiment.connectedLocalTerminal", true)
+    systemProperty("aws.experiment.dynamoDb", true)
+
+    debugOptions {
+        enabled.set(true)
+        suspend.set(false)
+    }
+
+    jvmArgs(
+        OpenedPackages + listOf(
+            // very noisy in UI tests
+            "--add-opens=java.desktop/javax.swing.text=ALL-UNNAMED",
+        )
+    )
+
+    ciOnly {
+        configure<JacocoTaskExtension> {
+            // sync with testing-subplugin
+            // don't instrument sdk, icons, etc.
+            includes = listOf("software.aws.toolkits.*")
+            excludes = listOf("software.aws.toolkits.telemetry.*")
+
+            // 221+ uses a custom classloader and jacoco fails to find classes
+            isIncludeNoLocationClasses = true
+
+            output = JacocoTaskExtension.Output.TCP_CLIENT // Dump to our jacoco server instead of to a file
+        }
+    }
+}

ui-tests/build.gradle.kts

@@ -44,8 +44,8 @@ tasks.test {
 }
 
 tasks.register<Test>("uiTestCore") {
-    dependsOn(":plugin-toolkit:jetbrains-core:buildPlugin")
-    inputs.files(":plugin-toolkit:jetbrains-core:buildPlugin")
+    dependsOn(":plugin-toolkit:intellij:buildPlugin")
+    inputs.files(":plugin-toolkit:intellij:buildPlugin")
 
     systemProperty("ide.experimental.ui", false)
     systemProperty("org.gradle.project.ideProfileName", ideProfileName)
@@ -55,7 +55,7 @@ tasks.register<Test>("uiTestCore") {
     systemProperty("testDataPath", project.rootDir.resolve("testdata").toString())
     systemProperty("testReportPath", project.buildDir.resolve("reports").resolve("tests").resolve("testRecordings").toString())
 
-    systemProperty("GRADLE_PROJECT", "plugin-toolkit:jetbrains-core")
+    systemProperty("GRADLE_PROJECT", "plugin-toolkit:intellij")
     useJUnitPlatform {
         includeTags("core")
     }