From 2d4a66fd5da659c40055006e3c5dbb91c6f4b6f4 Mon Sep 17 00:00:00 2001 From: Dmitry Kichinsky Date: Mon, 11 Dec 2023 09:55:42 +0100 Subject: [PATCH] [maven] encapsulate CodeInsightTestFixture in MavenDomTestCase GitOrigin-RevId: 8907aa2a62d66bb33b155b2444557c350a2e6b44 --- .../actions/AddMavenDependencyQuickFixTest.kt | 20 ++-- .../MavenAutomaticVersioningResolutionTest.kt | 4 +- ...enDependencyCompletionAndResolutionTest.kt | 2 +- .../dom/MavenDependencySmartCompletionTest.kt | 94 +++++++++---------- .../idea/maven/dom/MavenDomAnnotatorTest.kt | 4 +- .../maven/dom/MavenDomPathWithPropertyTest.kt | 4 +- .../dom/MavenDomSoftReferencesInParentTest.kt | 2 +- ...edPropertiesCompletionAndResolutionTest.kt | 6 +- .../maven/dom/MavenModelValidationTest.kt | 34 +++---- .../MavenModuleCompletionAndResolutionTest.kt | 20 ++-- .../MavenParentCompletionAndResolutionTest.kt | 10 +- ...avenPropertyCompletionAndResolutionTest.kt | 10 +- .../dom/MavenRelativePathResolutionTest.kt | 8 +- .../idea/maven/dom/MavenSpellcheckerTest.kt | 2 +- .../maven/dom/MavenSuperNavigationTest.kt | 18 ++-- .../idea/maven/dom/MavenTypingTest.kt | 2 +- ...MavenDuplicatedDependencyInspectionTest.kt | 12 +-- .../MavenDuplicatedPluginInspectionTest.java | 2 +- .../dom/MavenRedundantGroupIdTest.java | 12 +-- .../MavenAddDependencyIntentionTest.kt | 6 +- .../maven/testFramework/MavenDomTestCase.java | 38 ++++---- 21 files changed, 157 insertions(+), 153 deletions(-) diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/actions/AddMavenDependencyQuickFixTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/actions/AddMavenDependencyQuickFixTest.kt index bf40943ec738..7d1a782934a3 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/actions/AddMavenDependencyQuickFixTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/actions/AddMavenDependencyQuickFixTest.kt @@ -30,7 +30,7 @@ import org.junit.Test class AddMavenDependencyQuickFixTest : MavenDomWithIndicesTestCase() { private fun findAddMavenIntention(): IntentionAction { - for (intention in myFixture.getAvailableIntentions()) { + for (intention in fixture.getAvailableIntentions()) { if (intention.getText().contains("Add Maven")) { return intention } @@ -59,7 +59,7 @@ class AddMavenDependencyQuickFixTest : MavenDomWithIndicesTestCase() { 1 """.trimIndent()) - myFixture.configureFromExistingVirtualFile(f) + fixture.configureFromExistingVirtualFile(f) val intentionAction = findAddMavenIntention() @@ -67,7 +67,7 @@ class AddMavenDependencyQuickFixTest : MavenDomWithIndicesTestCase() { waitForImportWithinTimeout { withContext(Dispatchers.EDT) { - intentionAction.invoke(myProject, myFixture.getEditor(), myFixture.getFile()) + intentionAction.invoke(myProject, fixture.getEditor(), fixture.getFile()) } } val pomText = readAction { PsiManager.getInstance(myProject).findFile(myProjectPom)!!.getText() } @@ -96,20 +96,20 @@ class AddMavenDependencyQuickFixTest : MavenDomWithIndicesTestCase() { 1 """.trimIndent()) - myFixture.configureFromExistingVirtualFile(f) + fixture.configureFromExistingVirtualFile(f) val intentionAction = findAddMavenIntention() MavenArtifactSearchDialog.ourResultForTest = listOf(MavenId("commons-io", "commons-io", "2.4")) waitForImportWithinTimeout { withContext(Dispatchers.EDT) { - intentionAction.invoke(myProject, myFixture.getEditor(), myFixture.getFile()) + intentionAction.invoke(myProject, fixture.getEditor(), fixture.getFile()) } } MavenArtifactSearchDialog.ourResultForTest = listOf(MavenId("commons-io", "commons-io", "2.4")) waitForImportWithinTimeout { withContext(Dispatchers.EDT) { - intentionAction.invoke(myProject, myFixture.getEditor(), myFixture.getFile()) + intentionAction.invoke(myProject, fixture.getEditor(), fixture.getFile()) } } val pomText = readAction { PsiManager.getInstance(myProject).findFile(myProjectPom)!!.getText() } @@ -159,14 +159,14 @@ class AddMavenDependencyQuickFixTest : MavenDomWithIndicesTestCase() { """.trimIndent()) - myFixture.configureFromExistingVirtualFile(f) + fixture.configureFromExistingVirtualFile(f) val intentionAction = findAddMavenIntention() MavenArtifactSearchDialog.ourResultForTest = listOf(MavenId("commons-io", "commons-io", "2.4")) waitForImportWithinTimeout { withContext(Dispatchers.EDT) { - intentionAction.invoke(myProject, myFixture.getEditor(), myFixture.getFile()) + intentionAction.invoke(myProject, fixture.getEditor(), fixture.getFile()) } } val pomText = readAction { PsiManager.getInstance(myProject).findFile(myProjectPom)!!.getText() } @@ -207,7 +207,7 @@ class AddMavenDependencyQuickFixTest : MavenDomWithIndicesTestCase() { 1 """.trimIndent()) - myFixture.configureFromExistingVirtualFile(f) + fixture.configureFromExistingVirtualFile(f) val intentionAction = findAddMavenIntention() @@ -215,7 +215,7 @@ class AddMavenDependencyQuickFixTest : MavenDomWithIndicesTestCase() { waitForImportWithinTimeout { withContext(Dispatchers.EDT) { - intentionAction.invoke(myProject, myFixture.getEditor(), myFixture.getFile()) + intentionAction.invoke(myProject, fixture.getEditor(), fixture.getFile()) } } val pomText = readAction { PsiManager.getInstance(myProject).findFile(myProjectPom)!!.getText() } diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenAutomaticVersioningResolutionTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenAutomaticVersioningResolutionTest.kt index c35dbfd8824a..88f2ce410405 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenAutomaticVersioningResolutionTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenAutomaticVersioningResolutionTest.kt @@ -43,7 +43,7 @@ class MavenAutomaticVersioningResolutionTest : MavenDomTestCase() { m """.trimIndent()) assertResolved(m, findPsiFile(myProjectPom)) - myFixture.enableInspections(listOf>(MavenParentMissedVersionInspection::class.java)) + fixture.enableInspections(listOf>(MavenParentMissedVersionInspection::class.java)) checkHighlighting(m) } @@ -78,7 +78,7 @@ class MavenAutomaticVersioningResolutionTest : MavenDomTestCase() { m """.trimIndent()) - myFixture.enableInspections(listOf>(MavenParentMissedVersionInspection::class.java)) + fixture.enableInspections(listOf>(MavenParentMissedVersionInspection::class.java)) checkHighlighting(m) } diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDependencyCompletionAndResolutionTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDependencyCompletionAndResolutionTest.kt index 96021ba8a81a..53b97de16bc7 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDependencyCompletionAndResolutionTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDependencyCompletionAndResolutionTest.kt @@ -713,7 +713,7 @@ $libPath try { // prevent file path from wrapping. xmlSettings.XML_TEXT_WRAP = CommonCodeStyleSettings.DO_NOT_WRAP - myFixture.launchAction(action) + fixture.launchAction(action) } finally { xmlSettings.XML_TEXT_WRAP = prevValue diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDependencySmartCompletionTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDependencySmartCompletionTest.kt index 63465e2bb5f6..b705f6b781f9 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDependencySmartCompletionTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDependencySmartCompletionTest.kt @@ -34,14 +34,14 @@ class MavenDependencySmartCompletionTest : MavenDomWithIndicesTestCase() { """.trimIndent()) configTest(myProjectPom) - val elements = myFixture.completeBasic() - assertCompletionVariants(myFixture, RENDERING_TEXT, "junit:junit") + val elements = fixture.completeBasic() + assertCompletionVariants(fixture, RENDERING_TEXT, "junit:junit") UsefulTestCase.assertSize(1, elements) - myFixture.type('\n') + fixture.type('\n') - myFixture.checkResult(createPomXml(""" + fixture.checkResult(createPomXml(""" test project 1 @@ -77,11 +77,11 @@ class MavenDependencySmartCompletionTest : MavenDomWithIndicesTestCase() { """.trimIndent()) configTest(myProjectPom) - myFixture.complete(CompletionType.BASIC) - assertCompletionVariants(myFixture, RENDERING_TEXT, "junit:junit") - myFixture.type('\n') + fixture.complete(CompletionType.BASIC) + assertCompletionVariants(fixture, RENDERING_TEXT, "junit:junit") + fixture.type('\n') - myFixture.checkResult(createPomXml(""" + fixture.checkResult(createPomXml(""" test project 1 @@ -132,13 +132,13 @@ class MavenDependencySmartCompletionTest : MavenDomWithIndicesTestCase() { configTest(myProjectPom) - val elements = myFixture.completeBasic() + val elements = fixture.completeBasic() UsefulTestCase.assertSize(1, elements) - myFixture.type('\n') + fixture.type('\n') - myFixture.checkResult(createPomXml(""" + fixture.checkResult(createPomXml(""" test project 1 @@ -186,19 +186,19 @@ class MavenDependencySmartCompletionTest : MavenDomWithIndicesTestCase() { """.trimIndent()) - myFixture.configureFromExistingVirtualFile(myProjectPom) + fixture.configureFromExistingVirtualFile(myProjectPom) - var elements = myFixture.completeBasic() + var elements = fixture.completeBasic() assertTrue(elements.size > 0) assertEquals("junit:junit:3.8.1", elements[0].getLookupString()) - myFixture.type('\n') + fixture.type('\n') - elements = myFixture.completeBasic() + elements = fixture.completeBasic() UsefulTestCase.assertSize(1, elements) - myFixture.type('\n') + fixture.type('\n') - myFixture.checkResult(createPomXml(""" + fixture.checkResult(createPomXml(""" testproject1 @@ -211,7 +211,7 @@ class MavenDependencySmartCompletionTest : MavenDomWithIndicesTestCase() { """.trimIndent())) assertTrue( - myFixture.getLookupElementStrings()!!.containsAll(mutableListOf("3.8.1", "4.0"))) + fixture.getLookupElementStrings()!!.containsAll(mutableListOf("3.8.1", "4.0"))) } @Test @@ -231,19 +231,19 @@ class MavenDependencySmartCompletionTest : MavenDomWithIndicesTestCase() { """.trimIndent()) - myFixture.configureFromExistingVirtualFile(myProjectPom) + fixture.configureFromExistingVirtualFile(myProjectPom) - val elements = myFixture.completeBasic() + val elements = fixture.completeBasic() - assertCompletionVariants(myFixture, RENDERING_TEXT, "intellijartifactanother", "intellijartifact") + assertCompletionVariants(fixture, RENDERING_TEXT, "intellijartifactanother", "intellijartifact") - myFixture.type('\n') + fixture.type('\n') - assertCompletionVariants(myFixture, RENDERING_TEXT, "org.intellijgroup") + assertCompletionVariants(fixture, RENDERING_TEXT, "org.intellijgroup") - myFixture.type("\n") + fixture.type("\n") - myFixture.checkResult(createPomXml(""" + fixture.checkResult(createPomXml(""" testproject1 @@ -272,13 +272,13 @@ class MavenDependencySmartCompletionTest : MavenDomWithIndicesTestCase() { """.trimIndent()) - myFixture.configureFromExistingVirtualFile(myProjectPom) - val elements = myFixture.completeBasic() + fixture.configureFromExistingVirtualFile(myProjectPom) + val elements = fixture.completeBasic() UsefulTestCase.assertSize(1, elements) - myFixture.type('\n') + fixture.type('\n') - assertCompletionVariants(myFixture, RENDERING_TEXT, "org.example") + assertCompletionVariants(fixture, RENDERING_TEXT, "org.example") } @Test @@ -300,21 +300,21 @@ class MavenDependencySmartCompletionTest : MavenDomWithIndicesTestCase() { """.trimIndent()) - myFixture.configureFromExistingVirtualFile(myProjectPom) + fixture.configureFromExistingVirtualFile(myProjectPom) - val elements = myFixture.completeBasic() + val elements = fixture.completeBasic() UsefulTestCase.assertSize(1, elements) - myFixture.type('\n') + fixture.type('\n') - assertCompletionVariants(myFixture, RENDERING_TEXT, "org.example") + assertCompletionVariants(fixture, RENDERING_TEXT, "org.example") - myFixture.type('\n') + fixture.type('\n') - assertCompletionVariants(myFixture, RENDERING_TEXT, "1.0", "2.0") + assertCompletionVariants(fixture, RENDERING_TEXT, "1.0", "2.0") - myFixture.type('\n') + fixture.type('\n') - myFixture.checkResult(createPomXml(""" + fixture.checkResult(createPomXml(""" testproject1 @@ -361,17 +361,17 @@ class MavenDependencySmartCompletionTest : MavenDomWithIndicesTestCase() { """.trimIndent()) - myFixture.configureFromExistingVirtualFile(myProjectPom) + fixture.configureFromExistingVirtualFile(myProjectPom) - var elements = myFixture.completeBasic() + var elements = fixture.completeBasic() UsefulTestCase.assertSize(1, elements!!) - myFixture.type('\n') + fixture.type('\n') - elements = myFixture.completeBasic() + elements = fixture.completeBasic() UsefulTestCase.assertSize(1, elements) - myFixture.type('\n') + fixture.type('\n') - myFixture.checkResult(createPomXml(""" + fixture.checkResult(createPomXml(""" testproject1 @@ -432,13 +432,13 @@ class MavenDependencySmartCompletionTest : MavenDomWithIndicesTestCase() { """.trimIndent()) - myFixture.configureFromExistingVirtualFile(myProjectPom) + fixture.configureFromExistingVirtualFile(myProjectPom) - val elements = myFixture.complete(CompletionType.BASIC) + val elements = fixture.complete(CompletionType.BASIC) UsefulTestCase.assertSize(1, elements) - myFixture.type('\n') + fixture.type('\n') - myFixture.checkResult(createPomXml(""" + fixture.checkResult(createPomXml(""" testproject1 diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomAnnotatorTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomAnnotatorTest.kt index ce0838c8ed67..178d9c56618e 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomAnnotatorTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomAnnotatorTest.kt @@ -166,10 +166,10 @@ class MavenDomAnnotatorTest : MavenDomTestCase() { private fun checkGutters(virtualFile: VirtualFile, expectedProperties: Collection) { val file = PsiManager.getInstance(myProject).findFile(virtualFile)!! - myFixture.configureFromExistingVirtualFile(virtualFile) + fixture.configureFromExistingVirtualFile(virtualFile) val text = file.text - val actualProperties = myFixture.doHighlighting() + val actualProperties = fixture.doHighlighting() .filter { it.gutterIconRenderer != null } .map { text.substring(it.getStartOffset(), it.getEndOffset()) } .map { it.replace(" ", "") } diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomPathWithPropertyTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomPathWithPropertyTest.kt index f17d7125e199..2082515d8751 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomPathWithPropertyTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomPathWithPropertyTest.kt @@ -45,10 +45,10 @@ class MavenDomPathWithPropertyTest : MavenDomTestCase() { val dir = createProjectSubDir("aaa/bbb/res") val bbb = dir.getParent() - myFixture.renameElement(PsiManager.getInstance(myFixture.getProject()).findDirectory(bbb)!!, "Z") + fixture.renameElement(PsiManager.getInstance(fixture.getProject()).findDirectory(bbb)!!, "Z") - val text = PsiManager.getInstance(myFixture.getProject()).findFile(myProjectPom)!!.getText() + val text = PsiManager.getInstance(fixture.getProject()).findFile(myProjectPom)!!.getText() assert(text.contains("aaa/Z/res")) assert(text.contains("aaa/Z/res")) assert(text.contains("aaa/Z/res")) diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomSoftReferencesInParentTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomSoftReferencesInParentTest.kt index 04d23cae19e3..4cae0eefe564 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomSoftReferencesInParentTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomSoftReferencesInParentTest.kt @@ -101,7 +101,7 @@ class MavenDomSoftReferencesInParentTest : MavenDomTestCase() { } private suspend fun getDocument(f: VirtualFile): Document { - return readAction { myFixture.getDocument(findPsiFile(f)!!) } + return readAction { fixture.getDocument(findPsiFile(f)!!) } } private suspend fun checkHighlightingEdt() { diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenFilteredPropertiesCompletionAndResolutionTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenFilteredPropertiesCompletionAndResolutionTest.kt index 1e8e72bf9a21..b04d0209fdcf 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenFilteredPropertiesCompletionAndResolutionTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenFilteredPropertiesCompletionAndResolutionTest.kt @@ -514,7 +514,7 @@ class MavenFilteredPropertiesCompletionAndResolutionTest : MavenDomWithIndicesTe val f = createProjectSubFile("res/foo.properties", "foo=abc\${xxx}abc") assertResolved(f, findPropertyPsiElement(filter, "xxx")!!) - myFixture.configureFromExistingVirtualFile(filter) + fixture.configureFromExistingVirtualFile(filter) doInlineRename(f, "bar") assertEquals("foo=abc\${bar}abc", findPsiFile(f).getText()) @@ -676,9 +676,9 @@ class MavenFilteredPropertiesCompletionAndResolutionTest : MavenDomWithIndicesTe """.trimIndent()) - myFixture.configureFromExistingVirtualFile(f) + fixture.configureFromExistingVirtualFile(f) - val attribute = PsiTreeUtil.getParentOfType(myFixture.getFile().findElementAt(myFixture.getCaretOffset()), XmlAttribute::class.java) + val attribute = PsiTreeUtil.getParentOfType(fixture.getFile().findElementAt(fixture.getCaretOffset()), XmlAttribute::class.java) val references = attribute!!.getReferences() diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModelValidationTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModelValidationTest.kt index db41a7263ce3..42efc6de6f8e 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModelValidationTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModelValidationTest.kt @@ -55,7 +55,7 @@ class MavenModelValidationTest : MavenDomWithIndicesTestCase() { """.trimIndent()) configTest(modulePom) - val elementAtCaret = myFixture.getElementAtCaret() + val elementAtCaret = fixture.getElementAtCaret() UsefulTestCase.assertInstanceOf(elementAtCaret, PsiFile::class.java) assertEquals((elementAtCaret as PsiFile).getVirtualFile(), myProjectPom) @@ -63,7 +63,7 @@ class MavenModelValidationTest : MavenDomWithIndicesTestCase() { @Test fun testUnderstandingProjectSchemaWithoutNamespace() = runBlocking { - myFixture.saveText(myProjectPom, + fixture.saveText(myProjectPom, """ @@ -99,7 +99,7 @@ class MavenModelValidationTest : MavenDomWithIndicesTestCase() { @Test fun testAbsentModelVersion() = runBlocking { - myFixture.saveText(myProjectPom, + fixture.saveText(myProjectPom, """ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> foo @@ -110,7 +110,7 @@ class MavenModelValidationTest : MavenDomWithIndicesTestCase() { @Test fun testAbsentArtifactId() = runBlocking { - myFixture.saveText(myProjectPom, + fixture.saveText(myProjectPom, """ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 @@ -121,7 +121,7 @@ class MavenModelValidationTest : MavenDomWithIndicesTestCase() { @Test fun testUnknownModelVersion() = runBlocking { - myFixture.saveText(myProjectPom, + fixture.saveText(myProjectPom, """ 666 @@ -143,7 +143,7 @@ class MavenModelValidationTest : MavenDomWithIndicesTestCase() { @Test fun testAddingSettingsXmlReadingProblemsToProjectTag() = runBlocking { - myFixture.saveText(myProjectPom, + fixture.saveText(myProjectPom, """ 4.0.0 @@ -156,7 +156,7 @@ class MavenModelValidationTest : MavenDomWithIndicesTestCase() { readProjects() - myFixture.saveText(myProjectPom, + fixture.saveText(myProjectPom, """ <project> 4.0.0 @@ -170,7 +170,7 @@ class MavenModelValidationTest : MavenDomWithIndicesTestCase() { @Test fun testAddingProfilesXmlReadingProblemsToProjectTag() = runBlocking { - myFixture.saveText(myProjectPom, + fixture.saveText(myProjectPom, """ 4.0.0 @@ -183,7 +183,7 @@ class MavenModelValidationTest : MavenDomWithIndicesTestCase() { readProjects() - myFixture.saveText(myProjectPom, + fixture.saveText(myProjectPom, """ <project> 4.0.0 @@ -197,7 +197,7 @@ class MavenModelValidationTest : MavenDomWithIndicesTestCase() { @Test fun testAddingStructureReadingProblemsToParentTag() = runBlocking { - myFixture.saveText(myProjectPom, + fixture.saveText(myProjectPom, """ 4.0.0 @@ -214,7 +214,7 @@ class MavenModelValidationTest : MavenDomWithIndicesTestCase() { readProjects() - myFixture.saveText(myProjectPom, + fixture.saveText(myProjectPom, """ 4.0.0 @@ -242,7 +242,7 @@ class MavenModelValidationTest : MavenDomWithIndicesTestCase() { <<< """.trimIndent()) - myFixture.saveText(myProjectPom, + fixture.saveText(myProjectPom, """ 4.0.0 @@ -259,7 +259,7 @@ class MavenModelValidationTest : MavenDomWithIndicesTestCase() { """.trimIndent()) readProjects() - myFixture.saveText(myProjectPom, + fixture.saveText(myProjectPom, """ 4.0.0 @@ -279,7 +279,7 @@ class MavenModelValidationTest : MavenDomWithIndicesTestCase() { @Test fun testDoNotAddReadingSyntaxProblemsToProjectTag() = runBlocking { - myFixture.saveText(myProjectPom, + fixture.saveText(myProjectPom, """ 4.0.0 @@ -291,7 +291,7 @@ class MavenModelValidationTest : MavenDomWithIndicesTestCase() { readProjects() - myFixture.saveText(myProjectPom, + fixture.saveText(myProjectPom, """ 4.0.0 @@ -305,7 +305,7 @@ class MavenModelValidationTest : MavenDomWithIndicesTestCase() { @Test fun testDoNotAddDependencyAndModuleProblemsToProjectTag() = runBlocking { - myFixture.saveText(myProjectPom, + fixture.saveText(myProjectPom, """ 4.0.0 @@ -328,7 +328,7 @@ class MavenModelValidationTest : MavenDomWithIndicesTestCase() { readProjects() - myFixture.saveText(myProjectPom, + fixture.saveText(myProjectPom, """ 4.0.0 diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModuleCompletionAndResolutionTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModuleCompletionAndResolutionTest.kt index 18f1416f971c..24317e4a249c 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModuleCompletionAndResolutionTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenModuleCompletionAndResolutionTest.kt @@ -344,7 +344,7 @@ class MavenModuleCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { val i = getIntentionAtCaret(createModuleIntention) assertNotNull(i) - myFixture.launchAction(i) + fixture.launchAction(i) assertCreateModuleFixResult( "subDir/newModule/pom.xml", @@ -387,7 +387,7 @@ class MavenModuleCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { val i = getIntentionAtCaret(createModuleIntention) assertNotNull(i) - myFixture.launchAction(i) + fixture.launchAction(i) assertCreateModuleFixResult( "subDir/newModule.xml", @@ -431,7 +431,7 @@ class MavenModuleCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { val i = getIntentionAtCaret(createModuleIntention) assertNotNull(i) - myFixture.launchAction(i) + fixture.launchAction(i) assertCreateModuleFixResult( "subDir/newModule.xml/pom.xml", @@ -477,7 +477,7 @@ class MavenModuleCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { val i = getIntentionAtCaret(createModuleIntention) assertNotNull(i) - myFixture.launchAction(i) + fixture.launchAction(i) assertCreateModuleFixResult( "newModule/pom.xml", @@ -522,7 +522,7 @@ class MavenModuleCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { val i = getIntentionAtCaret(createModuleIntention) assertNotNull(i) - myFixture.launchAction(i) + fixture.launchAction(i) val pom = myProjectRoot.findFileByRelativePath("subDir/newModule/pom.xml") assertNotNull(pom) @@ -548,7 +548,7 @@ class MavenModuleCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { val i = getIntentionAtCaret(createModuleIntention) assertNotNull(i) - myFixture.launchAction(i) + fixture.launchAction(i) assertCreateModuleFixResult( "newModule/pom.xml", @@ -590,7 +590,7 @@ class MavenModuleCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { val i = getIntentionAtCaret(createModuleWithParentIntention) assertNotNull(i) - myFixture.launchAction(i) + fixture.launchAction(i) assertCreateModuleFixResult( "newModule/pom.xml", @@ -638,7 +638,7 @@ class MavenModuleCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { val i = getIntentionAtCaret(createModuleWithParentIntention) assertNotNull(i) - myFixture.launchAction(i) + fixture.launchAction(i) assertCreateModuleFixResult( "ppp/newModule/pom.xml", @@ -677,7 +677,7 @@ class MavenModuleCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { importProjectAsync(parentPom) - myFixture.saveText(parentPom, createPomXml( + fixture.saveText(parentPom, createPomXml( """ test project @@ -690,7 +690,7 @@ class MavenModuleCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { PsiDocumentManager.getInstance(myProject).commitAllDocuments() val i = getIntentionAtCaret(parentPom, createModuleWithParentIntention) assertNotNull(i) - myFixture.launchAction(i) + fixture.launchAction(i) assertCreateModuleFixResult( "ppp/newModule/pom.xml", diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenParentCompletionAndResolutionTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenParentCompletionAndResolutionTest.kt index 96ca5f68d968..3f5e08a53819 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenParentCompletionAndResolutionTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenParentCompletionAndResolutionTest.kt @@ -248,7 +248,7 @@ class MavenParentCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { """.trimIndent()) - myFixture.enableInspections(MavenRedundantGroupIdInspection::class.java) + fixture.enableInspections(MavenRedundantGroupIdInspection::class.java) checkHighlighting() } @@ -303,7 +303,7 @@ class MavenParentCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { m1 """.trimIndent()) - myFixture.enableInspections(listOf>(MavenPropertyInParentInspection::class.java)) + fixture.enableInspections(listOf>(MavenPropertyInParentInspection::class.java)) checkHighlighting(m2) } @@ -358,7 +358,7 @@ class MavenParentCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { m1 """.trimIndent()) - myFixture.enableInspections(listOf>(MavenPropertyInParentInspection::class.java)) + fixture.enableInspections(listOf>(MavenPropertyInParentInspection::class.java)) checkHighlighting(m2) } @@ -504,7 +504,7 @@ class MavenParentCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { """.trimIndent()) importProjectWithErrors() - myFixture.enableInspections(MavenParentMissedVersionInspection::class.java) + fixture.enableInspections(MavenParentMissedVersionInspection::class.java) checkHighlighting() } @@ -563,7 +563,7 @@ class MavenParentCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { val i = getIntentionAtCaret("Fix Relative Path") assertNotNull(i) - myFixture.launchAction(i) + fixture.launchAction(i) val el = getElementAtCaret(myProjectPom) assertEquals("bar/pom.xml", ElementManipulators.getValueText(el)) diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyCompletionAndResolutionTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyCompletionAndResolutionTest.kt index 0c96b65d0eed..34e8fa8a7349 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyCompletionAndResolutionTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyCompletionAndResolutionTest.kt @@ -756,9 +756,9 @@ class MavenPropertyCompletionAndResolutionTest : MavenDomTestCase() { """.trimIndent()) - myFixture.configureFromExistingVirtualFile(profiles) - myFixture.complete(CompletionType.BASIC) - val strings = myFixture.getLookupElementStrings()!! + fixture.configureFromExistingVirtualFile(profiles) + fixture.complete(CompletionType.BASIC) + val strings = fixture.getLookupElementStrings()!! assert(strings.containsAll(mutableListOf("foo", "bar"))) assert(!strings.contains("xxx")) @@ -778,9 +778,9 @@ class MavenPropertyCompletionAndResolutionTest : MavenDomTestCase() { """.trimIndent()) - myFixture.configureFromExistingVirtualFile(profiles) + fixture.configureFromExistingVirtualFile(profiles) readAction { - val elementAtCaret = myFixture.getElementAtCaret() + val elementAtCaret = fixture.getElementAtCaret() assert(elementAtCaret is XmlTag) assertEquals("foo", (elementAtCaret as XmlTag).getName()) } diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenRelativePathResolutionTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenRelativePathResolutionTest.kt index 3eb2af6879e3..fcf2cef1e5c1 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenRelativePathResolutionTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenRelativePathResolutionTest.kt @@ -40,8 +40,8 @@ $relativePathUnixSeparator """ ) - myFixture.configureFromExistingVirtualFile(pom) - val resolved = myFixture.getElementAtCaret() + fixture.configureFromExistingVirtualFile(pom) + val resolved = fixture.getElementAtCaret() assertTrue(resolved is XmlFileImpl) val f = LocalFileSystem.getInstance().refreshAndFindFileByPath(file.path) val parentPsi = findPsiFile(f) @@ -72,8 +72,8 @@ $relativePathUnixSeparator """ ) - myFixture.configureFromExistingVirtualFile(pom) - val resolved = myFixture.getElementAtCaret() + fixture.configureFromExistingVirtualFile(pom) + val resolved = fixture.getElementAtCaret() assertTrue(resolved is XmlFileImpl) val f = LocalFileSystem.getInstance().refreshAndFindFileByPath(file.path) val parentPsi = findPsiFile(f) diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenSpellcheckerTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenSpellcheckerTest.kt index 2c22fba28905..b189601a6730 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenSpellcheckerTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenSpellcheckerTest.kt @@ -25,7 +25,7 @@ class MavenSpellcheckerTest : MavenDomTestCase() { @Test fun testSpell() = runBlocking { - myFixture.enableInspections(SpellCheckingInspection::class.java) + fixture.enableInspections(SpellCheckingInspection::class.java) createProjectPom(""" test diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenSuperNavigationTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenSuperNavigationTest.kt index 745f809426d0..11b3e935684d 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenSuperNavigationTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenSuperNavigationTest.kt @@ -32,9 +32,9 @@ class MavenSuperNavigationTest : MavenDomTestCase() { """.trimIndent()) - myFixture.performEditorAction("GotoSuperMethod") + fixture.performEditorAction("GotoSuperMethod") - myFixture.checkResultWithInlays( + fixture.checkResultWithInlays( createPomXml( """ test @@ -84,9 +84,9 @@ class MavenSuperNavigationTest : MavenDomTestCase() { """.trimIndent() ) - myFixture.performEditorAction("GotoSuperMethod") + fixture.performEditorAction("GotoSuperMethod") - myFixture.checkResultWithInlays( + fixture.checkResultWithInlays( createPomXml( """ test @@ -137,7 +137,7 @@ class MavenSuperNavigationTest : MavenDomTestCase() { """.trimIndent()) configTest(m1) - myFixture.performEditorAction("GotoSuperMethod") + fixture.performEditorAction("GotoSuperMethod") val offset = getEditorOffset(parent) assertEquals(0, offset) @@ -184,10 +184,10 @@ class MavenSuperNavigationTest : MavenDomTestCase() { ) configTest(m1) - myFixture.performEditorAction("GotoSuperMethod") + fixture.performEditorAction("GotoSuperMethod") configTest(parent) - myFixture.checkResultWithInlays( + fixture.checkResultWithInlays( createPomXml( """ test @@ -255,10 +255,10 @@ class MavenSuperNavigationTest : MavenDomTestCase() { ) configTest(m1) - myFixture.performEditorAction("GotoSuperMethod") + fixture.performEditorAction("GotoSuperMethod") configTest(parent) - myFixture.checkResultWithInlays( + fixture.checkResultWithInlays( createPomXml( """ test diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenTypingTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenTypingTest.kt index ce764cbb111b..e5dae8097b4d 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenTypingTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenTypingTest.kt @@ -307,7 +307,7 @@ class MavenTypingTest : MavenDomTestCase() { private fun assertTypeResultInRegularFile(f: VirtualFile, c: Char, expected: String) { type(f, c) - myFixture.checkResult(expected) + fixture.checkResult(expected) } private fun assertBackspaceResult(xml: String) { diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenDuplicatedDependencyInspectionTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenDuplicatedDependencyInspectionTest.kt index 62d2ecca211e..eb48f38568e4 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenDuplicatedDependencyInspectionTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenDuplicatedDependencyInspectionTest.kt @@ -9,7 +9,7 @@ class MavenDuplicatedDependencyInspectionTest : MavenDomWithIndicesTestCase() { override fun runInDispatchThread() = true @Test fun testDuplicatedInSameFile() = runBlocking { - myFixture.enableInspections(MavenDuplicateDependenciesInspection::class.java) + fixture.enableInspections(MavenDuplicateDependenciesInspection::class.java) createProjectPom(""" mavenParent @@ -36,7 +36,7 @@ class MavenDuplicatedDependencyInspectionTest : MavenDomWithIndicesTestCase() { @Test fun testDuplicatedInSameFileDifferentVersion() = runBlocking { - myFixture.enableInspections(MavenDuplicateDependenciesInspection::class.java) + fixture.enableInspections(MavenDuplicateDependenciesInspection::class.java) createProjectPom(""" mavenParent @@ -62,7 +62,7 @@ class MavenDuplicatedDependencyInspectionTest : MavenDomWithIndicesTestCase() { @Test fun testDuplicatedInParentDifferentScope() = runBlocking { - myFixture.enableInspections(MavenDuplicateDependenciesInspection::class.java) + fixture.enableInspections(MavenDuplicateDependenciesInspection::class.java) createModulePom("child", """ mavenParent @@ -112,7 +112,7 @@ class MavenDuplicatedDependencyInspectionTest : MavenDomWithIndicesTestCase() { @Test fun testDuplicatedInParentSameScope() = runBlocking { - myFixture.enableInspections(MavenDuplicateDependenciesInspection::class.java) + fixture.enableInspections(MavenDuplicateDependenciesInspection::class.java) createModulePom("child", """ mavenParent @@ -161,7 +161,7 @@ class MavenDuplicatedDependencyInspectionTest : MavenDomWithIndicesTestCase() { @Test fun testDuplicatedInParentDifferentVersion() = runBlocking { - myFixture.enableInspections(MavenDuplicateDependenciesInspection::class.java) + fixture.enableInspections(MavenDuplicateDependenciesInspection::class.java) createModulePom("child", """ mavenParent @@ -207,7 +207,7 @@ class MavenDuplicatedDependencyInspectionTest : MavenDomWithIndicesTestCase() { @Test fun testDuplicatedInManagedDependencies() = runBlocking { - myFixture.enableInspections(MavenDuplicateDependenciesInspection::class.java) + fixture.enableInspections(MavenDuplicateDependenciesInspection::class.java) createProjectPom(""" mavenParent diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenDuplicatedPluginInspectionTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenDuplicatedPluginInspectionTest.java index f0584b177145..77943aeba5d6 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenDuplicatedPluginInspectionTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenDuplicatedPluginInspectionTest.java @@ -10,7 +10,7 @@ public class MavenDuplicatedPluginInspectionTest extends MavenDomTestCase { @Test public void testDuplicatedPlugin() { - myFixture.enableInspections(MavenDuplicatePluginInspection.class); + getFixture().enableInspections(MavenDuplicatePluginInspection.class); createProjectPom(""" mavenParent diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenRedundantGroupIdTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenRedundantGroupIdTest.java index d55de16fe7aa..3bc1c6546962 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenRedundantGroupIdTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/inspections/dom/MavenRedundantGroupIdTest.java @@ -17,7 +17,7 @@ public class MavenRedundantGroupIdTest extends MavenDomTestCase { protected void setUp() throws Exception { super.setUp(); - myFixture.enableInspections(MavenRedundantGroupIdInspection.class); + getFixture().enableInspections(MavenRedundantGroupIdInspection.class); } @Test @@ -75,12 +75,12 @@ public class MavenRedundantGroupIdTest extends MavenDomTestCase { 1.0 """); - myFixture.configureFromExistingVirtualFile(myProjectPom); - myFixture.doHighlighting(); + getFixture().configureFromExistingVirtualFile(myProjectPom); + getFixture().doHighlighting(); - for (IntentionAction intention : myFixture.getAvailableIntentions()) { + for (IntentionAction intention : getFixture().getAvailableIntentions()) { if (intention.getText().startsWith("Remove ") && intention.getText().contains("")) { - myFixture.launchAction(intention); + getFixture().launchAction(intention); break; } } @@ -89,7 +89,7 @@ public class MavenRedundantGroupIdTest extends MavenDomTestCase { //doPostponedFormatting(myProject) PostprocessReformattingAspect.getInstance(myProject).doPostponedFormatting(); - myFixture.checkResult(MavenTestCase.createPomXml(""" + getFixture().checkResult(MavenTestCase.createPomXml(""" childA 1.0 diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/intentions/MavenAddDependencyIntentionTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/intentions/MavenAddDependencyIntentionTest.kt index 9563688fe471..a82e3f475936 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/intentions/MavenAddDependencyIntentionTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/intentions/MavenAddDependencyIntentionTest.kt @@ -94,8 +94,8 @@ class MavenAddDependencyIntentionTest : MavenDomTestCase() { private fun doTest(classText: String, referenceText: String?) { val file = createProjectSubFile("src/main/java/A.java", classText) - myFixture.configureFromExistingVirtualFile(file) - val element = PsiTreeUtil.getParentOfType(myFixture.getFile().findElementAt(myFixture.getCaretOffset()), + fixture.configureFromExistingVirtualFile(file) + val element = PsiTreeUtil.getParentOfType(fixture.getFile().findElementAt(fixture.getCaretOffset()), PsiJavaCodeReferenceElement::class.java) assertNull(element!!.resolve()) @@ -103,7 +103,7 @@ class MavenAddDependencyIntentionTest : MavenDomTestCase() { val fix = AddMavenDependencyQuickFix(element) if (referenceText == null) { - assertFalse(fix.isAvailable(myProject, myFixture.getEditor(), myFixture.getFile())) + assertFalse(fix.isAvailable(myProject, fixture.getEditor(), fixture.getFile())) } else { assertEquals(fix.getReferenceText(), referenceText) diff --git a/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenDomTestCase.java b/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenDomTestCase.java index b98f3a4f1e7c..fd522b7acfce 100644 --- a/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenDomTestCase.java +++ b/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenDomTestCase.java @@ -56,7 +56,7 @@ import java.util.*; import java.util.function.Function; public abstract class MavenDomTestCase extends MavenMultiVersionImportingTestCase { - protected CodeInsightTestFixture myFixture; + private CodeInsightTestFixture fixture; private final Map myConfigTimestamps = new HashMap<>(); private boolean myOriginalAutoCompletion; @@ -72,11 +72,11 @@ public abstract class MavenDomTestCase extends MavenMultiVersionImportingTestCas protected void setUpFixtures() throws Exception { myTestFixture = IdeaTestFixtureFactory.getFixtureFactory().createFixtureBuilder(getName()).getFixture(); - myFixture = IdeaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(myTestFixture); - myFixture.setUp(); - ((CodeInsightTestFixtureImpl)myFixture).canChangeDocumentDuringHighlighting(true); // org.jetbrains.idea.maven.utils.MavenRehighlighter + fixture = IdeaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(myTestFixture); + getFixture().setUp(); + ((CodeInsightTestFixtureImpl)getFixture()).canChangeDocumentDuringHighlighting(true); // org.jetbrains.idea.maven.utils.MavenRehighlighter - myFixture.enableInspections(MavenModelInspection.class); + getFixture().enableInspections(MavenModelInspection.class); myOriginalAutoCompletion = CodeInsightSettings.getInstance().AUTOCOMPLETE_ON_CODE_COMPLETION; CodeInsightSettings.getInstance().AUTOCOMPLETE_ON_CODE_COMPLETION = false; @@ -88,10 +88,10 @@ public abstract class MavenDomTestCase extends MavenMultiVersionImportingTestCas CodeInsightSettings.getInstance().AUTOCOMPLETE_ON_CODE_COMPLETION = myOriginalAutoCompletion; myConfigTimestamps.clear(); - myFixture.tearDown(); + getFixture().tearDown(); } finally { - myFixture = null; + fixture = null; } } @@ -109,14 +109,14 @@ public abstract class MavenDomTestCase extends MavenMultiVersionImportingTestCas MavenLog.LOG.warn("MavenDomTestCase configTest skipped"); return; } - myFixture.configureFromExistingVirtualFile(f); + getFixture().configureFromExistingVirtualFile(f); myConfigTimestamps.put(f, f.getTimeStamp()); MavenLog.LOG.warn("MavenDomTestCase configTest performed"); } protected void type(VirtualFile f, char c) { configTest(f); - myFixture.type(c); + getFixture().type(c); } protected PsiReference getReferenceAtCaret(VirtualFile f) { @@ -142,7 +142,7 @@ public abstract class MavenDomTestCase extends MavenMultiVersionImportingTestCas protected Editor getEditor(VirtualFile f) { configTest(f); - return myFixture.getEditor(); + return getFixture().getEditor(); } protected int getEditorOffset() { @@ -159,7 +159,7 @@ public abstract class MavenDomTestCase extends MavenMultiVersionImportingTestCas private PsiFile getTestPsiFile(VirtualFile f) { configTest(f); - return myFixture.getFile(); + return getFixture().getFile(); } protected XmlTag findTag(String path) { @@ -300,7 +300,7 @@ public abstract class MavenDomTestCase extends MavenMultiVersionImportingTestCas protected List getCompletionVariants(VirtualFile f, Function lookupElementStringFunction) { configTest(f); - LookupElement[] variants = myFixture.completeBasic(); + LookupElement[] variants = getFixture().completeBasic(); List result = new ArrayList<>(); for (LookupElement each : variants) { @@ -316,7 +316,7 @@ public abstract class MavenDomTestCase extends MavenMultiVersionImportingTestCas protected Set getDependencyCompletionVariants(VirtualFile f, Function lookupElementStringFunction) { configTest(f); - LookupElement[] variants = myFixture.completeBasic(); + LookupElement[] variants = getFixture().completeBasic(); Set result = new TreeSet<>(); for (LookupElement each : variants) { @@ -371,7 +371,7 @@ public abstract class MavenDomTestCase extends MavenMultiVersionImportingTestCas MavenLog.LOG.warn("checkHighlighting: psi file is null"); } else { - var document = myFixture.getDocument(psiFile); + var document = getFixture().getDocument(psiFile); if (null == document) { MavenLog.LOG.warn("checkHighlighting: document is null"); } @@ -385,7 +385,7 @@ public abstract class MavenDomTestCase extends MavenMultiVersionImportingTestCas MavenLog.LOG.warn("checkHighlighting: test configured"); try { - myFixture.testHighlighting(true, false, true, f); + getFixture().testHighlighting(true, false, true, f); } catch (Throwable throwable) { throw new RuntimeException(throwable); @@ -402,7 +402,7 @@ public abstract class MavenDomTestCase extends MavenMultiVersionImportingTestCas protected IntentionAction getIntentionAtCaret(VirtualFile pomFile, String intentionName) { configTest(pomFile); try { - List intentions = myFixture.getAvailableIntentions(); + List intentions = getFixture().getAvailableIntentions(); return CodeInsightTestUtil.findIntentionByText(intentions, intentionName); } @@ -429,7 +429,7 @@ public abstract class MavenDomTestCase extends MavenMultiVersionImportingTestCas final RenameHandler renameHandler = RenameHandlerRegistry.getInstance().getRenameHandler(context); assertNotNull(renameHandler); assertInstanceOf(renameHandler, VariableInplaceRenameHandler.class); - CodeInsightTestUtil.doInlineRename((VariableInplaceRenameHandler)renameHandler, value, myFixture); + CodeInsightTestUtil.doInlineRename((VariableInplaceRenameHandler)renameHandler, value, getFixture()); } protected void assertCannotRename() { @@ -500,6 +500,10 @@ public abstract class MavenDomTestCase extends MavenMultiVersionImportingTestCas assertUnorderedElementsAreEqual(actual, expected); } + protected @NotNull CodeInsightTestFixture getFixture() { + return fixture; + } + protected static class HighlightPointer { public PsiElement element; public String text;