Skip to content

Always pass a function to BooleanSelector.evaluate #1125

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 2 commits into from
Dec 18, 2019
Merged

Always pass a function to BooleanSelector.evaluate #1125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b705b6c
Always pass a function to BooleanSelector.evaluate
natebosch Dec 18, 2019
0dc7d6f
More cases
natebosch Dec 18, 2019
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
2 changes: 1 addition & 1 deletion pkgs/test_api/lib/src/backend/metadata.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ class Metadata {
// doing it for every test individually.
var empty = Metadata._();
var merged = forTag.keys.toList().fold(empty, (Metadata merged, selector) {
if (!selector.evaluate(tags)) return merged;
if (!selector.evaluate(tags.contains)) return merged;
return merged.merge(forTag.remove(selector));
});

Expand Down
4 changes: 2 additions & 2 deletions pkgs/test_core/lib/src/runner.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,12 +261,12 @@ class Runner {
}

// If the user provided tags, skip tests that don't match all of them.
if (!suite.config.includeTags.evaluate(test.metadata.tags)) {
if (!suite.config.includeTags.evaluate(test.metadata.tags.contains)) {
return false;
}

// Skip tests that do match any tags the user wants to exclude.
if (suite.config.excludeTags.evaluate(test.metadata.tags)) {
if (suite.config.excludeTags.evaluate(test.metadata.tags.contains)) {
return false;
}

Expand Down
3 changes: 2 additions & 1 deletion pkgs/test_core/lib/src/runner/loader.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ class Loader {
return;
}

if (_config.suiteDefaults.excludeTags.evaluate(suiteConfig.metadata.tags)) {
if (_config.suiteDefaults.excludeTags
.evaluate(suiteConfig.metadata.tags.contains)) {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion pkgs/test_core/lib/src/runner/suite.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ class SuiteConfiguration {
// Otherwise, resolve the tag-specific components.
var newTags = Map<BooleanSelector, SuiteConfiguration>.from(tags);
var merged = tags.keys.fold(empty, (SuiteConfiguration merged, selector) {
if (!selector.evaluate(_metadata.tags)) return merged;
if (!selector.evaluate(_metadata.tags.contains)) return merged;
return merged.merge(newTags.remove(selector));
});

Expand Down