Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated XML Schemas to be compatible with XSD Diagram parsing tool #32

Merged
merged 1 commit into from
Feb 2, 2018
Merged

Updated XML Schemas to be compatible with XSD Diagram parsing tool #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
171 changes: 47 additions & 124 deletions src/Magento/FunctionalTestingFramework/Test/etc/Actions/assertActions.xsd
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 6 additions & 17 deletions src/Magento/FunctionalTestingFramework/Test/etc/Actions/clickActions.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
<xs:choice>
<xs:element type="clickType" name="click" minOccurs="0" maxOccurs="unbounded"/>
<xs:element type="clickWithLeftButtonType" name="clickWithLeftButton" minOccurs="0" maxOccurs="unbounded"/>
<xs:element type="clickWithRightButtonType" name="clickWithRightButton" minOccurs="0"
maxOccurs="unbounded"/>
<xs:element type="clickWithRightButtonType" name="clickWithRightButton" minOccurs="0" maxOccurs="unbounded"/>
<xs:element type="doubleClickType" name="doubleClick" minOccurs="0" maxOccurs="unbounded"/>
<xs:element type="conditionalClickType" name="conditionalClick" minOccurs="0" maxOccurs="unbounded"/>
</xs:choice>
Expand All @@ -20,9 +19,7 @@
<xs:attribute type="xs:string" name="selector"/>
<xs:attribute type="xs:string" name="selectorArray"/>
<xs:attribute type="xs:string" name="userInput"/>
<xs:attribute ref="stepKey" use="required"/>
<xs:attribute ref="before"/>
<xs:attribute ref="after"/>
<xs:attributeGroup ref="commonActionAttributes"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
Expand All @@ -33,9 +30,7 @@
<xs:attribute type="xs:string" name="selectorArray"/>
<xs:attribute type="xs:string" name="x"/>
<xs:attribute type="xs:string" name="y"/>
<xs:attribute ref="stepKey" use="required"/>
<xs:attribute ref="before"/>
<xs:attribute ref="after"/>
<xs:attributeGroup ref="commonActionAttributes"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
Expand All @@ -46,9 +41,7 @@
<xs:attribute type="xs:string" name="selectorArray"/>
<xs:attribute type="xs:string" name="x"/>
<xs:attribute type="xs:string" name="y"/>
<xs:attribute ref="stepKey" use="required"/>
<xs:attribute ref="before"/>
<xs:attribute ref="after"/>
<xs:attributeGroup ref="commonActionAttributes"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
Expand All @@ -58,19 +51,15 @@
<xs:attribute type="xs:string" name="selector" use="required"/>
<xs:attribute type="xs:string" name="dependentSelector" use="required"/>
<xs:attribute type="xs:boolean" name="visible" use="required"/>
<xs:attribute ref="stepKey" use="required"/>
<xs:attribute ref="before"/>
<xs:attribute ref="after"/>
<xs:attributeGroup ref="commonActionAttributes"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:complexType name="doubleClickType">
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:string" name="selector" use="required"/>
<xs:attribute ref="stepKey" use="required"/>
<xs:attribute ref="before"/>
<xs:attribute ref="after"/>
<xs:attributeGroup ref="commonActionAttributes"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
Expand Down
51 changes: 23 additions & 28 deletions src/Magento/FunctionalTestingFramework/Test/etc/Actions/commonAttributes.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,25 @@
<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:attribute type="xs:string" name="stepKey" id="stepKey">
<xs:annotation>
<xs:documentation>
Test action's unique identifier.
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute type="xs:string" name="before" id="before">
<xs:annotation>
<xs:documentation>
stepKey of action that must be executed next.
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute type="xs:string" name="after" id="after">
<xs:annotation>
<xs:documentation>
stepKey of preceding action.
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute type="xs:string" name="selector" id="selector">
<xs:annotation>
<xs:documentation>
Selector to be used in test action.
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attributeGroup name="commonActionAttributes">
<xs:attribute type="xs:string" name="stepKey" use="required">
<xs:annotation>
<xs:documentation>
Test action's unique identifier.
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute type="xs:string" name="before">
<xs:annotation>
<xs:documentation>
stepKey of action that must be executed next.
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute type="xs:string" name="after">
<xs:annotation>
<xs:documentation>
stepKey of preceding action.
</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:attributeGroup>
</xs:schema>
39 changes: 10 additions & 29 deletions src/Magento/FunctionalTestingFramework/Test/etc/Actions/customActions.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
<xs:choice>
<xs:element type="magentoCLIType" name="magentoCLI" minOccurs="0" maxOccurs="unbounded"/>
<xs:element type="closeAdminNotificationType" name="closeAdminNotification" minOccurs="0" maxOccurs="unbounded"/>
<xs:element type="searchAndMultiSelectOptionType" name="searchAndMultiSelectOption" minOccurs="0"
maxOccurs="unbounded"/>
<xs:element type="searchAndMultiSelectOptionType" name="searchAndMultiSelectOption" minOccurs="0" maxOccurs="unbounded"/>
<xs:element type="formatMoneyType" name="formatMoney" minOccurs="0" maxOccurs="unbounded"/>
<xs:element type="parseFloatType" name="parseFloat" minOccurs="0" maxOccurs="unbounded"/>
<xs:element type="mSetLocaleType" name="mSetLocale" minOccurs="0" maxOccurs="unbounded"/>
Expand All @@ -24,18 +23,14 @@
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:string" name="command"/>
<xs:attribute ref="stepKey" use="required"/>
<xs:attribute ref="before"/>
<xs:attribute ref="after"/>
<xs:attributeGroup ref="commonActionAttributes"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:complexType name="closeAdminNotificationType">
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute ref="stepKey" use="required"/>
<xs:attribute ref="before"/>
<xs:attribute ref="after"/>
<xs:attributeGroup ref="commonActionAttributes"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
Expand All @@ -45,9 +40,7 @@
<xs:attribute type="xs:string" name="selector" use="required"/>
<xs:attribute type="xs:string" name="parameterArray" use="required"/>
<xs:attribute type="xs:string" name="requiredAction"/>
<xs:attribute ref="stepKey" use="required"/>
<xs:attribute ref="before"/>
<xs:attribute ref="after"/>
<xs:attributeGroup ref="commonActionAttributes"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
Expand All @@ -56,19 +49,15 @@
<xs:extension base="xs:string">
<xs:attribute type="xs:string" name="userInput"/>
<xs:attribute type="xs:string" name="locale"/>
<xs:attribute ref="stepKey" use="required"/>
<xs:attribute ref="before"/>
<xs:attribute ref="after"/>
<xs:attributeGroup ref="commonActionAttributes"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:complexType name="parseFloatType">
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:string" name="userInput"/>
<xs:attribute ref="stepKey" use="required"/>
<xs:attribute ref="before"/>
<xs:attribute ref="after"/>
<xs:attributeGroup ref="commonActionAttributes"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
Expand All @@ -77,37 +66,29 @@
<xs:extension base="xs:string">
<xs:attribute type="xs:string" name="userInput"/>
<xs:attribute type="xs:string" name="locale" use="required"/>
<xs:attribute ref="stepKey" use="required"/>
<xs:attribute ref="before"/>
<xs:attribute ref="after"/>
<xs:attributeGroup ref="commonActionAttributes"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:complexType name="mResetLocaleType">
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute ref="stepKey" use="required"/>
<xs:attribute ref="before"/>
<xs:attribute ref="after"/>
<xs:attributeGroup ref="commonActionAttributes"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:complexType name="scrollToTopOfPageType">
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute ref="stepKey" use="required"/>
<xs:attribute ref="before"/>
<xs:attribute ref="after"/>
<xs:attributeGroup ref="commonActionAttributes"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:complexType name="clearFieldType">
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:string" name="selector" use="required"/>
<xs:attribute ref="stepKey" use="required"/>
<xs:attribute ref="before"/>
<xs:attribute ref="after"/>
<xs:attributeGroup ref="commonActionAttributes"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
Expand Down
20 changes: 6 additions & 14 deletions src/Magento/FunctionalTestingFramework/Test/etc/Actions/dataActions.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,7 @@
<xs:element type="requiredEntityType" name="requiredEntity" minOccurs="0" maxOccurs="unbounded"/>
</xs:choice>
<xs:attribute ref="entity" use="required"/>
<xs:attribute ref="stepKey" use="required"/>
<xs:attribute ref="before"/>
<xs:attribute ref="after"/>
<xs:attributeGroup ref="commonActionAttributes"/>
<xs:attribute ref="storeCode"/>
</xs:complexType>

Expand All @@ -66,10 +64,8 @@
<xs:element type="requiredEntityType" name="requiredEntity" minOccurs="0" maxOccurs="unbounded"/>
</xs:choice>
<xs:attribute ref="entity" use="required"/>
<xs:attribute ref="stepKey" use="required"/>
<xs:attribute ref="createDataKey" use="required"/>
<xs:attribute ref="before"/>
<xs:attribute ref="after"/>
<xs:attributeGroup ref="commonActionAttributes"/>
<xs:attribute ref="storeCode"/>
</xs:complexType>

Expand All @@ -80,9 +76,7 @@
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute ref="createDataKey" use="required"/>
<xs:attribute ref="stepKey" use="required"/>
<xs:attribute ref="before"/>
<xs:attribute ref="after"/>
<xs:attributeGroup ref="commonActionAttributes"/>
<xs:attribute ref="storeCode"/>
</xs:extension>
</xs:simpleContent>
Expand All @@ -96,16 +90,14 @@
<xs:element type="requiredEntityType" name="requiredEntity" minOccurs="0" maxOccurs="unbounded"/>
</xs:choice>
<xs:attribute ref="entity" use="required"/>
<xs:attribute ref="stepKey" use="required"/>
<xs:attribute type="xs:integer" name="index">
<xs:annotation>
<xs:documentation>
If getData is supposed to return an array of objects, grab only index instead.
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute ref="before"/>
<xs:attribute ref="after"/>
<xs:attributeGroup ref="commonActionAttributes"/>
<xs:attribute ref="storeCode"/>
</xs:complexType>

Expand All @@ -116,8 +108,8 @@
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute ref="createDataKey" use="required"/>
<xs:attribute ref="before"/>
<xs:attribute ref="after"/>
<xs:attribute name="before"/>
<xs:attribute name="after"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
Expand Down
Loading