Skip to content

Commit 7de6505

Browse files
imeron2433imeron2433
committed
MQE-619: [Data Input] Change root tags from config to represent their containing elements
- change xsd schema root tags to reflect contents
1 parent 437a7de commit 7de6505

File tree

13 files changed

+39
-33
lines changed

13 files changed

+39
-33
lines changed

‎dev/tests/verification/TestModule/Data/ParameterArrayData.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
*/
77
-->
88

9-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="simpleParamData" type="data">
1212
<data key="name">name</data>
1313
<data key="uniqueNamePre" unique="prefix">prename</data>
1414
<data key="uniqueNamePost" unique="suffix">postname</data>
1515
</entity>
16-
</config>
16+
</entities>

‎dev/tests/verification/TestModule/Data/PersistedReplacementData.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88
-->
99

10-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1111
xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
1212
<entity name="ReplacementPerson" type="samplePerson">
1313
<data key="firstname">John</data>
@@ -22,4 +22,4 @@
2222
<data key="lastName">Dane</data>
2323
<data key="mergedField">unmerged</data>
2424
</entity>
25-
</config>
25+
</entities>

‎dev/tests/verification/TestModule/Data/PersistedReplacementMergeData.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
*/
88
-->
99

10-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1111
xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
1212
<entity name="DefaultPerson" type="samplePerson">
1313
<data key="mergedField">merged</data>
1414
<data key="newField">newField</data>
1515
</entity>
16-
</config>
16+
</entities>

‎dev/tests/verification/TestModule/Data/ReplacementData.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88
-->
99

10-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1111
xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
1212
<entity name="simpleData" type="simpleData">
1313
<data key="firstname">John</data>
@@ -18,4 +18,4 @@
1818
<data key="firstname" unique="prefix">John</data>
1919
<data key="lastname" unique="suffix">Doe</data>
2020
</entity>
21-
</config>
21+
</entities>

‎dev/tests/verification/TestModule/Page/SamplePage.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88

9-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
1111
<page name="SamplePage" url="/{{var1}}/{{var2}}.html" module="SampleTests" parameterized="true">
1212
<section name="SampleSection"/>
@@ -20,4 +20,4 @@
2020
<page name="TwoParamPage" url="/{{var1}}/{{var2}}.html" module="SampleTests" parameterized="true">
2121
<section name="SampleSection"/>
2222
</page>
23-
</config>
23+
</pages>

‎dev/tests/verification/TestModule/Section/LocatorFunctionSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88

9-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="LocatorFunctionSection">
1212
<element name="simpleLocator" type="button" locatorFunction="contains('label', 'Name')"/>
@@ -16,4 +16,4 @@
1616
<element name="arrayLocator" type="button" locatorFunction="find('img', ['title' => 'diagram'])"/>
1717
<element name="arrayLocatorTwoParam" type="button" locatorFunction="find({{arg1}}, {{arg2}})" parameterized="true"/>
1818
</section>
19-
</config>
19+
</sections>

‎dev/tests/verification/TestModule/Section/SampleSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88

9-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="SampleSection">
1212
<element name="simpleElement" type="button" selector="#element"/>
@@ -18,4 +18,4 @@
1818
<element name="timeoutElement" type="button" selector="#foo" timeout="30"/>
1919
<element name="mergeElement" type="button" selector="#unMerge"/>
2020
</section>
21-
</config>
21+
</sections>

‎dev/tests/verification/TestModule/Section/ZMergeSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88

9-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="SampleSection">
1212
<element name="oneParamElement" type="button" selector="#element .{{var1}}" parameterized="true"/>
@@ -16,4 +16,4 @@
1616
<element name="mergeElement" type="select" selector="#merge"/>
1717
<element name="newElement" type="select" selector="#newElement"/>
1818
</section>
19-
</config>
19+
</sections>

‎etc/di.xml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
<argument name="converter" xsi:type="object">Magento\FunctionalTestingFramework\Config\Converter</argument>
7979
<argument name="schemaLocator" xsi:type="object">Magento\FunctionalTestingFramework\Config\SchemaLocator\Page</argument>
8080
<argument name="idAttributes" xsi:type="array">
81-
<item name="/config/page" xsi:type="string">name</item>
82-
<item name="/config/page/section" xsi:type="string">name</item>
81+
<item name="/pages/page" xsi:type="string">name</item>
82+
<item name="/pages/page/section" xsi:type="string">name</item>
8383
</argument>
8484
<argument name="fileName" xsi:type="string">*Page.xml</argument>
8585
<argument name="defaultScope" xsi:type="string">Page</argument>
@@ -91,8 +91,8 @@
9191
<argument name="converter" xsi:type="object">Magento\FunctionalTestingFramework\Config\Converter</argument>
9292
<argument name="schemaLocator" xsi:type="object">Magento\FunctionalTestingFramework\Config\SchemaLocator\Section</argument>
9393
<argument name="idAttributes" xsi:type="array">
94-
<item name="/config/section" xsi:type="string">name</item>
95-
<item name="/config/section/element" xsi:type="string">name</item>
94+
<item name="/sections/section" xsi:type="string">name</item>
95+
<item name="/sections/section/element" xsi:type="string">name</item>
9696
</argument>
9797
<argument name="fileName" xsi:type="string">*Section.xml</argument>
9898
<argument name="defaultScope" xsi:type="string">Section</argument>
@@ -146,10 +146,10 @@
146146
<argument name="converter" xsi:type="object">Magento\FunctionalTestingFramework\Config\Converter</argument>
147147
<argument name="schemaLocator" xsi:type="object">Magento\FunctionalTestingFramework\Config\SchemaLocator\DataProfile</argument>
148148
<argument name="idAttributes" xsi:type="array">
149-
<item name="/config/entity" xsi:type="string">name</item>
150-
<item name="/config/entity/data" xsi:type="string">key</item>
151-
<item name="/config/entity/array" xsi:type="string">key</item>
152-
<item name="/config/entity/required-entity" xsi:type="string">name</item>
149+
<item name="/entities/entity" xsi:type="string">name</item>
150+
<item name="/entities/entity/data" xsi:type="string">key</item>
151+
<item name="/entities/entity/array" xsi:type="string">key</item>
152+
<item name="/entities/entity/required-entity" xsi:type="string">name</item>
153153
</argument>
154154
<argument name="fileName" xsi:type="string">*Data.xml</argument>
155155
<argument name="defaultScope" xsi:type="string">Data</argument>
@@ -179,10 +179,10 @@
179179
<argument name="converter" xsi:type="object">Magento\FunctionalTestingFramework\Config\Converter</argument>
180180
<argument name="schemaLocator" xsi:type="object">Magento\FunctionalTestingFramework\Config\SchemaLocator\Metadata</argument>
181181
<argument name="idAttributes" xsi:type="array">
182-
<item name="/config/operation" xsi:type="string">name</item>
183-
<item name="/config/operation/field" xsi:type="string">key</item>
184-
<item name="/config/operation/array" xsi:type="string">key</item>
185-
<item name="/config/operation/object" xsi:type="string">key</item>
182+
<item name="/operations/operation" xsi:type="string">name</item>
183+
<item name="/operations/operation/field" xsi:type="string">key</item>
184+
<item name="/operations/operation/array" xsi:type="string">key</item>
185+
<item name="/operations/operation/object" xsi:type="string">key</item>
186186
</argument>
187187
<argument name="fileName" xsi:type="string">*-meta.xml</argument>
188188
<argument name="defaultScope" xsi:type="string">Metadata</argument>
@@ -273,11 +273,17 @@
273273

274274
<!--Config for Action Group -->
275275

276+
<virtualType name="Magento\FunctionalTestingFramework\Config\SchemaLocator\ActionGroup" type="Magento\FunctionalTestingFramework\Config\SchemaLocator">
277+
<arguments>
278+
<argument name="schemaPath" xsi:type="string">Magento/FunctionalTestingFramework/Test/etc/actionGroup.xsd</argument>
279+
</arguments>
280+
</virtualType>
281+
276282
<virtualType name="Magento\FunctionalTestingFramework\Config\Reader\ActionGroupData" type="Magento\FunctionalTestingFramework\Config\Reader\Filesystem">
277283
<arguments>
278284
<argument name="fileResolver" xsi:type="object">Magento\FunctionalTestingFramework\Config\FileResolver\Module</argument>
279285
<argument name="converter" xsi:type="object">Magento\FunctionalTestingFramework\Config\ActionGroupDataConverter</argument>
280-
<argument name="schemaLocator" xsi:type="object">Magento\FunctionalTestingFramework\Config\SchemaLocator\TestData</argument>
286+
<argument name="schemaLocator" xsi:type="object">Magento\FunctionalTestingFramework\Config\SchemaLocator\ActionGroup</argument>
281287
<argument name="idAttributes" xsi:type="array">
282288
<item name="/actionGroups/actionGroup" xsi:type="string">name</item>
283289
<item name="/actionGroups/actionGroup/arguments/argument" xsi:type="string">name</item>

‎src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
10-
<xs:element name="config">
10+
<xs:element name="operations">
1111
<xs:complexType>
1212
<xs:sequence>
1313
<xs:element name="operation" maxOccurs="unbounded" minOccurs="0">

‎src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified"
1010
xmlns:xs="http://www.w3.org/2001/XMLSchema">
1111

12-
<xs:element name="config">
12+
<xs:element name="entities">
1313
<xs:annotation>
1414
<xs:documentation>
1515
The root element for configuration data.

‎src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<xs:documentation>The definition of a page object.</xs:documentation>
1212
</xs:annotation>
1313

14-
<xs:element name="config">
14+
<xs:element name="pages">
1515
<xs:annotation>
1616
<xs:documentation>
1717
The root element for configuration data.

‎src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
10-
<xs:element name="config">
10+
<xs:element name="sections">
1111
<xs:annotation>
1212
<xs:documentation>
1313
The root element for configuration data.

0 commit comments

Comments
 (0)