Fix Rider Test Suites (#4419)

* checking tests fail

* fix solution path

Author: vchikoti1998

buildspec/linuxIntegrationTests.yml

@@ -39,7 +39,7 @@ phases:
       - ls -alh $AWS_CONFIG_FILE
       - cat $AWS_CONFIG_FILE
       - chmod +x gradlew
-      - DISPLAY=:22 ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME integrationTest coverageReport -x :plugin-toolkit:jetbrains-rider:integrationTest --info --console plain
+      - DISPLAY=:22 ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME integrationTest coverageReport --info --console plain
       - |
         if [ $(docker ps -q | wc -l) -gt 0 ]; then
             echo 'Docker containers were not completely cleaned up!';

buildspec/windowsTests.yml

@@ -37,7 +37,7 @@ phases:
         }
 
          # Rider is very expensive (spikes our CI jobs to 50% CPU, so let it do the prep work in parallel, but run tests later
-        ./gradlew -PideProfileName="$Env:ALTERNATIVE_IDE_PROFILE_NAME" check :plugin-toolkit:jetbrains-rider:compileTestKotlin -x :plugin-toolkit:jetbrains-rider:test --info --console plain --continue
+        ./gradlew -PideProfileName="$Env:ALTERNATIVE_IDE_PROFILE_NAME" check :plugin-toolkit:jetbrains-rider:compileTestKotlin --info --console plain --continue
         if ($LastExitCode -ne 0) {
           Write-Host "Command failed with exit code $LastExitCode"
           exit -1

buildspec/windowsTestsForToolkit.yml

@@ -37,7 +37,7 @@ phases:
         }
 
          # Rider is very expensive (spikes our CI jobs to 50% CPU, so let it do the prep work in parallel, but run tests later
-        ./gradlew -PideProfileName="$Env:ALTERNATIVE_IDE_PROFILE_NAME" :plugin-toolkit:intellij-standalone:check :plugin-toolkit:jetbrains-rider:compileTestKotlin -x :plugin-toolkit:jetbrains-rider:test --info --console plain --continue
+        ./gradlew -PideProfileName="$Env:ALTERNATIVE_IDE_PROFILE_NAME" :plugin-toolkit:intellij-standalone:check :plugin-toolkit:jetbrains-rider:compileTestKotlin --info --console plain --continue
         if ($LastExitCode -ne 0) {
           Write-Host "Command failed with exit code $LastExitCode"
           exit -1

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

@@ -56,7 +56,7 @@ abstract class DotnetLocalLambdaRunConfigurationIntegrationTestBase(private val
         PropertiesComponent.getInstance().setValue("debugger.immediate.window.in.watches", initialImmediateWindow)
     }
 
-    override fun getSolutionDirectoryName(): String = solutionName
+    override fun getSolutionDirectoryName(): String = "testData/solutions/$solutionName"
 
     @Test
     fun samIsExecutedDebugger() {
@@ -151,7 +151,7 @@ abstract class DotnetLocalLambdaImageRunConfigurationIntegrationTestBase(private
         removeAllBreakpoints(project)
     }
 
-    override fun getSolutionDirectoryName(): String = solutionName
+    override fun getSolutionDirectoryName(): String = "testData/solutions/$solutionName"
 
     @Test
     fun samIsExecutedImage() {

plugins/toolkit/jetbrains-rider/resources/META-INF/ext-rider.xml

@@ -29,7 +29,6 @@
         <handlerResolver id="DOTNET" implementationClass="software.aws.toolkits.jetbrains.services.lambda.dotnet.DotNetLambdaHandlerResolver"/>
         <handlerCompletion id="DOTNET" implementationClass="software.aws.toolkits.jetbrains.services.lambda.completion.DotNetHandlerCompletion"/>
         <sam.runtimeDebugSupport id="DOTNET" implementationClass="software.aws.toolkits.jetbrains.services.lambda.dotnet.DotNetRuntimeDebugSupport"/>
-        <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.dotnet.Dotnet50ImageDebug"/>
         <sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.dotnet.Dotnet60ImageDebug"/>
         <sam.projectWizard id="DOTNET" implementationClass="software.aws.toolkits.jetbrains.services.lambda.dotnet.DotNetSamProjectWizard"/>
     </extensions>

plugins/toolkit/jetbrains-rider/src-232+/software/aws/toolkits/jetbrains/utils/OpenSolutionFileParams.kt

@@ -6,6 +6,14 @@ package software.aws.toolkits.jetbrains.utils
 import java.io.File
 
 typealias OpenSolutionFileParams = com.jetbrains.rider.test.OpenSolutionParams
-fun openSolutionFile(solutionDirName: String) = File(solutionDirName)
+fun openSolutionFile(solutionDirName: String): File {
+    val solutionFileName = when {
+        solutionDirName.endsWith("SamHelloWorldApp") -> "SamHelloWorldApp.sln"
+        solutionDirName.endsWith("EchoLambda6X") -> "EchoLambda.sln"
+        solutionDirName.endsWith("ImageLambda6X") -> "ImageLambda.sln"
+        else -> throw IllegalArgumentException("Unsupported solution directory: $solutionDirName")
+    }
+    return File("$solutionDirName/$solutionFileName")
+}
 
-const val OPEN_SOLUTION_DIR_NAME: String = "testData/solutions/SamHelloWorldApp/SamHelloWorldApp.sln"
+const val OPEN_SOLUTION_DIR_NAME: String = "testData/solutions/SamHelloWorldApp"

plugins/toolkit/jetbrains-rider/tst/software/aws/toolkits/jetbrains/services/lambda/dotnet/LambdaGutterMarkHighlightingTest.kt

@@ -7,6 +7,8 @@ import base.backendStartTimeout
 import com.jetbrains.rdclient.testFramework.waitForDaemon
 import com.jetbrains.rider.projectView.solution
 import com.jetbrains.rider.test.base.BaseTestWithMarkup
+import org.testng.SkipException
+import org.testng.annotations.BeforeMethod
 import org.testng.annotations.DataProvider
 import org.testng.annotations.Test
 import software.aws.toolkits.jetbrains.protocol.awsSettingModel
@@ -18,6 +20,14 @@ class LambdaGutterMarkHighlightingTest : BaseTestWithMarkup() {
         private const val LAMBDA_RUN_MARKER_ATTRIBUTE_ID = "AWS Lambda Run Method Gutter Mark"
     }
 
+    @BeforeMethod
+    fun skipTestsOnWindows() {
+        val ideVersion = System.getProperty("org.gradle.project.ideProfileName")
+        if (System.getProperty("os.name").contains("Windows") && ideVersion == "2023.2") {
+            throw SkipException("Test skipped because it flakes on Windows 2023.2")
+        }
+    }
+
     override val backendLoadedTimeout: Duration = backendStartTimeout
     override val backendShellLoadTimeout: Duration = backendStartTimeout