diff --git a/src/ReportGenerator.Core.Test/Issues/Issue235_Cobertura.cs b/src/ReportGenerator.Core.Test/Issues/Issue235_Cobertura.cs index e471d7c0..6b91d2ca 100644 --- a/src/ReportGenerator.Core.Test/Issues/Issue235_Cobertura.cs +++ b/src/ReportGenerator.Core.Test/Issues/Issue235_Cobertura.cs @@ -1,6 +1,6 @@ using System.Linq; using System.Xml.Linq; -using Moq; +using NSubstitute; using Palmmedia.ReportGenerator.Core.Parser; using Palmmedia.ReportGenerator.Core.Parser.Filtering; using Xunit; @@ -30,12 +30,12 @@ public class Issue235_Cobertura [Fact] public void NestedClassWithoutParentIsPresent() { - var filterMock = new Mock(); - filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny())).Returns(true); + var filter = Substitute.For(); + filter.IsElementIncludedInReport(Arg.Any()).Returns(true); var report = XDocument.Parse(Report); - var parserResult = new CoberturaParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report.Root); + var parserResult = new CoberturaParser(filter, filter, filter).Parse(report.Root); Assert.Equal("OutwardPaymentDocumentProcessing.HttpStart", parserResult.Assemblies.First().Classes.First().Name); } diff --git a/src/ReportGenerator.Core.Test/Parser/Analysis/CodeFileTest.cs b/src/ReportGenerator.Core.Test/Parser/Analysis/CodeFileTest.cs index be84fa23..b649c450 100644 --- a/src/ReportGenerator.Core.Test/Parser/Analysis/CodeFileTest.cs +++ b/src/ReportGenerator.Core.Test/Parser/Analysis/CodeFileTest.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using Moq; +using NSubstitute; using Palmmedia.ReportGenerator.Core.Parser.Analysis; using Palmmedia.ReportGenerator.Core.Parser.FileReading; using Xunit; @@ -267,24 +267,24 @@ public void AnalyzeFile_NonExistingFile_AnalysisIsReturned() [Fact] public void AnalyzeFile_AdditionFileReaderNoError_RegularFileReaderIgnored() { - var additionalFileReaderMock = new Mock(); - string error = null; - additionalFileReaderMock.Setup(f => f.LoadFile(It.IsAny(), out error)) + var additionalFileReader = Substitute.For(); + string errorArg = Arg.Any(); + additionalFileReader.LoadFile(Arg.Any(), out errorArg) .Returns(new[] { "Test" }); - var fileReaderMock = new Mock(); + var fileReader = Substitute.For(); - var sut = new CodeFile("C:\\temp\\Other.cs", new int[] { -2, -1, 0, 1 }, new LineVisitStatus[] { LineVisitStatus.NotCoverable, LineVisitStatus.NotCoverable, LineVisitStatus.NotCovered, LineVisitStatus.Covered }, additionalFileReaderMock.Object); + var sut = new CodeFile("C:\\temp\\Other.cs", new int[] { -2, -1, 0, 1 }, new LineVisitStatus[] { LineVisitStatus.NotCoverable, LineVisitStatus.NotCoverable, LineVisitStatus.NotCovered, LineVisitStatus.Covered }, additionalFileReader); Assert.Null(sut.TotalLines); - var fileAnalysis = sut.AnalyzeFile(fileReaderMock.Object); + var fileAnalysis = sut.AnalyzeFile(fileReader); Assert.NotNull(fileAnalysis); Assert.Null(fileAnalysis.Error); - additionalFileReaderMock.Verify(f => f.LoadFile(It.IsAny(), out error), Times.Once); - fileReaderMock.Verify(f => f.LoadFile(It.IsAny(), out error), Times.Never); + additionalFileReader.Received(1).LoadFile(Arg.Any(), out errorArg); + fileReader.DidNotReceive().LoadFile(Arg.Any(), out errorArg); } /// @@ -293,20 +293,29 @@ public void AnalyzeFile_AdditionFileReaderNoError_RegularFileReaderIgnored() [Fact] public void AnalyzeFile_AdditionFileReaderReturnsError_RegularFileReaderUsed() { - var additionalFileReaderMock = new Mock(); - string error = "Some error"; - additionalFileReaderMock.Setup(f => f.LoadFile(It.IsAny(), out error)) - .Returns((string[])null); - - var fileReaderMock = new Mock(); - fileReaderMock.Setup(f => f.LoadFile(It.IsAny(), out error)) - .Returns(new[] { "Test" }); - - var sut = new CodeFile("C:\\temp\\Other.cs", new int[] { -2, -1, 0, 1 }, new LineVisitStatus[] { LineVisitStatus.NotCoverable, LineVisitStatus.NotCoverable, LineVisitStatus.NotCovered, LineVisitStatus.Covered }, additionalFileReaderMock.Object); + var additionalFileReader = Substitute.For(); + string errorArg = Arg.Any(); + string errorOut = "Some error"; + additionalFileReader.LoadFile(Arg.Any(), out errorArg) + .Returns(x => + { + x[1] = errorOut; + return null; + }); + + var fileReader = Substitute.For(); + fileReader.LoadFile(Arg.Any(), out errorArg) + .Returns(x => + { + x[1] = errorOut; + return new[] { "Test" }; + }); + + var sut = new CodeFile("C:\\temp\\Other.cs", new int[] { -2, -1, 0, 1 }, new LineVisitStatus[] { LineVisitStatus.NotCoverable, LineVisitStatus.NotCoverable, LineVisitStatus.NotCovered, LineVisitStatus.Covered }, additionalFileReader); Assert.Null(sut.TotalLines); - var fileAnalysis = sut.AnalyzeFile(fileReaderMock.Object); + var fileAnalysis = sut.AnalyzeFile(fileReader); Assert.NotNull(fileAnalysis); Assert.NotNull(fileAnalysis.Error); @@ -314,8 +323,8 @@ public void AnalyzeFile_AdditionFileReaderReturnsError_RegularFileReaderUsed() Assert.Equal(4, sut.TotalLines); Assert.Equal(4, fileAnalysis.Lines.Count()); - additionalFileReaderMock.Verify(f => f.LoadFile(It.IsAny(), out error), Times.Once); - fileReaderMock.Verify(f => f.LoadFile(It.IsAny(), out error), Times.Once); + additionalFileReader.Received(1).LoadFile(Arg.Any(), out errorArg); + fileReader.Received(1).LoadFile(Arg.Any(), out errorArg); } /// diff --git a/src/ReportGenerator.Core.Test/Parser/CloverParserTest.cs b/src/ReportGenerator.Core.Test/Parser/CloverParserTest.cs index 254dc75d..38fe1738 100644 --- a/src/ReportGenerator.Core.Test/Parser/CloverParserTest.cs +++ b/src/ReportGenerator.Core.Test/Parser/CloverParserTest.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; using System.Xml.Linq; -using Moq; +using NSubstitute; using Palmmedia.ReportGenerator.Core.Parser; using Palmmedia.ReportGenerator.Core.Parser.Analysis; using Palmmedia.ReportGenerator.Core.Parser.FileReading; @@ -25,12 +25,12 @@ public class CloverParserTest public CloverParserTest() { - var filterMock = new Mock(); - filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny())).Returns(true); + var filter = Substitute.For(); + filter.IsElementIncludedInReport(Arg.Any()).Returns(true); var report = XDocument.Load(FilePath1); new CloverReportPreprocessor(new[] { "C:\\temp" }).Execute(report); - this.parserResult = new CloverParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report); + this.parserResult = new CloverParser(filter, filter, filter).Parse(report); } /// diff --git a/src/ReportGenerator.Core.Test/Parser/CoberturaParserTest.cs b/src/ReportGenerator.Core.Test/Parser/CoberturaParserTest.cs index 292af615..2eef103c 100644 --- a/src/ReportGenerator.Core.Test/Parser/CoberturaParserTest.cs +++ b/src/ReportGenerator.Core.Test/Parser/CoberturaParserTest.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; using System.Xml.Linq; -using Moq; +using NSubstitute; using Palmmedia.ReportGenerator.Core.Parser; using Palmmedia.ReportGenerator.Core.Parser.Analysis; using Palmmedia.ReportGenerator.Core.Parser.FileReading; @@ -19,7 +19,7 @@ namespace Palmmedia.ReportGenerator.Core.Test.Parser [Collection("FileManager")] public class CoberturaParserTest { - private static readonly string FilePathJavaReport = Path.Combine(FileManager.GetJavaReportDirectory(), "Cobertura2.1.1.xml"); + private static readonly string FilePathJavaReport = Path.Combine(FileManager.GetJavaReportDirectory(), "Cobertura2.1.1.xml"); private static readonly string FilePathCSharpReport = Path.Combine(FileManager.GetCSharpReportDirectory(), "Cobertura_coverlet.xml"); private readonly ParserResult javaParserResult; @@ -156,11 +156,11 @@ public void MethodMetricsTest() /// A test for MethodMetrics /// [Theory] - [InlineData("Test", "Test.AbstractClass", "C:\\temp\\AbstractClass.cs", ".ctor()", 1, 1, 100, 100, 1)] - [InlineData("Test", "Test.AbstractClass_SampleImpl1", "C:\\temp\\AbstractClass.cs", "Method1()", 3, 1, 0, 100, 2)] - [InlineData("Test", "Test.PartialClass", "C:\\temp\\PartialClass.cs", "set_SomeProperty(System.Int32)", 4, 2, 66.66, 50, 2.15)] - [InlineData("Test", "Test.Program", "C:\\temp\\Program.cs", "Main(System.String[])", 4, 1, 89.65, 100, 1.00)] - [InlineData("Test", "Test.TestClass", "C:\\temp\\TestClass.cs", "SampleFunction()", 5, 4, 80, 50, 4.13)] + [InlineData("Test", "Test.AbstractClass", "C:\\temp\\AbstractClass.cs", ".ctor()", 1, 1, 100, 100, 1)] + [InlineData("Test", "Test.AbstractClass_SampleImpl1", "C:\\temp\\AbstractClass.cs", "Method1()", 3, 1, 0, 100, 2)] + [InlineData("Test", "Test.PartialClass", "C:\\temp\\PartialClass.cs", "set_SomeProperty(System.Int32)", 4, 2, 66.66, 50, 2.15)] + [InlineData("Test", "Test.Program", "C:\\temp\\Program.cs", "Main(System.String[])", 4, 1, 89.65, 100, 1.00)] + [InlineData("Test", "Test.TestClass", "C:\\temp\\TestClass.cs", "SampleFunction()", 5, 4, 80, 50, 4.13)] public void MethodMetricsTest_2(string assemblyName, string className, string filePath, string methodName, int expectedMethodMetrics, double expectedComplexity, double expectedLineCoverage, double expectedBranchCoverage, double expectedCrapScore) { var methodMetrics = csharpParserResult @@ -219,12 +219,12 @@ public void CodeElementsTest() private static ParserResult ParseReport(string filePath) { - var filterMock = new Mock(); - filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny())).Returns(true); + var filter = Substitute.For(); + filter.IsElementIncludedInReport(Arg.Any()).Returns(true); var report = XDocument.Load(filePath); new CoberturaReportPreprocessor().Execute(report); - return new CoberturaParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report.Root); + return new CoberturaParser(filter, filter, filter).Parse(report.Root); } } } diff --git a/src/ReportGenerator.Core.Test/Parser/CoverageReportParserTest.cs b/src/ReportGenerator.Core.Test/Parser/CoverageReportParserTest.cs index b1ff1953..1dd9e85a 100644 --- a/src/ReportGenerator.Core.Test/Parser/CoverageReportParserTest.cs +++ b/src/ReportGenerator.Core.Test/Parser/CoverageReportParserTest.cs @@ -1,6 +1,6 @@ using System.IO; using System.Linq; -using Moq; +using NSubstitute; using Palmmedia.ReportGenerator.Core.Parser; using Palmmedia.ReportGenerator.Core.Parser.Filtering; using Xunit; @@ -14,11 +14,11 @@ namespace Palmmedia.ReportGenerator.Core.Test.Parser [Collection("FileManager")] public class CoverageReportParserTest { - private readonly Mock filterMock = new Mock(); + private readonly IFilter filter = Substitute.For(); public CoverageReportParserTest() { - this.filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny())).Returns(true); + this.filter.IsElementIncludedInReport(Arg.Any()).Returns(true); } /// @@ -28,10 +28,10 @@ public CoverageReportParserTest() public void ParseFiles_SingleReportFileWithSingleReport_PartCoverNotSupported() { string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "Partcover2.3.xml"); - Assert.Throws(() => new CoverageReportParser(1, 1, System.Array.Empty(), this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath })); + Assert.Throws(() => new CoverageReportParser(1, 1, System.Array.Empty(), this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath })); filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "Partcover2.2.xml"); - Assert.Throws(() => new CoverageReportParser(1, 1, System.Array.Empty(), this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath })); + Assert.Throws(() => new CoverageReportParser(1, 1, System.Array.Empty(), this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath })); } /// @@ -41,65 +41,65 @@ public void ParseFiles_SingleReportFileWithSingleReport_PartCoverNotSupported() public void ParseFiles_SingleReportFileWithSingleReport_CorrectParserIsReturned() { string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "NCover1.5.8.xml"); - var parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }); + var parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath }); Assert.Equal("NCover", parserResult.ParserName); Assert.Empty(parserResult.SourceDirectories); filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "OpenCover.xml"); - parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }); + parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath }); Assert.Equal("OpenCover", parserResult.ParserName); Assert.Empty(parserResult.SourceDirectories); filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "dotCover.xml"); - parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }); + parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath }); Assert.Equal("DotCover", parserResult.ParserName); Assert.Empty(parserResult.SourceDirectories); filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "VisualStudio2010.coveragexml"); - parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }); + parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath }); Assert.Equal("VisualStudio", parserResult.ParserName); Assert.Empty(parserResult.SourceDirectories); filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "DynamicCodeCoverage.xml"); - parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }); + parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath }); Assert.Equal("DynamicCodeCoverage", parserResult.ParserName); Assert.Empty(parserResult.SourceDirectories); filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "mprof-report.xml"); - parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }); + parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath }); Assert.Equal("MProf", parserResult.ParserName); Assert.Empty(parserResult.SourceDirectories); filePath = Path.Combine(FileManager.GetJavaReportDirectory(), "Cobertura2.1.1.xml"); - parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }); + parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath }); Assert.Equal("Cobertura", parserResult.ParserName); Assert.Single(parserResult.SourceDirectories); Assert.Equal("C:/temp", parserResult.SourceDirectories.First()); filePath = Path.Combine(FileManager.GetCPlusPlusReportDirectory(), "Cobertura_CPPCoverage.xml"); - parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }); + parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath }); Assert.Equal("Cobertura", parserResult.ParserName); Assert.Empty(parserResult.SourceDirectories); filePath = Path.Combine(FileManager.GetJavaReportDirectory(), "JaCoCo0.8.3.xml"); - parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }); + parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath }); Assert.Equal("JaCoCo", parserResult.ParserName); Assert.Single(parserResult.SourceDirectories); Assert.Equal("C:\\somedirectory", parserResult.SourceDirectories.First()); filePath = Path.Combine(FileManager.GetJavaReportDirectory(), "Clover_OpenClover4.3.1.xml"); - parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }); + parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath }); Assert.Equal("Clover", parserResult.ParserName); Assert.Single(parserResult.SourceDirectories); Assert.Equal("C:\\somedirectory", parserResult.SourceDirectories.First()); filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "lcov.info"); - parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }); + parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath }); Assert.Equal("LCov", parserResult.ParserName); Assert.Empty(parserResult.SourceDirectories); filePath = Path.Combine(FileManager.GetCPlusPlusReportDirectory(), "gcov", "basic", "main.cpp.gcov"); - parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }); + parserResult = new CoverageReportParser(1, 1, new string[] { "C:\\somedirectory" }, this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath }); Assert.Equal("GCov", parserResult.ParserName); Assert.Single(parserResult.SourceDirectories); Assert.Equal("C:\\somedirectory", parserResult.SourceDirectories.First()); @@ -112,10 +112,10 @@ public void ParseFiles_SingleReportFileWithSingleReport_CorrectParserIsReturned( public void ParseFiles_SingleReportFileWithSeveralReports_PartCoverNotSupported() { string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiPartcover2.3.xml"); - Assert.Throws(() => new CoverageReportParser(1, 1, System.Array.Empty(), this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath })); + Assert.Throws(() => new CoverageReportParser(1, 1, System.Array.Empty(), this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath })); filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiPartcover2.2.xml"); - Assert.Throws(() => new CoverageReportParser(1, 1, System.Array.Empty(), this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath })); + Assert.Throws(() => new CoverageReportParser(1, 1, System.Array.Empty(), this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath })); } /// @@ -125,23 +125,23 @@ public void ParseFiles_SingleReportFileWithSeveralReports_PartCoverNotSupported( public void ParseFiles_SingleReportFileWithSeveralReports_CorrectParserIsReturned() { string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiNCover1.5.8.xml"); - string parserName = new CoverageReportParser(1, 1, System.Array.Empty(), this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }).ParserName; + string parserName = new CoverageReportParser(1, 1, System.Array.Empty(), this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath }).ParserName; Assert.Equal("MultiReport (2x NCover)", parserName); filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiOpenCover.xml"); - parserName = new CoverageReportParser(1, 1, System.Array.Empty(), this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }).ParserName; + parserName = new CoverageReportParser(1, 1, System.Array.Empty(), this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath }).ParserName; Assert.Equal("MultiReport (2x OpenCover)", parserName); filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultidotCover.xml"); - parserName = new CoverageReportParser(1, 1, System.Array.Empty(), this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }).ParserName; + parserName = new CoverageReportParser(1, 1, System.Array.Empty(), this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath }).ParserName; Assert.Equal("MultiReport (2x DotCover)", parserName); filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiVisualStudio2010.coveragexml"); - parserName = new CoverageReportParser(1, 1, System.Array.Empty(), this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }).ParserName; + parserName = new CoverageReportParser(1, 1, System.Array.Empty(), this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath }).ParserName; Assert.Equal("MultiReport (2x VisualStudio)", parserName); filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiDynamicCodeCoverage.xml"); - parserName = new CoverageReportParser(1, 1, System.Array.Empty(), this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }).ParserName; + parserName = new CoverageReportParser(1, 1, System.Array.Empty(), this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath }).ParserName; Assert.Equal("MultiReport (2x DynamicCodeCoverage)", parserName); } @@ -153,7 +153,7 @@ public void ParseFiles_SeveralReportFilesWithSingleReport_CorrectParserIsReturne { string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "OpenCover.xml"); string filePath2 = Path.Combine(FileManager.GetCSharpReportDirectory(), "NCover1.5.8.xml"); - string parserName = new CoverageReportParser(1, 1, System.Array.Empty(), this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath, filePath2 }).ParserName; + string parserName = new CoverageReportParser(1, 1, System.Array.Empty(), this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath, filePath2 }).ParserName; Assert.Equal("MultiReport (1x NCover, 1x OpenCover)", parserName); } @@ -165,7 +165,7 @@ public void ParseFiles_SeveralReportFilesWithSeveralReports_CorrectParserIsRetur { string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "NCover1.5.8.xml"); string filePath2 = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiOpenCover.xml"); - string parserName = new CoverageReportParser(1, 1, System.Array.Empty(), this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath, filePath2 }).ParserName; + string parserName = new CoverageReportParser(1, 1, System.Array.Empty(), this.filter, this.filter, this.filter).ParseFiles(new string[] { filePath, filePath2 }).ParserName; Assert.Equal("MultiReport (1x NCover, 2x OpenCover)", parserName); } @@ -175,7 +175,7 @@ public void ParseFiles_SeveralReportFilesWithSeveralReports_CorrectParserIsRetur [Fact] public void ParseFiles_NoReports_CorrectParserIsReturned() { - string parserName = new CoverageReportParser(1, 1, System.Array.Empty(), this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { string.Empty }).ParserName; + string parserName = new CoverageReportParser(1, 1, System.Array.Empty(), this.filter, this.filter, this.filter).ParseFiles(new string[] { string.Empty }).ParserName; Assert.Equal(string.Empty, parserName); } } diff --git a/src/ReportGenerator.Core.Test/Parser/DotCoverParserTest.cs b/src/ReportGenerator.Core.Test/Parser/DotCoverParserTest.cs index 97ca7182..703aa9da 100644 --- a/src/ReportGenerator.Core.Test/Parser/DotCoverParserTest.cs +++ b/src/ReportGenerator.Core.Test/Parser/DotCoverParserTest.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; using System.Xml.Linq; -using Moq; +using NSubstitute; using Palmmedia.ReportGenerator.Core.Parser; using Palmmedia.ReportGenerator.Core.Parser.Analysis; using Palmmedia.ReportGenerator.Core.Parser.FileReading; @@ -24,10 +24,10 @@ public class DotCoverParserTest public DotCoverParserTest() { - var filterMock = new Mock(); - filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny())).Returns(true); + var filter = Substitute.For(); + filter.IsElementIncludedInReport(Arg.Any()).Returns(true); - this.parserResult = new DotCoverParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(XDocument.Load(FilePath1)); + this.parserResult = new DotCoverParser(filter, filter, filter).Parse(XDocument.Load(FilePath1)); } /// diff --git a/src/ReportGenerator.Core.Test/Parser/DynamicCodeCoverageParserTest.cs b/src/ReportGenerator.Core.Test/Parser/DynamicCodeCoverageParserTest.cs index f6182307..1cefb11a 100644 --- a/src/ReportGenerator.Core.Test/Parser/DynamicCodeCoverageParserTest.cs +++ b/src/ReportGenerator.Core.Test/Parser/DynamicCodeCoverageParserTest.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; using System.Xml.Linq; -using Moq; +using NSubstitute; using Palmmedia.ReportGenerator.Core.Parser; using Palmmedia.ReportGenerator.Core.Parser.Analysis; using Palmmedia.ReportGenerator.Core.Parser.FileReading; @@ -24,11 +24,11 @@ public class DynamicCodeCoverageParserTest public DynamicCodeCoverageParserTest() { - var filterMock = new Mock(); - filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny())).Returns(true); + var filter = Substitute.For(); + filter.IsElementIncludedInReport(Arg.Any()).Returns(true); var report = XDocument.Load(FilePath); - this.parserResult = new DynamicCodeCoverageParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report); + this.parserResult = new DynamicCodeCoverageParser(filter, filter, filter).Parse(report); } /// diff --git a/src/ReportGenerator.Core.Test/Parser/GCovParserTest.cs b/src/ReportGenerator.Core.Test/Parser/GCovParserTest.cs index a9fac5c7..2bf69768 100644 --- a/src/ReportGenerator.Core.Test/Parser/GCovParserTest.cs +++ b/src/ReportGenerator.Core.Test/Parser/GCovParserTest.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Moq; +using NSubstitute; using Palmmedia.ReportGenerator.Core.Parser; using Palmmedia.ReportGenerator.Core.Parser.Analysis; using Palmmedia.ReportGenerator.Core.Parser.FileReading; @@ -24,12 +24,12 @@ public class GCovParserTest public GCovParserTest() { - var filterMock = new Mock(); - filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny())).Returns(true); + var filter = Substitute.For(); + filter.IsElementIncludedInReport(Arg.Any()).Returns(true); var lines = File.ReadAllLines(FilePath); new GCovReportPreprocessor(new[] { "C:\\temp" }).Execute(lines); - this.parserResult = new GCovParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(lines); + this.parserResult = new GCovParser(filter, filter, filter).Parse(lines); } /// diff --git a/src/ReportGenerator.Core.Test/Parser/JaCoCoParserTest.cs b/src/ReportGenerator.Core.Test/Parser/JaCoCoParserTest.cs index 3f27696e..5b4f8989 100644 --- a/src/ReportGenerator.Core.Test/Parser/JaCoCoParserTest.cs +++ b/src/ReportGenerator.Core.Test/Parser/JaCoCoParserTest.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; using System.Xml.Linq; -using Moq; +using NSubstitute; using Palmmedia.ReportGenerator.Core.Parser; using Palmmedia.ReportGenerator.Core.Parser.Analysis; using Palmmedia.ReportGenerator.Core.Parser.FileReading; @@ -25,12 +25,12 @@ public class JaCoCoParserTest public JaCoCoParserTest() { - var filterMock = new Mock(); - filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny())).Returns(true); + var filter = Substitute.For(); + filter.IsElementIncludedInReport(Arg.Any()).Returns(true); var report = XDocument.Load(FilePath1); new JaCoCoReportPreprocessor(new[] { "C:\\temp" }).Execute(report); - this.parserResult = new JaCoCoParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report); + this.parserResult = new JaCoCoParser(filter, filter, filter).Parse(report); } /// diff --git a/src/ReportGenerator.Core.Test/Parser/LCovParserTest.cs b/src/ReportGenerator.Core.Test/Parser/LCovParserTest.cs index 0d048daf..4fd2226d 100644 --- a/src/ReportGenerator.Core.Test/Parser/LCovParserTest.cs +++ b/src/ReportGenerator.Core.Test/Parser/LCovParserTest.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Moq; +using NSubstitute; using Palmmedia.ReportGenerator.Core.Parser; using Palmmedia.ReportGenerator.Core.Parser.Analysis; using Palmmedia.ReportGenerator.Core.Parser.FileReading; @@ -23,11 +23,11 @@ public class LCovParserTest public LCovParserTest() { - var filterMock = new Mock(); - filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny())).Returns(true); + var filter = Substitute.For(); + filter.IsElementIncludedInReport(Arg.Any()).Returns(true); var lines = File.ReadAllLines(FilePath); - this.parserResult = new LCovParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(lines); + this.parserResult = new LCovParser(filter, filter, filter).Parse(lines); } /// diff --git a/src/ReportGenerator.Core.Test/Parser/MProfParserTest.cs b/src/ReportGenerator.Core.Test/Parser/MProfParserTest.cs index fea40032..db0733cc 100644 --- a/src/ReportGenerator.Core.Test/Parser/MProfParserTest.cs +++ b/src/ReportGenerator.Core.Test/Parser/MProfParserTest.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; using System.Xml.Linq; -using Moq; +using NSubstitute; using Palmmedia.ReportGenerator.Core.Parser; using Palmmedia.ReportGenerator.Core.Parser.Analysis; using Palmmedia.ReportGenerator.Core.Parser.FileReading; @@ -24,11 +24,11 @@ public class MProfParserTest public MProfParserTest() { - var filterMock = new Mock(); - filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny())).Returns(true); + var filter = Substitute.For(); + filter.IsElementIncludedInReport(Arg.Any()).Returns(true); var report = XDocument.Load(FilePath); - this.parserResult = new MProfParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report); + this.parserResult = new MProfParser(filter, filter, filter).Parse(report); } /// diff --git a/src/ReportGenerator.Core.Test/Parser/NCoverParserTest.cs b/src/ReportGenerator.Core.Test/Parser/NCoverParserTest.cs index 9f095f3b..bb22fc6f 100644 --- a/src/ReportGenerator.Core.Test/Parser/NCoverParserTest.cs +++ b/src/ReportGenerator.Core.Test/Parser/NCoverParserTest.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; using System.Xml.Linq; -using Moq; +using NSubstitute; using Palmmedia.ReportGenerator.Core.Parser; using Palmmedia.ReportGenerator.Core.Parser.Analysis; using Palmmedia.ReportGenerator.Core.Parser.FileReading; @@ -24,11 +24,11 @@ public class NCoverParserTest public NCoverParserTest() { - var filterMock = new Mock(); - filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny())).Returns(true); + var filter = Substitute.For(); + filter.IsElementIncludedInReport(Arg.Any()).Returns(true); var report = XDocument.Load(FilePath); - this.parserResult = new NCoverParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report); + this.parserResult = new NCoverParser(filter, filter, filter).Parse(report); } /// diff --git a/src/ReportGenerator.Core.Test/Parser/OpenCoverParserTest.cs b/src/ReportGenerator.Core.Test/Parser/OpenCoverParserTest.cs index 48d2d961..bc3fac68 100644 --- a/src/ReportGenerator.Core.Test/Parser/OpenCoverParserTest.cs +++ b/src/ReportGenerator.Core.Test/Parser/OpenCoverParserTest.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; using System.Xml.Linq; -using Moq; +using NSubstitute; using Palmmedia.ReportGenerator.Core.Parser; using Palmmedia.ReportGenerator.Core.Parser.Analysis; using Palmmedia.ReportGenerator.Core.Parser.FileReading; @@ -31,18 +31,18 @@ public class OpenCoverParserTest public OpenCoverParserTest() { - var filterMock = new Mock(); - filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny())).Returns(true); + var filter = Substitute.For(); + filter.IsElementIncludedInReport(Arg.Any()).Returns(true); - this.parserResultWithoutPreprocessing = new OpenCoverParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(XDocument.Load(FilePath1)); + this.parserResultWithoutPreprocessing = new OpenCoverParser(filter, filter, filter).Parse(XDocument.Load(FilePath1)); var report = XDocument.Load(FilePath1); new OpenCoverReportPreprocessor().Execute(report); - this.parserResultWithPreprocessing = new OpenCoverParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report); + this.parserResultWithPreprocessing = new OpenCoverParser(filter, filter, filter).Parse(report); report = XDocument.Load(FilePath2); new OpenCoverReportPreprocessor().Execute(report); - this.parserResultWithTrackedMethods = new OpenCoverParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report); + this.parserResultWithTrackedMethods = new OpenCoverParser(filter, filter, filter).Parse(report); } /// diff --git a/src/ReportGenerator.Core.Test/Parser/ParserResultTest.cs b/src/ReportGenerator.Core.Test/Parser/ParserResultTest.cs index c6f93993..ea417a5b 100644 --- a/src/ReportGenerator.Core.Test/Parser/ParserResultTest.cs +++ b/src/ReportGenerator.Core.Test/Parser/ParserResultTest.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; using System.Xml.Linq; -using Moq; +using NSubstitute; using Palmmedia.ReportGenerator.Core.Parser; using Palmmedia.ReportGenerator.Core.Parser.Analysis; using Palmmedia.ReportGenerator.Core.Parser.FileReading; @@ -27,19 +27,19 @@ public class ParserResultTest public ParserResultTest() { - var filterMock = new Mock(); - filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny())).Returns(true); + var filter = Substitute.For(); + filter.IsElementIncludedInReport(Arg.Any()).Returns(true); - this.parserResultWithoutPreprocessing = new OpenCoverParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(XDocument.Load(FilePath)); - this.parserResultWithoutPreprocessing.Merge(new OpenCoverParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(XDocument.Load(FilePath))); + this.parserResultWithoutPreprocessing = new OpenCoverParser(filter, filter, filter).Parse(XDocument.Load(FilePath)); + this.parserResultWithoutPreprocessing.Merge(new OpenCoverParser(filter, filter, filter).Parse(XDocument.Load(FilePath))); var report = XDocument.Load(FilePath); new OpenCoverReportPreprocessor().Execute(report); - this.parserResultWithPreprocessing = new OpenCoverParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report); + this.parserResultWithPreprocessing = new OpenCoverParser(filter, filter, filter).Parse(report); report = XDocument.Load(FilePath); new OpenCoverReportPreprocessor().Execute(report); - this.parserResultWithPreprocessing.Merge(new OpenCoverParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report)); + this.parserResultWithPreprocessing.Merge(new OpenCoverParser(filter, filter, filter).Parse(report)); } /// @@ -236,11 +236,11 @@ public void MethodMetricsTest() [Fact] public void OpenCoverMethodMetricsTest() { - var filterMock = new Mock(); - filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny())).Returns(true); + var filter = Substitute.For(); + filter.IsElementIncludedInReport(Arg.Any()).Returns(true); string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiOpenCover.xml"); - var parserResult = new CoverageReportParser(1, 1, System.Array.Empty(), filterMock.Object, filterMock.Object, filterMock.Object).ParseFiles(new string[] { filePath }); + var parserResult = new CoverageReportParser(1, 1, System.Array.Empty(), filter, filter, filter).ParseFiles(new string[] { filePath }); var metrics = parserResult.Assemblies .Single(a => a.Name == "Test").Classes @@ -266,11 +266,11 @@ public void OpenCoverMethodMetricsTest() [Fact] public void OpenCoverBranchesTest() { - var filterMock = new Mock(); - filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny())).Returns(true); + var filter = Substitute.For(); + filter.IsElementIncludedInReport(Arg.Any()).Returns(true); string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiOpenCover.xml"); - var parserResult = new CoverageReportParser(1, 1, System.Array.Empty(), filterMock.Object, filterMock.Object, filterMock.Object).ParseFiles(new string[] { filePath }); + var parserResult = new CoverageReportParser(1, 1, System.Array.Empty(), filter, filter, filter).ParseFiles(new string[] { filePath }); var fileAnalysis = GetFileAnalysis(parserResult.Assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); diff --git a/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2010.cs b/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2010.cs index 92598ada..1bb4abf0 100644 --- a/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2010.cs +++ b/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2010.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; using System.Xml.Linq; -using Moq; +using NSubstitute; using Palmmedia.ReportGenerator.Core.Parser; using Palmmedia.ReportGenerator.Core.Parser.Analysis; using Palmmedia.ReportGenerator.Core.Parser.FileReading; @@ -24,11 +24,11 @@ public class VisualStudioParserTest_2010 public VisualStudioParserTest_2010() { - var filterMock = new Mock(); - filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny())).Returns(true); + var filter = Substitute.For(); + filter.IsElementIncludedInReport(Arg.Any()).Returns(true); var report = XDocument.Load(FilePath); - this.parserResult = new VisualStudioParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report); + this.parserResult = new VisualStudioParser(filter, filter, filter).Parse(report); } /// diff --git a/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2012.cs b/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2012.cs index 615b9a71..29e6acbf 100644 --- a/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2012.cs +++ b/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2012.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; using System.Xml.Linq; -using Moq; +using NSubstitute; using Palmmedia.ReportGenerator.Core.Parser; using Palmmedia.ReportGenerator.Core.Parser.Analysis; using Palmmedia.ReportGenerator.Core.Parser.FileReading; @@ -24,11 +24,11 @@ public class VisualStudioParserTest_2012 public VisualStudioParserTest_2012() { - var filterMock = new Mock(); - filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny())).Returns(true); + var filter = Substitute.For(); + filter.IsElementIncludedInReport(Arg.Any()).Returns(true); var report = XDocument.Load(FilePath); - this.parserResult = new VisualStudioParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report); + this.parserResult = new VisualStudioParser(filter, filter, filter).Parse(report); } /// diff --git a/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2013.cs b/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2013.cs index d9aa200a..c76cfc8f 100644 --- a/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2013.cs +++ b/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2013.cs @@ -2,7 +2,7 @@ using System.IO; using System.Linq; using System.Xml.Linq; -using Moq; +using NSubstitute; using Palmmedia.ReportGenerator.Core.Parser; using Palmmedia.ReportGenerator.Core.Parser.Analysis; using Palmmedia.ReportGenerator.Core.Parser.FileReading; @@ -24,11 +24,11 @@ public class VisualStudioParserTest_2013 public VisualStudioParserTest_2013() { - var filterMock = new Mock(); - filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny())).Returns(true); + var filter = Substitute.For(); + filter.IsElementIncludedInReport(Arg.Any()).Returns(true); var report = XDocument.Load(FilePath); - this.parserResult = new VisualStudioParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report); + this.parserResult = new VisualStudioParser(filter, filter, filter).Parse(report); } /// diff --git a/src/ReportGenerator.Core.Test/ReportConfigurationValidatorTest.cs b/src/ReportGenerator.Core.Test/ReportConfigurationValidatorTest.cs index 70e7db5c..76f39115 100644 --- a/src/ReportGenerator.Core.Test/ReportConfigurationValidatorTest.cs +++ b/src/ReportGenerator.Core.Test/ReportConfigurationValidatorTest.cs @@ -1,5 +1,5 @@ using System.IO; -using Moq; +using NSubstitute; using Palmmedia.ReportGenerator.Core.Logging; using Palmmedia.ReportGenerator.Core.Reporting; using Xunit; @@ -11,12 +11,11 @@ public class ReportConfigurationValidatorTest { private static readonly string ReportPath = Path.Combine(FileManager.GetCSharpReportDirectory(), "OpenCover.xml"); - private readonly Mock reportBuilderFactoryMock = new Mock(); + private readonly IReportBuilderFactory reportBuilderFactory = Substitute.For(); public ReportConfigurationValidatorTest() { - this.reportBuilderFactoryMock - .Setup(r => r.GetAvailableReportTypes()) + this.reportBuilderFactory.GetAvailableReportTypes() .Returns(new[] { "Latex", "Xml", "Html", "Something" }); } @@ -36,7 +35,7 @@ public void Validate_AllPropertiesApplied_ValidationPasses() VerbosityLevel.Info.ToString(), null); - var sut = new ReportConfigurationValidator(this.reportBuilderFactoryMock.Object); + var sut = new ReportConfigurationValidator(this.reportBuilderFactory); Assert.True(sut.Validate(configuration)); } @@ -57,7 +56,7 @@ public void Validate_NoReport_ValidationFails() VerbosityLevel.Info.ToString(), null); - var sut = new ReportConfigurationValidator(this.reportBuilderFactoryMock.Object); + var sut = new ReportConfigurationValidator(this.reportBuilderFactory); Assert.False(sut.Validate(configuration)); } @@ -78,7 +77,7 @@ public void Validate_NonExistingReport_ValidationFails() VerbosityLevel.Info.ToString(), null); - var sut = new ReportConfigurationValidator(this.reportBuilderFactoryMock.Object); + var sut = new ReportConfigurationValidator(this.reportBuilderFactory); Assert.False(sut.Validate(configuration)); } @@ -99,7 +98,7 @@ public void Validate_NoTargetDirectory_ValidationFails() VerbosityLevel.Info.ToString(), null); - var sut = new ReportConfigurationValidator(this.reportBuilderFactoryMock.Object); + var sut = new ReportConfigurationValidator(this.reportBuilderFactory); Assert.False(sut.Validate(configuration)); } @@ -120,7 +119,7 @@ public void Validate_InvalidTargetDirectory_ValidationFails() VerbosityLevel.Info.ToString(), null); - var sut = new ReportConfigurationValidator(this.reportBuilderFactoryMock.Object); + var sut = new ReportConfigurationValidator(this.reportBuilderFactory); Assert.False(sut.Validate(configuration)); } @@ -141,7 +140,7 @@ public void Validate_InvalidSourceDirectory_ValidationFails() VerbosityLevel.Info.ToString(), null); - var sut = new ReportConfigurationValidator(this.reportBuilderFactoryMock.Object); + var sut = new ReportConfigurationValidator(this.reportBuilderFactory); Assert.False(sut.Validate(configuration)); } @@ -162,7 +161,7 @@ public void Validate_InvalidHistoryDirectory_ValidationFails() VerbosityLevel.Info.ToString(), null); - var sut = new ReportConfigurationValidator(this.reportBuilderFactoryMock.Object); + var sut = new ReportConfigurationValidator(this.reportBuilderFactory); Assert.False(sut.Validate(configuration)); } @@ -183,7 +182,7 @@ public void Validate_InvalidReportType_ValidationFails() VerbosityLevel.Info.ToString(), null); - var sut = new ReportConfigurationValidator(this.reportBuilderFactoryMock.Object); + var sut = new ReportConfigurationValidator(this.reportBuilderFactory); Assert.False(sut.Validate(configuration)); } @@ -204,7 +203,7 @@ public void Validate_InvalidFilter_ValidationFails() VerbosityLevel.Info.ToString(), null); - var sut = new ReportConfigurationValidator(this.reportBuilderFactoryMock.Object); + var sut = new ReportConfigurationValidator(this.reportBuilderFactory); Assert.False(sut.Validate(configuration)); } @@ -225,7 +224,7 @@ public void Validate_InvalidPlugin_ValidationFails() VerbosityLevel.Info.ToString(), null); - var sut = new ReportConfigurationValidator(this.reportBuilderFactoryMock.Object); + var sut = new ReportConfigurationValidator(this.reportBuilderFactory); Assert.False(sut.Validate(configuration)); } diff --git a/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj b/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj index 01c19f74..5d549074 100644 --- a/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj +++ b/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj @@ -15,7 +15,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all