3.0.0 fixed linemarker tests

Author: Vitaliy Boyko

build.gradle

@@ -19,6 +19,7 @@ version '3.0.0'
 
 apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'java'
+apply plugin: 'idea'
 apply plugin: 'groovy'
 apply plugin: 'org.jetbrains.changelog'
 
@@ -91,3 +92,14 @@ changelog {
     unreleasedTerm = "[Unreleased]"
     groups = ["Added", "Changed", "Deprecated", "Removed", "Fixed", "Security"]
 }
+
+idea {
+    project {
+        jdkName         = javaVersion
+        languageLevel   = javaVersion
+    }
+
+    module {
+        generatedSourceDirs += file('gen')
+    }
+}

tests/com/magento/idea/magento2plugin/linemarker/LinemarkerFixtureTestCase.java

@@ -40,7 +40,7 @@ protected void assertHasLinemarkerWithTooltipAndIcon(final String tooltip, final
                 continue;
             }
             if (lineMarkerTooltip.equals(tooltip)
-                    && lineMarkerIcon.toString().endsWith(icon)) {
+                    && lineMarkerIcon.toString().contains(icon)) {
                 return;
             }
         }

tests/com/magento/idea/magento2plugin/linemarker/graphqls/GraphQlResolverClassLinemarkerRegistrarTest.java

@@ -15,6 +15,6 @@ public class GraphQlResolverClassLinemarkerRegistrarTest extends LinemarkerFixtu
     public void testWithValidSchemaResolver() {
         myFixture.configureByFile(this.getFixturePath("schema.graphqls", "graphqls"));
 
-        assertHasLinemarkerWithTooltipAndIcon("Navigate to class", "/nodes/class.svg");
+        assertHasLinemarkerWithTooltipAndIcon("Navigate to class", "nodes/class.svg");
     }
 }

tests/com/magento/idea/magento2plugin/linemarker/php/ConfigurationTypeClassLinemarkerRegistrarTest.java

@@ -15,7 +15,7 @@ public class ConfigurationTypeClassLinemarkerRegistrarTest extends LinemarkerFix
     public void testTypeNameClassShouldHaveLinemarker() {
         myFixture.configureByFile(this.getFixturePath("Topmenu.php", "php"));
 
-        assertHasLinemarkerWithTooltipAndIcon("Navigate to configuration", "/fileTypes/xml.svg");
+        assertHasLinemarkerWithTooltipAndIcon("Navigate to configuration", "fileTypes/xml.svg");
     }
 
     /**
@@ -24,6 +24,6 @@ public void testTypeNameClassShouldHaveLinemarker() {
     public void testRegularPhpClassShouldNotHaveLinemarker() {
         myFixture.configureByFile(this.getFixturePath("ClassNotConfiguredInDiXml.php", "php"));
 
-        assertHasNoLinemarkerWithTooltipAndIcon("Navigate to configuration", "/fileTypes/xml.svg");
+        assertHasNoLinemarkerWithTooltipAndIcon("Navigate to configuration", "fileTypes/xml.svg");
     }
 }

tests/com/magento/idea/magento2plugin/linemarker/php/GraphQlResolverUsageLinemarkerRegistrarTest.java

@@ -15,7 +15,7 @@ public class GraphQlResolverUsageLinemarkerRegistrarTest extends LinemarkerFixtu
     public void testResolverClassShouldHaveLinemarker() {
         myFixture.configureByFile(this.getFixturePath("Resolver.php", "php"));
 
-        assertHasNoLinemarkerWithTooltipAndIcon("Navigate to schema", "/icons/graphqlFile.svg");
+        assertHasNoLinemarkerWithTooltipAndIcon("Navigate to schema", "icons/graphqlFile.svg");
     }
 
     /**
@@ -24,6 +24,6 @@ public void testResolverClassShouldHaveLinemarker() {
     public void testRegularClassShouldNotHaveLinemarker() {
         myFixture.configureByFile(this.getFixturePath("ClassNotConfiguredInSchema.php", "php"));
 
-        assertHasNoLinemarkerWithTooltipAndIcon("Navigate to schema", "/icons/graphqlFile.svg");
+        assertHasNoLinemarkerWithTooltipAndIcon("Navigate to schema", "icons/graphqlFile.svg");
     }
 }

tests/com/magento/idea/magento2plugin/linemarker/php/ObserverClassLinemarkerRegistrarTest.java

@@ -15,7 +15,7 @@ public class ObserverClassLinemarkerRegistrarTest extends LinemarkerFixtureTestC
     public void testObserverClassShouldHaveLinemarker() {
         myFixture.configureByFile(this.getFixturePath("TestObserver.php", "php"));
 
-        assertHasLinemarkerWithTooltipAndIcon("Navigate to configuration", "/fileTypes/xml.svg");
+        assertHasLinemarkerWithTooltipAndIcon("Navigate to configuration", "fileTypes/xml.svg");
     }
 
     /**
@@ -24,6 +24,6 @@ public void testObserverClassShouldHaveLinemarker() {
     public void testRegularPhpClassShouldNotHaveLinemarker() {
         myFixture.configureByFile(this.getFixturePath("TestNotObserver.php", "php"));
 
-        assertHasNoLinemarkerWithTooltipAndIcon("Navigate to configuration", "/fileTypes/xml.svg");
+        assertHasNoLinemarkerWithTooltipAndIcon("Navigate to configuration", "fileTypes/xml.svg");
     }
 }

tests/com/magento/idea/magento2plugin/linemarker/php/PluginLinemarkerRegistrarTest.java

@@ -15,7 +15,7 @@ public class PluginLinemarkerRegistrarTest extends LinemarkerFixtureTestCase {
     public void testClassWithPluginShouldHaveLinemarker() {
         myFixture.configureByFile(this.getFixturePath("PluginClass.php", "php"));
 
-        assertHasLinemarkerWithTooltipAndIcon("Navigate to plugins", "/nodes/plugin.svg");
+        assertHasLinemarkerWithTooltipAndIcon("Navigate to plugins", "nodes/plugin.svg");
     }
 
     /**
@@ -24,6 +24,6 @@ public void testClassWithPluginShouldHaveLinemarker() {
     public void testClassWithoutPluginShouldNotHaveLinemarker() {
         myFixture.configureByFile(this.getFixturePath("RegularClass.php", "php"));
 
-        assertHasNoLinemarkerWithTooltipAndIcon("Navigate to plugins", "/nodes/plugin.svg");
+        assertHasNoLinemarkerWithTooltipAndIcon("Navigate to plugins", "nodes/plugin.svg");
     }
 }

tests/com/magento/idea/magento2plugin/linemarker/php/PluginTargetLinemarkerRegistrarTest.java

@@ -16,8 +16,8 @@ public class PluginTargetLinemarkerRegistrarTest extends LinemarkerFixtureTestCa
     public void testPluginToClassShouldHaveLinemarker() {
         myFixture.configureByFile(this.getFixturePath("Topmenu.php", "php"));
 
-        assertHasLinemarkerWithTooltipAndIcon("Navigate to target method", "/nodes/method.svg");
-        assertHasLinemarkerWithTooltipAndIcon("Navigate to target class", "/nodes/class.svg");
+        assertHasLinemarkerWithTooltipAndIcon("Navigate to target method", "nodes/method.svg");
+        assertHasLinemarkerWithTooltipAndIcon("Navigate to target class", "nodes/class.svg");
     }
 
     /**
@@ -26,8 +26,8 @@ public void testPluginToClassShouldHaveLinemarker() {
     public void testPluginToInterfaceShouldHaveLinemarker() {
         myFixture.configureByFile(this.getFixturePath("MviewState.php", "php"));
 
-        assertHasLinemarkerWithTooltipAndIcon("Navigate to target method", "/nodes/method.svg");
-        assertHasLinemarkerWithTooltipAndIcon("Navigate to target class", "/nodes/class.svg");
+        assertHasLinemarkerWithTooltipAndIcon("Navigate to target method", "nodes/method.svg");
+        assertHasLinemarkerWithTooltipAndIcon("Navigate to target class", "nodes/class.svg");
     }
 
     /**
@@ -37,6 +37,6 @@ public void testRegularClassShouldNotHaveLinemarker() {
         myFixture.configureByFile(this.getFixturePath("ClassNotConfiguredInDiXml.php", "php"));
 
         assertHasNoLinemarkerWithTooltipAndIcon("Navigate to target method", "/nodes/method.svg");
-        assertHasNoLinemarkerWithTooltipAndIcon("Navigate to target class", "/nodes/class.svg");
+        assertHasNoLinemarkerWithTooltipAndIcon("Navigate to target class", "nodes/class.svg");
     }
 }