diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/ModuleHighlightingTest.kt b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/ModuleHighlightingTest.kt
index 4c97b1e57bac..874742d360f8 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/ModuleHighlightingTest.kt
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/ModuleHighlightingTest.kt
@@ -40,8 +40,7 @@ class ModuleHighlightingTest : LightCodeInsightFixtureTestCase() {
}
fun testWrongFileName() {
- myFixture.configureByText("M.java", """/* ... */ module M { }""")
- myFixture.checkHighlighting()
+ highlight("M.java", """/* ... */ module M { }""")
}
fun testFileDuplicate() {
@@ -50,9 +49,7 @@ class ModuleHighlightingTest : LightCodeInsightFixtureTestCase() {
}
fun testWrongFileLocation() {
- val file = addFile("pkg/module-info.java", """module M { }""")
- myFixture.configureFromExistingVirtualFile(file)
- myFixture.checkHighlighting()
+ highlight("pkg/module-info.java", """module M { }""")
}
fun testDuplicateStatements() {
@@ -152,8 +149,10 @@ class ModuleHighlightingTest : LightCodeInsightFixtureTestCase() {
//
private fun addFile(path: String, text: String, module: ModuleDescriptor = MAIN) = VfsTestUtil.createFile(module.root(), path, text)
- private fun highlight(text: String, filter: Boolean = false) {
- myFixture.configureByText("module-info.java", text)
+ private fun highlight(text: String, filter: Boolean = false) = highlight("module-info.java", text, filter)
+
+ private fun highlight(path: String, text: String, filter: Boolean = false) {
+ myFixture.configureFromExistingVirtualFile(addFile(path, text))
if (filter) {
(myFixture as CodeInsightTestFixtureImpl).setVirtualFileFilter { it.name != PsiJavaModule.MODULE_INFO_FILE }
}