Merge pull request #139 from magento/plugin-104-cover-mftf-data-entity-test-coverage

Added test coverage MFTF Entity name autocomplete and reference, fixed bugs

Author: Vitaliy

resources/META-INF/plugin.xml

@@ -85,7 +85,7 @@
 
         <projectService serviceImplementation="com.magento.idea.magento2plugin.project.Settings"/>
 
-        <completion.contributor language="XML" implementationClass="com.magento.idea.magento2plugin.completion.xml.XmlCompletionContributor" />
+        <completion.contributor language="XML" implementationClass="com.magento.idea.magento2plugin.completion.xml.XmlCompletionContributor" id="xml" />
 
         <psi.referenceContributor language="XML" implementation="com.magento.idea.magento2plugin.reference.xml.XmlReferenceContributor"/>
         <psi.referenceContributor language="PHP" implementation="com.magento.idea.magento2plugin.reference.php.PhpReferenceContributor"/>

src/com/magento/idea/magento2plugin/completion/xml/XmlCompletionContributor.java

@@ -209,7 +209,8 @@ public XmlCompletionContributor() {
         // mftf selector completion contributor
         extend(CompletionType.BASIC,
             psiElement(XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN)
-            .inside(XmlPatterns.xmlAttribute())
+            .inside(XmlPatterns.xmlAttribute()
+            .withName(MftfActionGroup.SELECTOR_ATTRIBUTE))
             .inFile(xmlFile().withName(string().endsWith("Test.xml"))),
             new SelectorCompletionProvider()
         );

src/com/magento/idea/magento2plugin/magento/files/MftfActionGroup.java

@@ -0,0 +1,14 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+package com.magento.idea.magento2plugin.magento.files;
+
+public class MftfActionGroup {
+
+    public static String SELECTOR_ATTRIBUTE = "selector";
+    public static String ENTITY_ATTRIBUTE = "entity";
+    public static String CREATE_DATA_TAG = "createData";
+    public static String UPDATE_DATA_TAG = "updateData";
+    public static String USER_INPUT_TAG = "userInput";
+}

src/com/magento/idea/magento2plugin/reference/xml/XmlReferenceContributor.java

@@ -8,6 +8,7 @@
 import com.intellij.psi.PsiReferenceContributor;
 import com.intellij.psi.PsiReferenceRegistrar;
 import com.intellij.psi.xml.XmlTokenType;
+import com.magento.idea.magento2plugin.magento.files.MftfActionGroup;
 import com.magento.idea.magento2plugin.php.util.PhpRegex;
 import com.magento.idea.magento2plugin.reference.provider.*;
 import com.magento.idea.magento2plugin.reference.provider.mftf.*;
@@ -157,22 +158,28 @@ public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar)
                 )
         );
 
-        // <someXmlTag someAttribute="{{someValue}}" />
+        // <someXmlTag userInput="{{someValue}}" />
         registrar.registerReferenceProvider(
-            XmlPatterns.xmlAttributeValue().withValue(string().matches(".*\\{\\{[^\\}]+\\}\\}.*")),
+            XmlPatterns.xmlAttributeValue().withValue(
+                    string().matches(".*\\{\\{[^\\}]+\\}\\}.*")
+            ).withParent(XmlPatterns.xmlAttribute().withName(
+                    MftfActionGroup.USER_INPUT_TAG
+            )),
             new CompositeReferenceProvider(
-                new DataReferenceProvider(),
-                new PageReferenceProvider(),
-                new SectionReferenceProvider()
+                new DataReferenceProvider()
             )
         );
 
         // <createData entity="SimpleProduct" />
+        // <updateData entity="SimpleProduct" />
         registrar.registerReferenceProvider(
-            XmlPatterns.xmlAttributeValue().withParent(XmlPatterns.xmlAttribute().withName(string().oneOf("entity", "value", "userInput", "url"))),
+            XmlPatterns.xmlAttributeValue().withParent(XmlPatterns.xmlAttribute()
+                .withName(MftfActionGroup.ENTITY_ATTRIBUTE)
+                .withParent(XmlPatterns.xmlTag().withName(
+                    string().oneOf(MftfActionGroup.CREATE_DATA_TAG, MftfActionGroup.UPDATE_DATA_TAG)
+            ))),
             new CompositeReferenceProvider(
-                new DataReferenceProvider(),
-                new SectionReferenceProvider()
+                new DataReferenceProvider()
             )
         );