From 6c926543e2672c93bf00eecc656a12956ccb8cbb Mon Sep 17 00:00:00 2001
From: Pavel Dolgov <pavel.dolgov@jetbrains.com>
Date: Thu, 11 Jan 2018 20:25:35 +0300
Subject: [PATCH] Java: Don't need to access tree elements of module-info.java
 in tests

---
 .../intellij/java/codeInsight/daemon/ModuleHighlightingTest.kt | 2 --
 .../java/codeInspection/Java9NonAccessibleTypeExposedTest.kt   | 2 --
 .../java/codeInspection/Java9RedundantRequiresStatementTest.kt | 2 --
 .../java/codeInspection/Java9ReflectionClassVisibilityTest.kt  | 3 ---
 4 files changed, 9 deletions(-)

diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/ModuleHighlightingTest.kt b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/ModuleHighlightingTest.kt
index 7b3b3e0d8269..a24a7e150a8a 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/ModuleHighlightingTest.kt
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/ModuleHighlightingTest.kt
@@ -10,13 +10,11 @@ import com.intellij.codeInspection.deprecation.MarkedForRemovalInspection
 import com.intellij.java.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase
 import com.intellij.java.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.*
 import com.intellij.openapi.util.TextRange
-import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
 import org.assertj.core.api.Assertions.assertThat
 
 class ModuleHighlightingTest : LightJava9ModulesCodeInsightFixtureTestCase() {
   override fun setUp() {
     super.setUp()
-    (myFixture as CodeInsightTestFixtureImpl).setVirtualFileFilter({ it.name != "module-info.java"})
 
     addFile("module-info.java", "module M2 { }", M2)
     addFile("module-info.java", "module M3 { }", M3)
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9NonAccessibleTypeExposedTest.kt b/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9NonAccessibleTypeExposedTest.kt
index c492536b5856..91307b2272e5 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9NonAccessibleTypeExposedTest.kt
+++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9NonAccessibleTypeExposedTest.kt
@@ -18,7 +18,6 @@ package com.intellij.java.codeInspection
 import com.intellij.java.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase
 import com.intellij.java.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.M2
 import com.intellij.java.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.MAIN
-import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
 import com.siyeh.ig.visibility.ClassEscapesItsScopeInspection
 import org.intellij.lang.annotations.Language
 import org.jetbrains.annotations.NonNls
@@ -31,7 +30,6 @@ class Java9NonAccessibleTypeExposedTest : LightJava9ModulesCodeInsightFixtureTes
   override fun setUp() {
     super.setUp()
     myFixture.enableInspections(ClassEscapesItsScopeInspection())
-    (myFixture as CodeInsightTestFixtureImpl).setVirtualFileFilter({ it.name != "module-info.java"})
 
     addFile("module-info.java", "module MAIN { exports apiPkg; exports otherPkg; requires M2; }", MAIN)
     addFile("module-info.java", "module M2 { exports m2Pkg; }", M2)
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9RedundantRequiresStatementTest.kt b/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9RedundantRequiresStatementTest.kt
index b4bd234f14de..5bbde9bbb288 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9RedundantRequiresStatementTest.kt
+++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9RedundantRequiresStatementTest.kt
@@ -24,7 +24,6 @@ import com.intellij.openapi.application.ex.PathManagerEx
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.testFramework.InspectionTestUtil
 import com.intellij.testFramework.createGlobalContextForTool
-import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
 import org.intellij.lang.annotations.Language
 
 /**
@@ -33,7 +32,6 @@ import org.intellij.lang.annotations.Language
 class Java9RedundantRequiresStatementTest : LightJava9ModulesCodeInsightFixtureTestCase() {
   override fun setUp() {
     super.setUp()
-    (myFixture as CodeInsightTestFixtureImpl).setVirtualFileFilter({ it.name != "module-info.java"})
 
     addFile("module-info.java", "module M2 { exports org.example.m2; }", ModuleDescriptor.M2)
     addFile("module-info.java", "module M4 { exports org.example.m4; }", ModuleDescriptor.M4)
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9ReflectionClassVisibilityTest.kt b/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9ReflectionClassVisibilityTest.kt
index df50e8b6bf43..3d746a957d09 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9ReflectionClassVisibilityTest.kt
+++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9ReflectionClassVisibilityTest.kt
@@ -22,8 +22,6 @@ import com.intellij.java.testFramework.fixtures.LightJava9ModulesCodeInsightFixt
 import com.intellij.java.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor
 import com.intellij.java.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.M2
 import com.intellij.java.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.MAIN
-import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
-import org.intellij.lang.annotations.Language
 
 /**
  * @author Pavel.Dolgov
@@ -35,7 +33,6 @@ class Java9ReflectionClassVisibilityTest : LightJava9ModulesCodeInsightFixtureTe
   override fun setUp() {
     super.setUp()
     myFixture.enableInspections(Java9ReflectionClassVisibilityInspection())
-    (myFixture as CodeInsightTestFixtureImpl).setVirtualFileFilter({ it.name != "module-info.java"})
   }
 
   fun testOpenModule() {