From d66eaab4c6fd99f8b3ec0023a2924368801e27f3 Mon Sep 17 00:00:00 2001 From: Justin Robb Date: Tue, 13 Nov 2018 10:43:14 -0800 Subject: [PATCH] Changed UseConsoleOutput boolean to ReporterOutputType enum --- src/coverlet.console/Program.cs | 2 +- src/coverlet.core/Reporters/CoberturaReporter.cs | 2 +- src/coverlet.core/Reporters/IReporter.cs | 8 +++++++- src/coverlet.core/Reporters/JsonReporter.cs | 2 +- src/coverlet.core/Reporters/LcovReporter.cs | 2 +- src/coverlet.core/Reporters/OpenCoverReporter.cs | 2 +- src/coverlet.core/Reporters/TeamCityReporter.cs | 2 +- src/coverlet.msbuild.tasks/CoverageResultTask.cs | 2 +- 8 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/coverlet.console/Program.cs b/src/coverlet.console/Program.cs index febc80f..0583484 100644 --- a/src/coverlet.console/Program.cs +++ b/src/coverlet.console/Program.cs @@ -72,7 +72,7 @@ namespace Coverlet.Console if (reporter == null) throw new Exception($"Specified output format '{format}' is not supported"); - if (reporter.UseConsoleOutput) + if (reporter.OutputType == ReporterOutputType.Console) { // Output to console logger.LogInformation(" Outputting results to console"); diff --git a/src/coverlet.core/Reporters/CoberturaReporter.cs b/src/coverlet.core/Reporters/CoberturaReporter.cs index f83411f..6023e22 100644 --- a/src/coverlet.core/Reporters/CoberturaReporter.cs +++ b/src/coverlet.core/Reporters/CoberturaReporter.cs @@ -10,7 +10,7 @@ namespace Coverlet.Core.Reporters { public class CoberturaReporter : IReporter { - public bool UseConsoleOutput => false; + public ReporterOutputType OutputType => ReporterOutputType.File; public string Format => "cobertura"; diff --git a/src/coverlet.core/Reporters/IReporter.cs b/src/coverlet.core/Reporters/IReporter.cs index 7526816..1e885ba 100644 --- a/src/coverlet.core/Reporters/IReporter.cs +++ b/src/coverlet.core/Reporters/IReporter.cs @@ -2,9 +2,15 @@ namespace Coverlet.Core.Reporters { public interface IReporter { - bool UseConsoleOutput { get; } + ReporterOutputType OutputType { get; } string Format { get; } string Extension { get; } string Report(CoverageResult result); } + + public enum ReporterOutputType + { + File, + Console, + } } \ No newline at end of file diff --git a/src/coverlet.core/Reporters/JsonReporter.cs b/src/coverlet.core/Reporters/JsonReporter.cs index 4213a5d..a9cf48c 100644 --- a/src/coverlet.core/Reporters/JsonReporter.cs +++ b/src/coverlet.core/Reporters/JsonReporter.cs @@ -4,7 +4,7 @@ namespace Coverlet.Core.Reporters { public class JsonReporter : IReporter { - public bool UseConsoleOutput => false; + public ReporterOutputType OutputType => ReporterOutputType.File; public string Format => "json"; diff --git a/src/coverlet.core/Reporters/LcovReporter.cs b/src/coverlet.core/Reporters/LcovReporter.cs index 2b9dd51..22d84d6 100644 --- a/src/coverlet.core/Reporters/LcovReporter.cs +++ b/src/coverlet.core/Reporters/LcovReporter.cs @@ -6,7 +6,7 @@ namespace Coverlet.Core.Reporters { public class LcovReporter : IReporter { - public bool UseConsoleOutput => false; + public ReporterOutputType OutputType => ReporterOutputType.File; public string Format => "lcov"; diff --git a/src/coverlet.core/Reporters/OpenCoverReporter.cs b/src/coverlet.core/Reporters/OpenCoverReporter.cs index f94447d..f9d9e77 100644 --- a/src/coverlet.core/Reporters/OpenCoverReporter.cs +++ b/src/coverlet.core/Reporters/OpenCoverReporter.cs @@ -9,7 +9,7 @@ namespace Coverlet.Core.Reporters { public class OpenCoverReporter : IReporter { - public bool UseConsoleOutput => false; + public ReporterOutputType OutputType => ReporterOutputType.File; public string Format => "opencover"; diff --git a/src/coverlet.core/Reporters/TeamCityReporter.cs b/src/coverlet.core/Reporters/TeamCityReporter.cs index 3f74a2f..63bee51 100644 --- a/src/coverlet.core/Reporters/TeamCityReporter.cs +++ b/src/coverlet.core/Reporters/TeamCityReporter.cs @@ -6,7 +6,7 @@ namespace coverlet.core.Reporters { public class TeamCityReporter : IReporter { - public bool UseConsoleOutput => true; + public ReporterOutputType OutputType => ReporterOutputType.Console; public string Format => "teamcity"; diff --git a/src/coverlet.msbuild.tasks/CoverageResultTask.cs b/src/coverlet.msbuild.tasks/CoverageResultTask.cs index 1a0c8aa..c014674 100644 --- a/src/coverlet.msbuild.tasks/CoverageResultTask.cs +++ b/src/coverlet.msbuild.tasks/CoverageResultTask.cs @@ -65,7 +65,7 @@ namespace Coverlet.MSbuild.Tasks if (reporter == null) throw new Exception($"Specified output format '{format}' is not supported"); - if (reporter.UseConsoleOutput) + if (reporter.OutputType == ReporterOutputType.Console) { // Output to console Console.WriteLine(" Outputting results to console");