Skip to content

Commit 7bb3efa

Browse files
ArtemiyAAAintellij-monorepo-bot
authored andcommitted
RIDER-110592 Migrate assertAllProjectsWereLoaded to SolutionApiFacade and remove redundant imports
GitOrigin-RevId: 34b43e1289f819f9f7aa18e0319c66d73c1958e6
1 parent 7e47fce commit 7bb3efa

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/projectModel/FcsModuleReaderTest.kt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import com.intellij.openapi.editor.impl.EditorImpl
55
import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx
66
import com.intellij.openapi.project.Project
77
import com.intellij.platform.backend.workspace.WorkspaceModel
8-
import com.jetbrains.rider.test.framework.executeWithGold
98
import com.jetbrains.rdclient.util.idea.pumpMessages
109
import com.jetbrains.rider.daemon.util.hasErrors
1110
import com.jetbrains.rider.editors.getProjectModelId
@@ -21,7 +20,7 @@ import com.jetbrains.rider.test.annotations.TestSettings
2120
import com.jetbrains.rider.test.base.ProjectModelBaseTest
2221
import com.jetbrains.rider.test.enums.BuildTool
2322
import com.jetbrains.rider.test.enums.sdk.SdkVersion
24-
import com.jetbrains.rider.test.framework.assertAllProjectsWereLoaded
23+
import com.jetbrains.rider.test.framework.executeWithGold
2524
import com.jetbrains.rider.test.framework.frameworkLogger
2625
import com.jetbrains.rider.test.scriptingApi.*
2726
import com.jetbrains.rider.util.idea.syncFromBackend
@@ -118,7 +117,7 @@ class FcsModuleReaderTest : ProjectModelBaseTest() {
118117
fun testUnloadReloadCSharp() {
119118
executeWithGold(testGoldFile) {
120119
withNonFSharpProjectReferences {
121-
assertAllProjectsWereLoaded(project)
120+
assertAllProjectsWereLoaded()
122121
dumpModuleReader(it, "Init", project)
123122

124123
openFsFileDumpModuleReader(it, "1. Open F# file", true, emptyList())
@@ -147,7 +146,7 @@ class FcsModuleReaderTest : ProjectModelBaseTest() {
147146
fun testTypeInsideClassUnloadReload() {
148147
executeWithGold(testGoldFile) {
149148
withNonFSharpProjectReferences {
150-
assertAllProjectsWereLoaded(project)
149+
assertAllProjectsWereLoaded()
151150
openFsFileDumpModuleReader(it, "Init", true, emptyList())
152151

153152
addReference(project, arrayOf("ProjectReferencesCSharp", "FSharpProject"), "<CSharpProject>")
@@ -201,7 +200,7 @@ class FcsModuleReaderTest : ProjectModelBaseTest() {
201200
fun testTypeOutsideClassUnloadReload() {
202201
executeWithGold(testGoldFile) {
203202
withNonFSharpProjectReferences {
204-
assertAllProjectsWereLoaded(project)
203+
assertAllProjectsWereLoaded()
205204
openFsFileDumpModuleReader(it, "Init", true, emptyList())
206205

207206
addReference(project, arrayOf("ProjectReferencesCSharp", "FSharpProject"), "<CSharpProject>")
@@ -228,7 +227,7 @@ class FcsModuleReaderTest : ProjectModelBaseTest() {
228227
fun testLoadReferenced() {
229228
executeWithGold(testGoldFile) {
230229
withNonFSharpProjectReferences {
231-
assertAllProjectsWereLoaded(project)
230+
assertAllProjectsWereLoaded()
232231
openFsFileDumpModuleReader(it, "Init", false, listOf("CSharpProject"))
233232

234233
waitForDaemonCloseAllOpenEditors(project)
@@ -245,7 +244,7 @@ class FcsModuleReaderTest : ProjectModelBaseTest() {
245244
@Test
246245
fun testGotoUsagesFromCSharp() {
247246
withNonFSharpProjectReferences {
248-
assertAllProjectsWereLoaded(project)
247+
assertAllProjectsWereLoaded()
249248
withOpenedEditor("CSharpProject/Class1.cs", "Class1.cs") {
250249
waitForNextDaemon()
251250
callAction(IdeActions.ACTION_GOTO_DECLARATION)
@@ -258,7 +257,7 @@ class FcsModuleReaderTest : ProjectModelBaseTest() {
258257
@Test
259258
fun testGotoUsagesFromCSharpChangeCSharp() {
260259
withNonFSharpProjectReferences {
261-
assertAllProjectsWereLoaded(project)
260+
assertAllProjectsWereLoaded()
262261
withOpenedEditor("CSharpProject/Class1.cs", "Class1.cs") {
263262
typeWithLatency("1")
264263
waitForNextDaemon()
@@ -272,7 +271,7 @@ class FcsModuleReaderTest : ProjectModelBaseTest() {
272271
@Test
273272
fun testGotoUsagesFromCSharpChangeCSharp2() {
274273
withNonFSharpProjectReferences {
275-
assertAllProjectsWereLoaded(project)
274+
assertAllProjectsWereLoaded()
276275

277276
withOpenedEditor("FSharpProject/Library.fs") {
278277
waitForNextDaemon()

rider-fsharp/src/test/kotlin/com/jetbrains/rider/plugins/fsharp/test/cases/projectModel/FcsProjectProviderTest.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import com.jetbrains.rider.test.annotations.TestSettings
1515
import com.jetbrains.rider.test.base.PerTestSolutionTestBase
1616
import com.jetbrains.rider.test.enums.BuildTool
1717
import com.jetbrains.rider.test.enums.sdk.SdkVersion
18-
import com.jetbrains.rider.test.framework.assertAllProjectsWereLoaded
1918
import com.jetbrains.rider.test.scriptingApi.*
2019
import com.jetbrains.rider.util.idea.syncFromBackend
2120
import org.testng.annotations.BeforeMethod
@@ -63,7 +62,7 @@ class FcsProjectProviderTest : PerTestSolutionTestBase() {
6362
@Solution("ProjectReferencesFSharp")
6463
@Test
6564
fun projectReferencesFSharp() {
66-
assertAllProjectsWereLoaded(project)
65+
assertAllProjectsWereLoaded()
6766
assertHasErrorsAndProjectStampAndReferences("ReferenceFrom/Library.fs", true, emptyList())
6867

6968
waitForDaemonCloseAllOpenEditors(project)
@@ -88,7 +87,7 @@ class FcsProjectProviderTest : PerTestSolutionTestBase() {
8887
@Test
8988
@Solution("ProjectReferencesCSharp")
9089
fun projectReferencesCSharp() {
91-
assertAllProjectsWereLoaded(project)
90+
assertAllProjectsWereLoaded()
9291
assertHasErrorsAndProjectStampAndReferences("FSharpProject/Library.fs", true, emptyList())
9392

9493
waitForDaemonCloseAllOpenEditors(project)
@@ -121,7 +120,7 @@ class FcsProjectProviderTest : PerTestSolutionTestBase() {
121120
@Solution("ProjectReferencesCSharp")
122121
fun projectReferencesCSharpNoModuleReader() {
123122
withoutNonFSharpProjectReferences {
124-
assertAllProjectsWereLoaded(project)
123+
assertAllProjectsWereLoaded()
125124
assertHasErrorsAndProjectStampAndReferences("FSharpProject/Library.fs", true, emptyList())
126125

127126
waitForDaemonCloseAllOpenEditors(project)

0 commit comments

Comments
 (0)