Commit 559f9b1

authored

[logging] Use plugin logger for test coverage files (#8516)

Part of #8369

1 parent 7518324 commit 559f9b1Copy full SHA for 559f9b1

File tree

2 files changed

+21

-4

lines changed

src/io/flutter/run/coverage
- FlutterCoverageProgramRunner.java
- FlutterCoverageRunner.java

2 files changed

+21

-4

lines changed

`‎src/io/flutter/run/coverage/FlutterCoverageProgramRunner.java‎`

Lines changed: 15 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,9 @@`
`24`	`24`	`import com.intellij.openapi.vfs.LocalFileSystem;`
`25`	`25`	`import com.intellij.openapi.vfs.VfsUtil;`
`26`	`26`	`import io.flutter.FlutterBundle;`
	`27`	`+import io.flutter.logging.PluginLogger;`
`27`	`28`	`import io.flutter.run.test.TestConfig;`
	`29`	`+import io.flutter.settings.FlutterSettings;`
`28`	`30`	`import io.flutter.utils.OpenApiUtils;`
`29`	`31`	`import org.jetbrains.annotations.NonNls;`
`30`	`32`	`import org.jetbrains.annotations.NotNull;`
`@@ -33,9 +35,10 @@`
`33`	`35`	`import java.nio.file.Files;`
`34`	`36`	`import java.nio.file.Path;`
`35`	`37`	`import java.nio.file.Paths;`
	`38`	`+import java.util.Objects;`
`36`	`39`
`37`	`40`	`public class FlutterCoverageProgramRunner extends GenericProgramRunner<RunnerSettings> {`
`38`		`- private static final @NotNull Logger LOG = Logger.getInstance(FlutterCoverageProgramRunner.class.getName());`
	`41`	`+ private static final @NotNull Logger LOG = PluginLogger.createLogger(FlutterCoverageProgramRunner.class);`
`39`	`42`
`40`	`43`	`private static final String ID = "FlutterCoverageProgramRunner";`
`41`	`44`	`private ProcessHandler handler;`
`@@ -98,7 +101,17 @@ private void processCoverage(ExecutionEnvironment env) {`
`98`	`101`	`}`
`99`	`102`	`}`
`100`	`103`	`else {`
`101`		`- LOG.error(FlutterBundle.message("coverage.path.not.found", path));`
	`104`	`+ LOG.error(FlutterBundle.message("coverage.path.not.found", getSafePath(path)));`
`102`	`105`	`}`
`103`	`106`	`}`
	`107`	`+`
	`108`	`+ private @NotNull String getSafePath(@NotNull Path path) {`
	`109`	`+ if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) {`
	`110`	`+ return path.toString();`
	`111`	`+ }`
	`112`	`+`
	`113`	`+ if (path.getNameCount() == 0) return "";`
	`114`	`+`
	`115`	`+ return Objects.requireNonNull(path.getFileName()).toString();`
	`116`	`+ }`
`104`	`117`	`}`

`‎src/io/flutter/run/coverage/FlutterCoverageRunner.java‎`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`	`import com.intellij.openapi.diagnostic.Logger;`
`12`	`12`	`import com.intellij.rt.coverage.data.ProjectData;`
`13`	`13`	`import io.flutter.FlutterBundle;`
	`14`	`+import io.flutter.logging.PluginLogger;`
	`15`	`+import io.flutter.settings.FlutterSettings;`
`14`	`16`	`import org.jetbrains.annotations.NotNull;`
`15`	`17`	`import org.jetbrains.annotations.Nullable;`
`16`	`18`
`@@ -19,7 +21,7 @@`
`19`	`21`
`20`	`22`	`public class FlutterCoverageRunner extends CoverageRunner {`
`21`	`23`	`private static final String ID = "FlutterCoverageRunner";`
`22`		`- private static final @NotNull Logger LOG = Logger.getInstance(FlutterCoverageRunner.class.getName());`
	`24`	`+ private static final @NotNull Logger LOG = PluginLogger.createLogger(FlutterCoverageRunner.class);`
`23`	`25`
`24`	`26`	`@Nullable`
`25`	`27`	`@Override`
`@@ -37,7 +39,9 @@ private static ProjectData doLoadCoverageData(@NotNull final File sessionDataFil`
`37`	`39`	`LcovInfo.readInto(projectData, sessionDataFile);`
`38`	`40`	`}`
`39`	`41`	`catch (IOException ex) {`
`40`		`- LOG.warn(FlutterBundle.message("coverage.data.not.read", sessionDataFile.getAbsolutePath()));`
	`42`	`+ LOG.warn(FlutterBundle.message("coverage.data.not.read", FlutterSettings.getInstance().isFilePathLoggingEnabled()`
	`43`	`+ ? sessionDataFile.getAbsolutePath()`
	`44`	`+ : sessionDataFile.getName()));`
`41`	`45`	`return null;`
`42`	`46`	`}`
`43`	`47`	`return projectData;`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 559f9b1

File tree

2 files changed

2 files changed

`‎src/io/flutter/run/coverage/FlutterCoverageProgramRunner.java‎`

`‎src/io/flutter/run/coverage/FlutterCoverageRunner.java‎`

0 commit comments