Skip to content

Commit 54d84be

Browse files
authored
Test console filters for URLs and Flutter Doctor output. (#1217)
1 parent d20f70b commit 54d84be

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

src/io/flutter/run/test/TestLaunchState.java

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.intellij.execution.Executor;
1010
import com.intellij.execution.configurations.CommandLineState;
1111
import com.intellij.execution.configurations.RuntimeConfigurationError;
12+
import com.intellij.execution.filters.UrlFilter;
1213
import com.intellij.execution.process.ProcessHandler;
1314
import com.intellij.execution.runners.ExecutionEnvironment;
1415
import com.intellij.execution.testframework.TestConsoleProperties;
@@ -20,11 +21,14 @@
2021
import com.intellij.execution.testframework.sm.runner.SMTestLocator;
2122
import com.intellij.execution.testframework.ui.BaseTestsOutputConsoleView;
2223
import com.intellij.execution.ui.ConsoleView;
24+
import com.intellij.openapi.module.Module;
25+
import com.intellij.openapi.module.ModuleUtil;
26+
import com.intellij.openapi.project.Project;
2327
import com.intellij.openapi.vfs.VirtualFile;
2428
import com.jetbrains.lang.dart.ide.runner.DartRelativePathsConsoleFilter;
25-
import com.jetbrains.lang.dart.ide.runner.test.DartTestEventsConverter;
2629
import com.jetbrains.lang.dart.ide.runner.util.DartTestLocationProvider;
2730
import com.jetbrains.lang.dart.util.DartUrlResolver;
31+
import io.flutter.console.FlutterConsoleFilter;
2832
import io.flutter.pub.PubRoot;
2933
import io.flutter.run.daemon.DaemonConsoleView;
3034
import io.flutter.run.daemon.RunMode;
@@ -97,11 +101,18 @@ protected ConsoleView createConsole(@NotNull Executor executor) throws Execution
97101
if (!testConsoleEnabled) {
98102
return super.createConsole(executor);
99103
}
104+
100105
// Create a console showing a test tree.
101-
final DartUrlResolver resolver = DartUrlResolver.getInstance(getEnvironment().getProject(), testFileOrDir);
106+
final Project project = getEnvironment().getProject();
107+
final DartUrlResolver resolver = DartUrlResolver.getInstance(project, testFileOrDir);
102108
final ConsoleProps props = new ConsoleProps(config, executor, resolver);
103109
final BaseTestsOutputConsoleView console = SMTestRunnerConnectionUtil.createConsole("FlutterTestRunner", props);
104-
console.addMessageFilter(new DartRelativePathsConsoleFilter(config.getProject(), getBaseDir()));
110+
final Module module = ModuleUtil.findModuleForFile(testFileOrDir, project);
111+
if (module != null) {
112+
console.addMessageFilter(new FlutterConsoleFilter(module));
113+
}
114+
console.addMessageFilter(new DartRelativePathsConsoleFilter(project, getBaseDir()));
115+
console.addMessageFilter(new UrlFilter());
105116
return console;
106117
}
107118

0 commit comments

Comments
 (0)