build

Author: rli

noop/build.gradle.kts

@@ -0,0 +1,5 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+// project that does nothing
+tasks.register("test")

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/BearerTokenProvider.kt

@@ -6,7 +6,6 @@ package software.aws.toolkits.jetbrains.core.credentials.sso.bearer
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.util.containers.orNull
-import org.jetbrains.annotations.ApiStatus.Internal
 import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider
 import software.amazon.awssdk.auth.token.credentials.SdkToken
 import software.amazon.awssdk.auth.token.credentials.SdkTokenProvider

settings.gradle.kts

@@ -97,11 +97,15 @@ rootProject.name = "aws-toolkit-jetbrains"
 include("detekt-rules")
 include("ui-tests")
 include("sandbox-all")
+include("ui-tests-starter")
 when (providers.gradleProperty("ideProfileName").get()) {
     // FIX_WHEN_MIN_IS_242: `tmp-all` test module no longer needed in 242+
-    "2023.3", "2024.1" -> include("tmp-all")
-    // available 242+
-    else -> include("ui-tests-starter")
+    "2023.3", "2024.1" -> {
+        include("tmp-all")
+
+        // only available 242+
+        project(":ui-tests-starter").projectDir = file("noop")
+    }
 }
 
 /*

ui-tests-starter/build.gradle.kts

@@ -1,3 +1,6 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 import software.aws.toolkits.gradle.intellij.IdeVersions
 

ui-tests-starter/tst/OfflineAmazonQInlineCompletionTest.kt

@@ -14,13 +14,13 @@ import com.intellij.ide.starter.project.LocalProjectInfo
 import com.intellij.ide.starter.runner.CurrentTestMethod
 import com.intellij.ide.starter.runner.Starter
 import org.junit.jupiter.api.Test
-import java.nio.file.Path
-import java.nio.file.Paths
-import kotlin.io.path.writeText
 import org.kodein.di.DI
 import org.kodein.di.bindSingleton
 import java.io.File
+import java.nio.file.Path
+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
@@ -41,9 +41,7 @@ object TestCIServer : CIServer {
     override fun ignoreTestFailure(testName: String, message: String, details: String) {
     }
 
-    override fun isTestFailureShouldBeIgnored(message: String): Boolean {
-        return false
-    }
+    override fun isTestFailureShouldBeIgnored(message: String) = false
 }
 
 class OfflineAmazonQInlineCompletionTest {
@@ -88,7 +86,8 @@ class OfflineAmazonQInlineCompletionTest {
                 """.trimIndent()
             )
         Paths.get(System.getProperty("user.home"), ".aws", "sso", "cache", "d3b447f809607422aac1470dd17fbb32e358cdb3.json")
-            .writeText("""
+            .writeText(
+                """
                 {
                   "issuerUrl": "https://example.awsapps.com/start",
                   "region": "us-east-1",
@@ -97,7 +96,8 @@ class OfflineAmazonQInlineCompletionTest {
                   "createdAt": "1970-01-01T00:00:00Z",
                   "expiresAt": "1970-01-01T00:00:00Z"
                 }
-            """.trimIndent())
+                """.trimIndent()
+            )
         Starter.newContext(CurrentTestMethod.hyphenateWithClass(), testCase).apply {
             System.getProperty("ui.test.plugins").split(File.pathSeparator).forEach { path ->
                 pluginConfigurator.installPluginFromPath(
@@ -115,6 +115,6 @@ class OfflineAmazonQInlineCompletionTest {
                     // left meta + c
                     repeat(5) { hotKey(18, 67) }
                 }
-        }
+            }
     }
 }