diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListeners.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/Listeners.xml similarity index 53% rename from plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListeners.xml rename to plugins/devkit/devkit-java-tests/testData/codeInsight/Listeners.xml index 2a29e2545128..00e8fdf9ff9e 100644 --- a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListeners.xml +++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/Listeners.xml @@ -25,4 +25,28 @@ activeInHeadlessMode="INVALID_VALUE" activeInTestMode="INVALID_VALUE"/> + + + + + + + + + <listener topic="java.lang.String" + activeInHeadlessMode="true" activeInTestMode="true"/> + <listener class="java.lang.String" + activeInHeadlessMode="true" activeInTestMode="true"/> + + + java.util.Collection" + topic="java.util.Collection"/> + + + INVALID_VALUE" + activeInTestMode="INVALID_VALUE"/> + + \ No newline at end of file diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersDepends-dependency.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersDepends-dependency.xml similarity index 52% rename from plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersDepends-dependency.xml rename to plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersDepends-dependency.xml index 352338d5ec5a..53265f6f7eb3 100644 --- a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersDepends-dependency.xml +++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersDepends-dependency.xml @@ -5,4 +5,9 @@ activeInHeadlessMode="true" activeInTestMode="true"/> + + + + \ No newline at end of file diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersDepends.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersDepends.xml similarity index 100% rename from plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersDepends.xml rename to plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersDepends.xml diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersNoPluginIdStandalone.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersNoPluginIdStandalone.xml similarity index 52% rename from plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersNoPluginIdStandalone.xml rename to plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersNoPluginIdStandalone.xml index 15912eab7c96..33e61bdbbd72 100644 --- a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersNoPluginIdStandalone.xml +++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersNoPluginIdStandalone.xml @@ -5,4 +5,9 @@ activeInHeadlessMode="true" activeInTestMode="true"/> + + + + \ No newline at end of file diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersNoSinceBuild.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersNoSinceBuild.xml similarity index 58% rename from plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersNoSinceBuild.xml rename to plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersNoSinceBuild.xml index f602be9707ee..430f2814be45 100644 --- a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersNoSinceBuild.xml +++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersNoSinceBuild.xml @@ -9,4 +9,9 @@ activeInHeadlessMode="true" activeInTestMode="true"/> + + + + \ No newline at end of file diff --git a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersPre193.xml b/plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersPre193.xml similarity index 59% rename from plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersPre193.xml rename to plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersPre193.xml index 1003d33c9ad5..3da8ae750853 100644 --- a/plugins/devkit/devkit-java-tests/testData/codeInsight/ApplicationListenersPre193.xml +++ b/plugins/devkit/devkit-java-tests/testData/codeInsight/ListenersPre193.xml @@ -10,4 +10,9 @@ activeInHeadlessMode="true" activeInTestMode="true"/> + + + + \ No newline at end of file diff --git a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlFunctionalTest.groovy b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlFunctionalTest.groovy index 2323e37b9522..468e970a62db 100644 --- a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlFunctionalTest.groovy +++ b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlFunctionalTest.groovy @@ -97,25 +97,25 @@ class PluginXmlFunctionalTest extends JavaCodeInsightFixtureTestCase { moduleBuilder.addLibrary("coreImpl", coreImpl) } - void testApplicationListeners() { - doHighlightingTest("ApplicationListeners.xml") + void testListeners() { + doHighlightingTest("Listeners.xml") } - void testApplicationListenersNoSinceBuild() { - doHighlightingTest("ApplicationListenersNoSinceBuild.xml") + void testListenersNoSinceBuild() { + doHighlightingTest("ListenersNoSinceBuild.xml") } - void testApplicationListenersPre193() { - doHighlightingTest("ApplicationListenersPre193.xml") + void testListenersPre193() { + doHighlightingTest("ListenersPre193.xml") } - void testApplicationListenersDepends() { + void testListenersDepends() { myFixture.copyFileToProject(getTestName(false) + ".xml", "META-INF/plugin.xml") - doHighlightingTest("ApplicationListenersDepends-dependency.xml") + doHighlightingTest("ListenersDepends-dependency.xml") } - void testApplicationListenersNoPluginIdStandalone() { - doHighlightingTest("ApplicationListenersNoPluginIdStandalone.xml") + void testListenersNoPluginIdStandalone() { + doHighlightingTest("ListenersNoPluginIdStandalone.xml") } void testExtensionI18n() {