rider

Author: rli

plugins/toolkit/jetbrains-rider/tst-233-242/base/BaseTestWithMarkup.kt

@@ -0,0 +1,10 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package base
+
+abstract class BaseTestWithMarkup : com.jetbrains.rider.test.base.BaseTestWithMarkup() {
+    abstract fun solutionDirectoryName(): String
+
+    override fun getSolutionDirectoryName() = solutionDirectoryName()
+}

plugins/toolkit/jetbrains-rider/tst-233-242/base/BaseTestWithSolution.kt

@@ -0,0 +1,10 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package base
+
+abstract class BaseTestWithSolution : com.jetbrains.rider.test.base.BaseTestWithSolution() {
+    abstract fun solutionDirectoryName(): String
+
+    override fun getSolutionDirectoryName() = solutionDirectoryName()
+}

plugins/toolkit/jetbrains-rider/tst-243+/base/BaseTestWithMarkup.kt

@@ -0,0 +1,11 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package base
+
+abstract class BaseTestWithMarkup : com.jetbrains.rider.test.base.BaseTestWithMarkup() {
+    abstract fun solutionDirectoryName(): String
+
+    override val testSolution: String
+        get() = solutionDirectoryName()
+}

plugins/toolkit/jetbrains-rider/tst-243+/base/BaseTestWithSolution.kt

@@ -0,0 +1,11 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package base
+
+abstract class BaseTestWithSolution : com.jetbrains.rider.test.base.BaseTestWithSolution() {
+    abstract fun solutionDirectoryName(): String
+
+    override val testSolution: String
+        get() = solutionDirectoryName()
+}

plugins/toolkit/jetbrains-rider/tst/base/AwsReuseSolutionTestBase.kt

@@ -4,7 +4,6 @@
 package base
 
 import com.jetbrains.rider.projectView.solutionDirectory
-import com.jetbrains.rider.test.base.BaseTestWithSolution
 import com.jetbrains.rider.test.debugger.XDebuggerTestHelper
 import com.jetbrains.rider.test.scriptingApi.getVirtualFileFromPath
 /**
@@ -16,8 +15,6 @@ abstract class AwsReuseSolutionTestBase : BaseTestWithSolution() {
     override val persistCaches: Boolean get() = false
     override val restoreNuGetPackages: Boolean get() = false
 
-    abstract override fun getSolutionDirectoryName(): String
-
     // 15 is a magic number (it's the return statement since they are all the same), but the only
     // example of it used that I could find it is used that way:
     // https://github.com/JetBrains/fsharp-support/blob/93ab17493a34a0bc0fd4c70b11adde02f81455c4/rider-fsharp/src/test/kotlin/debugger/AsyncDebuggerTest.kt#L6

plugins/toolkit/jetbrains-rider/tst/software/aws/toolkits/jetbrains/services/lambda/completion/DotNetHandlerCompletionProviderTest.kt

@@ -13,7 +13,7 @@ import software.aws.toolkits.jetbrains.utils.OPEN_SOLUTION_DIR_NAME
 
 class DotNetHandlerCompletionProviderTest : AwsReuseSolutionTestBase() {
 
-    override fun getSolutionDirectoryName(): String = OPEN_SOLUTION_DIR_NAME
+    override fun solutionDirectoryName(): String = OPEN_SOLUTION_DIR_NAME
 
     override val waitForCaches = true
 

plugins/toolkit/jetbrains-rider/tst/software/aws/toolkits/jetbrains/services/lambda/completion/DotNetHandlerCompletionTest.kt

@@ -3,21 +3,21 @@
 
 package software.aws.toolkits.jetbrains.services.lambda.completion
 
+import base.BaseTestWithSolution
 import base.allowCustomDotnetRoots
 import base.backendStartTimeout
 import com.intellij.ui.icons.CachedImageIcon
 import com.jetbrains.rd.ide.model.IconModel
 import com.jetbrains.rd.ui.icons.toIdeaIcon
 import com.jetbrains.rider.test.annotations.TestEnvironment
-import com.jetbrains.rider.test.base.BaseTestWithSolution
 import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.BeforeSuite
 import org.testng.annotations.Test
 import software.aws.toolkits.jetbrains.utils.OPEN_SOLUTION_DIR_NAME
 import java.time.Duration
 
 class DotNetHandlerCompletionTest : BaseTestWithSolution() {
-    override fun getSolutionDirectoryName() = OPEN_SOLUTION_DIR_NAME
+    override fun solutionDirectoryName() = OPEN_SOLUTION_DIR_NAME
 
     override val backendLoadedTimeout: Duration = backendStartTimeout
 

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

@@ -13,7 +13,7 @@ import software.aws.toolkits.jetbrains.services.lambda.sam.SamCommon
 import software.aws.toolkits.jetbrains.utils.OPEN_SOLUTION_DIR_NAME
 
 class DotNetLambdaBuilderTest : AwsReuseSolutionTestBase() {
-    override fun getSolutionDirectoryName(): String = OPEN_SOLUTION_DIR_NAME
+    override fun solutionDirectoryName(): String = OPEN_SOLUTION_DIR_NAME
 
     private val sut = DotNetLambdaBuilder()
 

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

@@ -17,7 +17,7 @@ import software.aws.toolkits.jetbrains.utils.OPEN_SOLUTION_DIR_NAME
  */
 class DotNetLambdaHandlerResolverTest : AwsReuseSolutionTestBase() {
 
-    override fun getSolutionDirectoryName(): String = OPEN_SOLUTION_DIR_NAME
+    override fun solutionDirectoryName(): String = OPEN_SOLUTION_DIR_NAME
 
     @Test
     fun testHandler_SingleValidHandler() {

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

@@ -3,10 +3,10 @@
 
 package software.aws.toolkits.jetbrains.services.lambda.dotnet
 
+import base.BaseTestWithMarkup
 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.annotations.DataProvider
 import org.testng.annotations.Test
 import software.aws.toolkits.jetbrains.protocol.awsSettingModel
@@ -20,7 +20,7 @@ class LambdaGutterMarkHighlightingTest : BaseTestWithMarkup() {
 
     override val backendLoadedTimeout: Duration = backendStartTimeout
 
-    override fun getSolutionDirectoryName() = "SamHelloWorldApp"
+    override fun solutionDirectoryName() = "SamHelloWorldApp"
 
     @Test
     fun testClass_FunctionClass_Detected() = verifyLambdaGutterMark()