diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/ModuleCompletionTest.kt b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/ModuleCompletionTest.kt index 9b2545837586..703fa488c3f3 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/ModuleCompletionTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/ModuleCompletionTest.kt @@ -15,8 +15,8 @@ */ package com.intellij.java.codeInsight.completion -import com.intellij.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase -import com.intellij.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.M2 +import com.intellij.java.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase +import com.intellij.java.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.M2 import org.assertj.core.api.Assertions.assertThat class ModuleCompletionTest : LightJava9ModulesCodeInsightFixtureTestCase() { 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 aba1df76d41a..0e5348af2954 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 @@ -18,8 +18,8 @@ package com.intellij.java.codeInsight.daemon import com.intellij.codeInsight.daemon.impl.JavaHighlightInfoTypes import com.intellij.codeInspection.deprecation.DeprecationInspection import com.intellij.openapi.util.TextRange -import com.intellij.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase -import com.intellij.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.* +import com.intellij.java.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase +import com.intellij.java.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.* import org.assertj.core.api.Assertions.assertThat class ModuleHighlightingTest : LightJava9ModulesCodeInsightFixtureTestCase() { diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/ModuleRenameTest.kt b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/ModuleRenameTest.kt index 9755d16657b6..8f1d0ad7bfb3 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/ModuleRenameTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/ModuleRenameTest.kt @@ -18,8 +18,8 @@ package com.intellij.java.codeInsight.daemon import com.intellij.psi.impl.file.impl.JavaFileManager import com.intellij.psi.search.GlobalSearchScope import com.intellij.refactoring.rename.RenameProcessor -import com.intellij.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase -import com.intellij.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.M2 +import com.intellij.java.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase +import com.intellij.java.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.M2 class ModuleRenameTest : LightJava9ModulesCodeInsightFixtureTestCase() { override fun setUp() { diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/AddRequiredModuleTest.kt b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/AddRequiredModuleTest.kt index 4803888ee0e3..f9fc6af5027b 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/AddRequiredModuleTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/AddRequiredModuleTest.kt @@ -16,8 +16,8 @@ package com.intellij.java.codeInsight.daemon.quickFix import com.intellij.codeInsight.daemon.QuickFixBundle -import com.intellij.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase -import com.intellij.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.* +import com.intellij.java.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase +import com.intellij.java.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.* /** * @author Pavel.Dolgov diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/MergeModuleStatementsFixTest.kt b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/MergeModuleStatementsFixTest.kt index 4ca7171e1d6a..32b0c0d91e41 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/MergeModuleStatementsFixTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/MergeModuleStatementsFixTest.kt @@ -18,8 +18,8 @@ package com.intellij.java.codeInsight.daemon.quickFix import com.intellij.JavaTestUtil.getRelativeJavaTestDataPath import com.intellij.codeInsight.daemon.QuickFixBundle import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase -import com.intellij.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase -import com.intellij.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.* +import com.intellij.java.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase +import com.intellij.java.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.* /** * @author Pavel.Dolgov diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9ModuleExportsPackageToItselfTest.kt b/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9ModuleExportsPackageToItselfTest.kt index 7ca7c1c03c9a..727730150e7e 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9ModuleExportsPackageToItselfTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9ModuleExportsPackageToItselfTest.kt @@ -17,8 +17,8 @@ package com.intellij.java.codeInspection import com.intellij.codeInspection.InspectionsBundle import com.intellij.codeInspection.java19modules.Java9ModuleExportsPackageToItselfInspection -import com.intellij.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase -import com.intellij.testFramework.fixtures.MultiModuleJava9ProjectDescriptor +import com.intellij.java.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase +import com.intellij.java.testFramework.fixtures.MultiModuleJava9ProjectDescriptor import org.intellij.lang.annotations.Language /** 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 9aa2dfc1282d..54c228422645 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9NonAccessibleTypeExposedTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9NonAccessibleTypeExposedTest.kt @@ -15,9 +15,9 @@ */ package com.intellij.java.codeInspection -import com.intellij.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase -import com.intellij.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.M2 -import com.intellij.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.MAIN +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.siyeh.ig.visibility.ClassEscapesItsScopeInspection import org.intellij.lang.annotations.Language import org.jetbrains.annotations.NonNls 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 66e374785053..85b1fb96f31e 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9RedundantRequiresStatementTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9RedundantRequiresStatementTest.kt @@ -22,8 +22,8 @@ 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.LightJava9ModulesCodeInsightFixtureTestCase -import com.intellij.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor +import com.intellij.java.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase +import com.intellij.java.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor import org.intellij.lang.annotations.Language import org.jetbrains.annotations.NonNls 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 e711c4af60b9..c4f57516a161 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9ReflectionClassVisibilityTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9ReflectionClassVisibilityTest.kt @@ -18,10 +18,10 @@ package com.intellij.java.codeInspection import com.intellij.JavaTestUtil import com.intellij.codeInspection.reflectiveAccess.Java9ReflectionClassVisibilityInspection import com.intellij.openapi.util.io.FileUtil -import com.intellij.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase -import com.intellij.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor -import com.intellij.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.M2 -import com.intellij.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.MAIN +import com.intellij.java.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase +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 org.intellij.lang.annotations.Language /** diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9UnusedServiceImplementationsTest.kt b/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9UnusedServiceImplementationsTest.kt index af9cb05a6e9d..f10537578eca 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9UnusedServiceImplementationsTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/Java9UnusedServiceImplementationsTest.kt @@ -23,9 +23,9 @@ import com.intellij.openapi.util.io.FileUtil import com.intellij.testFramework.InspectionTestCase import com.intellij.testFramework.InspectionTestUtil import com.intellij.testFramework.createGlobalContextForTool -import com.intellij.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase -import com.intellij.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor -import com.intellij.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.* +import com.intellij.java.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase +import com.intellij.java.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor +import com.intellij.java.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.* import org.intellij.lang.annotations.Language /** diff --git a/java/java-tests/testSrc/com/intellij/java/ide/actions/CreateModuleInfoActionTest.kt b/java/java-tests/testSrc/com/intellij/java/ide/actions/CreateModuleInfoActionTest.kt index ba7eeddd31f4..822e18aa37ae 100644 --- a/java/java-tests/testSrc/com/intellij/java/ide/actions/CreateModuleInfoActionTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/ide/actions/CreateModuleInfoActionTest.kt @@ -25,8 +25,8 @@ import com.intellij.psi.PsiJavaModule import com.intellij.psi.PsiManager import com.intellij.testFramework.MapDataContext import com.intellij.testFramework.PlatformTestUtil -import com.intellij.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase -import com.intellij.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.MAIN +import com.intellij.java.testFramework.fixtures.LightJava9ModulesCodeInsightFixtureTestCase +import com.intellij.java.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.MAIN class CreateModuleInfoActionTest : LightJava9ModulesCodeInsightFixtureTestCase() { fun test() { diff --git a/java/java-tests/testSrc/com/intellij/java/testFramework/fixtures/LightJava9ModulesCodeInsightFixtureTestCase.kt b/java/java-tests/testSrc/com/intellij/java/testFramework/fixtures/LightJava9ModulesCodeInsightFixtureTestCase.kt index 562f156ff68d..03bd50ba7762 100644 --- a/java/java-tests/testSrc/com/intellij/java/testFramework/fixtures/LightJava9ModulesCodeInsightFixtureTestCase.kt +++ b/java/java-tests/testSrc/com/intellij/java/testFramework/fixtures/LightJava9ModulesCodeInsightFixtureTestCase.kt @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.testFramework.fixtures +package com.intellij.java.testFramework.fixtures +import com.intellij.java.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor +import com.intellij.java.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.MAIN import com.intellij.openapi.vfs.VirtualFile import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.VfsTestUtil -import com.intellij.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor -import com.intellij.testFramework.fixtures.MultiModuleJava9ProjectDescriptor.ModuleDescriptor.MAIN +import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase abstract class LightJava9ModulesCodeInsightFixtureTestCase : LightCodeInsightFixtureTestCase() { override fun getProjectDescriptor(): LightProjectDescriptor = MultiModuleJava9ProjectDescriptor diff --git a/java/java-tests/testSrc/com/intellij/java/testFramework/fixtures/MultiModuleJava9ProjectDescriptor.kt b/java/java-tests/testSrc/com/intellij/java/testFramework/fixtures/MultiModuleJava9ProjectDescriptor.kt index cd0abf9e0386..8ea5b69a3ac7 100644 --- a/java/java-tests/testSrc/com/intellij/java/testFramework/fixtures/MultiModuleJava9ProjectDescriptor.kt +++ b/java/java-tests/testSrc/com/intellij/java/testFramework/fixtures/MultiModuleJava9ProjectDescriptor.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.testFramework.fixtures +package com.intellij.java.testFramework.fixtures import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.openapi.application.runWriteAction @@ -28,6 +28,7 @@ import com.intellij.openapi.vfs.ex.temp.TempFileSystem import com.intellij.pom.java.LanguageLevel import com.intellij.testFramework.IdeaTestUtil import com.intellij.testFramework.LightPlatformTestCase +import com.intellij.testFramework.fixtures.DefaultLightProjectDescriptor import org.jetbrains.jps.model.java.JavaSourceRootType /**