Skip to content

Commit e5666c1

Browse files
committed
MQE-683: [Deprecation] Only use more nested assertion syntax
- Update to conversion script
1 parent fecb9f6 commit e5666c1

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

src/Magento/FunctionalTestingFramework/Upgrade/UpdateAssertionSchema.php

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,17 @@ private function convertOldAssertionToNew($assertion)
117117
$newString = "<$assertType";
118118
$subElements = ["actual" => [], "expected" => []];
119119
foreach ($sortedParts as $type => $value) {
120-
$value = rtrim(ltrim($value, '"'), '"');
121-
$value = rtrim(ltrim($value, "'"), "'");
120+
if (strpos($value, '"') === 0) {
121+
$value = rtrim(ltrim($value, '"'), '"');
122+
} elseif(strpos($value, "'") === 0) {
123+
$value = rtrim(ltrim($value, "'"), "'");
124+
}
125+
// If value is empty string, trim again
126+
if (str_replace(" ", "", $value) == "''") {
127+
$value = "";
128+
} elseif (str_replace(" ", "", $value) == '""') {
129+
$value = "";
130+
}
122131
$trimmedParts[$type] = $value;
123132
if (in_array($type, ["stepKey", "delta", "message", "before", "after", "remove"])) {
124133
if ($type == "stepKey") {
@@ -131,7 +140,7 @@ private function convertOldAssertionToNew($assertion)
131140
$subElements["actual"]["value"] = $value;
132141
} elseif ($type == "actualType") {
133142
$subElements["actual"]["type"] = $value;
134-
} elseif ($type == "expected" || $type = "expectedValue") {
143+
} elseif ($type == "expected" or $type == "expectedValue") {
135144
$subElements["expected"]["value"] = $value;
136145
} elseif ($type == "expectedType") {
137146
$subElements["expected"]["type"] = $value;
@@ -159,10 +168,6 @@ private function convertOldAssertionToNew($assertion)
159168
}
160169
$value = $subElement['value'];
161170
$typeValue = $subElement['type'];
162-
if (empty($value)) {
163-
$this->errors[] = "POTENTIAL ANOMALOUS OUPUT DETECTED, PLEASE MANUALLY CHECK OUTPUT " .
164-
"($assertType \"$stepKey\" in $this->currentFile)";
165-
}
166171
$newString .= "\t\t\t<{$type}Result type=\"$typeValue\">$value</{$type}Result>\n";
167172
}
168173
}

0 commit comments

Comments
 (0)