From 54e0af058c3bac569f00f0965ececa437fd0c0cd Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Tue, 21 Aug 2018 08:24:26 +0200
Subject: [PATCH] fix ComponentNotRegisteredInspectionTest

---
 .../UnregisteredApplicationComponent.java                     | 4 ++--
 .../UnregisteredApplicationComponent.kt                       | 4 ++--
 .../inspections/ComponentNotRegisteredInspectionTestBase.java | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/componentNotRegistered/UnregisteredApplicationComponent.java b/plugins/devkit/devkit-java-tests/testData/inspections/componentNotRegistered/UnregisteredApplicationComponent.java
index 21e05a3d961f..cf266139bf6d 100644
--- a/plugins/devkit/devkit-java-tests/testData/inspections/componentNotRegistered/UnregisteredApplicationComponent.java
+++ b/plugins/devkit/devkit-java-tests/testData/inspections/componentNotRegistered/UnregisteredApplicationComponent.java
@@ -1,13 +1,13 @@
 import com.intellij.openapi.components.BaseComponent;
 
-public class <warning descr="Application Component is not registered in plugin.xml">Unregistered<caret>ApplicationComponent</warning>
+public class <warning descr="Component is not registered in plugin.xml">UnregisteredApplicationComponent</warning>
   implements BaseComponent, UnregisteredApplicationComponentInterface {
 
   public static UnregisteredApplicationComponentInterface getInstance() {
     return null;
   }
 
-  public static class <warning descr="Application Component is not registered in plugin.xml">InnerStaticClassApplicationContext</warning>
+  public static class <warning descr="Component is not registered in plugin.xml">InnerStaticClassApplicationContext</warning>
   implements BaseComponent {}
 
   public class InnerClassApplicationContextIsNotChecked implements BaseComponent {}
diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/componentNotRegistered/UnregisteredApplicationComponent.kt b/plugins/devkit/devkit-kotlin-tests/testData/inspections/componentNotRegistered/UnregisteredApplicationComponent.kt
index 47afb4bbdf90..692f504e7aa8 100644
--- a/plugins/devkit/devkit-kotlin-tests/testData/inspections/componentNotRegistered/UnregisteredApplicationComponent.kt
+++ b/plugins/devkit/devkit-kotlin-tests/testData/inspections/componentNotRegistered/UnregisteredApplicationComponent.kt
@@ -1,9 +1,9 @@
 import com.intellij.openapi.components.BaseComponent
 
-class <warning descr="Application Component is not registered in plugin.xml">Unregistered<caret>BaseComponent</warning>
+class <warning descr="Component is not registered in plugin.xml">UnregisteredApplicationComponent</warning>
   : BaseComponent, UnregisteredApplicationComponentInterface {
 
-  class <warning descr="Application Component is not registered in plugin.xml">InnerStaticClassApplicationContext</warning>
+  class <warning descr="Component is not registered in plugin.xml">InnerStaticClassApplicationContext</warning>
   : BaseComponent
 
   inner class InnerClassApplicationContextIsNotChecked : BaseComponent
diff --git a/plugins/devkit/devkit-tests-api/src/org/jetbrains/idea/devkit/inspections/ComponentNotRegisteredInspectionTestBase.java b/plugins/devkit/devkit-tests-api/src/org/jetbrains/idea/devkit/inspections/ComponentNotRegisteredInspectionTestBase.java
index af3c6a98a740..4565cde4ab7a 100644
--- a/plugins/devkit/devkit-tests-api/src/org/jetbrains/idea/devkit/inspections/ComponentNotRegisteredInspectionTestBase.java
+++ b/plugins/devkit/devkit-tests-api/src/org/jetbrains/idea/devkit/inspections/ComponentNotRegisteredInspectionTestBase.java
@@ -94,10 +94,6 @@ public abstract class ComponentNotRegisteredInspectionTestBase extends PluginMod
 
     myFixture.testHighlighting("UnregisteredApplicationComponent." + getSourceFileExtension(),
                                "UnregisteredApplicationComponentInterface." + getSourceFileExtension());
-    final IntentionAction registerAction = myFixture.findSingleIntention("Register Application Component");
-    myFixture.launchAction(registerAction);
-
-    myFixture.checkResultByFile("META-INF/plugin.xml", "unregisteredApplicationComponent-plugin_after.xml", true);
   }