Skip to content

Engine scenario_app as a test, avoid needs-tests comment #3358

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
Dec 19, 2023
Merged

Engine scenario_app as a test, avoid needs-tests comment #3358

Show file tree
Hide file tree
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
16 changes: 11 additions & 5 deletions app_dart/lib/src/request_handlers/github/webhook_subscription.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ Set<RepositorySlug> kNeedsTests = <RepositorySlug>{
Config.packagesSlug,
};

final RegExp kEngineTestRegExp = RegExp(r'(tests?|benchmarks?)\.(dart|java|mm|m|cc|sh|py)$');

// Extentions for files that use // for single line comments.
// See [_allChangesAreCodeComments] for more.
@visibleForTesting
Expand Down Expand Up @@ -319,7 +317,7 @@ class GithubWebhookSubscription extends SubscriptionHandler {
}

// Check to see if tests were submitted with this PR.
if (_isATest(filename)) {
if (_isAFrameworkTest(filename)) {
hasTests = true;
}
}
Expand All @@ -346,7 +344,7 @@ class GithubWebhookSubscription extends SubscriptionHandler {
}
}

bool _isATest(String filename) {
bool _isAFrameworkTest(String filename) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we missing the _isAFrameworkTest definition?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This already existed, I just renamed this from _isATest to _isAFrameworkTest since I was adding _isAnEngineTest and wanted to differentiate them.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was looking for this function in my local fork..! Sorry for the noise.

if (kNotActuallyATest.any(filename.endsWith)) {
return false;
}
Expand Down Expand Up @@ -412,7 +410,7 @@ class GithubWebhookSubscription extends SubscriptionHandler {
needsTests = !_allChangesAreCodeComments(file);
}

if (kEngineTestRegExp.hasMatch(filename.toLowerCase())) {
if (_isAnEngineTest(filename)) {
hasTests = true;
}
}
Expand All @@ -430,6 +428,14 @@ class GithubWebhookSubscription extends SubscriptionHandler {
}
}

bool _isAnEngineTest(String filename) {
final RegExp engineTestRegExp = RegExp(r'(tests?|benchmarks?)\.(dart|java|mm|m|cc|sh|py)$');
return filename.contains('IosBenchmarks') ||
filename.contains('IosUnitTests') ||
filename.contains('scenario_app') ||
engineTestRegExp.hasMatch(filename.toLowerCase());
}

bool _fileContainsAddedCode(PullRequestFile file) {
// When null, do not assume 0 lines have been added.
final int linesAdded = file.additionsCount ?? 1;
Expand Down
212 changes: 54 additions & 158 deletions app_dart/test/request_handlers/github/webhook_subscription_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1558,167 +1558,63 @@ void foo() {
);
});

test('Engine labels PRs, no comment if Java tests', () async {
const int issueNumber = 123;

tester.message = generateGithubWebhookMessage(
action: 'opened',
number: issueNumber,
slug: Config.engineSlug,
);

when(pullRequestsService.listFiles(Config.engineSlug, issueNumber)).thenAnswer(
(_) => Stream<PullRequestFile>.fromIterable(<PullRequestFile>[
PullRequestFile()..filename = 'shell/platform/android/io/flutter/Blah.java',
PullRequestFile()..filename = 'shell/platform/android/test/io/flutter/BlahTest.java',
]),
);

await tester.post(webhook);

verifyNever(
issuesService.addLabelsToIssue(Config.engineSlug, issueNumber, any),
);

verifyNever(
issuesService.createComment(
Config.engineSlug,
issueNumber,
argThat(contains(config.missingTestsPullRequestMessageValue)),
),
);
});

test('Engine labels PRs, no comment if script tests', () async {
const int issueNumber = 123;

tester.message = generateGithubWebhookMessage(
action: 'opened',
number: issueNumber,
slug: Config.engineSlug,
);

when(pullRequestsService.listFiles(Config.engineSlug, issueNumber)).thenAnswer(
(_) => Stream<PullRequestFile>.fromIterable(<PullRequestFile>[
PullRequestFile()..filename = 'fml/blah.cc',
PullRequestFile()..filename = 'fml/testing/blah_test.sh',
]),
);

await tester.post(webhook);

verifyNever(
issuesService.createComment(
Config.engineSlug,
issueNumber,
argThat(contains(config.missingTestsPullRequestMessageValue)),
),
);
});

test('Engine labels PRs, no comment if cc tests', () async {
const int issueNumber = 123;

tester.message = generateGithubWebhookMessage(
action: 'opened',
number: issueNumber,
slug: Config.engineSlug,
);

when(pullRequestsService.listFiles(Config.engineSlug, issueNumber)).thenAnswer(
(_) => Stream<PullRequestFile>.fromIterable(<PullRequestFile>[
PullRequestFile()..filename = 'fml/blah.cc',
PullRequestFile()..filename = 'fml/blah_unittests.cc',
]),
);

await tester.post(webhook);

verifyNever(
issuesService.addLabelsToIssue(
Config.engineSlug,
issueNumber,
any,
),
);

verifyNever(
issuesService.createComment(
Config.engineSlug,
issueNumber,
argThat(contains(config.missingTestsPullRequestMessageValue)),
),
);
});

test('Engine labels PRs, no comment if py tests', () async {
const int issueNumber = 123;

tester.message = generateGithubWebhookMessage(
action: 'opened',
number: issueNumber,
slug: Config.engineSlug,
);

when(pullRequestsService.listFiles(Config.engineSlug, issueNumber)).thenAnswer(
(_) => Stream<PullRequestFile>.fromIterable(<PullRequestFile>[
PullRequestFile()..filename = 'tools/font-subset/main.cc',
PullRequestFile()..filename = 'tools/font-subset/test.py',
]),
);

await tester.post(webhook);

verifyNever(
issuesService.addLabelsToIssue(
Config.engineSlug,
issueNumber,
any,
),
);

verifyNever(
issuesService.createComment(
Config.engineSlug,
issueNumber,
argThat(contains(config.missingTestsPullRequestMessageValue)),
),
);
});

test('Engine labels PRs, no comment if cc benchmarks', () async {
const int issueNumber = 123;

tester.message = generateGithubWebhookMessage(
action: 'opened',
number: issueNumber,
slug: Config.engineSlug,
);

when(pullRequestsService.listFiles(Config.engineSlug, issueNumber)).thenAnswer(
(_) => Stream<PullRequestFile>.fromIterable(<PullRequestFile>[
PullRequestFile()..filename = 'fml/blah.cc',
PullRequestFile()..filename = 'fml/blah_benchmarks.cc',
]),
);
test('Engine labels PRs, no comment if tested', () async {
final List<List<String>> pullRequestFileList = [
<String>[
// Java tests.
'shell/platform/android/io/flutter/Blah.java',
'shell/platform/android/test/io/flutter/BlahTest.java',
],
<String>[
// Script tests.
'fml/blah.cc',
'fml/testing/blah_test.sh',
],
<String>[
// cc tests.
'fml/blah.cc',
'fml/blah_unittests.cc',
],
<String>[
// cc benchmarks.
'fml/blah.cc',
'fml/blah_benchmarks.cc',
],
<String>[
// py tests.
'tools/font-subset/main.cc',
'tools/font-subset/test.py',
],
<String>[
// scenario app is a test.
'scenario_app/project.pbxproj',
'scenario_app/Info_Impeller.plist',
],
];

for (int issueNumber = 0; issueNumber < pullRequestFileList.length; issueNumber++) {
tester.message = generateGithubWebhookMessage(
action: 'opened',
number: issueNumber,
slug: Config.engineSlug,
);

await tester.post(webhook);
when(pullRequestsService.listFiles(Config.engineSlug, issueNumber)).thenAnswer(
(_) => Stream<PullRequestFile>.fromIterable(
pullRequestFileList[issueNumber].map((String filename) => PullRequestFile()..filename = filename),
),
);

verifyNever(
issuesService.addLabelsToIssue(
Config.engineSlug,
issueNumber,
any,
),
);
await tester.post(webhook);

verifyNever(
issuesService.createComment(
Config.engineSlug,
issueNumber,
argThat(contains(config.missingTestsPullRequestMessageValue)),
),
);
verifyNever(
issuesService.createComment(
Config.engineSlug,
issueNumber,
argThat(contains(config.missingTestsPullRequestMessageValue)),
),
);
}
});

test('Engine labels PRs, no comments if pr is for release branches', () async {
Expand Down