[rider] Replace @TestEnvironment(solution) with @Solution

GitOrigin-RevId: 5d9a5140b2b02097bb462088d0c135e441dd07b6
JetBrains · Aug 24, 2024 · d590b4a · d590b4a
1 parent 90e7214
commit d590b4a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 36 deletions.
diff --git a/...rc/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/markup/FSharpHoverDocTest.kt b/...rc/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/markup/FSharpHoverDocTest.kt
@@ -42,17 +42,13 @@ class FSharpHoverDocTest : DocumentationTestBase() {
   fun `test multiple frameworks`() = doTest("Program.fs", "Program.fs")
 
   @Test
-  @TestEnvironment(
-    solution = "SwaggerProviderCSharp",
-    sdkVersion = SdkVersion.DOT_NET_6
-  )
+  @TestEnvironment(sdkVersion = SdkVersion.DOT_NET_6)
+  @Solution("SwaggerProviderCSharp")
   fun `provided method in csharp`() = doTest("CSharpLibrary.cs", "CSharpLibrary.cs")
 
   @Test
-  @TestEnvironment(
-    solution = "SwaggerProviderCSharp",
-    sdkVersion = SdkVersion.DOT_NET_6
-  )
+  @TestEnvironment(sdkVersion = SdkVersion.DOT_NET_6)
+  @Solution("SwaggerProviderCSharp")
   fun `provided abbreviation in csharp`() = doTestWithTypeProviders("OpenAPI Provider for")
 
   @Test

diff --git a/...tlin/com/jetbrains/rider/plugins/fsharp/test/cases/projectModel/FSharpProjectModelTest.kt b/...tlin/com/jetbrains/rider/plugins/fsharp/test/cases/projectModel/FSharpProjectModelTest.kt
@@ -2,10 +2,7 @@ package com.jetbrains.rider.plugins.fsharp.test.cases.projectModel
 
 import com.jetbrains.rd.ide.model.RdDndOrderType
 import com.jetbrains.rider.plugins.fsharp.test.fcsHost
-import com.jetbrains.rider.test.annotations.Issue
-import com.jetbrains.rider.test.annotations.Issues
-import com.jetbrains.rider.test.annotations.Mute
-import com.jetbrains.rider.test.annotations.TestEnvironment
+import com.jetbrains.rider.test.annotations.*
 import com.jetbrains.rider.test.base.ProjectModelBaseTest
 import com.jetbrains.rider.test.env.enums.SdkVersion
 import com.jetbrains.rider.test.framework.TestProjectModelContext
@@ -51,10 +48,8 @@ class FSharpProjectModelTest : ProjectModelBaseTest() {
 
   @Test
   @Mute("RIDER-110482")
-  @TestEnvironment(
-    solution = "FSharpProjectTree",
-    sdkVersion = SdkVersion.DOT_NET_5
-  )
+  @TestEnvironment(sdkVersion = SdkVersion.DOT_NET_5)
+  @Solution("FSharpProjectTree")
   fun testFSharpProjectStructure() {
     doTestDumpProjectsView {
       dump2("Init", false, false) {
@@ -182,10 +177,8 @@ class FSharpProjectModelTest : ProjectModelBaseTest() {
   }
 
   @Test
-  @TestEnvironment(
-    solution = "FsprojWithTwoFiles",
-    sdkVersion = SdkVersion.DOT_NET_5
-  )
+  @TestEnvironment(sdkVersion = SdkVersion.DOT_NET_5)
+  @Solution("FsprojWithTwoFiles")
   fun testManualFsprojChange() {
     doTestDumpProjectsView {
       dump2("Init", false, false) { }
@@ -203,10 +196,8 @@ class FSharpProjectModelTest : ProjectModelBaseTest() {
   }
 
   @Test(description = "RIDER-107198")
-  @TestEnvironment(
-    solution = "SolutionWithDuplicateTargets",
-    sdkVersion = SdkVersion.DOT_NET_5
-  )
+  @TestEnvironment(sdkVersion = SdkVersion.DOT_NET_5)
+  @Solution("SolutionWithDuplicateTargets")
   fun doNoneItemDuplicatesTest() {
     doTestDumpProjectsView {
       dump2("Init", checkSlnFile = false, compareProjFile = false) { }

diff --git a/...in/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersCSharpTest.kt b/...in/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersCSharpTest.kt
@@ -37,10 +37,8 @@ class TypeProvidersCSharpTest : BaseTypeProvidersTest() {
   }
 
   @Test
-  @TestEnvironment(
-    solution = "SwaggerProviderCSharp",
-    sdkVersion = SdkVersion.DOT_NET_6
-  )
+  @TestEnvironment(sdkVersion = SdkVersion.DOT_NET_6)
+  @Solution("SwaggerProviderCSharp")
   fun changeStaticArg() {
     withOpenedEditor(project, "CSharpLibrary/CSharpLibrary.cs", "CSharpLibrary.cs") {
       waitForDaemon()

diff --git a/...n/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersRuntimeTest.kt b/...n/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersRuntimeTest.kt
@@ -4,6 +4,7 @@ import com.jetbrains.rdclient.testFramework.waitForDaemon
 import com.jetbrains.rider.daemon.util.hasErrors
 import com.jetbrains.rider.plugins.fsharp.test.fcsHost
 import com.jetbrains.rider.test.annotations.Mute
+import com.jetbrains.rider.test.annotations.Solution
 import com.jetbrains.rider.test.annotations.TestEnvironment
 import com.jetbrains.rider.test.asserts.shouldBeFalse
 import com.jetbrains.rider.test.asserts.shouldBeTrue
@@ -23,9 +24,9 @@ class TypeProvidersRuntimeTest : BaseTypeProvidersTest() {
   @TestEnvironment(
     sdkVersion = SdkVersion.DOT_NET_CORE_3_1,
     buildTool = BuildTool.FULL,
-    platform = [PlatformType.WINDOWS_ALL],
-    solution = "TypeProviderLibrary"
+    platform = [PlatformType.WINDOWS_ALL]
   )
+  @Solution("TypeProviderLibrary")
   fun framework461() = doTest(".NET Framework 4.8")
 
   @Test
@@ -45,10 +46,8 @@ class TypeProvidersRuntimeTest : BaseTypeProvidersTest() {
   fun net7() = doTest(".NET 7")
 
   @Mute("RIDER-103648")
-  @TestEnvironment(
-    sdkVersion = SdkVersion.DOT_NET_CORE_3_1,
-    solution = "FscTypeProviderLibrary"
-  )
+  @TestEnvironment(sdkVersion = SdkVersion.DOT_NET_CORE_3_1)
+  @Solution("FscTypeProviderLibrary")
   fun fsc() = doTest(".NET Framework 4.8")
 
   private fun doTest(expectedRuntime: String) {

diff --git a/...t/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersTest.kt b/...t/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/typeProviders/TypeProvidersTest.kt
@@ -38,18 +38,18 @@ class TypeProvidersTest : BaseTypeProvidersTest() {
   @Test
   @Mute("RIDER-111885", platforms = [PlatformType.LINUX_ALL, PlatformType.MAC_OS_ALL])
   @TestEnvironment(
-    solution = "CsvTypeProvider",
     sdkVersion = SdkVersion.DOT_NET_6,
     buildTool = BuildTool.SDK
   )
+  @Solution("CsvTypeProvider")
   fun `csvProvider - units of measure`() = doTest("Library")
 
   @Test(description = "RIDER-101544")
   @TestEnvironment(
-    solution = "SwaggerProviderCSharp",
     sdkVersion = SdkVersion.DOT_NET_6,
     buildTool = BuildTool.SDK
   )
+  @Solution("SwaggerProviderCSharp")
   fun `srtp analysis`() {
     withOpenedEditor(project, "SwaggerProviderLibrary/SwaggerProvider.fs", "SwaggerProvider.fs") {
       waitForDaemon()