Skip to content

Commit 2e6d4b8

Browse files
jilu1jilu1
committed
Merge remote-tracking branch 'origin/MQE-185-refactor-page-object-generator' into develop
2 parents fd02364 + b658d26 commit 2e6d4b8

File tree

8 files changed

+558
-429
lines changed

8 files changed

+558
-429
lines changed

‎etc/di.xml

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@
5454
<argument name="configData" xsi:type="object">Magento\AcceptanceTestFramework\Page\Config\Data</argument>
5555
</arguments>
5656
</type>
57+
<type name="Magento\AcceptanceTestFramework\Generate\GenerateBlock">
58+
<arguments>
59+
<argument name="configData" xsi:type="object">Magento\AcceptanceTestFramework\Block\Config\Data</argument>
60+
</arguments>
61+
</type>
5762

5863
<type name="Magento\AcceptanceTestFramework\Dummy">
5964
<arguments>
@@ -76,6 +81,11 @@
7681
<argument name="schemaPath" xsi:type="string">Magento/AcceptanceTestFramework/Page/etc/pageObject.xsd</argument>
7782
</arguments>
7883
</virtualType>
84+
<virtualType name="Magento\AcceptanceTestFramework\Config\SchemaLocator\Block" type="Magento\AcceptanceTestFramework\Config\SchemaLocator">
85+
<arguments>
86+
<argument name="schemaPath" xsi:type="string">Magento/AcceptanceTestFramework/Page/etc/blockObject.xsd</argument>
87+
</arguments>
88+
</virtualType>
7989
<virtualType name="Magento\AcceptanceTestFramework\Config\Reader\Page" type="Magento\AcceptanceTestFramework\Config\Reader\Filesystem">
8090
<arguments>
8191
<argument name="fileResolver" xsi:type="object">Magento\AcceptanceTestFramework\Config\FileResolver\Mask</argument>
@@ -84,47 +94,40 @@
8494
<argument name="idAttributes" xsi:type="array">
8595
<item name="/config/page" xsi:type="string">name</item>
8696
<item name="/config/page/block" xsi:type="string">name</item>
87-
<item name="/config/page/block/element" xsi:type="string">name</item>
8897
</argument>
8998
<argument name="fileName" xsi:type="string">#\.xml$#</argument>
9099
<argument name="defaultScope" xsi:type="string">Page</argument>
91100
</arguments>
92101
</virtualType>
93-
<virtualType name="Magento\AcceptanceTestFramework\Page\Config\Data" type="Magento\AcceptanceTestFramework\Config\Data">
102+
<virtualType name="Magento\AcceptanceTestFramework\Config\Reader\Block" type="Magento\AcceptanceTestFramework\Config\Reader\Filesystem">
94103
<arguments>
95-
<argument name="reader" xsi:type="object">Magento\AcceptanceTestFramework\Config\Reader\Page</argument>
104+
<argument name="fileResolver" xsi:type="object">Magento\AcceptanceTestFramework\Config\FileResolver\Mask</argument>
105+
<argument name="converter" xsi:type="object">Magento\AcceptanceTestFramework\Config\Converter</argument>
106+
<argument name="schemaLocator" xsi:type="object">Magento\AcceptanceTestFramework\Config\SchemaLocator\Block</argument>
107+
<argument name="idAttributes" xsi:type="array">
108+
<item name="/config/block" xsi:type="string">name</item>
109+
<item name="/config/block/element" xsi:type="string">name</item>
110+
</argument>
111+
<argument name="fileName" xsi:type="string">#\.xml$#</argument>
112+
<argument name="defaultScope" xsi:type="string">Block</argument>
96113
</arguments>
97114
</virtualType>
98-
<virtualType name="Magento\AcceptanceTestFramework\DataProfile\Config\Data" type="Magento\AcceptanceTestFramework\Config\Data">
115+
<virtualType name="Magento\AcceptanceTestFramework\Page\Config\Data" type="Magento\AcceptanceTestFramework\Config\Data">
99116
<arguments>
100-
<argument name="reader" xsi:type="object">Magento\AcceptanceTestFramework\Config\Reader\DataProfile</argument>
117+
<argument name="reader" xsi:type="object">Magento\AcceptanceTestFramework\Config\Reader\Page</argument>
101118
</arguments>
102119
</virtualType>
103-
104-
<virtualType name="Magento\AcceptanceTestFramework\Config\SchemaLocator\DataProfile" type="Magento\AcceptanceTestFramework\Config\SchemaLocator">
120+
<virtualType name="Magento\AcceptanceTestFramework\Block\Config\Data" type="Magento\AcceptanceTestFramework\Config\Data">
105121
<arguments>
106-
<argument name="schemaPath" xsi:type="string">Magento/AcceptanceTestFramework/DataGenerator/etc/DataProfileSchema.xsd</argument>
122+
<argument name="reader" xsi:type="object">Magento\AcceptanceTestFramework\Config\Reader\Block</argument>
107123
</arguments>
108124
</virtualType>
109-
110-
<virtualType name="Magento\AcceptanceTestFramework\Config\Reader\DataProfile" type="Magento\AcceptanceTestFramework\Config\Reader\Filesystem">
125+
<type name="Magento\AcceptanceTestFramework\Generate\Pool">
111126
<arguments>
112-
<argument name="fileResolver" xsi:type="object">Magento\AcceptanceTestFramework\Config\FileResolver\Module</argument>
113-
<argument name="converter" xsi:type="object">Magento\AcceptanceTestFramework\Config\Converter</argument>
114-
<argument name="schemaLocator" xsi:type="object">Magento\AcceptanceTestFramework\Config\SchemaLocator\DataProfile</argument>
115-
<argument name="idAttributes" xsi:type="array">
116-
<item name="/config/entities/entity" xsi:type="string">name</item>
117-
<item name="/config/entities/entity/dataObjects/dataObject" xsi:type="string">name</item>
118-
<item name="/config/entities/entity/dataObjects/dataObject/dataArray/data" xsi:type="string">key</item>
127+
<argument name="pool" xsi:type="array">
128+
<item name="page" xsi:type="object">Magento\AcceptanceTestFramework\Generate\GeneratePage</item>
129+
<item name="block" xsi:type="object">Magento\AcceptanceTestFramework\Generate\GenerateBlock</item>
119130
</argument>
120-
<argument name="fileName" xsi:type="string">data.xml</argument>
121-
<argument name="defaultScope" xsi:type="string">*/etc</argument>
122-
</arguments>
123-
</virtualType>
124-
125-
<type name="Magento\AcceptanceTestFramework\DataProfileSchemaParser">
126-
<arguments>
127-
<argument name="dataProfiles" xsi:type="object">Magento\AcceptanceTestFramework\DataProfile\Config\Data</argument>
128131
</arguments>
129132
</type>
130133
</config>

‎src/Magento/AcceptanceTestFramework/Generate/AbstractGenerate.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,20 @@ abstract class AbstractGenerate implements LauncherInterface
1616
*/
1717
protected $cnt = 0;
1818

19+
/**
20+
* Execution start in Unix timestamp with microseconds.
21+
*
22+
* @var int
23+
*/
24+
protected $start;
25+
26+
/**
27+
* Execution end in Unix timestamp with microseconds.
28+
*
29+
* @var int
30+
*/
31+
protected $end;
32+
1933
/**
2034
* An array of errors.
2135
*

0 commit comments

Comments
 (0)