From 928554672c699a104cbb37a162a02d3c61391861 Mon Sep 17 00:00:00 2001 From: Manodnya Bhoite Date: Tue, 18 Feb 2025 14:55:18 -0800 Subject: [PATCH 1/8] Try 243 --- gradle.properties | 2 +- .../jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0501f6369a6..8b2a09e3e19 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ toolkitVersion=3.56-SNAPSHOT publishToken= publishChannel= -ideProfileName=2024.2 +ideProfileName=2024.3 remoteRobotPort=8080 diff --git a/ui-tests-starter/tst/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt b/ui-tests-starter/tst/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt index 669a781deb6..d86a18b525b 100644 --- a/ui-tests-starter/tst/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt +++ b/ui-tests-starter/tst/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt @@ -38,7 +38,7 @@ class OfflineAmazonQInlineCompletionTest { LocalProjectInfo( Paths.get("tstData", "Hello") ) - ).useRelease("2024.2") + ).useRelease("2024.3") Paths.get(System.getProperty("user.home"), ".aws", "sso", "cache", "ee1d2538cb8d358377d7661466c866af747a8a3f.json") .createParentDirectories() .writeText( From f935c2a3ff3a2063b12a2369e39e869f0b8f3a0e Mon Sep 17 00:00:00 2001 From: Manodnya Bhoite Date: Tue, 18 Feb 2025 16:21:15 -0800 Subject: [PATCH 2/8] try not running on ci --- .../software/aws/toolkits/jetbrains/uitests/TestCIServer.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt index 557f4059254..7a13d752575 100644 --- a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt +++ b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt @@ -4,10 +4,11 @@ package software.aws.toolkits.jetbrains.uitests import com.intellij.ide.starter.ci.CIServer +import com.intellij.ide.starter.junit5.config.LogEnvironmentVariables import java.nio.file.Path object TestCIServer : CIServer { - override val isBuildRunningOnCI: Boolean = System.getenv("CI").toBoolean() == true + override val isBuildRunningOnCI: Boolean = false//System.getenv("CI").toBoolean() override val buildNumber: String = "" override val branchName: String = "" override val buildParams: Map = mapOf() From c2f151be8e0bfca471b46e752b4f48180d72a9a3 Mon Sep 17 00:00:00 2001 From: Manodnya Bhoite Date: Tue, 18 Feb 2025 17:16:31 -0800 Subject: [PATCH 3/8] try --- .../software/aws/toolkits/jetbrains/uitests/TestCIServer.kt | 5 ++++- .../jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt index 7a13d752575..0e104c3f02a 100644 --- a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt +++ b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt @@ -4,11 +4,12 @@ package software.aws.toolkits.jetbrains.uitests import com.intellij.ide.starter.ci.CIServer +import com.intellij.ide.starter.config.ConfigurationStorage import com.intellij.ide.starter.junit5.config.LogEnvironmentVariables import java.nio.file.Path object TestCIServer : CIServer { - override val isBuildRunningOnCI: Boolean = false//System.getenv("CI").toBoolean() + override val isBuildRunningOnCI: Boolean = System.getenv("CI").toBoolean() override val buildNumber: String = "" override val branchName: String = "" override val buildParams: Map = mapOf() @@ -28,3 +29,5 @@ object TestCIServer : CIServer { override fun isTestFailureShouldBeIgnored(message: String) = false } + + diff --git a/ui-tests-starter/tst/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt b/ui-tests-starter/tst/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt index d86a18b525b..14ee6c84fde 100644 --- a/ui-tests-starter/tst/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt +++ b/ui-tests-starter/tst/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt @@ -6,6 +6,8 @@ import com.intellij.driver.sdk.openFile import com.intellij.driver.sdk.ui.ui import com.intellij.driver.sdk.waitForProjectOpen import com.intellij.ide.starter.ci.CIServer +import com.intellij.ide.starter.config.ConfigurationStorage +import com.intellij.ide.starter.config.logEnvironmentVariables import com.intellij.ide.starter.di.di import com.intellij.ide.starter.driver.engine.runIdeWithDriver import com.intellij.ide.starter.ide.IdeProductProvider @@ -28,6 +30,7 @@ class OfflineAmazonQInlineCompletionTest { di = DI { extend(di) bindSingleton(overrides = true) { TestCIServer } + ConfigurationStorage.Companion.logEnvironmentVariables(false) } } From eeda387e9aeee7def43215139dc4096e48fec010 Mon Sep 17 00:00:00 2001 From: Manodnya Bhoite Date: Tue, 18 Feb 2025 17:54:22 -0800 Subject: [PATCH 4/8] switched to 243 --- .../OfflineAmazonQInlineCompletionTest.kt | 101 ++++++++++++++++++ .../OfflineAmazonQInlineCompletionTest.kt | 4 +- .../jetbrains/uitests/TestCIServer.kt | 6 +- 3 files changed, 104 insertions(+), 7 deletions(-) create mode 100644 ui-tests-starter/tst-241-242/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt rename ui-tests-starter/{tst => tst-243+}/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt (97%) diff --git a/ui-tests-starter/tst-241-242/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt b/ui-tests-starter/tst-241-242/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt new file mode 100644 index 00000000000..073a7f6db57 --- /dev/null +++ b/ui-tests-starter/tst-241-242/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt @@ -0,0 +1,101 @@ +// Copyright 2025 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 +import com.intellij.driver.sdk.waitForProjectOpen +import com.intellij.ide.starter.ci.CIServer +import com.intellij.ide.starter.di.di +import com.intellij.ide.starter.driver.engine.runIdeWithDriver +import com.intellij.ide.starter.ide.IdeProductProvider +import com.intellij.ide.starter.junit5.hyphenateWithClass +import com.intellij.ide.starter.models.TestCase +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 org.junit.jupiter.api.condition.DisabledIfSystemProperty +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 + +@DisabledIfSystemProperty(named = "org.gradle.project.ideProfileName", matches = "2024.2", disabledReason = "Logging API not present for 242") +class OfflineAmazonQInlineCompletionTest { + init { + di = DI { + extend(di) + bindSingleton(overrides = true) { TestCIServer } + } + } + + @Test + fun `completion request with expired credentials does not freeze EDT`() { + val testCase = TestCase( + IdeProductProvider.IC, + LocalProjectInfo( + Paths.get("tstData", "Hello") + ) + ).useRelease("2024.2") + Paths.get(System.getProperty("user.home"), ".aws", "sso", "cache", "ee1d2538cb8d358377d7661466c866af747a8a3f.json") + .createParentDirectories() + .writeText( + """ + { + "clientId": "DummyId", + "clientSecret": "DummySecret", + "expiresAt": "3070-01-01T00:00:00Z", + "scopes": [ + "scope1", + "scope2" + ], + "issuerUrl": "1", + "region": "2", + "clientType": "public", + "grantTypes": [ + "authorization_code", + "refresh_token" + ], + "redirectUris": [ + "http://127.0.0.1/oauth/callback" + ] + } + """.trimIndent() + ) + Paths.get(System.getProperty("user.home"), ".aws", "sso", "cache", "d3b447f809607422aac1470dd17fbb32e358cdb3.json") + .writeText( + """ + { + "issuerUrl": "https://example.awsapps.com/start", + "region": "us-east-1", + "accessToken": "DummyAccessToken", + "refreshToken": "RefreshToken", + "createdAt": "1970-01-01T00:00:00Z", + "expiresAt": "1970-01-01T00:00:00Z" + } + """.trimIndent() + ) + Starter.newContext(CurrentTestMethod.hyphenateWithClass(), testCase).apply { + System.getProperty("ui.test.plugins").split(File.pathSeparator).forEach { path -> + pluginConfigurator.installPluginFromPath( + Path.of(path) + ) + } + + copyExistingConfig(Paths.get("tstData", "config")) + updateGeneralSettings() + }.runIdeWithDriver() + .useDriverAndCloseIde { + waitForProjectOpen() + openFile("Example.java") + ui.keyboard { + // left meta + c + repeat(5) { hotKey(18, 67) } + } + } + } +} diff --git a/ui-tests-starter/tst/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt similarity index 97% rename from ui-tests-starter/tst/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt rename to ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt index 14ee6c84fde..64bfad4d6ee 100644 --- a/ui-tests-starter/tst/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt +++ b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt @@ -1,4 +1,4 @@ -// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 package software.aws.toolkits.jetbrains.uitests @@ -41,7 +41,7 @@ class OfflineAmazonQInlineCompletionTest { LocalProjectInfo( Paths.get("tstData", "Hello") ) - ).useRelease("2024.3") + ).useRelease("2024.2") Paths.get(System.getProperty("user.home"), ".aws", "sso", "cache", "ee1d2538cb8d358377d7661466c866af747a8a3f.json") .createParentDirectories() .writeText( diff --git a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt index 0e104c3f02a..557f4059254 100644 --- a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt +++ b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt @@ -4,12 +4,10 @@ package software.aws.toolkits.jetbrains.uitests import com.intellij.ide.starter.ci.CIServer -import com.intellij.ide.starter.config.ConfigurationStorage -import com.intellij.ide.starter.junit5.config.LogEnvironmentVariables import java.nio.file.Path object TestCIServer : CIServer { - override val isBuildRunningOnCI: Boolean = System.getenv("CI").toBoolean() + override val isBuildRunningOnCI: Boolean = System.getenv("CI").toBoolean() == true override val buildNumber: String = "" override val branchName: String = "" override val buildParams: Map = mapOf() @@ -29,5 +27,3 @@ object TestCIServer : CIServer { override fun isTestFailureShouldBeIgnored(message: String) = false } - - From 1be5c3cd6b483a706f53b1c9788f3dd95b38577e Mon Sep 17 00:00:00 2001 From: Manodnya Bhoite Date: Tue, 18 Feb 2025 17:55:07 -0800 Subject: [PATCH 5/8] try 243 --- .../jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt | 2 +- .../jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui-tests-starter/tst-241-242/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt b/ui-tests-starter/tst-241-242/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt index 073a7f6db57..163ac1bf92d 100644 --- a/ui-tests-starter/tst-241-242/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt +++ b/ui-tests-starter/tst-241-242/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt @@ -40,7 +40,7 @@ class OfflineAmazonQInlineCompletionTest { LocalProjectInfo( Paths.get("tstData", "Hello") ) - ).useRelease("2024.2") + ).useRelease("2024.3") Paths.get(System.getProperty("user.home"), ".aws", "sso", "cache", "ee1d2538cb8d358377d7661466c866af747a8a3f.json") .createParentDirectories() .writeText( diff --git a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt index 64bfad4d6ee..cf24db734d9 100644 --- a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt +++ b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt @@ -41,7 +41,7 @@ class OfflineAmazonQInlineCompletionTest { LocalProjectInfo( Paths.get("tstData", "Hello") ) - ).useRelease("2024.2") + ).useRelease("2024.3") Paths.get(System.getProperty("user.home"), ".aws", "sso", "cache", "ee1d2538cb8d358377d7661466c866af747a8a3f.json") .createParentDirectories() .writeText( From 316c0ff602379a2409019e461336c4440a209b12 Mon Sep 17 00:00:00 2001 From: Manodnya Bhoite Date: Wed, 19 Feb 2025 11:53:45 -0800 Subject: [PATCH 6/8] addressed feedback --- .../OfflineAmazonQInlineCompletionTest.kt | 101 ------------------ .../OfflineAmazonQInlineCompletionTest.kt | 8 +- 2 files changed, 5 insertions(+), 104 deletions(-) delete mode 100644 ui-tests-starter/tst-241-242/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt diff --git a/ui-tests-starter/tst-241-242/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt b/ui-tests-starter/tst-241-242/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt deleted file mode 100644 index 163ac1bf92d..00000000000 --- a/ui-tests-starter/tst-241-242/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt +++ /dev/null @@ -1,101 +0,0 @@ -// Copyright 2025 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 -import com.intellij.driver.sdk.waitForProjectOpen -import com.intellij.ide.starter.ci.CIServer -import com.intellij.ide.starter.di.di -import com.intellij.ide.starter.driver.engine.runIdeWithDriver -import com.intellij.ide.starter.ide.IdeProductProvider -import com.intellij.ide.starter.junit5.hyphenateWithClass -import com.intellij.ide.starter.models.TestCase -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 org.junit.jupiter.api.condition.DisabledIfSystemProperty -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 - -@DisabledIfSystemProperty(named = "org.gradle.project.ideProfileName", matches = "2024.2", disabledReason = "Logging API not present for 242") -class OfflineAmazonQInlineCompletionTest { - init { - di = DI { - extend(di) - bindSingleton(overrides = true) { TestCIServer } - } - } - - @Test - fun `completion request with expired credentials does not freeze EDT`() { - val testCase = TestCase( - IdeProductProvider.IC, - LocalProjectInfo( - Paths.get("tstData", "Hello") - ) - ).useRelease("2024.3") - Paths.get(System.getProperty("user.home"), ".aws", "sso", "cache", "ee1d2538cb8d358377d7661466c866af747a8a3f.json") - .createParentDirectories() - .writeText( - """ - { - "clientId": "DummyId", - "clientSecret": "DummySecret", - "expiresAt": "3070-01-01T00:00:00Z", - "scopes": [ - "scope1", - "scope2" - ], - "issuerUrl": "1", - "region": "2", - "clientType": "public", - "grantTypes": [ - "authorization_code", - "refresh_token" - ], - "redirectUris": [ - "http://127.0.0.1/oauth/callback" - ] - } - """.trimIndent() - ) - Paths.get(System.getProperty("user.home"), ".aws", "sso", "cache", "d3b447f809607422aac1470dd17fbb32e358cdb3.json") - .writeText( - """ - { - "issuerUrl": "https://example.awsapps.com/start", - "region": "us-east-1", - "accessToken": "DummyAccessToken", - "refreshToken": "RefreshToken", - "createdAt": "1970-01-01T00:00:00Z", - "expiresAt": "1970-01-01T00:00:00Z" - } - """.trimIndent() - ) - Starter.newContext(CurrentTestMethod.hyphenateWithClass(), testCase).apply { - System.getProperty("ui.test.plugins").split(File.pathSeparator).forEach { path -> - pluginConfigurator.installPluginFromPath( - Path.of(path) - ) - } - - copyExistingConfig(Paths.get("tstData", "config")) - updateGeneralSettings() - }.runIdeWithDriver() - .useDriverAndCloseIde { - waitForProjectOpen() - openFile("Example.java") - ui.keyboard { - // left meta + c - repeat(5) { hotKey(18, 67) } - } - } - } -} diff --git a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt index cf24db734d9..aa934643e5d 100644 --- a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt +++ b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt @@ -7,7 +7,7 @@ import com.intellij.driver.sdk.ui.ui import com.intellij.driver.sdk.waitForProjectOpen import com.intellij.ide.starter.ci.CIServer import com.intellij.ide.starter.config.ConfigurationStorage -import com.intellij.ide.starter.config.logEnvironmentVariables +import com.intellij.ide.starter.config.starterConfigurationStorageDefaults import com.intellij.ide.starter.di.di import com.intellij.ide.starter.driver.engine.runIdeWithDriver import com.intellij.ide.starter.ide.IdeProductProvider @@ -30,7 +30,9 @@ class OfflineAmazonQInlineCompletionTest { di = DI { extend(di) bindSingleton(overrides = true) { TestCIServer } - ConfigurationStorage.Companion.logEnvironmentVariables(false) + val starterConfigurationValues = starterConfigurationStorageDefaults.toMutableMap() + starterConfigurationValues["ENV_LOG_ENVIRONMENT_VARIABLES"] = (!System.getenv("CI").toBoolean()).toString() + bindSingleton { ConfigurationStorage(this, starterConfigurationValues.toMap()) } } } @@ -41,7 +43,7 @@ class OfflineAmazonQInlineCompletionTest { LocalProjectInfo( Paths.get("tstData", "Hello") ) - ).useRelease("2024.3") + ).useRelease(System.getProperty("org.gradle.project.ideProfileName")) Paths.get(System.getProperty("user.home"), ".aws", "sso", "cache", "ee1d2538cb8d358377d7661466c866af747a8a3f.json") .createParentDirectories() .writeText( From b42c77e9a966d8c8d8f53f962933b63042d9c5e1 Mon Sep 17 00:00:00 2001 From: Manodnya Bhoite Date: Wed, 19 Feb 2025 13:11:02 -0800 Subject: [PATCH 7/8] try getting an instance --- .../uitests/OfflineAmazonQInlineCompletionTest.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt index aa934643e5d..162283fdd9d 100644 --- a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt +++ b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt @@ -30,9 +30,13 @@ class OfflineAmazonQInlineCompletionTest { di = DI { extend(di) bindSingleton(overrides = true) { TestCIServer } - val starterConfigurationValues = starterConfigurationStorageDefaults.toMutableMap() - starterConfigurationValues["ENV_LOG_ENVIRONMENT_VARIABLES"] = (!System.getenv("CI").toBoolean()).toString() - bindSingleton { ConfigurationStorage(this, starterConfigurationValues.toMap()) } + val defaults = ConfigurationStorage.instance().defaults.toMutableMap().apply { + put("LOG_ENVIRONMENT_VARIABLES", "false") + } + + bindSingleton(overrides = true) { + ConfigurationStorage(this, defaults) + } } } From a64ef19eec0695c3068dc26f2c81f22a35e3022d Mon Sep 17 00:00:00 2001 From: Manodnya Bhoite Date: Wed, 19 Feb 2025 13:42:12 -0800 Subject: [PATCH 8/8] fix tests --- ui-tests-starter/build.gradle.kts | 1 + .../jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui-tests-starter/build.gradle.kts b/ui-tests-starter/build.gradle.kts index 55fc9e3fed2..6bc269a1e78 100644 --- a/ui-tests-starter/build.gradle.kts +++ b/ui-tests-starter/build.gradle.kts @@ -58,6 +58,7 @@ tasks.test { useJUnitPlatform() systemProperty("ui.test.plugins", testPlugins.get().asPath) + systemProperty("org.gradle.project.ideProfileName", ideProfile.name) } // hack to disable ui tests in ./gradlew check diff --git a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt index 162283fdd9d..b3b3f146e8c 100644 --- a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt +++ b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/OfflineAmazonQInlineCompletionTest.kt @@ -7,7 +7,6 @@ import com.intellij.driver.sdk.ui.ui import com.intellij.driver.sdk.waitForProjectOpen import com.intellij.ide.starter.ci.CIServer import com.intellij.ide.starter.config.ConfigurationStorage -import com.intellij.ide.starter.config.starterConfigurationStorageDefaults import com.intellij.ide.starter.di.di import com.intellij.ide.starter.driver.engine.runIdeWithDriver import com.intellij.ide.starter.ide.IdeProductProvider @@ -31,7 +30,7 @@ class OfflineAmazonQInlineCompletionTest { extend(di) bindSingleton(overrides = true) { TestCIServer } val defaults = ConfigurationStorage.instance().defaults.toMutableMap().apply { - put("LOG_ENVIRONMENT_VARIABLES", "false") + put("LOG_ENVIRONMENT_VARIABLES", (!System.getenv("CI").toBoolean()).toString()) } bindSingleton(overrides = true) {