Re-enable Rider debug tests on 2020.3 (#2438)

Author: abrooksv

buildSrc/src/software/aws/toolkits/gradle/IdeVersions.kt

@@ -63,6 +63,7 @@ object IdeVersions {
                 "com.intellij.database",
                 "Pythonid:203.5981.165"
             ),
+            riderSdkOverride = "2020.3.2",
             ijSdkOverride = "2020.3",
             rdGenVersion = "0.203.161",
             nugetVersion = "2020.3.0"

jetbrains-rider/it/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotnetLocalLambdaRunConfigurationIntegrationTest.kt

@@ -7,10 +7,10 @@ import base.AwsReuseSolutionTestBase
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.intellij.execution.executors.DefaultDebugExecutor
-import com.intellij.openapi.application.ApplicationInfo
+import com.intellij.ide.util.PropertiesComponent
 import com.jetbrains.rider.projectView.solutionDirectory
 import org.assertj.core.api.Assertions.assertThat
-import org.testng.SkipException
+import org.testng.annotations.AfterMethod
 import org.testng.annotations.BeforeMethod
 import org.testng.annotations.Test
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials
@@ -27,9 +27,7 @@ class Dotnet21LocalLambdaRunConfigurationIntegrationTest : DotnetLocalLambdaRunC
 class Dotnet21LocalLambdaImageRunConfigurationIntegrationTest :
     DotnetLocalLambdaImageRunConfigurationIntegrationTestBase("ImageLambda2X", LambdaRuntime.DOTNETCORE2_1)
 
-class Dotnet31LocalLambdaRunConfigurationIntegrationTest : DotnetLocalLambdaRunConfigurationIntegrationTestBase("EchoLambda3X", LambdaRuntime.DOTNETCORE3_1) {
-    override val disableOn203 = false // At least run one test suite, running more than one will trigger failures
-}
+class Dotnet31LocalLambdaRunConfigurationIntegrationTest : DotnetLocalLambdaRunConfigurationIntegrationTestBase("EchoLambda3X", LambdaRuntime.DOTNETCORE3_1)
 
 class Dotnet31LocalLambdaImageRunConfigurationIntegrationTest :
     DotnetLocalLambdaImageRunConfigurationIntegrationTestBase("ImageLambda3X", LambdaRuntime.DOTNETCORE3_1)
@@ -46,23 +44,28 @@ abstract class DotnetLocalLambdaRunConfigurationIntegrationTestBase(private val
     private val mockCreds = AwsBasicCredentials.create("Access", "ItsASecret")
     private val handler = "EchoLambda::EchoLambda.Function::FunctionHandler"
 
-    protected open val disableOn203 = true
+    private var initialImmediateWindow: Boolean = false
 
     @BeforeMethod
     fun setUp() {
+        // Disable the immediate window due to double release of editor in 203, this issue should be fixed in later Rider versions FIX_WHEN_MIN_IS_211
+        initialImmediateWindow = PropertiesComponent.getInstance().getBoolean("debugger.immediate.window.in.watches")
+        PropertiesComponent.getInstance().setValue("debugger.immediate.window.in.watches", false, true)
+
         setSamExecutableFromEnvironment()
 
         MockCredentialsManager.getInstance().addCredentials(mockId, mockCreds)
     }
 
+    @AfterMethod
+    fun tearDown() {
+        PropertiesComponent.getInstance().setValue("debugger.immediate.window.in.watches", initialImmediateWindow)
+    }
+
     override fun getSolutionDirectoryName(): String = solutionName
 
     @Test
     fun samIsExecutedDebugger() {
-        if (disableOn203 && ApplicationInfo.getInstance().build.baselineVersion >= 203) {
-            throw SkipException("Test skipped due to double release of editor on 203")
-        }
-
         setBreakpoint()
 
         val runConfiguration = createHandlerBasedRunConfiguration(
@@ -120,13 +123,24 @@ abstract class DotnetLocalLambdaImageRunConfigurationIntegrationTestBase(private
     private val mockId = "MockCredsId"
     private val mockCreds = AwsBasicCredentials.create("Access", "ItsASecret")
 
+    private var initialImmediateWindow: Boolean = false
+
     @BeforeMethod
     fun setUp() {
+        // Disable the immediate window due to double release of editor in 203, this issue should be fixed in later Rider versions FIX_WHEN_MIN_IS_211
+        initialImmediateWindow = PropertiesComponent.getInstance().getBoolean("debugger.immediate.window.in.watches")
+        PropertiesComponent.getInstance().setValue("debugger.immediate.window.in.watches", false, true)
+
         setSamExecutableFromEnvironment()
 
         MockCredentialsManager.getInstance().addCredentials(mockId, mockCreds)
     }
 
+    @AfterMethod
+    fun tearDown() {
+        PropertiesComponent.getInstance().setValue("debugger.immediate.window.in.watches", initialImmediateWindow)
+    }
+
     override fun getSolutionDirectoryName(): String = solutionName
 
     @Test
@@ -149,10 +163,6 @@ abstract class DotnetLocalLambdaImageRunConfigurationIntegrationTestBase(private
 
     @Test
     fun samIsExecutedDebuggerImage() {
-        if (ApplicationInfo.getInstance().build.baselineVersion >= 203) {
-            throw SkipException("Test skipped due to double release of editor on 203")
-        }
-
         setBreakpoint()
 
         val template = "${project.solutionDirectory}/template.yaml"