build

Author: rli

ui-tests-starter/build.gradle.kts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
+import software.aws.toolkits.gradle.findFolders
 import software.aws.toolkits.gradle.intellij.IdeVersions
 
 plugins {
@@ -11,6 +12,16 @@ plugins {
     id("org.jetbrains.intellij.platform")
 }
 
+val ideProfile = IdeVersions.ideProfile(project)
+
+// 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))
+    }
+}
+
 intellijPlatform {
     buildSearchableOptions = false
     instrumentCode = false

ui-tests-starter/tst-241-242/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt

@@ -0,0 +1,29 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.uitests
+
+import com.intellij.ide.starter.ci.CIServer
+import java.nio.file.Path
+
+object TestCIServer : CIServer {
+    override val isBuildRunningOnCI: Boolean = System.getenv("CI").toBoolean() == true
+    override val buildNumber: String = ""
+    override val branchName: String = ""
+    override val buildParams: Map<String, String> = mapOf()
+
+    override fun publishArtifact(source: Path, artifactPath: String, artifactName: String) {
+    }
+
+    override fun reportTestFailure(testName: String, message: String, details: String) {
+        println("test: $testName")
+        println("message: $message")
+        println("details: $details")
+        error(message)
+    }
+
+    override fun ignoreTestFailure(testName: String, message: String, details: String) {
+    }
+
+    override fun isTestFailureShouldBeIgnored(message: String) = false
+}

ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt

@@ -0,0 +1,29 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.uitests
+
+import com.intellij.ide.starter.ci.CIServer
+import java.nio.file.Path
+
+object TestCIServer : CIServer {
+    override val isBuildRunningOnCI: Boolean = System.getenv("CI").toBoolean() == true
+    override val buildNumber: String = ""
+    override val branchName: String = ""
+    override val buildParams: Map<String, String> = mapOf()
+
+    override fun publishArtifact(source: Path, artifactPath: String, artifactName: String) {
+    }
+
+    override fun reportTestFailure(testName: String, message: String, details: String, linkToLogs: String?) {
+        println("test: $testName")
+        println("message: $message")
+        println("details: $details")
+        error(message)
+    }
+
+    override fun ignoreTestFailure(testName: String, message: String) {
+    }
+
+    override fun isTestFailureShouldBeIgnored(message: String) = false
+}

ui-tests-starter/tst/OfflineAmazonQInlineCompletionTest.kt renamed to ui-tests-starter/tst/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt

@@ -1,5 +1,6 @@
 // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+package software.aws.toolkits.jetbrains.uitests
 
 import com.intellij.driver.sdk.openFile
 import com.intellij.driver.sdk.ui.ui
@@ -22,28 +23,6 @@ import java.nio.file.Paths
 import kotlin.io.path.createParentDirectories
 import kotlin.io.path.writeText
 
-object TestCIServer : CIServer {
-    override val isBuildRunningOnCI: Boolean = System.getenv("CI").toBoolean() == true
-    override val buildNumber: String = ""
-    override val branchName: String = ""
-    override val buildParams: Map<String, String> = mapOf()
-
-    override fun publishArtifact(source: Path, artifactPath: String, artifactName: String) {
-    }
-
-    override fun reportTestFailure(testName: String, message: String, details: String) {
-        println("test: $testName")
-        println("message: $message")
-        println("details: $details")
-        error(message)
-    }
-
-    override fun ignoreTestFailure(testName: String, message: String, details: String) {
-    }
-
-    override fun isTestFailureShouldBeIgnored(message: String) = false
-}
-
 class OfflineAmazonQInlineCompletionTest {
     init {
         di = DI {