Skip to content

Commit 5039664

Browse files
committed
MQE-1541: Add option to generate:tests for XSD validation on 'merged files'
1 parent 3f67629 commit 5039664

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/Magento/FunctionalTestingFramework/Config/Reader/Filesystem.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,13 +232,13 @@ protected function validateSchema($configMerger, $filename = null)
232232
$errors = [];
233233
if ($configMerger && !$configMerger->validate($this->schemaFile, $errors)) {
234234
foreach ($errors as $error) {
235-
$error = str_replace("\n", "", $error);
235+
$error = str_replace(PHP_EOL, "", $error);
236236
LoggingUtil::getInstance()->getLogger(Filesystem::class)->criticalFailure(
237-
"Schema validation error. ",
237+
"Schema validation error:",
238238
($filename ? [ "file"=> $filename, "error" => $error]: ["error" => $error])
239239
);
240240
}
241-
throw new \Exception("Error: schema validation errors found in xml file(s) " . $filename . "\n");
241+
throw new \Exception("Schema validation errors found in xml file(s).");
242242
}
243243
}
244244
}

src/Magento/FunctionalTestingFramework/Util/Logger/MftfLogger.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,15 @@ public function deprecation($message, array $context = [])
3434
*
3535
* @param string $message The log message.
3636
* @param array $context The log context.
37+
* @param string $filename
3738
* @return void
3839
*/
39-
public function criticalFailure($message, array $context = [])
40+
public function criticalFailure($message, array $context = [], $filename = null)
4041
{
41-
$message = "CRITICAL FAILURE: " . $message;
42+
$message = "FAILURE: " . $message . $filename;
4243
// Suppress print during unit testing
4344
if (MftfApplicationConfig::getConfig()->getPhase() !== MftfApplicationConfig::UNIT_TEST_PHASE) {
44-
print ($message . json_encode($context) . "\n");
45+
print ($message . implode( "\n", $context) . "\n");
4546
}
4647
parent::critical($message, $context);
4748
}

0 commit comments

Comments
 (0)