Skip to content

Fix to pass additional args from the Flutter test template (#7261) #8836

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
pq merged 3 commits into from
Mar 16, 2026
Merged

Fix to pass additional args from the Flutter test template (#7261) #8836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f052c0
Fix to pass additional args from the Flutter test template (#7261)
dkandalov Feb 27, 2026
7d2a1c0
refactoring
dkandalov Mar 16, 2026
0c9e645
Update AUTHORS
dkandalov Mar 16, 2026
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
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ Eli Albert <crasowas@gmail.com>
Mohamed El Sayed <devblooming@tutanota.com>
Edwin Ludik <edwin.ludik@gmail.com>
Japnit Singh <truejswalia@gmail.com>
Dmitry Kandalov <dmitry.kandalov@gmail.com>
19 changes: 11 additions & 8 deletions src/io/flutter/run/test/FlutterTestConfigProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,23 +64,21 @@ protected boolean setupConfigurationFromContext(@NotNull TestConfig config,
return setupForDartFile(config, context, file);
}

private boolean setupForSingleTest(TestConfig config, ConfigurationContext context, DartFile file, String testName, boolean hasVariant) {
private boolean setupForSingleTest(@NotNull TestConfig config, ConfigurationContext context, DartFile file, String testName, boolean hasVariant) {
Comment thread
pq marked this conversation as resolved.
final VirtualFile testFile = verifyFlutterTestFile(config, context, file);
if (testFile == null) return false;

config.setFields(TestFields.forTestName(testName, testFile.getPath()).useRegexp(hasVariant));
setTestFields(config, TestFields.forTestName(testName, testFile.getPath()).useRegexp(hasVariant));
config.setGeneratedName();

return true;
}

private boolean setupForDartFile(TestConfig config, ConfigurationContext context, DartFile file) {
private boolean setupForDartFile(@NotNull TestConfig config, ConfigurationContext context, DartFile file) {
final VirtualFile testFile = verifyFlutterTestFile(config, context, file);
if (testFile == null) return false;

config.setFields(TestFields.forFile(testFile.getPath()));
setTestFields(config, TestFields.forFile(testFile.getPath()));
config.setGeneratedName();

return true;
}

Expand All @@ -91,17 +89,22 @@ private VirtualFile verifyFlutterTestFile(TestConfig config, ConfigurationContex
return FlutterUtils.isInTestDir(file) ? candidate : null;
}

private boolean setupForDirectory(TestConfig config, PsiDirectory dir) {
private boolean setupForDirectory(@NotNull TestConfig config, PsiDirectory dir) {
final PubRoot root = PubRoot.forDescendant(dir.getVirtualFile(), dir.getProject());
if (root == null) return false;

if (!root.hasTests(dir.getVirtualFile())) return false;

config.setFields(TestFields.forDir(dir.getVirtualFile().getPath()));
setTestFields(config, TestFields.forDir(dir.getVirtualFile().getPath()));
config.setGeneratedName();
return true;
}

private static void setTestFields(@NotNull TestConfig config, @NotNull TestFields fields) {
fields.setAdditionalArgs(config.getFields().getAdditionalArgs());
config.setFields(fields);
}

/**
* Returns true if a run config was already created for this file. If so we will reuse it.
*/
Expand Down
Loading