File tree Expand file tree Collapse file tree 2 files changed +23
-0
lines changed
jetbrains-rider/tst/software/aws/toolkits/jetbrains/services/lambda Expand file tree Collapse file tree 2 files changed +23
-0
lines changed Original file line number Diff line number Diff line change @@ -5,22 +5,33 @@ package software.aws.toolkits.jetbrains.services.lambda.completion
5
5
6
6
import base.allowCustomDotnetRoots
7
7
import base.backendStartTimeout
8
+ import base.msBuild
9
+ import base.setUpCustomToolset
10
+ import com.intellij.openapi.application.ApplicationManager
8
11
import com.intellij.openapi.util.IconLoader
9
12
import com.jetbrains.rd.ide.model.IconModel
10
13
import com.jetbrains.rider.test.annotations.TestEnvironment
11
14
import com.jetbrains.rider.test.base.BaseTestWithSolution
15
+ import com.jetbrains.rider.test.protocol.testProtocolHost
12
16
import org.assertj.core.api.Assertions.assertThat
13
17
import org.testng.annotations.BeforeSuite
14
18
import org.testng.annotations.Test
15
19
import java.time.Duration
16
20
17
21
class DotNetHandlerCompletionTest : BaseTestWithSolution () {
22
+ // FIX_WHEN_MIN_IS_212: backendShellLoadedTimeout is the one we actually need to override
18
23
override val backendLoadedTimeout: Duration = backendStartTimeout
19
24
20
25
override fun getSolutionDirectoryName (): String = " "
21
26
22
27
override val waitForCaches = true
23
28
29
+ @BeforeSuite
30
+ fun setMsBuildVersion () {
31
+ val host = ApplicationManager .getApplication().testProtocolHost
32
+ setUpCustomToolset(msBuild, host)
33
+ }
34
+
24
35
// TODO: Remove when https://youtrack.jetbrains.com/issue/RIDER-47995 is fixed FIX_WHEN_MIN_IS_203
25
36
@BeforeSuite
26
37
fun allowDotnetRoots () {
Original file line number Diff line number Diff line change 4
4
package software.aws.toolkits.jetbrains.services.lambda.dotnet
5
5
6
6
import base.backendStartTimeout
7
+ import base.msBuild
8
+ import base.setUpCustomToolset
9
+ import com.intellij.openapi.application.ApplicationManager
7
10
import com.jetbrains.rdclient.testFramework.waitForDaemon
8
11
import com.jetbrains.rider.projectView.solution
9
12
import com.jetbrains.rider.test.base.BaseTestWithMarkup
13
+ import com.jetbrains.rider.test.protocol.testProtocolHost
14
+ import org.testng.annotations.BeforeSuite
10
15
import org.testng.annotations.DataProvider
11
16
import org.testng.annotations.Test
12
17
import software.aws.toolkits.jetbrains.protocol.awsSettingModel
@@ -18,6 +23,13 @@ class LambdaGutterMarkHighlightingTest : BaseTestWithMarkup() {
18
23
private const val LAMBDA_RUN_MARKER_ATTRIBUTE_ID = " AWS Lambda Run Method Gutter Mark"
19
24
}
20
25
26
+ @BeforeSuite
27
+ fun setMsBuildVersion () {
28
+ val host = ApplicationManager .getApplication().testProtocolHost
29
+ setUpCustomToolset(msBuild, host)
30
+ }
31
+
32
+ // FIX_WHEN_MIN_IS_212: backendShellLoadedTimeout is the one we actually need to override
21
33
override val backendLoadedTimeout: Duration = backendStartTimeout
22
34
23
35
override fun getSolutionDirectoryName (): String = " SamHelloWorldApp"
You can’t perform that action at this time.
0 commit comments