ACP2E-3520: [QUANS] Core unit test failures in 2.4.7-p3

Author: thiaramus

app/code/Magento/Catalog/Test/Unit/Model/ProductOptions/Config/XsdTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -39,12 +39,19 @@ protected function setUp(): void
      * @param string $xmlString
      * @param array $expectedError
      */
-    protected function _loadDataForTest($schemaName, $xmlString, $expectedError)
+    protected function _loadDataForTest($schemaName, $xmlString, $expectedError, $isRegex = false)
     {
-        $actualError = $this->_xsdValidator->validate($this->_xsdSchemaPath . $schemaName, $xmlString);
-        $this->assertEquals(false, empty($actualError));
+        $actualErrors = $this->_xsdValidator->validate($this->_xsdSchemaPath . $schemaName, $xmlString);
+        $this->assertNotEmpty($actualErrors);
+
         foreach ($expectedError as $error) {
-            $this->assertContains($error, $actualError);
+            if ($isRegex) {
+                foreach ($actualErrors as $actualError) {
+                    $this->assertMatchesRegularExpression($error, $actualError);
+                }
+            } else {
+                $this->assertContains($error, $actualErrors);
+            }
         }
     }
 
@@ -53,9 +60,9 @@ protected function _loadDataForTest($schemaName, $xmlString, $expectedError)
      * @param array $expectedError
      * @dataProvider schemaCorrectlyIdentifiesInvalidProductOptionsDataProvider
      */
-    public function testSchemaCorrectlyIdentifiesInvalidProductOptionsXml($xmlString, $expectedError)
+    public function testSchemaCorrectlyIdentifiesInvalidProductOptionsXml($xmlString, $expectedError, $isRegex)
     {
-        $this->_loadDataForTest('product_options.xsd', $xmlString, $expectedError);
+        $this->_loadDataForTest('product_options.xsd', $xmlString, $expectedError, $isRegex);
     }
 
     /**

app/code/Magento/Catalog/Test/Unit/Model/ProductOptions/Config/_files/invalidProductOptionsXmlArray.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -12,13 +12,15 @@
             "Element 'inputType': This element is not expected. Expected is ( option ).\nLine: 1\n" .
             "The xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><inputType name=\"name_one\"/></config>\n2:\n"
         ],
+        'isRegex' => false
     ],
     'inputType_node_is_required' => [
         '<?xml version="1.0"?><config><option name="name_one"/></config>',
         [
             "Element 'option': Missing child element(s). Expected is ( inputType ).\nLine: 1\n" .
             "The xml was: \n0:<?xml version=\"1.0\"?>\n1:<config><option name=\"name_one\"/></config>\n2:\n"
         ],
+        'isRegex' => false
     ],
     'options_name_must_be_unique' => [
         '<?xml version="1.0"?><config><option name="name_one"><inputType name="name"/>' .
@@ -29,6 +31,7 @@
             "name=\"name_one\"><inputType name=\"name\"/></option><option name=\"name_one\"><inputType " .
             "name=\"name_two\"/></option></config>\n2:\n"
         ],
+        'isRegex' => false
     ],
     'inputType_name_must_be_unique' => [
         '<?xml version="1.0"?><config><option name="name"><inputType name="name_one"/>' .
@@ -39,15 +42,15 @@
             "1:<config><option name=\"name\"><inputType name=\"name_one\"/><inputType name=\"name_one\"/>" .
             "</option></config>\n2:\n"
         ],
+        'isRegex' => false
     ],
     'renderer_attribute_with_invalid_value' => [
         '<?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" .
-            "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"
+            "/Element \'option\', attribute \'renderer\': .* (is not a valid value|is not accepted).*/"
         ],
+        'isRegex' => true
     ],
     'disabled_attribute_with_invalid_value' => [
         '<?xml version="1.0"?><config><option name="name_one"><inputType name="name_one" disabled="7"/>' .
@@ -62,5 +65,6 @@
             "<inputType name=\"name_one\" disabled=\"7\"/><inputType name=\"name_two\" disabled=\"some_string\"/>" .
             "</option></config>\n2:\n"
         ],
+        'isRegex' => false
     ]
 ];