UI tests with Auth

Author: manodnyab

ui-tests-starter/build.gradle.kts

@@ -9,21 +9,26 @@ plugins {
     id("toolkit-kotlin-conventions")
     id("toolkit-intellij-plugin")
 
-    id("org.jetbrains.intellij.platform")
+    id("org.jetbrains.intellij.platform.module")
 }
 
 val ideProfile = IdeVersions.ideProfile(project)
 val testPlugins by configurations.registering
-val testPrep by sourceSets.creating {
-    java.srcDirs(findFolders(project, "tst-prep", ideProfile))
-}
-
 
-// Add our source sets per IDE profile version (i.e. src-211)
 sourceSets {
     test {
-        java.srcDirs(findFolders(project, "tst", ideProfile))
-        resources.srcDirs(findFolders(project, "tst-resources", ideProfile))
+        java.setSrcDirs(findFolders(project, "tst-prep", ideProfile))
+        resources.setSrcDirs(findFolders(project, "tst-resources", ideProfile))
+    }
+}
+
+val uiTestSource = sourceSets.create("uiTest") {
+    java.setSrcDirs(findFolders(project, "tst", ideProfile))
+}
+
+idea {
+    module {
+        testSources.from(uiTestSource.allSource.srcDirs)
     }
 }
 
@@ -32,56 +37,57 @@ intellijPlatform {
     instrumentCode = false
 }
 
+val uiTestImplementation by configurations.getting
 
+configurations.getByName(uiTestSource.compileClasspathConfigurationName) {
+    extendsFrom(uiTestImplementation)
+}
+
+configurations.getByName(uiTestSource.runtimeClasspathConfigurationName) {
+    extendsFrom(uiTestImplementation)
+}
 
 dependencies {
-    //testImplementation(platform("com.jetbrains.intellij.tools:ide-starter"))
     // should really be set by the BOM, but too much work to figure out right now
-    testImplementation("org.kodein.di:kodein-di-jvm:7.20.2")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
-
-    testImplementation(project(":plugin-core:jetbrains-community"))
-    testImplementation(project(":plugin-core:core"))
-    testImplementation(testFixtures(project(":plugin-core:jetbrains-community")))
-    val testPrepImplementation by configurations.getting
-
-    testPrepImplementation(testFixtures(project(":plugin-core:jetbrains-community")))
-
-
-
+    uiTestImplementation("org.kodein.di:kodein-di-jvm:7.20.2")
+    uiTestImplementation(platform(libs.junit5.bom))
+    uiTestImplementation(libs.junit5.jupiter)
 
     intellijPlatform {
-        //intellijIdeaCommunity(IdeVersions.ideProfile(providers).map { it.name })
-        //intellijIdeaCommunity(ideProfile.community.sdkVersion)
         val version = ideProfile.community.sdkVersion
         intellijIdeaCommunity(version, !version.contains("SNAPSHOT"))
-        testFramework(TestFrameworkType.JUnit5)
-        testFramework(TestFrameworkType.Starter)
+
+        localPlugin(project(":plugin-core"))
+        testImplementation(project(":plugin-core:core"))
+        testImplementation(project(":plugin-core:jetbrains-community"))
+        testImplementation(testFixtures(project(":plugin-core:jetbrains-community")))
+
         testFramework(TestFrameworkType.Bundled)
+        testFramework(TestFrameworkType.JUnit5)
+
+        testFramework(TestFrameworkType.Starter, configurationName = uiTestImplementation.name)
     }
 
     testPlugins(project(":plugin-amazonq", "pluginZip"))
     testPlugins(project(":plugin-core", "pluginZip"))
 }
 
-val prepareAmazonQTest = tasks.register<Test>("prepareAmazonQTest") {
-//    dependsOn(":plugin-core:jetbrains-community:test:abc")
-//    filter {
-//        setIncludePatterns("abc.*")
-//        //includeTestsMatching("abc.AbcTest")
-//        //excludeTestsMatching("software.aws.toolkits.jetbrains.*")
-//    }
-    testClassesDirs = testPrep.output.classesDirs
-    classpath = testPrep.runtimeClasspath
-
-    useJUnitPlatform()// Assuming your test task is named amazonQTest
+tasks.test {
+    enabled = false
+}
+
+val prepareAmazonQTest by intellijPlatformTesting.testIde.registering {
+    task {
+        useJUnitPlatform()
+    }
 }
 
-tasks.test {
-    dependsOn(testPlugins)
+tasks.register<Test>("uiTest") {
+    testClassesDirs = uiTestSource.output.classesDirs
+    classpath = uiTestSource.runtimeClasspath
+
     dependsOn(prepareAmazonQTest)
-    useJUnitPlatform()
+    dependsOn(testPlugins)
 
     systemProperty("ui.test.plugins", testPlugins.get().asPath)
 }

plugins/core/jetbrains-community/tstFixtures/abc/AbcTest.kt renamed to ui-tests-starter/tst-prep/PreAmazonQUiTest.kt

@@ -1,64 +1,52 @@
 // Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-package abc
-
 import com.intellij.openapi.Disposable
-import com.intellij.openapi.util.Disposer
 import com.intellij.testFramework.ApplicationExtension
 import com.intellij.testFramework.junit5.TestDisposable
 import org.junit.Rule
-import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import software.aws.toolkits.core.rules.SystemPropertyHelper
 import software.aws.toolkits.jetbrains.core.credentials.LegacyManagedBearerSsoConnection
 import software.aws.toolkits.jetbrains.core.credentials.ManagedBearerSsoConnection
+import software.aws.toolkits.jetbrains.core.credentials.pinning.ConnectionPinningManager
+import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
 import software.aws.toolkits.jetbrains.core.credentials.sono.Q_SCOPES
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProvider
 import software.aws.toolkits.jetbrains.utils.extensions.SsoLogin
 import software.aws.toolkits.jetbrains.utils.extensions.SsoLoginExtension
 
-
 @ExtendWith(ApplicationExtension::class, SsoLoginExtension::class)
 @SsoLogin("amazonq-test-account")
-//@DisabledIfEnvironmentVariable(named = "IS_PROD", matches = "false")
-class AbcTest {
-
+// @DisabledIfEnvironmentVariable(named = "IS_PROD", matches = "false")
+class PreAmazonQUiTest {
 
     @TestDisposable
-    private lateinit var disposable: Disposable
-
+    lateinit var disposable: Disposable
 
     @Rule
     @JvmField
     val systemPropertyHelper = SystemPropertyHelper()
 
     private lateinit var connection: ManagedBearerSsoConnection
 
-
-
     @BeforeEach
     fun setUp() {
-        // Setup test environment
-        System.setProperty("AWS_PROFILE","act_cred")
-
+        System.setProperty("aws.dev.useDAG", "true")
     }
 
-
     @Test
     fun `can set up Connection`() {
-        println("This ran")
-        connection = LegacyManagedBearerSsoConnection("start_url", "us-east-1", Q_SCOPES)
-        //ConnectionPinningManager.getInstance().setPinnedConnection(QConnection.getInstance(), connection)
-        (connection.getConnectionSettings().tokenProvider.delegate as BearerTokenProvider).reauthenticate()
-
-        //Disposer.register(disposable, connection)
-        // MockClientManager.useRealImplementations(disposableExtension.disposable)
-
+        try {
+            val startUrl = System.getenv("TEST_START_URL")
+            val region = System.getenv("TEST_REGION")
+            connection = LegacyManagedBearerSsoConnection(startUrl, region, Q_SCOPES)
+            ConnectionPinningManager.getInstance().setPinnedConnection(QConnection.getInstance(), connection)
+            (connection.getConnectionSettings().tokenProvider.delegate as BearerTokenProvider).reauthenticate()
+        } catch (e: Exception) {
+            error("Could not connect to Idc.")
+        }
     }
-
-
-
 }