Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync with the ultimate master #790

Closed
wants to merge 2 commits into from
Closed

Sync with the ultimate master #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
301107d
cleanup - utility class is not final
develar Dec 26, 2024
7721720
[rider] Reduce deprecated usages of BaseTestWithSolution in Rider tests
Konstantin343 Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...c/main/java/com/jetbrains/rider/ideaInterop/fileTypes/fsharp/lexer/FSharpKeywordsMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import java.util.Map;

class FSharpKeywordsMap {
final class FSharpKeywordsMap {
private static final Map<CharSequence, IElementType> ourKeywordMap = CollectionFactory.createCharSequenceMap(true);

static {
Expand Down
11 changes: 8 additions & 3 deletions ...c/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/debugger/AsyncDebuggerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.jetbrains.rider.plugins.fsharp.test.cases.debugger

import com.jetbrains.rider.test.OpenSolutionParams
import com.jetbrains.rider.test.annotations.Solution
import com.jetbrains.rider.test.annotations.TestEnvironment
import com.jetbrains.rider.test.base.DebuggerTestBase
import com.jetbrains.rider.test.env.enums.SdkVersion
Expand All @@ -9,12 +11,15 @@ import org.testng.annotations.Test

@Test
@TestEnvironment(sdkVersion = SdkVersion.DOT_NET_6)
@Solution("AsyncProgram")
class AsyncDebuggerTest : DebuggerTestBase() {
override val projectName = "AsyncProgram"
override val testSolution: String = projectName

override val waitForCaches = true
override val restoreNuGetPackages = true
override fun modifyOpenSolutionParams(params: OpenSolutionParams) {
super.modifyOpenSolutionParams(params)
params.waitForCaches = true
params.restoreNuGetPackages = true
}

@Test(description = "RIDER-27263")
fun testAsyncBreakpoint() {
Expand Down
8 changes: 6 additions & 2 deletions ...tlin/com/jetbrains/rider/plugins/fsharp/test/cases/projectModel/FSharpProjectModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +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.OpenSolutionParams
import com.jetbrains.rider.test.annotations.*
import com.jetbrains.rider.test.base.ProjectModelBaseTest
import com.jetbrains.rider.test.env.enums.SdkVersion
Expand All @@ -12,9 +13,12 @@ import org.testng.annotations.Test
import java.io.File

@Test
@Solution("EmptySolution")
class FSharpProjectModelTest : ProjectModelBaseTest() {
override val testSolution: String = "EmptySolution"
override val restoreNuGetPackages = true
override fun modifyOpenSolutionParams(params: OpenSolutionParams) {
super.modifyOpenSolutionParams(params)
params.restoreNuGetPackages = true
}

private fun moveItem(from: Array<Array<String>>, to: Array<String>, orderType: RdDndOrderType? = null) {
// Wait for updating/refreshing items possibly queued by FSharpItemsContainerRefresher.
Expand Down
12 changes: 7 additions & 5 deletions .../kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/projectModel/FcsModuleReaderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import com.jetbrains.rider.plugins.fsharp.test.withNonFSharpProjectReferences
import com.jetbrains.rider.projectView.workspace.containingProjectEntity
import com.jetbrains.rider.projectView.workspace.getId
import com.jetbrains.rider.projectView.workspace.getProjectModelEntity
import com.jetbrains.rider.test.OpenSolutionParams
import com.jetbrains.rider.test.annotations.Mute
import com.jetbrains.rider.test.annotations.Solution
import com.jetbrains.rider.test.annotations.TestEnvironment
Expand All @@ -31,13 +32,17 @@ import java.time.Duration

@Test
@TestEnvironment(sdkVersion = SdkVersion.LATEST_STABLE)
@Solution("EmptySolution")
class FcsModuleReaderTest : ProjectModelBaseTest() {
companion object {
private var launchCounter = 0
}

override val testSolution: String = "EmptySolution"
override val restoreNuGetPackages = true
override fun modifyOpenSolutionParams(params: OpenSolutionParams) {
super.modifyOpenSolutionParams(params)
params.restoreNuGetPackages = true
params.backendLoadedTimeout = Duration.ofMinutes(20)
}

@AfterMethod(alwaysRun = true)
fun tearDownTestCase() {
Expand Down Expand Up @@ -236,9 +241,6 @@ class FcsModuleReaderTest : ProjectModelBaseTest() {
}
}

override val backendLoadedTimeout: Duration
get() = Duration.ofMinutes(20)

@Solution("ProjectReferencesCSharp2")
@Test
fun testGotoUsagesFromCSharp() {
Expand Down
Loading