Fixed test names, and selector contributor

Author: Vitaliy Boyko

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,10 @@
+/*
+ * 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";
+}

testData/completion/xml/MftfEntityNameCompletionRegistrar/createDataInTestWithSectionMustBeEmpty/TestMftfTest.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="TestAddOutOfStockProductToCompareListTest">
+        <before>
+            <createData entity="Section<caret>" stepKey="product">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+        </before>
+    </test>
+</tests>

testData/project/magento2/app/code/Foo/Bar/Test/Mftf/Section/TestAdminAddProductsSection.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="TestAdminProductsSection">
+        <element name="testaddSelectedProducts" type="button" selector=".product_form_product_form_bundle-items_modal button.action-primary" timeout="30"/>
+        <element name="testfilters" type="button" selector=".product_form_product_form_bundle-items_modal button[data-action='grid-filter-expand']" timeout="30"/>
+        <element name="testapplyFilters" type="button" selector=".product_form_product_form_bundle-items_modal [data-action='grid-filter-apply']" timeout="30"/>
+    </section>
+</sections>

testData/project/magento2/app/code/Foo/Bar/Test/Mftf/Section/TestAdminAddProductsToOptionPanelSection.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="TestAdminProductsPanelSection">
+        <element name="testaddSelectedProducts" type="button" selector=".product_form_product_form_bundle-items_modal button.action-primary" timeout="30"/>
+    </section>
+</sections>

tests/com/magento/idea/magento2plugin/completion/xml/BackendModelXmlCompletionRegistrarTest.java

@@ -37,15 +37,15 @@ public void testSystemXmlBackendModelAttributeMatchWithFile() {
             ModuleSystemXml.FILE_NAME
         );
 
-        assertCompletionMatchWithFilePositiveCase(filePath, systemXmlBackendModelLookupStringCheck);
+        assertFileConatainsCompletions(filePath, systemXmlBackendModelLookupStringCheck);
     }
 
     public void testSystemXmlBackendModelAttributeDontMatchWithFile() {
         String filePath = this.getFixturePath(
             "other-file-than-system.xml"
         );
 
-        assertCompletionMatchWithFileNegativeCase(
+        assertFileNotConatainsCompletions(
                 filePath,
                 systemXmlBackendModelLookupStringCheck
         );
@@ -74,15 +74,15 @@ public void testConfigXmlBackendModelAttributeMatchWithFile() {
             ModuleConfigXml.FILE_NAME
         );
 
-        assertCompletionMatchWithFilePositiveCase(filePath, configXmlBackendModelLookupStringCheck);
+        assertFileConatainsCompletions(filePath, configXmlBackendModelLookupStringCheck);
     }
 
     public void testConfigXmlBackendModelAttributeDontMatchWithFile() {
         String filePath = this.getFixturePath(
             "other-file-than-config.xml"
         );
 
-        assertCompletionMatchWithFileNegativeCase(
+        assertFileNotConatainsCompletions(
                 filePath,
                 configXmlBackendModelLookupStringCheck
         );

tests/com/magento/idea/magento2plugin/completion/xml/CompletionXmlFixtureTestCase.java

@@ -29,7 +29,7 @@ public void assertCompletionContains(String filePath, String... lookupStrings) {
         checkContainsCompletion(lookupStrings);
     }
 
-    protected void assertCompletionMatchWithFilePositiveCase(
+    protected void assertFileConatainsCompletions(
             String positiveFilePath,
             String... lookupStrings
     ) {
@@ -42,7 +42,7 @@ protected void assertCompletionMatchWithFilePositiveCase(
         checkContainsCompletion(lookupStrings, messageEmptyLookup, messageCompletionContains);
     }
 
-    protected void assertCompletionMatchWithFileNegativeCase(
+    protected void assertFileNotConatainsCompletions(
             String negativeFilePath,
             String... lookupStrings
     ) {

tests/com/magento/idea/magento2plugin/completion/xml/MftfEntityNameCompletionRegistrarTest.java

@@ -19,48 +19,55 @@ public void testCreateDataActionGroupMustProvideCompletion () {
         );
         myFixture.copyFileToProject(filePath);
 
-        assertCompletionMatchWithFilePositiveCase(filePath, lookupStringsEntities);
+        assertFileConatainsCompletions(filePath, lookupStringsEntities);
     }
 
     public void testCreateDataInTestMustProvideCompletion () {
         String filePath = this.getFixturePath("TestMftfTest.xml");
         myFixture.copyFileToProject(filePath);
 
-        assertCompletionMatchWithFilePositiveCase(filePath, lookupStringsEntities);
+        assertFileConatainsCompletions(filePath, lookupStringsEntities);
+    }
+
+    public void testCreateDataInTestWithSectionMustBeEmpty () {
+        String filePath = this.getFixturePath("TestMftfTest.xml");
+        myFixture.copyFileToProject(filePath);
+
+        assertCompletionNotShowing(filePath);
     }
 
     public void testUpdateDataActionGroupMustProvideCompletion () {
         String filePath = this.getFixturePath("TestActionGroup.xml");
         myFixture.copyFileToProject(filePath);
 
-        assertCompletionMatchWithFilePositiveCase(filePath, lookupStringsEntities);
+        assertFileConatainsCompletions(filePath, lookupStringsEntities);
     }
 
     public void testUpdateDataInTestMustProvideCompletion () {
         String filePath = this.getFixturePath("TestMftfTest.xml");
         myFixture.copyFileToProject(filePath);
 
-        assertCompletionMatchWithFilePositiveCase(filePath, lookupStringsEntities);
+        assertFileConatainsCompletions(filePath, lookupStringsEntities);
     }
 
     public void testUserInputInActionGroupMustProvideCompletion () {
         String filePath = this.getFixturePath("TestActionGroup.xml");
         myFixture.copyFileToProject(filePath);
 
-        assertCompletionMatchWithFilePositiveCase(filePath, lookupStringsEntities);
+        assertFileConatainsCompletions(filePath, lookupStringsEntities);
     }
 
     public void testUserInputInTestMustProvideCompletion () {
         String filePath = this.getFixturePath("TestMftfTest.xml");
         myFixture.copyFileToProject(filePath);
 
-        assertCompletionMatchWithFilePositiveCase(filePath, lookupStringsEntities);
+        assertFileConatainsCompletions(filePath, lookupStringsEntities);
     }
 
     public void testEntityExtendsInDataMustProvideCompletion () {
         String filePath = this.getFixturePath("TestData.xml");
         myFixture.copyFileToProject(filePath);
 
-        assertCompletionMatchWithFilePositiveCase(filePath, lookupStringsEntities);
+        assertFileConatainsCompletions(filePath, lookupStringsEntities);
     }
 }

tests/com/magento/idea/magento2plugin/completion/xml/SourceModelXmlCompletionRegistrarTest.java

@@ -25,14 +25,14 @@ public void testSourceModelXmlElementMatchWithFilePositiveCase() {
         String filePath = this.getFixturePath(ModuleSystemXml.FILE_NAME);
         myFixture.copyFileToProject(filePath);
 
-        assertCompletionMatchWithFilePositiveCase(filePath, lookupStringsCheck);
+        assertFileConatainsCompletions(filePath, lookupStringsCheck);
     }
 
     public void testSourceModelXmlElementMatchWithFileNegativeCase() {
         String filePath = this.getFixturePath("not-system.xml");
         myFixture.copyFileToProject(filePath);
 
-        assertCompletionMatchWithFileNegativeCase(
+        assertFileNotConatainsCompletions(
             filePath,
             lookupStringsCheck
         );
@@ -49,14 +49,14 @@ public void testSourceModelXmlAttributeMatchWithFilePositiveCase() {
         String filePath = this.getFixturePath(ModuleWidgetXml.FILE_NAME);
         myFixture.copyFileToProject(filePath);
 
-        assertCompletionMatchWithFilePositiveCase(filePath, lookupStringsCheck);
+        assertFileConatainsCompletions(filePath, lookupStringsCheck);
     }
 
     public void testSourceModelXmlAttributeMatchWithFileNegativeCase() throws IOException {
         String filePath = this.getFixturePath("not-widget.xml");
         myFixture.copyFileToProject(filePath);
 
-        assertCompletionMatchWithFileNegativeCase(
+        assertFileNotConatainsCompletions(
             filePath,
             lookupStringsCheck
         );