From 375689d19fdaf18ba6b06755ccde0b9501ceea81 Mon Sep 17 00:00:00 2001 From: Karol Lewandowski Date: Wed, 2 Nov 2022 14:45:10 +0100 Subject: [PATCH] IDEA-189985 - RegistrationProblemsInspection - Split component and actions tests into separate classes GitOrigin-RevId: c6f012c1caab852add1505a2b412f99647728b43 --- .../xml/{ => actions}/ActionAbstractClass.xml | 0 .../{ => actions}/ActionUnresolvedClass.xml | 0 .../ActionWithoutDefaultCtor.xml | 0 .../xml/{ => actions}/ActionWrongClass.xml | 0 .../xml/{ => actions}/MyAbstractAction.java | 0 .../MyActionWithoutDefaultCtor.java | 0 .../AbstractApplicationComponent.java | 0 .../ApplicationComponent.java | 0 .../ApplicationComponent2.java | 0 .../ApplicationComponentInterface.java | 0 .../ComponentAbstractImplementation.xml | 0 ...ComponentClassNotAssignableToInterface.xml | 0 .../ComponentMissingImplementation.xml | 0 .../ComponentMultipleWithSameInterface.xml | 0 .../ComponentUnresolvedClass.xml | 0 .../{ => components}/MyModuleComponent.java | 0 .../{ => components}/MyModuleComponent2.java | 0 .../{ => components}/MyModuleComponent3.java | 0 .../MyModuleComponentInterface.java | 0 ...mlDomInspectionActionHighlightingTest.java | 31 +++++++++ ...omInspectionComponentHighlightingTest.java | 48 ++++++++++++++ .../PluginXmlDomInspectionTest.java | 62 ------------------ .../xml/{ => actions}/ActionAbstractClass.xml | 0 .../{ => actions}/ActionUnresolvedClass.xml | 0 .../ActionWithoutDefaultCtor.xml | 0 .../xml/{ => actions}/ActionWrongClass.xml | 0 .../xml/{ => actions}/MyAbstractAction.kt | 0 .../MyActionWithoutDefaultCtor.kt | 0 .../AbstractApplicationComponent.kt | 0 .../{ => components}/ApplicationComponent.kt | 0 .../{ => components}/ApplicationComponent2.kt | 0 .../ApplicationComponentInterface.kt | 0 .../ComponentAbstractImplementation.xml | 0 ...ComponentClassNotAssignableToInterface.xml | 0 .../ComponentMissingImplementation.xml | 0 .../ComponentMultipleWithSameInterface.xml | 0 .../ComponentUnresolvedClass.xml | 0 .../xml/{ => components}/MyModuleComponent.kt | 0 .../{ => components}/MyModuleComponent2.kt | 0 .../{ => components}/MyModuleComponent3.kt | 0 .../MyModuleComponentInterface.kt | 0 ...mlDomInspectionActionHighlightingTest.java | 32 ++++++++++ ...omInspectionComponentHighlightingTest.java | 49 +++++++++++++++ .../KtPluginXmlDomInspectionTest.java | 63 ------------------- 44 files changed, 160 insertions(+), 125 deletions(-) rename plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/{ => actions}/ActionAbstractClass.xml (100%) rename plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/{ => actions}/ActionUnresolvedClass.xml (100%) rename plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/{ => actions}/ActionWithoutDefaultCtor.xml (100%) rename plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/{ => actions}/ActionWrongClass.xml (100%) rename plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/{ => actions}/MyAbstractAction.java (100%) rename plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/{ => actions}/MyActionWithoutDefaultCtor.java (100%) rename plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/{ => components}/AbstractApplicationComponent.java (100%) rename plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/{ => components}/ApplicationComponent.java (100%) rename plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/{ => components}/ApplicationComponent2.java (100%) rename plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/{ => components}/ApplicationComponentInterface.java (100%) rename plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/{ => components}/ComponentAbstractImplementation.xml (100%) rename plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/{ => components}/ComponentClassNotAssignableToInterface.xml (100%) rename plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/{ => components}/ComponentMissingImplementation.xml (100%) rename plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/{ => components}/ComponentMultipleWithSameInterface.xml (100%) rename plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/{ => components}/ComponentUnresolvedClass.xml (100%) rename plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/{ => components}/MyModuleComponent.java (100%) rename plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/{ => components}/MyModuleComponent2.java (100%) rename plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/{ => components}/MyModuleComponent3.java (100%) rename plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/{ => components}/MyModuleComponentInterface.java (100%) create mode 100644 plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/PluginXmlDomInspectionActionHighlightingTest.java create mode 100644 plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/PluginXmlDomInspectionComponentHighlightingTest.java delete mode 100644 plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/PluginXmlDomInspectionTest.java rename plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/{ => actions}/ActionAbstractClass.xml (100%) rename plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/{ => actions}/ActionUnresolvedClass.xml (100%) rename plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/{ => actions}/ActionWithoutDefaultCtor.xml (100%) rename plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/{ => actions}/ActionWrongClass.xml (100%) rename plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/{ => actions}/MyAbstractAction.kt (100%) rename plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/{ => actions}/MyActionWithoutDefaultCtor.kt (100%) rename plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/{ => components}/AbstractApplicationComponent.kt (100%) rename plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/{ => components}/ApplicationComponent.kt (100%) rename plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/{ => components}/ApplicationComponent2.kt (100%) rename plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/{ => components}/ApplicationComponentInterface.kt (100%) rename plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/{ => components}/ComponentAbstractImplementation.xml (100%) rename plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/{ => components}/ComponentClassNotAssignableToInterface.xml (100%) rename plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/{ => components}/ComponentMissingImplementation.xml (100%) rename plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/{ => components}/ComponentMultipleWithSameInterface.xml (100%) rename plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/{ => components}/ComponentUnresolvedClass.xml (100%) rename plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/{ => components}/MyModuleComponent.kt (100%) rename plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/{ => components}/MyModuleComponent2.kt (100%) rename plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/{ => components}/MyModuleComponent3.kt (100%) rename plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/{ => components}/MyModuleComponentInterface.kt (100%) create mode 100644 plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtPluginXmlDomInspectionActionHighlightingTest.java create mode 100644 plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtPluginXmlDomInspectionComponentHighlightingTest.java delete mode 100644 plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtPluginXmlDomInspectionTest.java diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ActionAbstractClass.xml b/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/actions/ActionAbstractClass.xml similarity index 100% rename from plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ActionAbstractClass.xml rename to plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/actions/ActionAbstractClass.xml diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ActionUnresolvedClass.xml b/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/actions/ActionUnresolvedClass.xml similarity index 100% rename from plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ActionUnresolvedClass.xml rename to plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/actions/ActionUnresolvedClass.xml diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ActionWithoutDefaultCtor.xml b/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/actions/ActionWithoutDefaultCtor.xml similarity index 100% rename from plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ActionWithoutDefaultCtor.xml rename to plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/actions/ActionWithoutDefaultCtor.xml diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ActionWrongClass.xml b/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/actions/ActionWrongClass.xml similarity index 100% rename from plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ActionWrongClass.xml rename to plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/actions/ActionWrongClass.xml diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/MyAbstractAction.java b/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/actions/MyAbstractAction.java similarity index 100% rename from plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/MyAbstractAction.java rename to plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/actions/MyAbstractAction.java diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/MyActionWithoutDefaultCtor.java b/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/actions/MyActionWithoutDefaultCtor.java similarity index 100% rename from plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/MyActionWithoutDefaultCtor.java rename to plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/actions/MyActionWithoutDefaultCtor.java diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/AbstractApplicationComponent.java b/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/AbstractApplicationComponent.java similarity index 100% rename from plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/AbstractApplicationComponent.java rename to plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/AbstractApplicationComponent.java diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ApplicationComponent.java b/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/ApplicationComponent.java similarity index 100% rename from plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ApplicationComponent.java rename to plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/ApplicationComponent.java diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ApplicationComponent2.java b/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/ApplicationComponent2.java similarity index 100% rename from plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ApplicationComponent2.java rename to plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/ApplicationComponent2.java diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ApplicationComponentInterface.java b/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/ApplicationComponentInterface.java similarity index 100% rename from plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ApplicationComponentInterface.java rename to plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/ApplicationComponentInterface.java diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ComponentAbstractImplementation.xml b/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/ComponentAbstractImplementation.xml similarity index 100% rename from plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ComponentAbstractImplementation.xml rename to plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/ComponentAbstractImplementation.xml diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ComponentClassNotAssignableToInterface.xml b/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/ComponentClassNotAssignableToInterface.xml similarity index 100% rename from plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ComponentClassNotAssignableToInterface.xml rename to plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/ComponentClassNotAssignableToInterface.xml diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ComponentMissingImplementation.xml b/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/ComponentMissingImplementation.xml similarity index 100% rename from plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ComponentMissingImplementation.xml rename to plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/ComponentMissingImplementation.xml diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ComponentMultipleWithSameInterface.xml b/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/ComponentMultipleWithSameInterface.xml similarity index 100% rename from plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ComponentMultipleWithSameInterface.xml rename to plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/ComponentMultipleWithSameInterface.xml diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ComponentUnresolvedClass.xml b/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/ComponentUnresolvedClass.xml similarity index 100% rename from plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/ComponentUnresolvedClass.xml rename to plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/ComponentUnresolvedClass.xml diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/MyModuleComponent.java b/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/MyModuleComponent.java similarity index 100% rename from plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/MyModuleComponent.java rename to plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/MyModuleComponent.java diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/MyModuleComponent2.java b/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/MyModuleComponent2.java similarity index 100% rename from plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/MyModuleComponent2.java rename to plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/MyModuleComponent2.java diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/MyModuleComponent3.java b/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/MyModuleComponent3.java similarity index 100% rename from plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/MyModuleComponent3.java rename to plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/MyModuleComponent3.java diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/MyModuleComponentInterface.java b/plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/MyModuleComponentInterface.java similarity index 100% rename from plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/MyModuleComponentInterface.java rename to plugins/devkit/devkit-java-tests/testData/inspections/registrationProblems/xml/components/MyModuleComponentInterface.java diff --git a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/PluginXmlDomInspectionActionHighlightingTest.java b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/PluginXmlDomInspectionActionHighlightingTest.java new file mode 100644 index 000000000000..1abd1a48d6fd --- /dev/null +++ b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/PluginXmlDomInspectionActionHighlightingTest.java @@ -0,0 +1,31 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package org.jetbrains.idea.devkit.inspections; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.idea.devkit.DevkitJavaTestsUtil; + +@TestDataPath("$CONTENT_ROOT/testData/inspections/registrationProblems/xml/actions") +public class PluginXmlDomInspectionActionHighlightingTest extends PluginXmlDomInspectionTestBase { + @Override + protected String getBasePath() { + return DevkitJavaTestsUtil.TESTDATA_PATH + "inspections/registrationProblems/xml/actions"; + } + + public void testActionAbstractClass() { + myFixture.testHighlighting("ActionAbstractClass.xml", + "MyAbstractAction.java"); + } + + public void testActionUnresolvedClass() { + myFixture.testHighlighting("ActionUnresolvedClass.xml"); + } + + public void testActionWithoutDefaultCtor() { + myFixture.testHighlighting("ActionWithoutDefaultCtor.xml", + "MyActionWithoutDefaultCtor.java"); + } + + public void testActionWrongClass() { + myFixture.testHighlighting("ActionWrongClass.xml"); + } +} diff --git a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/PluginXmlDomInspectionComponentHighlightingTest.java b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/PluginXmlDomInspectionComponentHighlightingTest.java new file mode 100644 index 000000000000..c574d43f8177 --- /dev/null +++ b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/PluginXmlDomInspectionComponentHighlightingTest.java @@ -0,0 +1,48 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package org.jetbrains.idea.devkit.inspections; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.idea.devkit.DevkitJavaTestsUtil; + +@TestDataPath("$CONTENT_ROOT/testData/inspections/registrationProblems/xml/components") +public class PluginXmlDomInspectionComponentHighlightingTest extends PluginXmlDomInspectionTestBase { + @Override + protected String getBasePath() { + return DevkitJavaTestsUtil.TESTDATA_PATH + "inspections/registrationProblems/xml/components"; + } + + public void testComponentAbstractImplementation() { + myFixture.testHighlighting( + "ComponentAbstractImplementation.xml", + "AbstractApplicationComponent.java"); + } + + public void testComponentMissingImplementation() { + myFixture.testHighlighting( + "ComponentMissingImplementation.xml"); + } + + public void testComponentUnresolvedClass() { + myFixture.testHighlighting("ComponentUnresolvedClass.xml"); + } + + public void testComponentClassNotAssignableToInterface() { + myFixture.testHighlighting( + "ComponentClassNotAssignableToInterface.xml", + "ApplicationComponent.java"); + } + + public void testComponentMultipleWithSameInterface() { + myFixture.addClass("package com.intellij.openapi.module; public interface ModuleComponent {}"); + + myFixture.testHighlighting( + "ComponentMultipleWithSameInterface.xml", + "ApplicationComponent.java", + "ApplicationComponent2.java", + "ApplicationComponentInterface.java", + "MyModuleComponent.java", + "MyModuleComponent2.java", + "MyModuleComponent3.java", + "MyModuleComponentInterface.java"); + } +} diff --git a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/PluginXmlDomInspectionTest.java b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/PluginXmlDomInspectionTest.java deleted file mode 100644 index 7d39703faae1..000000000000 --- a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/PluginXmlDomInspectionTest.java +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.idea.devkit.inspections; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.idea.devkit.DevkitJavaTestsUtil; - -@TestDataPath("$CONTENT_ROOT/testData/inspections/registrationProblems/xml") -public class PluginXmlDomInspectionTest extends PluginXmlDomInspectionTestBase { - @Override - protected String getBasePath() { - return DevkitJavaTestsUtil.TESTDATA_PATH + "inspections/registrationProblems/xml"; - } - - public void testComponentAbstractImplementation() { - myFixture.testHighlighting("ComponentAbstractImplementation.xml", - "AbstractApplicationComponent.java"); - } - - public void testComponentMissingImplementation() { - myFixture.testHighlighting("ComponentMissingImplementation.xml"); - } - - public void testComponentUnresolvedClass() { - myFixture.testHighlighting("ComponentUnresolvedClass.xml"); - } - - public void testActionAbstractClass() { - myFixture.testHighlighting("ActionAbstractClass.xml", - "MyAbstractAction.java"); - } - - public void testActionUnresolvedClass() { - myFixture.testHighlighting("ActionUnresolvedClass.xml"); - } - - public void testActionWithoutDefaultCtor() { - myFixture.testHighlighting("ActionWithoutDefaultCtor.xml", - "MyActionWithoutDefaultCtor.java"); - } - - public void testActionWrongClass() { - myFixture.testHighlighting("ActionWrongClass.xml"); - } - - public void testComponentClassNotAssignableToInterface() { - myFixture.testHighlighting("ComponentClassNotAssignableToInterface.xml", - "ApplicationComponent.java"); - } - - public void testComponentMultipleWithSameInterface() { - myFixture.addClass("package com.intellij.openapi.module; public interface ModuleComponent {}"); - - myFixture.testHighlighting("ComponentMultipleWithSameInterface.xml", - "ApplicationComponent.java", - "ApplicationComponent2.java", - "ApplicationComponentInterface.java", - "MyModuleComponent.java", - "MyModuleComponent2.java", - "MyModuleComponent3.java", - "MyModuleComponentInterface.java"); - } -} diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ActionAbstractClass.xml b/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/actions/ActionAbstractClass.xml similarity index 100% rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ActionAbstractClass.xml rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/actions/ActionAbstractClass.xml diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ActionUnresolvedClass.xml b/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/actions/ActionUnresolvedClass.xml similarity index 100% rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ActionUnresolvedClass.xml rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/actions/ActionUnresolvedClass.xml diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ActionWithoutDefaultCtor.xml b/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/actions/ActionWithoutDefaultCtor.xml similarity index 100% rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ActionWithoutDefaultCtor.xml rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/actions/ActionWithoutDefaultCtor.xml diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ActionWrongClass.xml b/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/actions/ActionWrongClass.xml similarity index 100% rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ActionWrongClass.xml rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/actions/ActionWrongClass.xml diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/MyAbstractAction.kt b/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/actions/MyAbstractAction.kt similarity index 100% rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/MyAbstractAction.kt rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/actions/MyAbstractAction.kt diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/MyActionWithoutDefaultCtor.kt b/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/actions/MyActionWithoutDefaultCtor.kt similarity index 100% rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/MyActionWithoutDefaultCtor.kt rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/actions/MyActionWithoutDefaultCtor.kt diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/AbstractApplicationComponent.kt b/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/AbstractApplicationComponent.kt similarity index 100% rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/AbstractApplicationComponent.kt rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/AbstractApplicationComponent.kt diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ApplicationComponent.kt b/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/ApplicationComponent.kt similarity index 100% rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ApplicationComponent.kt rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/ApplicationComponent.kt diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ApplicationComponent2.kt b/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/ApplicationComponent2.kt similarity index 100% rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ApplicationComponent2.kt rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/ApplicationComponent2.kt diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ApplicationComponentInterface.kt b/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/ApplicationComponentInterface.kt similarity index 100% rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ApplicationComponentInterface.kt rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/ApplicationComponentInterface.kt diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ComponentAbstractImplementation.xml b/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/ComponentAbstractImplementation.xml similarity index 100% rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ComponentAbstractImplementation.xml rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/ComponentAbstractImplementation.xml diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ComponentClassNotAssignableToInterface.xml b/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/ComponentClassNotAssignableToInterface.xml similarity index 100% rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ComponentClassNotAssignableToInterface.xml rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/ComponentClassNotAssignableToInterface.xml diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ComponentMissingImplementation.xml b/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/ComponentMissingImplementation.xml similarity index 100% rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ComponentMissingImplementation.xml rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/ComponentMissingImplementation.xml diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ComponentMultipleWithSameInterface.xml b/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/ComponentMultipleWithSameInterface.xml similarity index 100% rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ComponentMultipleWithSameInterface.xml rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/ComponentMultipleWithSameInterface.xml diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ComponentUnresolvedClass.xml b/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/ComponentUnresolvedClass.xml similarity index 100% rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/ComponentUnresolvedClass.xml rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/ComponentUnresolvedClass.xml diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/MyModuleComponent.kt b/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/MyModuleComponent.kt similarity index 100% rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/MyModuleComponent.kt rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/MyModuleComponent.kt diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/MyModuleComponent2.kt b/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/MyModuleComponent2.kt similarity index 100% rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/MyModuleComponent2.kt rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/MyModuleComponent2.kt diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/MyModuleComponent3.kt b/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/MyModuleComponent3.kt similarity index 100% rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/MyModuleComponent3.kt rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/MyModuleComponent3.kt diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/MyModuleComponentInterface.kt b/plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/MyModuleComponentInterface.kt similarity index 100% rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/MyModuleComponentInterface.kt rename to plugins/devkit/devkit-kotlin-tests/testData/inspections/registrationProblems/xml/components/MyModuleComponentInterface.kt diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtPluginXmlDomInspectionActionHighlightingTest.java b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtPluginXmlDomInspectionActionHighlightingTest.java new file mode 100644 index 000000000000..6c79331e1014 --- /dev/null +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtPluginXmlDomInspectionActionHighlightingTest.java @@ -0,0 +1,32 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package org.jetbrains.idea.devkit.kotlin.inspections; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.idea.devkit.inspections.PluginXmlDomInspectionTestBase; +import org.jetbrains.idea.devkit.kotlin.DevkitKtTestsUtil; + +@TestDataPath("$CONTENT_ROOT/testData/inspections/registrationProblems/xml/actions") +public class KtPluginXmlDomInspectionActionHighlightingTest extends PluginXmlDomInspectionTestBase { + @Override + protected String getBasePath() { + return DevkitKtTestsUtil.TESTDATA_PATH + "inspections/registrationProblems/xml/actions"; + } + + public void testActionAbstractClass() { + myFixture.testHighlighting("ActionAbstractClass.xml", + "MyAbstractAction.kt"); + } + + public void testActionUnresolvedClass() { + myFixture.testHighlighting("ActionUnresolvedClass.xml"); + } + + public void testActionWithoutDefaultCtor() { + myFixture.testHighlighting("ActionWithoutDefaultCtor.xml", + "MyActionWithoutDefaultCtor.kt"); + } + + public void testActionWrongClass() { + myFixture.testHighlighting("ActionWrongClass.xml"); + } +} diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtPluginXmlDomInspectionComponentHighlightingTest.java b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtPluginXmlDomInspectionComponentHighlightingTest.java new file mode 100644 index 000000000000..722381e69f28 --- /dev/null +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtPluginXmlDomInspectionComponentHighlightingTest.java @@ -0,0 +1,49 @@ +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package org.jetbrains.idea.devkit.kotlin.inspections; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.idea.devkit.inspections.PluginXmlDomInspectionTestBase; +import org.jetbrains.idea.devkit.kotlin.DevkitKtTestsUtil; + +@TestDataPath("$CONTENT_ROOT/testData/inspections/registrationProblems/xml/components") +public class KtPluginXmlDomInspectionComponentHighlightingTest extends PluginXmlDomInspectionTestBase { + @Override + protected String getBasePath() { + return DevkitKtTestsUtil.TESTDATA_PATH + "inspections/registrationProblems/xml/components"; + } + + public void testComponentAbstractImplementation() { + myFixture.testHighlighting( + "ComponentAbstractImplementation.xml", + "AbstractApplicationComponent.kt"); + } + + public void testComponentMissingImplementation() { + myFixture.testHighlighting( + "ComponentMissingImplementation.xml"); + } + + public void testComponentUnresolvedClass() { + myFixture.testHighlighting("ComponentUnresolvedClass.xml"); + } + + public void testComponentClassNotAssignableToInterface() { + myFixture.testHighlighting( + "ComponentClassNotAssignableToInterface.xml", + "ApplicationComponent.kt"); + } + + public void testComponentMultipleWithSameInterface() { + myFixture.addClass("package com.intellij.openapi.module; public interface ModuleComponent {}"); + + myFixture.testHighlighting( + "ComponentMultipleWithSameInterface.xml", + "ApplicationComponent.kt", + "ApplicationComponent2.kt", + "ApplicationComponentInterface.kt", + "MyModuleComponent.kt", + "MyModuleComponent2.kt", + "MyModuleComponent3.kt", + "MyModuleComponentInterface.kt"); + } +} diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtPluginXmlDomInspectionTest.java b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtPluginXmlDomInspectionTest.java deleted file mode 100644 index c55bc7822aaa..000000000000 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtPluginXmlDomInspectionTest.java +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package org.jetbrains.idea.devkit.kotlin.inspections; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.idea.devkit.inspections.PluginXmlDomInspectionTestBase; -import org.jetbrains.idea.devkit.kotlin.DevkitKtTestsUtil; - -@TestDataPath("$CONTENT_ROOT/testData/inspections/registrationProblems/xml") -public class KtPluginXmlDomInspectionTest extends PluginXmlDomInspectionTestBase { - @Override - protected String getBasePath() { - return DevkitKtTestsUtil.TESTDATA_PATH + "inspections/registrationProblems/xml"; - } - - public void testComponentAbstractImplementation() { - myFixture.testHighlighting("ComponentAbstractImplementation.xml", - "AbstractApplicationComponent.kt"); - } - - public void testComponentMissingImplementation() { - myFixture.testHighlighting("ComponentMissingImplementation.xml"); - } - - public void testComponentUnresolvedClass() { - myFixture.testHighlighting("ComponentUnresolvedClass.xml"); - } - - public void testActionAbstractClass() { - myFixture.testHighlighting("ActionAbstractClass.xml", - "MyAbstractAction.kt"); - } - - public void testActionUnresolvedClass() { - myFixture.testHighlighting("ActionUnresolvedClass.xml"); - } - - public void testActionWithoutDefaultCtor() { - myFixture.testHighlighting("ActionWithoutDefaultCtor.xml", - "MyActionWithoutDefaultCtor.kt"); - } - - public void testActionWrongClass() { - myFixture.testHighlighting("ActionWrongClass.xml"); - } - - public void testComponentClassNotAssignableToInterface() { - myFixture.testHighlighting("ComponentClassNotAssignableToInterface.xml", - "ApplicationComponent.kt"); - } - - public void testComponentMultipleWithSameInterface() { - myFixture.addClass("package com.intellij.openapi.module; public interface ModuleComponent {}"); - - myFixture.testHighlighting("ComponentMultipleWithSameInterface.xml", - "ApplicationComponent.kt", - "ApplicationComponent2.kt", - "ApplicationComponentInterface.kt", - "MyModuleComponent.kt", - "MyModuleComponent2.kt", - "MyModuleComponent3.kt", - "MyModuleComponentInterface.kt"); - } -}