Skip to content

Fix invalid data-sets for unit tests #95

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

Merged
Vinai merged 9 commits into from
Apr 16, 2024
Merged

Fix invalid data-sets for unit tests #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1f00b03
Fix invalid data-sets for catalog unit tests
vpodorozh Apr 8, 2024
937b635
Fix invalid data-sets for ImportExport unit tests
vpodorozh Apr 9, 2024
826d2f4
Fix invalid data-sets for Framework\MessageQueue unit tests
vpodorozh Apr 9, 2024
3b566b1
Fix static tests.
vpodorozh Apr 9, 2024
41eb33a
Fix invalid data-sets for Sales unit test
vpodorozh Apr 9, 2024
a478ff8
Fix invalid data-sets for Integration unit test
vpodorozh Apr 9, 2024
4d71a3b
Fix invalid data-sets for Email unit test
vpodorozh Apr 9, 2024
d3dedf0
Fix data providers for unit tests - Config and Directory
vpodorozh Apr 9, 2024
c78c7bd
Remove totally unnessesary PHP version ifcondition. I tested it on 8.…
vpodorozh Apr 9, 2024
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
3 changes: 2 additions & 1 deletion ...to/Catalog/Test/Unit/Model/ProductOptions/Config/_files/invalidProductOptionsXmlArray.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@
'<?xml version="1.0"?><config><option name="name_one" renderer="123true"><inputType name="name_one"/>' .
'</option></config>',
[
"Element 'option', attribute 'renderer': '123true' is not a valid value of the atomic type 'modelName'.\n" .
"Element 'option', attribute 'renderer': [facet 'pattern'] The value '123true' is not accepted " .
"by the pattern '([\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\n" .
"Line: 1\nThe xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><option name=\"name_one\" " .
"renderer=\"123true\"><inputType name=\"name_one\"/></option></config>\n2:\n"
],
Expand Down
18 changes: 11 additions & 7 deletions ...agento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/invalidProductTypesXmlArray.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
'type_modelinstance_invalid_value' => [
'<?xml version="1.0"?><config><type name="some_name" modelInstance="123" /></config>',
[
"Element 'type', attribute 'modelInstance': '123' is not a valid value of the atomic type 'modelName'.\n" .
"Element 'type', attribute 'modelInstance': [facet 'pattern'] The value '123' is not " .
"accepted by the pattern '([\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\n" .
"Line: 1\nThe xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><type name=\"some_name\" " .
"modelInstance=\"123\"/></config>\n2:\n"
],
Expand Down Expand Up @@ -71,16 +72,18 @@
'type_pricemodel_instance_invalid_value' => [
'<?xml version="1.0"?><config><type name="some_name"><priceModel instance="123123" /></type></config>',
[
"Element 'priceModel', attribute 'instance': '123123' is not a valid value of the atomic " .
"type 'modelName'.\nLine: 1\nThe xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><type " .
"Element 'priceModel', attribute 'instance': [facet 'pattern'] The value '123123' is not accepted " .
"by the pattern '([\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\n" .
"Line: 1\nThe xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><type " .
"name=\"some_name\"><priceModel instance=\"123123\"/></type></config>\n2:\n"
],
],
'type_indexermodel_instance_invalid_value' => [
'<?xml version="1.0"?><config><type name="some_name"><indexerModel instance="123" /></type></config>',
[
"Element 'indexerModel', attribute 'instance': '123' is not a valid value of the atomic type " .
"'modelName'.\nLine: 1\nThe xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><type " .
"Element 'indexerModel', attribute 'instance': [facet 'pattern'] The value '123' is not accepted " .
"by the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\n" .
"Line: 1\nThe xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><type " .
"name=\"some_name\"><indexerModel instance=\"123\"/></type></config>\n2:\n"
],
],
Expand All @@ -102,8 +105,9 @@
'stockindexermodel_instance_invalid_value' => [
'<?xml version="1.0"?><config><type name="some_name"><stockIndexerModel instance="1234"/></type></config>',
[
"Element 'stockIndexerModel', attribute 'instance': '1234' is not a valid value of the atomic type " .
"'modelName'.\nLine: 1\nThe xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><type " .
"Element 'stockIndexerModel', attribute 'instance': [facet 'pattern'] The value '1234' is not accepted " .
"by the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\n" .
"Line: 1\nThe xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><type " .
"name=\"some_name\"><stockIndexerModel instance=\"1234\"/></type></config>\n2:\n"
],
],
Expand Down
6 changes: 4 additions & 2 deletions app/code/Magento/Config/Test/Unit/Model/Config/_files/invalidSystemXmlArray.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@
"1:<config><system><section id=\"section1\"><group id=\"group1\"><label>Label</label><field " .
"id=\"field_id\"><config_path>co</config_path></field></group><group id=\"group2\"><label>" .
"Label_One</label></group></section></system></config>\n2:\n",
"Element 'config_path': 'co' is not a valid value of the atomic type 'typeConfigPath'.\nLine: 1\n" .
"Element 'config_path': [facet 'minLength'] The value has a length of '2'; " .
"this underruns the allowed minimum length of '5'.\nLine: 1\n" .
"The xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><system><section id=\"section1\"><group " .
"id=\"group1\"><label>Label</label><field id=\"field_id\"><config_path>co</config_path></field>" .
"</group><group id=\"group2\"><label>Label_One</label></group></section></system></config>\n2:\n"
Expand All @@ -107,7 +108,8 @@
"1:<config><system><section id=\"section1\"><group id=\"group1\"><label>Label</label><field " .
"id=\"field_id\"><if_module_enabled>Som</if_module_enabled></field></group><group id=\"group2\">" .
"<label>Label_One</label></group></section></system></config>\n2:\n",
"Element 'if_module_enabled': 'Som' is not a valid value of the atomic type 'typeModule'.\n" .
"Element 'if_module_enabled': [facet 'minLength'] The value has a length of '3'; " .
"this underruns the allowed minimum length of '5'.\n" .
"Line: 1\nThe xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><system><section id=\"section1\">" .
"<group id=\"group1\"><label>Label</label><field id=\"field_id\"><if_module_enabled>Som" .
"</if_module_enabled></field></group><group id=\"group2\"><label>Label_One</label></group>" .
Expand Down
6 changes: 1 addition & 5 deletions app/code/Magento/Directory/Test/Unit/Model/CurrencyTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,12 @@ function (array $args) {
*/
public function getOutputFormatDataProvider(): array
{
$ar_DZ = "\u{062C}.\u{0645}.\u{200F}\u{00A0}%s";
if (version_compare(PHP_VERSION, '8.3', '>=')) {
$ar_DZ = "%s\u{00A0}\u{062C}.\u{0645}.\u{200F}";
}
return [
'en_US:USD' => ['en_US', 'USD', '$%s'],
'en_US:PLN' => ['en_US', 'PLN', "PLN\u{00A0}%s"],
'en_US:PKR' => ['en_US', 'PKR', "PKR\u{00A0}%s"],
'af_ZA:VND' => ['af_ZA', 'VND', "\u{20AB}%s"],
'ar_DZ:EGP' => ['ar_DZ', 'EGP', $ar_DZ],
'ar_DZ:EGP' => ['ar_DZ', 'EGP', "%s\u{00A0}\u{062C}.\u{0645}.\u{200F}"],
'ar_SA:USD' => ['ar_SA', 'USD', "%s\u{00A0}US$"],
'ar_SA:LBP' => ['ar_SA', 'LBP', "%s\u{00A0}\u{0644}.\u{0644}.\u{200F}"],
'fa_IR:USD' => ['fa_IR', 'USD', "\u{200E}$%s"],
Expand Down
5 changes: 3 additions & 2 deletions app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,9 @@ public function mergedXmlDataProvider()
'node "template" with invalid attribute "area"' => [
'<config><template id="test" label="Test" file="test.txt" type="text" module="Module" area="invalid"/></config>',
[
"Element 'template', attribute 'area': 'invalid' is not a valid value of the atomic type " .
"'areaType'.The xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><template id=\"test\" " .
"Element 'template', attribute 'area': [facet 'enumeration'] The value 'invalid' is not " .
"an element of the set {'frontend', 'adminhtml'}.The xml was: \n" .
"0:<?xml version=\"1.0\"?>\n1:<config><template id=\"test\" " .
"label=\"Test\" file=\"test.txt\" type=\"text\" module=\"Module\" area=\"invalid\"/>" .
"</config>\n2:\n",
],
Expand Down
17 changes: 7 additions & 10 deletions app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/_files/invalidExportXmlArray.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,14 @@
],
'attributes_with_type_modelName_and_invalid_value' => [
'<?xml version="1.0"?><config><entity name="Name/one" model="model_one" '
. 'entityAttributeFilterType="model_one"/><entityType entity="Name/one" name="name_one" model="1"/>'
. ' <fileFormat name="name_one" model="1model"/></config>',
. 'entityAttributeFilterType="model_one"/><entityType entity="Name/one" name="name_one" model="1"/>'
. ' <fileFormat name="name_one" model="1model"/></config>',
[
"Element 'entityType', attribute 'model': '1' is not a valid value of the atomic type 'modelName'.\n" .
"Line: 1\nThe xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><entity name=\"Name/one\" " .
"model=\"model_one\" entityAttributeFilterType=\"model_one\"/><entityType entity=\"Name/one\" " .
"name=\"name_one\" model=\"1\"/> <fileFormat name=\"name_one\" model=\"1model\"/></config>\n2:\n",
"Element 'fileFormat', attribute 'model': '1model' is not a valid value of the atomic type 'modelName'.\n" .
"Line: 1\nThe xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><entity name=\"Name/one\" " .
"model=\"model_one\" entityAttributeFilterType=\"model_one\"/><entityType entity=\"Name/one\" " .
"name=\"name_one\" model=\"1\"/> <fileFormat name=\"name_one\" model=\"1model\"/></config>\n2:\n"
"Element 'fileFormat', attribute 'model': [facet 'pattern'] The value '1model'" .
" is not accepted by the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\n" .
"Line: 1\nThe xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><entity name=\"Name/one\"" .
" model=\"model_one\" entityAttributeFilterType=\"model_one\"/><entityType entity=\"Name/one\"" .
" name=\"name_one\" model=\"1\"/> <fileFormat name=\"name_one\" model=\"1model\"/></config>\n2:\n"
],
],
'productType_node_with_required_attribute' => [
Expand Down
8 changes: 5 additions & 3 deletions ...Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportMergedXmlArray.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@
'<?xml version="1.0"?><config><entity name="test_name" label="test_label" model="34afwer" ' .
'behaviorModel="test" /></config>',
[
"Element 'entity', attribute 'model': '34afwer' is not a valid value of the atomic type 'modelName'.\n" .
"Element 'entity', attribute 'model': [facet 'pattern'] The value '34afwer'" .
" is not accepted by the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\n" .
"Line: 1\nThe xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><entity name=\"test_name\" " .
"label=\"test_label\" model=\"34afwer\" behaviorModel=\"test\"/></config>\n2:\n"
],
Expand All @@ -60,8 +61,9 @@
'<?xml version="1.0"?><config><entity name="test_name" label="test_label" model="test" behaviorModel="666" />' .
'</config>',
[
"Element 'entity', attribute 'behaviorModel': '666' is not a valid value of the atomic type " .
"'modelName'.\nLine: 1\nThe xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><entity " .
"Element 'entity', attribute 'behaviorModel': [facet 'pattern'] The value '666'" .
" is not accepted by the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\n" .
"Line: 1\nThe xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><entity " .
"name=\"test_name\" label=\"test_label\" model=\"test\" behaviorModel=\"666\"/></config>\n2:\n"
],
]
Expand Down
16 changes: 9 additions & 7 deletions app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportXmlArray.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,18 @@
'entity_with_invalid_model_value' => [
'<?xml version="1.0"?><config><entity name="some_name" model="12345"/></config>',
[
"Element 'entity', attribute 'model': '12345' is not a valid value of the atomic type 'modelName'.\n" .
"Line: 1\nThe xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><entity name=\"some_name\" " .
"model=\"12345\"/></config>\n2:\n"

"Element 'entity', attribute 'model': [facet 'pattern'] The value '12345' is not accepted " .
"by the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\n" .
"Line: 1\nThe xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><entity name=\"some_name\"" .
" model=\"12345\"/></config>\n2:\n"
],
],
'entity_with_invalid_behaviormodel_value' => [
'<?xml version="1.0"?><config><entity name="some_name" behaviorModel="=--09"/></config>',
[
"Element 'entity', attribute 'behaviorModel': '=--09' is not a valid value of the atomic type " .
"'modelName'.\nLine: 1\nThe xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><entity " .
"Element 'entity', attribute 'behaviorModel': [facet 'pattern'] The value '=--09'" .
" is not accepted by the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\n" .
"Line: 1\nThe xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><entity " .
"name=\"some_name\" behaviorModel=\"=--09\"/></config>\n2:\n"
],
],
Expand Down Expand Up @@ -65,7 +66,8 @@
'entitytype_with_invalid_model_attribute_value' => [
'<?xml version="1.0"?><config><entityType entity="entity_name" name="some_name" model="1test"/></config>',
[
"Element 'entityType', attribute 'model': '1test' is not a valid value of the atomic type 'modelName'.\n" .
"Element 'entityType', attribute 'model': [facet 'pattern'] The value '1test'" .
" is not accepted by the pattern '([\\\\]?[a-zA-Z_][a-zA-Z0-9_]*)+'.\n" .
"Line: 1\nThe xml was: \n0:<?xml version=\"1.0\"?>\n" .
"1:<config><entityType entity=\"entity_name\" name=\"some_name\" model=\"1test\"/></config>\n2:\n"
],
Expand Down
8 changes: 5 additions & 3 deletions app/code/Magento/Integration/Test/Unit/Model/Config/XsdTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,9 @@ public function exemplarXmlDataProvider()
</integration>
</integrations>',
[
"Element 'integration', attribute 'name': '' is not a valid value of the atomic type " .
"'integrationNameType'.The xml was: \n0:<?xml version=\"1.0\"?>\n1:<integrations>\n" .
"Element 'integration', attribute 'name': [facet 'minLength'] The value '' has a " .
"length of '0'; this underruns the allowed minimum length of '2'.The xml was: \n" .
"0:<?xml version=\"1.0\"?>\n1:<integrations>\n" .
"2: <integration name=\"\">\n3: <email>" .
"test-integration1@magento.com</email>\n4: <endpoint_url>" .
"http://endpoint.url</endpoint_url>\n5: <identity_link_url>" .
Expand All @@ -368,7 +369,8 @@ public function exemplarXmlDataProvider()
</integration>
</integrations>',
[
"Element 'email': 'invalid' is not a valid value of the atomic type 'emailType'.The xml was: \n" .
"Element 'email': [facet 'pattern'] The value 'invalid' is not accepted by " .
"the pattern '[^@]+@[^\.]+\..+'.The xml was: \n" .
"0:<?xml version=\"1.0\"?>\n1:<integrations>\n2: <integration " .
"name=\"TestIntegration1\">\n3: <email>invalid</email>\n" .
"4: <endpoint_url>http://endpoint.url</endpoint_url>\n" .
Expand Down
8 changes: 5 additions & 3 deletions app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/Config/XsdTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@ protected function _getExemplarTestData()
'non-valid empty renderer class name' => [
'<config><renderers><page type="p1"><renderer product_type="prt1"/></page></renderers></config>',
[
"Element 'renderer': '' is not a valid value of the atomic type 'classNameType'.The xml was: \n" .
"Element 'renderer': [facet 'pattern'] The value '' is not accepted by the pattern " .
"'[A-Z][a-zA-Z\d]*(\\\\[A-Z][a-zA-Z\d]*)*'.The xml was: \n" .
"0:<?xml version=\"1.0\"?>\n1:<config><renderers><page type=\"p1\"><renderer " .
"product_type=\"prt1\"/></page></renderers></config>\n2:\n"
],
Expand Down Expand Up @@ -256,8 +257,9 @@ protected function _getExemplarTestData()
'<config><totals><total name="i1"><title>Title</title><source_field>foo</source_field>' .
'<model>a model</model></total></totals></config>',
[
"Element 'model': 'a model' is not a valid value of the atomic type 'classNameType'.The xml " .
"was: \n0:<?xml version=\"1.0\"?>\n1:<config><totals><total name=\"i1\"><title>Title</title>" .
"Element 'model': [facet 'pattern'] The value 'a model' is not accepted by the pattern " .
"'[A-Z][a-zA-Z\d]*(\\\\[A-Z][a-zA-Z\d]*)*'.The xml was: \n" .
"0:<?xml version=\"1.0\"?>\n1:<config><totals><total name=\"i1\"><title>Title</title>" .
"<source_field>foo</source_field><model>a model</model></total></totals></config>\n2:\n"
],
],
Expand Down
Loading