Skip to content

Simplify assertResultErrors to avoid closure serialization #1159

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
merged 1 commit into from
Feb 16, 2021
Merged

Simplify assertResultErrors to avoid closure serialization #1159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 9 additions & 16 deletions tests/src/Traits/QueryResultAssertionTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

use Drupal\Core\Cache\CacheableMetadata;
use Drupal\graphql\GraphQL\Execution\ExecutionResult;
use GraphQL\Error\Error;
use GraphQL\Server\OperationParams;

/**
Expand Down Expand Up @@ -145,34 +144,28 @@ private function assertResultData(ExecutionResult $result, $expected): void {
* @internal
*/
private function assertResultErrors(ExecutionResult $result, array $expected): void {
// Retrieve the list of error strings.
$errors = array_map(function (Error $error) {
return $error->getMessage();
}, $result->errors);

// Initalize the status.
$unexpected = [];
$matchCount = array_map(function () {
return 0;
}, array_flip($expected));
$matchCount = array_fill_keys($expected, 0);

// Iterate through error messages.
// Collect unmatched errors and count pattern hits.
while ($error = array_pop($errors)) {
foreach ($result->errors as $error) {
$error_message = $error->getMessage();
$match = FALSE;
foreach ($expected as $pattern) {
if (@preg_match($pattern, $error) === FALSE) {
$match = $match || $pattern == $error;
if (@preg_match($pattern, $error_message) === FALSE) {
$match = $match || $pattern == $error_message;
$matchCount[$pattern]++;
}
else {
$match = $match || preg_match($pattern, $error);
$match = $match || preg_match($pattern, $error_message);
$matchCount[$pattern]++;
}
}

if (!$match) {
$unexpected[] = $error;
$unexpected[] = $error_message;
}
}

Expand All @@ -181,8 +174,8 @@ private function assertResultErrors(ExecutionResult $result, array $expected): v
return $count == 0;
}));

$this->assertEquals([], $missing, "Missing errors:\n* " . implode("\n* ", $missing));
$this->assertEquals([], $unexpected, "Unexpected errors:\n* " . implode("\n* ", $unexpected));
self::assertEmpty($missing, "Missing errors:\n* " . implode("\n* ", $missing));
self::assertEmpty($unexpected, "Unexpected errors:\n* " . implode("\n* ", $unexpected));
}

/**
Expand Down