Refactored tests, added class do not exist warning

Vitaliy Boyko · Vitaliy Boyko · commit 970c129bdc62 · 2020-04-24T12:50:07.000+03:00
diff --git a/resources/magento2/inspection.properties b/resources/magento2/inspection.properties
@@ -1,8 +1,7 @@
-inspection.class.hierarchyImplementationCheck=Class must implement {0}
-inspection.class.hierarchyExtendingCheck=Class must extend {0}
 inspection.plugin.duplicateInSameFile=The plugin name already used in this file. For more details see Inspection Description.
 inspection.plugin.duplicateInOtherPlaces=The plugin name "{0}" for targeted "{1}" class is already used in the module "{2}" ({3} scope). For more details see Inspection Description.
 inspection.graphql.resolver.mustImplement=Class must implements any of the following interfaces: \\Magento\\Framework\\GraphQl\\Query\\ResolverInterface, \\Magento\\Framework\\GraphQl\\Query\\Resolver\\BatchResolverInterface, \\Magento\\Framework\\GraphQl\\Query\\Resolver\\BatchServiceContractResolverInterface
+inspection.graphql.resolver.notExist=Resolver class do not exist
 inspection.graphql.resolver.fix.family=Implement Resolver interface
 inspection.graphql.resolver.fix.title=Select one of the following interface
 inspection.plugin.error.nonPublicMethod=You can't declare a plugin for a not public method.
diff --git a/src/com/magento/idea/magento2plugin/inspections/graphqls/SchemaResolverInspection.java b/src/com/magento/idea/magento2plugin/inspections/graphqls/SchemaResolverInspection.java
@@ -35,14 +35,19 @@ public void visitValue(@NotNull GraphQLValue element) {
                 GetPhpClassByFQN getPhpClassByFQN = GetPhpClassByFQN.getInstance(holder.getProject());
                 PhpClass resolverClass = getPhpClassByFQN.execute(resolverFQN);
                 if (resolverClass == null) {
+                    holder.registerProblem(element,
+                        inspectionBundle.message(
+                            "inspection.graphql.resolver.notExist"
+                        ),
+                        ProblemHighlightType.ERROR);
                     return;
                 }
                 if (!GraphQlUtil.isResolver(resolverClass)) {
                     holder.registerProblem(element,
-                            inspectionBundle.message(
-                                    "inspection.graphql.resolver.mustImplement"
-                            ),
-                            ProblemHighlightType.ERROR);
+                        inspectionBundle.message(
+                            "inspection.graphql.resolver.mustImplement"
+                        ),
+                        ProblemHighlightType.ERROR);
                 }
             }
         };
diff --git a/src/com/magento/idea/magento2plugin/magento/files/GraphQLSchema.java b/src/com/magento/idea/magento2plugin/magento/files/GraphQLSchema.java
@@ -0,0 +1,9 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+package com.magento.idea.magento2plugin.magento.files;
+
+public class GraphQLSchema {
+    public static String FILE_NAME = "schema.graphqls";
+}
diff --git a/testData/inspections/graphqls/SchemaResolverInspection/withInvalidSchemaResolverInterface/schema.graphqls b/testData/inspections/graphqls/SchemaResolverInspection/withInvalidSchemaResolverInterface/schema.graphqls
@@ -2,5 +2,5 @@
 # See COPYING.txt for license details.
 
 type Query {
-    test(input: test!): test @resolver(class: "\\Magento\\InspectionTest\\Model\\GraphQl\\WithInvalidSchemaResolverInterface\\Item") @doc(description: "Test")
+    test(input: test!): test @resolver(class: "\\Magento\\Backend\\Model\\Source\\YesNo") @doc(description: "Test")
 }
diff --git a/testData/inspections/graphqls/SchemaResolverInspection/withValidBatchResolverInterface/schema.graphqls b/testData/inspections/graphqls/SchemaResolverInspection/withValidBatchResolverInterface/schema.graphqls
@@ -2,5 +2,5 @@
 # See COPYING.txt for license details.
 
 type Query {
-    test(input: test!): test @resolver(class: "\\Magento\\InspectionTest\\Model\\GraphQl\\WithValidBatchResolverInterface\\Item") @doc(description: "Test")
+    test(input: test!): test @resolver(class: "\\Magento\\CatalogGraphQl\\Model\\Resolver\\ImplementsBatchResolverInterface") @doc(description: "Test")
 }
diff --git a/testData/inspections/graphqls/SchemaResolverInspection/withValidBatchServiceContractResolverInterface/schema.graphqls b/testData/inspections/graphqls/SchemaResolverInspection/withValidBatchServiceContractResolverInterface/schema.graphqls
@@ -2,5 +2,5 @@
 # See COPYING.txt for license details.
 
 type Query {
-    test(input: test!): test @resolver(class: "\\Magento\\InspectionTest\\Model\\GraphQl\\WithValidBatchServiceContractResolverInterface\\Item") @doc(description: "Test")
+    test(input: test!): test @resolver(class: "\\Magento\\CatalogGraphQl\\Model\\Resolver\\ImplementsBatchServiceContractResolverInterface") @doc(description: "Test")
 }
diff --git a/testData/inspections/graphqls/SchemaResolverInspection/withValidSchemaResolverInterface/schema.graphqls b/testData/inspections/graphqls/SchemaResolverInspection/withValidSchemaResolverInterface/schema.graphqls
@@ -2,5 +2,5 @@
 # See COPYING.txt for license details.
 
 type Query {
-    test(input: test!): test @resolver(class: "\\Magento\\InspectionTest\\Model\\GraphQl\\WithValidSchemaResolverInterface\\Item") @doc(description: "Test")
+    test(input: test!): test @resolver(class: "\\Magento\\CatalogGraphQl\\Model\\Resolver\\ImplementsResolverInterface") @doc(description: "Test")
 }
diff --git a/testData/project/magento2/app/code/Magento/InspectionTest/Model/GraphQl/WithInvalidSchemaResolverInterface/Item.php b/testData/project/magento2/app/code/Magento/InspectionTest/Model/GraphQl/WithInvalidSchemaResolverInterface/Item.php
diff --git a/testData/project/magento2/app/code/Magento/InspectionTest/composer.json b/testData/project/magento2/app/code/Magento/InspectionTest/composer.json
diff --git a/testData/project/magento2/app/code/Magento/InspectionTest/etc/module.xml b/testData/project/magento2/app/code/Magento/InspectionTest/etc/module.xml
diff --git a/testData/project/magento2/app/code/Magento/InspectionTest/registration.php b/testData/project/magento2/app/code/Magento/InspectionTest/registration.php
diff --git a/testData/project/magento2/vendor/magento/module-catalog-graph-ql/Model/Resolver/ImplementsBatchResolverInterface.php b/testData/project/magento2/vendor/magento/module-catalog-graph-ql/Model/Resolver/ImplementsBatchResolverInterface.php
@@ -5,11 +5,10 @@
  */
 declare(strict_types=1);
 
-namespace Magento\InspectionTest\Model\GraphQl\WithValidBatchResolverInterface;
+namespace Magento\CatalogGraphQl\Model\Resolver;
 
 use Magento\Framework\GraphQl\Query\Resolver\BatchResolverInterface;
 
-class Item implements BatchResolverInterface
+class ImplementsBatchResolverInterface implements BatchResolverInterface
 {
-}
-?>
+}
diff --git a/testData/project/magento2/vendor/magento/module-catalog-graph-ql/Model/Resolver/ImplementsBatchServiceContractResolverInterface.php b/testData/project/magento2/vendor/magento/module-catalog-graph-ql/Model/Resolver/ImplementsBatchServiceContractResolverInterface.php
@@ -5,11 +5,10 @@
  */
 declare(strict_types=1);
 
-namespace Magento\InspectionTest\Model\GraphQl\WithValidBatchServiceContractResolverInterface;
+namespace Magento\CatalogGraphQl\Model\Resolver;
 
 use Magento\Framework\GraphQl\Query\Resolver\BatchServiceContractResolverInterface;
 
-class Item implements BatchServiceContractResolverInterface
+class ImplementsBatchServiceContractResolverInterface implements BatchServiceContractResolverInterface
 {
-}
-?>
+}
diff --git a/testData/project/magento2/vendor/magento/module-catalog-graph-ql/Model/Resolver/ImplementsResolverInterface.php b/testData/project/magento2/vendor/magento/module-catalog-graph-ql/Model/Resolver/ImplementsResolverInterface.php
@@ -5,10 +5,10 @@
  */
 declare(strict_types=1);
 
-namespace Magento\InspectionTest\Model\GraphQl\WithValidSchemaResolverInterface;
+namespace Magento\CatalogGraphQl\Model\Resolver;
 
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 
-class Item implements ResolverInterface
+class ImplementsResolverInterface implements ResolverInterface
 {
 }
diff --git a/tests/com/magento/idea/magento2plugin/inspections/graphqls/InspectionGraphqlsFixtureTestCase.java b/tests/com/magento/idea/magento2plugin/inspections/graphqls/InspectionGraphqlsFixtureTestCase.java
@@ -6,8 +6,7 @@
 package com.magento.idea.magento2plugin.inspections.graphqls;
 
 import com.magento.idea.magento2plugin.BaseProjectTestCase;
-import com.intellij.codeInsight.daemon.impl.HighlightInfo;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 
 abstract public class InspectionGraphqlsFixtureTestCase extends BaseProjectTestCase {
 
diff --git a/tests/com/magento/idea/magento2plugin/inspections/graphqls/SchemaResolverInspectionTest.java b/tests/com/magento/idea/magento2plugin/inspections/graphqls/SchemaResolverInspectionTest.java
@@ -4,6 +4,8 @@
  */
 package com.magento.idea.magento2plugin.inspections.graphqls;
 
+import com.magento.idea.magento2plugin.magento.files.GraphQLSchema;
+
 public class SchemaResolverInspectionTest extends InspectionGraphqlsFixtureTestCase {
 
     private final String errorMessage =  inspectionBundle.message(
@@ -21,23 +23,23 @@ protected boolean isWriteActionRequired() {
     }
 
     public void testWithValidSchemaResolverInterface() throws Exception {
-        myFixture.configureByFile(getFixturePath("schema.graphqls"));
+        myFixture.configureByFile(getFixturePath(GraphQLSchema.FILE_NAME));
         assertHasNoHighlighting(errorMessage);
     }
 
     public void testWithInvalidSchemaResolverInterface() throws Exception {
-        myFixture.configureByFile(getFixturePath("schema.graphqls"));
+        myFixture.configureByFile(getFixturePath(GraphQLSchema.FILE_NAME));
         assertHasHighlighting(errorMessage);
     }
 
     public void testWithValidBatchResolverInterface() throws Exception {
-        myFixture.configureByFile(getFixturePath("schema.graphqls"));
+        myFixture.configureByFile(getFixturePath(GraphQLSchema.FILE_NAME));
 
         assertHasNoHighlighting(errorMessage);
     }
 
     public void testWithValidBatchServiceContractResolverInterface() throws Exception {
-        myFixture.configureByFile(getFixturePath("schema.graphqls"));
+        myFixture.configureByFile(getFixturePath(GraphQLSchema.FILE_NAME));
 
         assertHasNoHighlighting(errorMessage);
     }

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`	`# See COPYING.txt for license details.`
`3`	`3`
`4`	`4`	`type Query {`
`5`		`- test(input: test!): test @resolver(class: "\\Magento\\InspectionTest\\Model\\GraphQl\\WithInvalidSchemaResolverInterface\\Item") @doc(description: "Test")`
	`5`	`+ test(input: test!): test @resolver(class: "\\Magento\\Backend\\Model\\Source\\YesNo") @doc(description: "Test")`
`6`	`6`	`}`