Feedback changes

Author: konarshankar07

tests/com/magento/idea/magento2plugin/inspections/php/GraphQlResolverInspectionTest.java

@@ -4,41 +4,32 @@
  */
 package com.magento.idea.magento2plugin.inspections.php;
 
-import com.intellij.testFramework.fixtures.BasePlatformTestCase;
-import java.io.File;
-
-public class GraphQlResolverInspectionTest extends BasePlatformTestCase {
+public class GraphQlResolverInspectionTest extends InspectionPhpFixtureTestCase {
 
     @Override
     public void setUp() throws Exception {
         super.setUp();
         myFixture.enableInspections(GraphQlResolverInspection.class);
     }
 
-    @Override
-    protected String getTestDataPath() {
-        return new File("testData/inspections/php/"
-                + getClass().getSimpleName().replace("Test", "")).getAbsolutePath();
-    }
-
     @Override
     protected boolean isWriteActionRequired() {
         return false;
     }
 
     public void testWithInvalidResolverInterface() throws Exception {
-        myFixture.addFileToProject(getTestDataPath() + "/withInvalidResolverInterface/" + "schema.graphqls", "type Query {" +
+        myFixture.addFileToProject("schema.graphqls", "type Query {" +
                 "InvalidResolverTest: InvalidResolver @resolver(class: \"\\\\Magento\\\\Test\\\\InvalidResolverTest\")" +
                 "}");
-        myFixture.configureByFile(getTestName(true) + "/" + "InvalidResolverTest.php");
+        myFixture.configureByFile(getFixturePath("InvalidResolverTest.php"));
         myFixture.checkHighlighting();
     }
 
     public void testWithValidResolverInterface() throws Exception {
-        myFixture.addFileToProject(getTestDataPath() + "/withValidResolverInterface/" + "schema.graphqls", "type mutation {" +
+        myFixture.addFileToProject("schema.graphqls", "type mutation {" +
                 "    ValidResolverTest(): ValidResolver @resolver(class: \"\\\\Magento\\\\Test\\\\ValidResolverTest\")" +
                 "}");
-        myFixture.configureByFile(getTestName(true) + "/" + "ValidResolverTest.php");
+        myFixture.configureByFile(getFixturePath("ValidResolverTest.php"));
         myFixture.checkHighlighting();
     }
 }

tests/com/magento/idea/magento2plugin/inspections/php/InspectionPhpFixtureTestCase.java

@@ -0,0 +1,26 @@
+package com.magento.idea.magento2plugin.inspections.php;
+
+import com.magento.idea.magento2plugin.BaseProjectTestCase;
+
+import java.io.File;
+
+abstract public class InspectionPhpFixtureTestCase extends BaseProjectTestCase {
+
+    private static final String testDataFolderPath = "testData" + File.separator + "inspections" + File.separator;
+    private static final String fixturesFolderPath = "php" + File.separator;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        myFixture.setTestDataPath(testDataFolderPath);
+    }
+
+    @Override
+    protected boolean isWriteActionRequired() {
+        return false;
+    }
+
+    protected String getFixturePath(String fileName) {
+        return prepareFixturePath(fileName, fixturesFolderPath);
+    }
+}