Skip to content

Commit a1d547f

Browse files
Rrego6Rrego6
committed
MC-38349: Create automated test for SVC changes
- use more generic pathname in tests
1 parent ca3578a commit a1d547f

7 files changed

+151
-142
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
"zendframework/zend-stdlib": "^3.2.1",
1818
"nikic/php-parser": "~4.4.0||~4.5.0||~4.6.0",
1919
"sabre/xml": "^2.1",
20-
"ext-dom": "*"
2120
},
2221
"require-dev": {
2322
"phpunit/phpunit": "^6.5.0",
23+
"ext-dom": "*",
2424
"squizlabs/php_codesniffer": "^3.5"
2525
},
2626
"autoload": {

‎tests/Unit/Console/Command/CompareSourceCommandDatabaseSchemasTest.php

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ public function changesDataProvider()
6565
$pathToFixtures . '/drop-foreign-key/source-code-after',
6666
[
6767
'#Database \(MAJOR\)#',
68-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/drop-foreign-key/source-code-before/Magento/DbSchema/etc/db_schema\.xml:0#',
68+
'#[\w/]+' . '/drop-foreign-key/source-code-before/Magento/DbSchema/etc/db_schema\.xml:0#',
6969
'#unit_test_table/FL_ALLOWED_SEVERITIES\s*\|\s*Foreign key was removed\s*\|\s*M108#',
70-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/drop-foreign-key/source-code-before/Magento/DbSchema/etc/db_schema_whitelist\.json:0 \| unit_test_table/constraint#',
70+
'#[\w/]+' . '/drop-foreign-key/source-code-before/Magento/DbSchema/etc/db_schema_whitelist\.json:0 \| unit_test_table/constraint#',
7171
'#unit_test_table/constraint\s*\|\s*Module db schema whitelist reduced \(unit_test_table/constraint\)#'
7272
],
7373
'Major change is detected.'
@@ -77,7 +77,7 @@ public function changesDataProvider()
7777
$pathToFixtures . '/change-foreign-key/source-code-after',
7878
[
7979
'#Database \(MAJOR\)#',
80-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/change-foreign-key/source-code-before/Magento/DbSchema/etc/db_schema\.xml:0#',
80+
'#[\w/]+' . 'change-foreign-key/source-code-before/Magento/DbSchema/etc/db_schema\.xml:0#',
8181
'#unit_test_table/FL_ALLOWED_SEVERITIES/referenceTable\s*\|\s*Foreign key was changed\s*\|\s*M205#'
8282
],
8383
'Major change is detected.'
@@ -87,7 +87,7 @@ public function changesDataProvider()
8787
$pathToFixtures . '/add-foreign-key/source-code-after',
8888
[
8989
'#Database \(MAJOR\)#',
90-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/add-foreign-key/source-code-after/Magento/DbSchema/etc/db_schema\.xml:0#',
90+
'#[\w/]+' . 'add-foreign-key/source-code-after/Magento/DbSchema/etc/db_schema\.xml:0#',
9191
'#unit_test_table/FL_ALLOWED_SEVERITIES\s*\|\s*Foreign key was added\s*\|\s*M204#'
9292
],
9393
'Major change is detected.'
@@ -97,8 +97,8 @@ public function changesDataProvider()
9797
$pathToFixtures . '/drop-primary-key/source-code-after',
9898
[
9999
'#Database \(MAJOR\)#',
100-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/drop-primary-key/source-code-before/Magento/DbSchema/etc/db_schema\.xml:0#',
101-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/drop-primary-key/source-code-before/Magento/DbSchema/etc/db_schema_whitelist.json:0#',
100+
'#[\w/]+' . 'drop-primary-key/source-code-before/Magento/DbSchema/etc/db_schema\.xml:0#',
101+
'#[\w/]+' . 'drop-primary-key/source-code-before/Magento/DbSchema/etc/db_schema_whitelist.json:0#',
102102
'#unit_test_table\s*\|\s*Module db schema whitelist reduced \(unit_test_table\)\.\s*\|\s*M110#',
103103
'#unit_test_table/PRIMARY\s*\|\s*Primary key was removed\s*\|\s*M207#'
104104
],
@@ -109,8 +109,8 @@ public function changesDataProvider()
109109
$pathToFixtures . '/change-primary-key/source-code-after',
110110
[
111111
'/Database \(MAJOR\)/',
112-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/change-primary-key/source-code-after/Magento/DbSchema/etc/db_schema\.xml:0#',
113-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/change-primary-key/source-code-before/Magento/DbSchema/etc/db_schema\.xml:0#',
112+
'#[\w/]+' . 'change-primary-key/source-code-after/Magento/DbSchema/etc/db_schema\.xml:0#',
113+
'#[\w/]+' . 'change-primary-key/source-code-before/Magento/DbSchema/etc/db_schema\.xml:0#',
114114
'/unit_test_table\/PRIMARY\s*\|\s*Primary key was changed\s*\|\s*M206/'
115115
],
116116
'Major change is detected.'
@@ -120,7 +120,7 @@ public function changesDataProvider()
120120
$pathToFixtures . '/add-primary-key/source-code-after',
121121
[
122122
'/Database \(MAJOR\)/',
123-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/add-primary-key/source-code-after/Magento/DbSchema/etc/db_schema\.xml:0#',
123+
'#[\w/]+' . 'add-primary-key/source-code-after/Magento/DbSchema/etc/db_schema\.xml:0#',
124124
'/unit_test_table\/PRIMARY\s*\|\s*Primary key was added\s*\|\s*M205/'
125125
],
126126
'Major change is detected.'
@@ -132,8 +132,8 @@ public function changesDataProvider()
132132
'/Database \(MAJOR\)/',
133133
'/unit_test_table\/UNIQUE_KEY\s*\|\s*Unique key was removed\s*\|\s*M209/',
134134
'#unit_test_table/constraint\s*\|\s*Module db schema whitelist reduced \(unit_test_table/constraint\)\.\s*\|\s*M110#',
135-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/drop-unique-key/source-code-before/Magento/DbSchema/etc/db_schema.xml:0#',
136-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/drop-unique-key/source-code-before/Magento/DbSchema/etc/db_schema_whitelist.json:0#'
135+
'#[\w/]+' . 'drop-unique-key/source-code-before/Magento/DbSchema/etc/db_schema.xml:0#',
136+
'#[\w/]+' . 'drop-unique-key/source-code-before/Magento/DbSchema/etc/db_schema_whitelist.json:0#'
137137
],
138138
'Major change is detected.'
139139
],
@@ -143,8 +143,8 @@ public function changesDataProvider()
143143
[
144144
'/Database \(MAJOR\)/',
145145
'/unit_test_table\/UNIQUE_KEY\s*\|\s*Unique key was changed\s*\|\s*M210/',
146-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/change-unique-key/source-code-before/Magento/DbSchema/etc/db_schema\.xml:0#',
147-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/change-unique-key/source-code-after/Magento/DbSchema/etc/db_schema\.xml:0#'
146+
'#[\w/]+' . 'change-unique-key/source-code-before/Magento/DbSchema/etc/db_schema\.xml:0#',
147+
'#[\w/]+' . 'change-unique-key/source-code-after/Magento/DbSchema/etc/db_schema\.xml:0#'
148148
],
149149
'Major change is detected.'
150150
],
@@ -154,7 +154,7 @@ public function changesDataProvider()
154154
[
155155
'/Database \(MAJOR\)/',
156156
'/unit_test_table\/UNIQUE_KEY\s*\|\s*Unique key was added\s*\|\s*M208/',
157-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/add-unique-key/source-code-after/Magento/DbSchema/etc/db_schema\.xml:0#'
157+
'#[\w/]+' . 'add-unique-key/source-code-after/Magento/DbSchema/etc/db_schema\.xml:0#'
158158
],
159159
'Major change is detected.'
160160
],
@@ -165,8 +165,8 @@ public function changesDataProvider()
165165
'/Database \(MAJOR\)/',
166166
'/unit_test_table\/time_occurred\s*\|\s*Column was removed\s*\|\s*M107/',
167167
'/Module db schema whitelist reduced \(unit\_test\_table\/column\).\s*\|\s*M110/',
168-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/column-removed/source-code-before/Magento/DbSchema/etc/db_schema_whitelist\.json:0#',
169-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/column-removed/source-code-before/Magento/DbSchema/etc/db_schema\.xml:0#'
168+
'#[\w/]+' . 'column-removed/source-code-before/Magento/DbSchema/etc/db_schema_whitelist\.json:0#',
169+
'#[\w/]+' . 'column-removed/source-code-before/Magento/DbSchema/etc/db_schema\.xml:0#'
170170
],
171171
'Major change is detected.'
172172
],
@@ -175,7 +175,7 @@ public function changesDataProvider()
175175
$pathToFixtures . '/column-added/source-code-after',
176176
[
177177
'/Database \(MINOR\)/',
178-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/column-added/source-code-after/Magento/DbSchema/etc/db_schema\.xml:0#',
178+
'#[\w/]+' . 'column-added/source-code-after/Magento/DbSchema/etc/db_schema\.xml:0#',
179179
'/unit_test_table\/time_occurred\s*\|\s*Column was added\s*\|\s*M203/'
180180
],
181181
'Minor change is detected.'
@@ -187,8 +187,8 @@ public function changesDataProvider()
187187
'/Database \(MAJOR\)/',
188188
'/other_unit_test_table\s*\|\s*Table was dropped\s*\|\s*M104/',
189189
'/Module db schema whitelist reduced \(other\_unit\_test\_table\).\s*\|\s*M110/',
190-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/table-dropped/source-code-before/Magento/DbSchema/etc/db_schema\.xml:0#',
191-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/table-dropped/source-code-before/Magento/DbSchema/etc/db_schema_whitelist\.json:0#'
190+
'#[\w/]+' . '/table-dropped/source-code-before/Magento/DbSchema/etc/db_schema\.xml:0#',
191+
'#[\w/]+' . '/table-dropped/source-code-before/Magento/DbSchema/etc/db_schema_whitelist\.json:0#'
192192
],
193193
'Major change is detected.'
194194
],
@@ -200,8 +200,8 @@ public function changesDataProvider()
200200
'/other_unit_test_table\s*\|\s*Table was added\s*\|\s*M202/',
201201
'#other_table\s*\|\s*Table was added\s*\|\s*M202#',
202202
'#other_table\s*\|\s*Whitelist do not have table other_table declared in db_schema\.xml\s*\|\s*M109#',
203-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/table-added/source-code-after/Magento/DbSchema/etc/db_schema\.xml:0#',
204-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/table-added/source-code-after/Magento/DbSchema/etc/db_schema_whitelist\.json:0#',
203+
'#[\w/]+' . '/table-added/source-code-after/Magento/DbSchema/etc/db_schema\.xml:0#',
204+
'#[\w/]+' . '/table-added/source-code-after/Magento/DbSchema/etc/db_schema_whitelist\.json:0#',
205205

206206
],
207207
'Minor change is detected.'
@@ -212,9 +212,9 @@ public function changesDataProvider()
212212
[
213213
'/Database \(MAJOR\)/',
214214
'/unit_test_table\s*\|\s*Table was dropped\s*\|\s*M104/',
215-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/table-changed/source-code-after/Magento/DbSchema/etc/db_schema\.xml:0#',
216-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/table-changed/source-code-before/Magento/DbSchema/etc/db_schema\.xml:0#',
217-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/table-changed/source-code-before/Magento/DbSchema/etc/db_schema_whitelist\.json:0#',
215+
'#[\w/]+' . 'table-changed/source-code-after/Magento/DbSchema/etc/db_schema\.xml:0#',
216+
'#[\w/]+' . 'table-changed/source-code-before/Magento/DbSchema/etc/db_schema\.xml:0#',
217+
'#[\w/]+' . 'table-changed/source-code-before/Magento/DbSchema/etc/db_schema_whitelist\.json:0#',
218218
'/unit_test_table\s*\|\s*Module db schema whitelist reduced \(unit\_test\_table\).\s*\|\s*M110/',
219219
'/new_unit_test_table\s*\|\s*Table was added\s*\|\s*M202/'
220220
],
@@ -225,7 +225,7 @@ public function changesDataProvider()
225225
$pathToFixtures . '/table-resource-changed/source-code-after',
226226
[
227227
'/Database \(MAJOR\)/',
228-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/table-resource-changed/source-code-before/Magento/DbSchema/etc/db_schema\.xml:0#',
228+
'#[\w/]+' . '/table-resource-changed/source-code-before/Magento/DbSchema/etc/db_schema\.xml:0#',
229229
'/unit_test_table\s*\|\s*Table chard was changed from default to sales\s*\|\s*M105/'
230230
],
231231
'Major change is detected.'
@@ -239,8 +239,8 @@ public function changesDataProvider()
239239
'/Magento\/DbSchemaSecond\/etc\/db_schema_whitelist\.json:0\s*\|\s*unit_test_table3\s*\|\s*Module db schema whitelist reduced \(unit\_test\_table3\).\s*\|\s*M110/',
240240
'/Magento\/DbSchemaSecond\/etc\/db_schema_whitelist\.json:0\s*\|\s*unit_test_table2\s*\|\s*Module db schema whitelist reduced \(unit\_test\_table2\).\s*\|\s*M110/',
241241
'/Magento\/DbSchema\/etc\/db_schema_whitelist.json:0\s*\|\s*unit_test_table3\s*\|\s*Module db schema whitelist reduced \(unit\_test\_table3\).\s*\|\s*M110/',
242-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/whitelist-was-reduced/source-code-before/Magento/DbSchemaSecond/etc/db_schema\.xml:0#',
243-
'#Console/Command/CompareSourceCommandTest/_files/db_schema/whitelist-was-reduced/source-code-before/Magento/DbSchema/etc/db_schema\.xml:0#'
242+
'#[\w/]+' . '/whitelist-was-reduced/source-code-before/Magento/DbSchemaSecond/etc/db_schema\.xml:0#',
243+
'#[\w/]+' . '/whitelist-was-reduced/source-code-before/Magento/DbSchema/etc/db_schema\.xml:0#'
244244
],
245245
'Major change is detected.'
246246
],

‎tests/Unit/Console/Command/CompareSourceCommandDiXmlTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function changesDataProvider()
6868
$pathToFixtures . '/moved-to-specific/source-code-after',
6969
[
7070
'#Suggested semantic versioning change: MAJOR#',
71-
'#MAJOR\s*\|\s*Console/Command/CompareSourceCommandTest/_files/di_xml/moved-to-specific/source-code-before/Magento/TestModule/etc/di\.xml:0#',
71+
'#MAJOR\s*\|\s' . '[\w/]+' . '/moved-to-specific/source-code-before/Magento/TestModule/etc/di\.xml:0#',
7272
'#scope\s*\|\s*Virtual Type was changed\s*\|\s*M201#'
7373
],
7474
'Major change is detected.',
@@ -78,7 +78,7 @@ public function changesDataProvider()
7878
$pathToFixtures . '/remove-type/source-code-after',
7979
[
8080
'#Suggested semantic versioning change: MAJOR#',
81-
'#MAJOR\s*\|\s*Console/Command/CompareSourceCommandTest/_files/di_xml/remove-type/source-code-before/Magento/TestModule/etc/di\.xml:0#',
81+
'#MAJOR\s*\|\s' . '[\w/]+' . 'remove-type/source-code-before/Magento/TestModule/etc/di\.xml:0#',
8282
'#customCacheInstance2\s*\|\s*Virtual Type was removed\s*\|\s*M200\s*#'
8383
],
8484
'Major change is detected.',
@@ -88,7 +88,7 @@ public function changesDataProvider()
8888
$pathToFixtures . '/change-type/source-code-after',
8989
[
9090
'#Suggested semantic versioning change: MAJOR#',
91-
'#MAJOR\s*\|\s*Console/Command/CompareSourceCommandTest/_files/di_xml/change-type/source-code-before/Magento/TestModule/etc/di\.xml:0#',
91+
'#MAJOR\s*\|\s' . '[\w/]+' . '/change-type/source-code-before/Magento/TestModule/etc/di\.xml:0#',
9292
'#type\s*\|\s*Virtual Type was changed\s*\|\s*M201#'
9393
],
9494
'Major change is detected.',
@@ -98,7 +98,7 @@ public function changesDataProvider()
9898
$pathToFixtures . '/change-name/source-code-after',
9999
[
100100
'#Suggested semantic versioning change: MAJOR#',
101-
'#MAJOR\s*\|\s*Console/Command/CompareSourceCommandTest/_files/di_xml/change-name/source-code-before/Magento/TestModule/etc/di\.xml:0#',
101+
'#MAJOR\s*\|\s*' . '[\w/]+' . '/change-name/source-code-before/Magento/TestModule/etc/di\.xml:0#',
102102
'#cacheInstance\s*\|\s*Virtual Type was removed\s*\|\s*M200#'
103103
],
104104
'Major change is detected.',

‎tests/Unit/Console/Command/CompareSourceCommandLayoutTest.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,15 @@ public function testExecute(
4545
public function changesDataProvider()
4646
{
4747
$pathToFixtures = __DIR__ . '/CompareSourceCommandTest/_files/layout_xml';
48+
getcwd();
4849

4950
return [
5051
'block_remove' => [
5152
$pathToFixtures . '/block_remove/source-code-before',
5253
$pathToFixtures . '/block_remove/source-code-after',
5354
[
5455
'#Suggested semantic versioning change: MAJOR#',
55-
'#MAJOR\s*\|\s*Console/Command/CompareSourceCommandTest/_files/layout_xml/block_remove/source-code-before/Magento/Customer/view/adminhtml/layout/customer_index_viewwishlist\.xml:0#',
56+
'#MAJOR\s*\|\s' . '[\w/]+' . '/block_remove/source-code-before/Magento/Customer/view/adminhtml/layout/customer_index_viewwishlist\.xml:0#',
5657
'#admin\.customer\.view\.wishlist\s*\|\s*Block was removed\s*\|\s*M220#'
5758
],
5859
'Major change is detected.',
@@ -62,7 +63,7 @@ public function changesDataProvider()
6263
$pathToFixtures . '/container_remove/source-code-after',
6364
[
6465
'#Suggested semantic versioning change: MAJOR#',
65-
'#MAJOR\s*\|\s*Console/Command/CompareSourceCommandTest/_files/layout_xml/container_remove/source-code-before/Magento/Customer/view/adminhtml/layout/customer_index_viewwishlist\.xml:0#',
66+
'#MAJOR\s*\|\s*' . '[\w/]+' . '/container_remove/source-code-before/Magento/Customer/view/adminhtml/layout/customer_index_viewwishlist\.xml:0#',
6667
'#root\s*\|\s*Container was removed\s*\|\s*M221#'
6768
],
6869
'Major change is detected.',
@@ -72,8 +73,8 @@ public function changesDataProvider()
7273
$pathToFixtures . '/update_remove/source-code-after',
7374
[
7475
'#Suggested semantic versioning change: MAJOR#',
75-
'#MAJOR\s*\|\s*Console/Command/CompareSourceCommandTest/_files/layout_xml/update_remove/source-code-before/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_configurable\.xml:0',
76-
'#catalog_product_superconfig_config\s*\|\s*An Update was removed\s*\|\s*M222'
76+
'#MAJOR\s*\|\s*' . '[\w/]+' . '/update_remove/source-code-before/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_configurable\.xml:0#',
77+
'#catalog_product_superconfig_config\s*\|\s*An Update was removed\s*\|\s*M222#'
7778
],
7879
'Major change is detected.',
7980
],

0 commit comments

Comments
 (0)