diff --git a/README.md b/README.md index 4e8aea6a..17406a4b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # ReportGenerator -*ReportGenerator* converts XML reports generated by OpenCover, dotCover, Visual Studio, NCover or Cobertura into human readable reports in various formats. +*ReportGenerator* converts XML reports generated by OpenCover, dotCover, Visual Studio, NCover, Cobertura or JaCoCo into human readable reports in various formats. The reports do not only show the coverage quota, but also include the source code and visualize which lines have been covered. @@ -13,6 +13,7 @@ The following [output formats](https://github.com/danielpalme/ReportGenerator/wi * Latex, LatexSummary * TextSummary * CsvSummary +* PngChart * Badges * [Custom reports](https://github.com/danielpalme/ReportGenerator/wiki/Custom-reports) @@ -23,6 +24,7 @@ The following [output formats](https://github.com/danielpalme/ReportGenerator/wi * Visual Studio ([vstest.console.exe](https://github.com/danielpalme/ReportGenerator/wiki/Visual-Studio-Coverage-Tools#vstestconsoleexe), [CodeCoverage.exe](https://github.com/danielpalme/ReportGenerator/wiki/Visual-Studio-Coverage-Tools#codecoverageexe)) * [NCover](https://www.ncover.com/info/download) (tested version 1.5.8, other versions may not work) * [Cobertura](https://github.com/cobertura/cobertura) +* [JaCoCo](https://www.jacoco.org/jacoco/index.html) * Mono ([mprof-report](https://www.mono-project.com/docs/debug+profile/profile/profiler/#analyzing-the-profile-data)) Additional information about *ReportGenerator* can be found under [Resources](#resources). @@ -52,7 +54,9 @@ Parameters: ["]-reports:[;][;]["] ["]-targetdir:["] [["]-reporttypes:[;]["]] + [["]-sourcedirs:[;][;]["]] [["]-historydir:["]] + [["]-plugins:[;][;]["]] [["]-assemblyfilters:<(+|-)filter>[;<(+|-)filter>][;<(+|-)filter>]["]] [["]-classfilters:<(+|-)filter>[;<(+|-)filter>][;<(+|-)filter>]["]] [["]-filefilters:<(+|-)filter>[;<(+|-)filter>][;<(+|-)filter>]["]] @@ -60,22 +64,25 @@ Parameters: [["]-tag:["]] Explanations: - Reports: The coverage reports that should be parsed (separated by - semicolon). Wildcards are allowed. - Targetdirectory: The directory where the generated report should be saved. - Reporttypes: The output formats and scope (separated by semicolon). - Values: Badges, Cobertura, CsvSummary, Html, HtmlChart, HtmlSummary, Latex, LatexSummary, MHtml, - PngChart, TextSummary, Xml, XmlSummary - History directory: Optional directory for storing persistent coverage information. - Can be used in future reports to show coverage evolution. - Assembly Filters: Optional list of assemblies that should be included or excluded in the report. - Class Filters: Optional list of classes that should be included or excluded in the report. - File Filters: Optional list of files that should be included or excluded in the report. - Exclusion filters take precedence over inclusion filters. - Wildcards are allowed. - Verbosity: The verbosity level of the log messages. - Values: Verbose, Info, Warning, Error, Off - Tag: Optional tag or build version. + Reports: The coverage reports that should be parsed (separated by semicolon). + Globbing is supported. + Target directory: The directory where the generated report should be saved. + Report types: The output formats and scope (separated by semicolon). + Values: Badges, Cobertura, CsvSummary, Html, HtmlChart, HtmlSummary, Latex, LatexSummary, MHtml, + PngChart, TextSummary, Xml, XmlSummary + Source directories: Optional directories which contain the corresponding source code (separated by semicolon). + The source directories are used if coverage report contains classes without path information. + History directory: Optional directory for storing persistent coverage information. + Can be used in future reports to show coverage evolution. + Plugins: Optional plugin files for custom reports or custom history storage (separated by semicolon). + Assembly filters: Optional list of assemblies that should be included or excluded in the report. + Class filters: Optional list of classes that should be included or excluded in the report. + File filters: Optional list of files that should be included or excluded in the report. + Exclusion filters take precedence over inclusion filters. + Wildcards are allowed. + Verbosity: The verbosity level of the log messages. + Values: Verbose, Info, Warning, Error, Off + Tag: Optional tag or build version. Default values: -reporttypes:Html @@ -87,7 +94,7 @@ Default values: Examples: "-reports:coverage.xml" "-targetdir:C:\report" "-reports:target\*\*.xml" "-targetdir:C:\report" -reporttypes:Latex;HtmlSummary -tag:v1.4.5 - "-reports:coverage1.xml;coverage2.xml" "-targetdir:report" + "-reports:coverage1.xml;coverage2.xml" "-targetdir:report" "-sourcedirs:C:\MyProject" -plugins:CustomReports.dll "-reports:coverage.xml" "-targetdir:C:\report" "-assemblyfilters:+Included;-Excluded.*" ``` @@ -111,7 +118,7 @@ A MSBuild task also exists: - + ``` diff --git a/docs/index.html b/docs/index.html index 72525d07..e2d6ac96 100644 --- a/docs/index.html +++ b/docs/index.html @@ -24,7 +24,7 @@

ReportGenerator

-

ReportGenerator converts XML reports generated by
OpenCover, dotCover, Visual Studio, NCover or Cobertura
into human readable reports in various formats

+

ReportGenerator converts XML reports generated by
OpenCover, dotCover, Visual Studio, NCover, Cobertura or JaCoCo
into human readable reports in various formats

diff --git a/docs/resources/CustomExtensions_v4.zip b/docs/resources/CustomExtensions_v4.zip index d06ff584..febeb004 100644 Binary files a/docs/resources/CustomExtensions_v4.zip and b/docs/resources/CustomExtensions_v4.zip differ diff --git a/docs/resources/SampleReports.zip b/docs/resources/SampleReports.zip index b678af3a..0cebdfdc 100644 Binary files a/docs/resources/SampleReports.zip and b/docs/resources/SampleReports.zip differ diff --git a/docs/resources/logo.png b/docs/resources/logo.png index 38a96f63..0f04dbad 100644 Binary files a/docs/resources/logo.png and b/docs/resources/logo.png differ diff --git a/docs/usage.html b/docs/usage.html index eee5ccbe..a2924370 100644 --- a/docs/usage.html +++ b/docs/usage.html @@ -37,7 +37,7 @@

NuGet Package

Reports

-
Path to the coverage report(s) that should be parsed.
Wildcards are allowed.
+
Path to the coverage report(s) that should be parsed.
Globbing is supported.
@@ -68,7 +68,20 @@

Report types

History directory

Optional directory for storing persistent coverage information. Choose a directory which does not get deleted between builds.
Required to show the history chart in the HTML reports.
- + +
+
+ +

Plugins

+
Optional plugin files for custom reports or custom history storage.
+
+
+ + +
+
+
+ Add plugin

@@ -188,7 +201,7 @@

Usage

runtimes: '.NET Core', description: 'Use this package if your project is based on .NET Core and you want to use ReportGenerator as a \'DotnetCliTool\'.', installoptions: [ - { tool: 'Manual', hint: 'Add the following element to your project file:', command: '' } + { tool: 'Manual', hint: 'Add the following element to your project file:', command: '\r\n \r\n' } ], executables: [{ runtime: '.NET Core', tool: 'dotnet reportgenerator' }] }, @@ -210,21 +223,23 @@

Usage

$scope.reports = ['OpenCover.xml']; $scope.targetdir = 'coveragereport'; $scope.reporttypes = [ - { name: 'HTML', description: 'The default output format. Creates a summary overview (index.htm) and detailed reports for each class.', checked: true }, - { name: 'HTMLSummary', description: 'Creates a single HTML file (summary.htm) without links.', checked: false }, - { name: 'HTMLInline', description: 'Same as HTML but CSS and JavaScript is included in every HTML page. This results in larger file sizes, but can be useful for integration into build servers like VSTS, since they may block referenced CSS and JavaScript files.', checked: false }, - { name: 'HTMLChart', description: 'Creates a single HTML file containing a chart with historic coverage information.', checked: false }, - { name: 'MHTML', description: 'Same as HTML but packaged into a single MHTML file.', checked: false }, - { name: 'Cobertura', description: 'Creates a XML file in Cobertura format. This format integrates with tools like VSTS or Jenkins.', checked: false }, - { name: 'XML', description: 'Creates a XML file containing a summary for all classes and detailed reports for each class.', checked: false }, - { name: 'XMLSummary', description: 'Creates a single XML file containing a summary for all classes.', checked: false }, - { name: 'Latex', description: 'Creates a single TEX file containing a summary for all classes and detailed reports for each class.', checked: false }, - { name: 'LatexSummary', description: 'Creates a single TEX file containing a summary for all classes.', checked: false }, - { name: 'TextSummary', description: 'Creates a single TXT file containing coverage information per class.', checked: false }, - { name: 'CsvSummary', description: 'Creates a single CSV file containing coverage information per class.', checked: false }, - { name: 'Badges', description: 'Creates three SVG and two PNG files that show line and/or branch coverage information.', checked: false } + { name: 'HTML', description: 'The default output format. Creates a summary overview (index.htm) and detailed reports for each class.', requiresHistoryDir: false, checked: true }, + { name: 'HTMLSummary', description: 'Creates a single HTML file (summary.htm) without links.', requiresHistoryDir: false, checked: false }, + { name: 'HTMLInline', description: 'Same as HTML but CSS and JavaScript is included in every HTML page. This results in larger file sizes, but can be useful for integration into build servers like Azure DevOps (VSTS), since they may block referenced CSS and JavaScript files.', requiresHistoryDir: false, checked: false }, + { name: 'HTMLChart', description: 'Creates a single HTML file containing a chart with historic coverage information.', requiresHistoryDir: true, checked: false }, + { name: 'MHTML', description: 'Same as HTML but packaged into a single MHTML file.', requiresHistoryDir: false, checked: false }, + { name: 'Cobertura', description: 'Creates a XML file in Cobertura format. This format integrates with tools like Azure DevOps (VSTS) or Jenkins.', requiresHistoryDir: false, checked: false }, + { name: 'XML', description: 'Creates a XML file containing a summary for all classes and detailed reports for each class.', requiresHistoryDir: false, checked: false }, + { name: 'XMLSummary', description: 'Creates a single XML file containing a summary for all classes.', requiresHistoryDir: false, checked: false }, + { name: 'Latex', description: 'Creates a single TEX file containing a summary for all classes and detailed reports for each class.', requiresHistoryDir: false, checked: false }, + { name: 'LatexSummary', description: 'Creates a single TEX file containing a summary for all classes.', requiresHistoryDir: false, checked: false }, + { name: 'TextSummary', description: 'Creates a single TXT file containing coverage information per class.', requiresHistoryDir: false, checked: false }, + { name: 'CsvSummary', description: 'Creates a single CSV file containing coverage information per class.', requiresHistoryDir: false, checked: false }, + { name: 'PngChart', description: 'Creates a single PNG file containing a chart with historic coverage information.', requiresHistoryDir: true, checked: false }, + { name: 'Badges', description: 'Creates three SVG and two PNG files that show line and/or branch coverage information.', requiresHistoryDir: false, checked: false } ]; $scope.historydir = null; + $scope.plugins = []; $scope.assemblyfilters = []; $scope.classfilters = []; $scope.filefilters = []; @@ -238,6 +253,14 @@

Usage

$scope.reports.splice(index, 1); } + $scope.addPlugin = function() { + $scope.plugins.push(null); + } + + $scope.removePlugin = function(index) { + $scope.plugins.splice(index, 1); + } + $scope.addAssemblyFilter = function() { $scope.assemblyfilters.push(null); } @@ -308,6 +331,25 @@

Usage

result += $scope.historydir; result += '"'; } + + if ($scope.plugins.length > 0) { + result += '\r\n'; + result += '"-plugins:'; + + for (var i = 0; i < $scope.plugins.length; i++) { + if ($scope.plugins[i] === null || $scope.plugins[i] === undefined || $scope.plugins[i].length === 0) { + continue; + } + + if (i > 0) { + result += ';'; + } + + result += $scope.plugins[i]; + } + + result += '"'; + } if ($scope.assemblyfilters.length > 0) { result += '\r\n'; diff --git a/src/.gitignore b/src/.gitignore index eda2adce..56df7c46 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -9,4 +9,5 @@ *.user *.Cache bin -obj \ No newline at end of file +obj +.DS_Store diff --git a/src/Deployment/chocolatey/reportgenerator.portable.nuspec b/src/Deployment/chocolatey/reportgenerator.portable.nuspec index 36f392fa..7fb5ea79 100644 --- a/src/Deployment/chocolatey/reportgenerator.portable.nuspec +++ b/src/Deployment/chocolatey/reportgenerator.portable.nuspec @@ -2,7 +2,7 @@ reportgenerator.portable - 3.0.0.0 + 4.0.0.0 ReportGenerator (Portable) - Generates reports for various code coverage tools Daniel Palme Daniel Palme @@ -12,10 +12,10 @@ https://github.com/danielpalme/ReportGenerator https://github.com/danielpalme/ReportGenerator/wiki https://github.com/danielpalme/ReportGenerator/issues - http://danielpalme.github.io/ReportGenerator/resources/logo.png + http://danielpalme.github.io/ReportGenerator/resources/logo_512.png false - ReportGenerator converts XML reports generated by OpenCover, PartCover, dotCover, Visual Studio, NCover, or Cobertura or into human readable reports in various formats. The reports do not only show the coverage quota, but also include the source code and visualize which line has been covered. - ReportGenerator converts XML reports generated by OpenCover, PartCover, dotCover, Visual Studio, NCover, or Cobertura or into human readable reports in various formats. The reports do not only show the coverage quota, but also include the source code and visualize which line has been covered. + ReportGenerator converts XML reports generated by OpenCover, dotCover, Visual Studio, NCover, Cobertura or JaCoCo or into human readable reports in various formats. The reports do not only show the coverage quota, but also include the source code and visualize which line has been covered. + ReportGenerator converts XML reports generated by OpenCover, dotCover, Visual Studio, NCover, Cobertura or JaCoCo or into human readable reports in various formats. The reports do not only show the coverage quota, but also include the source code and visualize which line has been covered. en-US Code Coverage Reporting Testing TDD Utility diff --git a/src/Deployment/nuget/DotnetToolSettings.xml b/src/Deployment/nuget/DotnetToolSettings.xml new file mode 100644 index 00000000..254ecc19 --- /dev/null +++ b/src/Deployment/nuget/DotnetToolSettings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Deployment/nuget/Readme_ReportGenerator.Core.txt b/src/Deployment/nuget/Readme_ReportGenerator.Core.txt new file mode 100644 index 00000000..be01dfb5 --- /dev/null +++ b/src/Deployment/nuget/Readme_ReportGenerator.Core.txt @@ -0,0 +1,24 @@ +======================================================================= += = += = += ReportGenerator = += Generation of coverage reports = += = += http://www.palmmedia.de = += = += = +======================================================================= + +DESCRIPTION + +This package is only suited to create plugins for ReportGenerator. + +https://github.com/danielpalme/ReportGenerator/wiki/Custom-reports +https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage + + +If you want to generate coverage reports use one of the following packages: + +https://www.nuget.org/packages/ReportGenerator +https://www.nuget.org/packages/dotnet-reportgenerator-cli +https://www.nuget.org/packages/dotnet-reportgenerator-globaltool \ No newline at end of file diff --git a/src/Deployment/nuget/ReportGenerator.Core.nuspec b/src/Deployment/nuget/ReportGenerator.Core.nuspec new file mode 100644 index 00000000..a9046e5c --- /dev/null +++ b/src/Deployment/nuget/ReportGenerator.Core.nuspec @@ -0,0 +1,40 @@ + + + + ReportGenerator.Core + 4.0.0.0 + + <authors>Daniel Palme</authors> + <owners /> + <licenseUrl>https://raw.githubusercontent.com/danielpalme/ReportGenerator/master/LICENSE.txt</licenseUrl> + <projectUrl>https://github.com/danielpalme/ReportGenerator</projectUrl> + <iconUrl>http://danielpalme.github.io/ReportGenerator/resources/logo_plugin_512.png</iconUrl> + <requireLicenseAcceptance>false</requireLicenseAcceptance> + <summary>ReportGenerator converts XML reports generated by OpenCover, dotCover, Visual Studio, NCover, Cobertura or JaCoCo or into human readable reports in various formats. The reports do not only show the coverage quota, but also include the source code and visualize which line has been covered.</summary> + <description>ReportGenerator converts XML reports generated by OpenCover, dotCover, Visual Studio, NCover, Cobertura or JaCoCo or into human readable reports in various formats. The reports do not only show the coverage quota, but also include the source code and visualize which line has been covered. + +Use this package if you want to write a custom plugin for ReportGenerator or if you want to call/execute ReportGenerator within your code base. + +Plugin development: +https://github.com/danielpalme/ReportGenerator/wiki/Custom-reports +https://github.com/danielpalme/ReportGenerator/wiki/Custom-history-storage</description> + <language>en-US</language> + <tags>Code Coverage Reporting Testing TDD Utility</tags> + <repository type="git" url="https://github.com/danielpalme/ReportGenerator.git" /> + <dependencies> + <dependency id="Microsoft.Build.Utilities.Core" version="15.8.166" /> + <dependency id="Microsoft.Extensions.Configuration" version="2.1.1" /> + <dependency id="Microsoft.Extensions.Configuration.Binder" version="2.1.1" /> + <dependency id="Microsoft.Extensions.Configuration.CommandLine" version="2.1.1" /> + <dependency id="Microsoft.Extensions.Configuration.Json" version="2.1.1" /> + <dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0-beta0004" /> + </dependencies> + </metadata> + <files> + <file src="..\..\target\bin\Release\ReportGenerator.Core.deps.json" target="lib\netstandard2.0\" /> + <file src="..\..\target\bin\Release\ReportGenerator.Core.dll" target="lib\netstandard2.0\" /> + <file src="..\..\target\bin\Release\LICENSE.txt" target="LICENSE.txt" /> + <file src="Readme_ReportGenerator.Core.txt" target="Readme.txt" /> + </files> +</package> + diff --git a/src/Deployment/nuget/ReportGenerator.nuspec b/src/Deployment/nuget/ReportGenerator.nuspec index fb758745..6ec75410 100644 --- a/src/Deployment/nuget/ReportGenerator.nuspec +++ b/src/Deployment/nuget/ReportGenerator.nuspec @@ -2,28 +2,48 @@ <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <metadata> <id>ReportGenerator</id> - <version>2.0.0.0</version> + <version>4.0.0.0</version> <title /> <authors>Daniel Palme</authors> <owners /> <licenseUrl>https://raw.githubusercontent.com/danielpalme/ReportGenerator/master/LICENSE.txt</licenseUrl> <projectUrl>https://github.com/danielpalme/ReportGenerator</projectUrl> - <iconUrl>http://danielpalme.github.io/ReportGenerator/resources/logo.png</iconUrl> + <iconUrl>http://danielpalme.github.io/ReportGenerator/resources/logo_512.png</iconUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> - <description>ReportGenerator converts XML reports generated by OpenCover, PartCover, dotCover, Visual Studio, NCover, or Cobertura or into human readable reports in various formats. The reports do not only show the coverage quota, but also include the source code and visualize which line has been covered.</description> - <summary /> + <summary>ReportGenerator converts XML reports generated by OpenCover, dotCover, Visual Studio, NCover, Cobertura or JaCoCo or into human readable reports in various formats. The reports do not only show the coverage quota, but also include the source code and visualize which line has been covered.</summary> + <description>ReportGenerator converts XML reports generated by OpenCover, dotCover, Visual Studio, NCover, Cobertura or JaCoCo or into human readable reports in various formats. The reports do not only show the coverage quota, but also include the source code and visualize which line has been covered. + +Use this package if your project is based on .NET Framework or .NET Core and you want to use ReportGenerator via the command line or a build script. + +Usage: +$(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\net47\ReportGenerator.exe [options] +dotnet $(UserProfile)\.nuget\packages\reportgenerator\x.y.z\tools\netcoreapp2.0\ReportGenerator.dll [options]</description> <language>en-US</language> <tags>Code Coverage Reporting Testing TDD Utility</tags> + <repository type="git" url="https://github.com/danielpalme/ReportGenerator.git" /> </metadata> <files> - <file src="..\..\target\bin\Release\ICSharpCode.NRefactory.dll" target="tools" /> - <file src="..\..\target\bin\Release\ICSharpCode.NRefactory.CSharp.dll" target="tools" /> - <file src="..\..\target\bin\Release\ReportGenerator.exe" target="tools" /> - <file src="..\..\target\bin\Release\ReportGenerator.exe.config" target="tools" /> - <file src="..\..\target\bin\Release\ReportGenerator.XML" target="tools" /> - <file src="..\..\target\bin\Release\ReportGenerator.Reporting.dll" target="tools" /> - <file src="..\..\target\bin\Release\ReportGenerator.Reporting.XML" target="tools" /> <file src="..\..\target\bin\Release\LICENSE.txt" target="LICENSE.txt" /> <file src="..\..\target\bin\Release\Readme.txt" target="Readme.txt" /> + + <!-- MSBuild *.props file --> + <file src="ReportGenerator.props" target="build\netstandard2.0" /> + + <!-- .NET 4.7 ('tools\netcoreapp2.0' directory) --> + <file src="..\..\target\bin\Release\netcoreapp2.0\publish\**\*.*" target="tools\netcoreapp2.0" /> + + <!-- .NET 4.7 ('tools\net47' directory) --> + <file src="..\..\target\bin\Release\appsettings.json" target="tools\net47" /> + <file src="..\..\target\bin\Release\Microsoft.Build.*.dll" target="tools\net47" /> + <file src="..\..\target\bin\Release\Microsoft.Extensions.*.dll" target="tools\net47" /> + <file src="..\..\target\bin\Release\Microsoft.Win32.Primitives.dll" target="tools\net47" /> + <file src="..\..\target\bin\Release\Newtonsoft.Json.dll" target="tools\net47" /> + <file src="..\..\target\bin\Release\netstandard.dll" target="tools\net47" /> + <file src="..\..\target\bin\Release\ReportGenerator.Core.dll" target="tools\net47" /> + <file src="..\..\target\bin\Release\ReportGenerator.exe" target="tools\net47" /> + <file src="..\..\target\bin\Release\ReportGenerator.exe.config" target="tools\net47" /> + <file src="..\..\target\bin\Release\SixLabors.*.dll" target="tools\net47" /> + <file src="..\..\target\bin\Release\System.*.dll" target="tools\net47" /> </files> -</package> \ No newline at end of file +</package> + diff --git a/src/Deployment/nuget/ReportGenerator.props b/src/Deployment/nuget/ReportGenerator.props new file mode 100644 index 00000000..150c2232 --- /dev/null +++ b/src/Deployment/nuget/ReportGenerator.props @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> + <PropertyGroup> + <ReportGeneratorAssembly>$(MSBuildThisFileDirectory)..\..\tools\netcoreapp2.0\ReportGenerator.Core.dll</ReportGeneratorAssembly> + </PropertyGroup> + <UsingTask TaskName="ReportGenerator" AssemblyFile="$(ReportGeneratorAssembly)" /> +</Project> \ No newline at end of file diff --git a/src/Deployment/nuget/dotnet-reportgenerator-cli.nuspec b/src/Deployment/nuget/dotnet-reportgenerator-cli.nuspec new file mode 100644 index 00000000..b24c4b9f --- /dev/null +++ b/src/Deployment/nuget/dotnet-reportgenerator-cli.nuspec @@ -0,0 +1,57 @@ +<?xml version="1.0"?> +<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> + <metadata> + <id>dotnet-reportgenerator-cli</id> + <version>4.0.0.0</version> + <title /> + <authors>Daniel Palme</authors> + <owners /> + <licenseUrl>https://raw.githubusercontent.com/danielpalme/ReportGenerator/master/LICENSE.txt</licenseUrl> + <projectUrl>https://github.com/danielpalme/ReportGenerator</projectUrl> + <iconUrl>http://danielpalme.github.io/ReportGenerator/resources/logo_cli_512.png</iconUrl> + <requireLicenseAcceptance>false</requireLicenseAcceptance> + <summary>ReportGenerator converts XML reports generated by OpenCover, dotCover, Visual Studio, NCover, Cobertura or JaCoCo or into human readable reports in various formats. The reports do not only show the coverage quota, but also include the source code and visualize which line has been covered.</summary> + <description>ReportGenerator converts XML reports generated by OpenCover, dotCover, Visual Studio, NCover, Cobertura or JaCoCo or into human readable reports in various formats. The reports do not only show the coverage quota, but also include the source code and visualize which line has been covered. + +Use this package if your project is based on .NET Core and you want to use ReportGenerator as a 'DotnetCliTool'. + +Installation: +Add the following element to your project file: +<ItemGroup> +<DotNetCliToolReference Include="dotnet-reportgenerator-cli" Version="x.y.z" /> +</ItemGroup> + +Usage: +dotnet reportgenerator [options]</description> + <language>en-US</language> + <tags>Code Coverage Reporting Testing TDD Utility</tags> + <repository type="git" url="https://github.com/danielpalme/ReportGenerator.git" /> + <packageTypes> + <packageType name="DotnetCliTool" /> + </packageTypes> + <dependencies> + <group targetFramework=".NETCoreApp2.0"> + <dependency id="McMaster.NETCore.Plugins" version="0.1.1" /> + <dependency id="Microsoft.Build.Utilities.Core" version="15.8.166" /> + <dependency id="Microsoft.Extensions.Configuration" version="2.1.1" /> + <dependency id="Microsoft.Extensions.Configuration.Binder" version="2.1.1" /> + <dependency id="Microsoft.Extensions.Configuration.CommandLine" version="2.1.1" /> + <dependency id="Microsoft.Extensions.Configuration.Json" version="2.1.1" /> + <dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0-beta0004" /> + <dependency id="Microsoft.NETCore.App" version="2.0.0" exclude="Build,Analyzers" /> + </group> + </dependencies> + </metadata> + <files> + <file src="..\..\target\bin\Release\LICENSE.txt" target="LICENSE.txt" /> + <file src="..\..\target\bin\Release\Readme.txt" target="Readme.txt" /> + + <!-- NetCoreApp2.0 ('lib\netcoreapp2.0' directory) --> + <file src="..\..\target\bin\Release\netcoreapp2.0\appsettings.json" target="lib\netcoreapp2.0" /> + <file src="..\..\target\bin\Release\netcoreapp2.0\ReportGenerator.Core.dll" target="lib\netcoreapp2.0" /> + <file src="..\..\target\bin\Release\netcoreapp2.0\ReportGenerator.DotnetCorePluginLoader.dll" target="lib\netcoreapp2.0" /> + <file src="..\..\target\bin\Release\netcoreapp2.0\dotnet-reportgenerator.deps.json" target="lib\netcoreapp2.0\dotnet-reportgenerator.deps.json" /> + <file src="..\..\target\bin\Release\netcoreapp2.0\dotnet-reportgenerator.dll" target="lib\netcoreapp2.0\dotnet-reportgenerator.dll" /> + <file src="..\..\target\bin\Release\netcoreapp2.0\dotnet-reportgenerator.runtimeconfig.json" target="lib\netcoreapp2.0\dotnet-reportgenerator.runtimeconfig.json" /> + </files> +</package> \ No newline at end of file diff --git a/src/Deployment/nuget/dotnet-reportgenerator-globaltool.nuspec b/src/Deployment/nuget/dotnet-reportgenerator-globaltool.nuspec new file mode 100644 index 00000000..3ead2037 --- /dev/null +++ b/src/Deployment/nuget/dotnet-reportgenerator-globaltool.nuspec @@ -0,0 +1,40 @@ +<?xml version="1.0"?> +<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> + <metadata> + <id>dotnet-reportgenerator-globaltool</id> + <version>4.0.0.0</version> + <title /> + <authors>Daniel Palme</authors> + <owners /> + <licenseUrl>https://raw.githubusercontent.com/danielpalme/ReportGenerator/master/LICENSE.txt</licenseUrl> + <projectUrl>https://github.com/danielpalme/ReportGenerator</projectUrl> + <iconUrl>http://danielpalme.github.io/ReportGenerator/resources/logo_global_512.png</iconUrl> + <requireLicenseAcceptance>false</requireLicenseAcceptance> + <summary>ReportGenerator converts XML reports generated by OpenCover, dotCover, Visual Studio, NCover, Cobertura or JaCoCo or into human readable reports in various formats. The reports do not only show the coverage quota, but also include the source code and visualize which line has been covered.</summary> + <description>ReportGenerator converts XML reports generated by OpenCover, dotCover, Visual Studio, NCover, Cobertura or JaCoCo or into human readable reports in various formats. The reports do not only show the coverage quota, but also include the source code and visualize which line has been covered. + +Use this package if your project is based on .NET Core and you want to use ReportGenerator as a (global) 'DotnetTool'. + +Installation: +dotnet tool install -g dotnet-reportgenerator-globaltool +dotnet tool install dotnet-reportgenerator-globaltool --tool-path tools + +Usage: +reportgenerator [options] +tools\reportgenerator.exe [options]</description> + <language>en-US</language> + <tags>Code Coverage Reporting Testing TDD Utility</tags> + <repository type="git" url="https://github.com/danielpalme/ReportGenerator.git" /> + <packageTypes> + <packageType name="DotnetTool" /> + </packageTypes> + </metadata> + <files> + <file src="..\..\target\bin\Release\LICENSE.txt" target="LICENSE.txt" /> + <file src="..\..\target\bin\Release\Readme.txt" target="Readme.txt" /> + + <!-- NetCoreApp2.1 ('tools\netcoreapp2.1' directory) --> + <file src="..\..\target\bin\Release\netcoreapp2.1\publish\**\*.*" target="tools\netcoreapp2.1\any" /> + <file src="DotnetToolSettings.xml" target="tools\netcoreapp2.1\any" /> + </files> +</package> \ No newline at end of file diff --git a/src/Readme.txt b/src/Readme.txt index 3c9e7c15..48791c7e 100644 --- a/src/Readme.txt +++ b/src/Readme.txt @@ -11,7 +11,7 @@ DESCRIPTION -ReportGenerator converts XML reports generated by OpenCover, PartCover, dotCover, Visual Studio, NCover or Cobertura +ReportGenerator converts XML reports generated by OpenCover, dotCover, Visual Studio, NCover, Cobertura or JaCoCo into human readable reports in various formats. The reports do not only show the coverage quota, but also include the source code and visualize which lines have been @@ -23,6 +23,7 @@ It is also possible to pass one XML file containing several reports to ReportGen The following output formats are supported by ReportGenerator: -HTML, HTMLSummary, HTMLInline, HTMLChart, MHTML +-Cobertura -XML, XMLSummary -Latex, LatexSummary -TextSummary @@ -33,18 +34,14 @@ The following output formats are supported by ReportGenerator: Compatibility: -OpenCover -PartCover 4.0 -PartCover 2.2, 2.3 +OpenCover, coverlet, altcover dotCover Visual Studio (vstest.console.exe, CodeCoverage.exe) NCover (tested version 1.5.8, other versions may not work) Cobertura +JaCoCo Mono (mprof-report) -Also available as NuGet package: -https://www.nuget.org/packages/ReportGenerator/ - ======================================================================= LICENSE @@ -59,14 +56,31 @@ For further details take a look at LICENSE.txt. CHANGELOG -3.1.2.0 - - - * Fix: Issue #119: Fixed behavior of 'Enable filtering' button +4.0.0.0 + + * New: Issue #112: Added support for .NET Core + * New: Issue #126: Usage of multiple cores during report generation + * New: Issue #131: Linked method metric names to code location + * New: Issue #143: Added MSBuild task definition to the NuGet package + * New: Improved Latex and XML reports + * New: Added Coberatura as output format + * New: Issue #141: Compare with historic coverage + * New: Issue #151: Reduced color brightness + * New: Issue #160: Added JaCoCo support + * New: Issue #161: Added globbing support for 'reports' command line parameter + * Fix: Issue #127: Fixed coverage calculation for NCover + * Fix: Issue #133: Empty Risk Hotspots section when no risk hotspot exists + * Fix: Issue #135: Handling of NaN in metrics of Cobertura files + * Fix: Issue #136: Changed branch handling in Cobertura parser + * Fix: Issue #145: Improved handling of coverage files generated by altcover + * Fix: Issue #157: OpenCover parser ignores classes with only async methods + * Fix: Issue #164: HTML reports contain history chart as inline PNG to show chart when JS is disabled + * Fix: Issue #165: Limited report files path lengths + * Fix: Issue #169: Improved formatting of percentual metrics + * Change: Dropped support for PartCover 3.1.1.0 - * Fix: Issue #117: Improved file filters (classes get removed if all files are removed) 3.1.0.0 @@ -93,7 +107,7 @@ CHANGELOG * New: Issue #99: Added new command line parameter "-tag" to add a custom text to reports and historic charts * New: Issue #101: Added stripped rows on summary table * Change: Dropped support for legacy command line parameters - * Change: Change 'IReportBuilder' interface which is used for custom reports + * Change: Changed 'IReportBuilder' interface which is used for custom reports 2.5.11.0 diff --git a/src/ReportGenerator.Console.NetCore/Program.cs b/src/ReportGenerator.Console.NetCore/Program.cs new file mode 100644 index 00000000..d9203418 --- /dev/null +++ b/src/ReportGenerator.Console.NetCore/Program.cs @@ -0,0 +1,18 @@ +namespace Palmmedia.ReportGenerator.Console.NetCore +{ + /// <summary> + /// Command line access to the ReportBuilder. + /// </summary> + internal class Program + { + /// <summary> + /// The main method. + /// </summary> + /// <param name="args">The command line arguments.</param> + /// <returns>Return code indicating success/failure.</returns> + internal static int Main(string[] args) + { + return Core.Program.Main(args); + } + } +} diff --git a/src/ReportGenerator.Console.NetCore/ProgramIcon.ico b/src/ReportGenerator.Console.NetCore/ProgramIcon.ico new file mode 100644 index 00000000..1d455f70 Binary files /dev/null and b/src/ReportGenerator.Console.NetCore/ProgramIcon.ico differ diff --git a/src/ReportGenerator.Console.NetCore/Properties/launchSettings.json b/src/ReportGenerator.Console.NetCore/Properties/launchSettings.json new file mode 100644 index 00000000..a6813f7d --- /dev/null +++ b/src/ReportGenerator.Console.NetCore/Properties/launchSettings.json @@ -0,0 +1,7 @@ +{ + "profiles": { + "ReportGenerator.Console.NetCore": { + "commandName": "Project" + } + } +} \ No newline at end of file diff --git a/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj b/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj new file mode 100644 index 00000000..021ad645 --- /dev/null +++ b/src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj @@ -0,0 +1,35 @@ +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <OutputType>Exe</OutputType> + <TargetFramework>netcoreapp2.0</TargetFramework> + <ApplicationIcon>ProgramIcon.ico</ApplicationIcon> + <AssemblyName>ReportGenerator</AssemblyName> + <RootNamespace>Palmmedia.ReportGenerator</RootNamespace> + <StartupObject>Palmmedia.ReportGenerator.Console.NetCore.Program</StartupObject> + <AssemblyVersion>4.0.0.0</AssemblyVersion> + <FileVersion>4.0.0.0</FileVersion> + </PropertyGroup> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> + <OutputPath>..\target\bin\Debug\</OutputPath> + </PropertyGroup> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> + <OutputPath>..\target\bin\Release\</OutputPath> + </PropertyGroup> + + <ItemGroup> + <None Remove="ProgramIcon.ico" /> + </ItemGroup> + + <ItemGroup> + <Content Include="ProgramIcon.ico" /> + </ItemGroup> + + <ItemGroup> + <ProjectReference Include="..\ReportGenerator.Core\ReportGenerator.Core.csproj" /> + <ProjectReference Include="..\ReportGenerator.DotnetCorePluginLoader\ReportGenerator.DotnetCorePluginLoader.csproj" /> + </ItemGroup> + +</Project> \ No newline at end of file diff --git a/src/ReportGenerator.Console.Test/Common/FileSearchTest.cs b/src/ReportGenerator.Console.Test/Common/FileSearchTest.cs deleted file mode 100644 index 0f0dac6e..00000000 --- a/src/ReportGenerator.Console.Test/Common/FileSearchTest.cs +++ /dev/null @@ -1,132 +0,0 @@ -using System; -using System.IO; -using System.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Common; - -namespace Palmmedia.ReportGeneratorTest.Common -{ - /// <summary> - /// This is a test class for FileSearch and is intended - /// to contain all FileSearch Unit Tests - /// </summary> - [TestClass] - public class FileSearchTest - { - [TestMethod] - public void GetFiles_FilePatternNull_ArgumentException() - { - try - { - FileSearch.GetFiles(null).ToArray(); - Assert.Fail("ArgumentException expected"); - } - catch (Exception ex) - { - Assert.IsInstanceOfType(ex, typeof(ArgumentException)); - } - } - - [TestMethod] - public void GetFiles_FilePatternEmtpy_ArgumentException() - { - try - { - FileSearch.GetFiles(string.Empty).ToArray(); - Assert.Fail("ArgumentException expected"); - } - catch (Exception ex) - { - Assert.IsInstanceOfType(ex, typeof(ArgumentException)); - } - } - - [TestMethod] - public void GetFiles_FilePatternInvalid_ArgumentException() - { - try - { - FileSearch.GetFiles("\"").ToArray(); - Assert.Fail("ArgumentException expected"); - } - catch (Exception ex) - { - Assert.IsInstanceOfType(ex, typeof(ArgumentException)); - } - } - - [TestMethod] - public void GetFiles_OnlyDriveWithoutFilePattern_ArgumentException() - { - try - { - FileSearch.GetFiles("C:\\").ToArray(); - Assert.Fail("ArgumentException expected"); - } - catch (Exception ex) - { - Assert.IsInstanceOfType(ex, typeof(ArgumentException)); - } - } - - [TestMethod] - public void GetFiles_OnlyUNCPathWithoutFilePattern_ArgumentException() - { - try - { - FileSearch.GetFiles("\\test").ToArray(); - Assert.Fail("ArgumentException expected"); - } - catch (Exception ex) - { - Assert.IsInstanceOfType(ex, typeof(ArgumentException)); - } - } - - [TestMethod] - public void GetFiles_EmptyDirectory_NoFilesFound() - { - Directory.CreateDirectory("tmp"); - - var files = FileSearch.GetFiles(Path.Combine("tmp", "*")).ToArray(); - Assert.AreEqual(0, files.Length); - - Directory.Delete("tmp"); - } - - [TestMethod] - public void GetFiles_SingleDirectory_XmlFilesFound() - { - var files = FileSearch.GetFiles(Path.Combine(FileManager.GetCSharpReportDirectory(), "*.xml")).ToArray(); - Assert.AreEqual(16, files.Length); - } - - [TestMethod] - public void GetFiles_MultiDirectory_AllFilesFound() - { - var files = FileSearch.GetFiles(Path.Combine(FileManager.GetFilesDirectory(), "*", "*", "*")).ToArray(); - Assert.IsTrue(files.Length >= 39); - } - - [TestMethod] - public void GetFiles_MultiDirectory_MatchingFilesFound() - { - var files = FileSearch.GetFiles(Path.Combine(FileManager.GetFilesDirectory(), "CSharp", "*roject*", "*lyzer*.cs")).ToArray(); - Assert.AreEqual(1, files.Length); - } - - [TestMethod] - public void GetFiles_RelativePath_DllFound() - { - var files = FileSearch.GetFiles("..\\*\\*.dll").ToArray(); - Assert.IsTrue(files.Any(f => f.EndsWith(this.GetType().Assembly.GetName().Name + ".dll", StringComparison.OrdinalIgnoreCase))); - } - - [TestMethod] - public void GetFiles_UncPath_NoFilesFound() - { - var files = FileSearch.GetFiles(@"\\DoesNotExist\*.xml").ToArray(); - Assert.AreEqual(0, files.Length); - } - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/Analysis/BranchTest.cs b/src/ReportGenerator.Console.Test/Parser/Analysis/BranchTest.cs deleted file mode 100644 index 7852f94e..00000000 --- a/src/ReportGenerator.Console.Test/Parser/Analysis/BranchTest.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser.Analysis; - -namespace Palmmedia.ReportGeneratorTest.Parser.Analysis -{ - /// <summary> - /// This is a test class for Branch and is intended - /// to contain all Branch Unit Tests - /// </summary> - [TestClass] - public class BranchTest - { - /// <summary> - /// A test for the Constructor - /// </summary> - [TestMethod] - public void Constructor() - { - var sut = new Branch(10, "Test"); - - Assert.AreEqual(10, sut.BranchVisits, "Not equal"); - } - - /// <summary> - /// A test for Equals - /// </summary> - [TestMethod] - public void Equals() - { - var target1 = new Branch(10, "Test"); - var target2 = new Branch(11, "Test"); - var target3 = new Branch(10, "Test123"); - - Assert.IsTrue(target1.Equals(target2), "Objects are not equal"); - Assert.IsFalse(target1.Equals(target3), "Objects are equal"); - Assert.IsFalse(target1.Equals(null), "Objects are equal"); - Assert.IsFalse(target1.Equals(new object()), "Objects are equal"); - } - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/Analysis/ClassTest.cs b/src/ReportGenerator.Console.Test/Parser/Analysis/ClassTest.cs deleted file mode 100644 index e59e5671..00000000 --- a/src/ReportGenerator.Console.Test/Parser/Analysis/ClassTest.cs +++ /dev/null @@ -1,111 +0,0 @@ -using System.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser.Analysis; - -namespace Palmmedia.ReportGeneratorTest.Parser.Analysis -{ - /// <summary> - /// This is a test class for ClassTest and is intended - /// to contain all ClassTest Unit Tests - /// </summary> - [TestClass] - public class ClassTest - { - /// <summary> - /// A test for the Constructor - /// </summary> - [TestMethod] - public void Constructor() - { - Assembly assembly = new Assembly("C:\\test\\TestAssembly.dll"); - string classname = "TestClass"; - - var sut = new Class(classname, assembly); - - Assert.AreEqual(assembly, sut.Assembly, "Not equal"); - Assert.AreEqual(classname, sut.Name, "Not equal"); - } - - /// <summary> - /// A test for AddFile - /// </summary> - [TestMethod] - public void AddFile_AddSingleFile_FileIsStored() - { - var assembly = new Assembly("C:\\test\\TestAssembly.dll"); - var sut = new Class("Test", assembly); - var file = new CodeFile("C:\\temp\\Program.cs", new int[0], new LineVisitStatus[0]); - sut.AddFile(file); - - Assert.AreEqual(file, sut.Files.First(), "Not equal"); - Assert.AreEqual(1, sut.Files.Count(), "Wrong number of classes"); - } - - /// <summary> - /// A test for Merge - /// </summary> - [TestMethod] - public void Merge_MergeClassWithOneFileAndOneMethodMetric_FileIsStored() - { - var assembly = new Assembly("C:\\test\\TestAssembly.dll"); - var sut = new Class("Test", assembly); - var classToMerge = new Class("Test", assembly); - var file = new CodeFile("C:\\temp\\Program.cs", new int[0], new LineVisitStatus[0]); - var methodMetric = new MethodMetric("Test"); - classToMerge.AddFile(file); - classToMerge.AddMethodMetric(methodMetric); - sut.Merge(classToMerge); - - Assert.AreEqual(file, sut.Files.First(), "Not equal"); - Assert.AreEqual(1, sut.Files.Count(), "Wrong number of classes"); - Assert.AreEqual(methodMetric, sut.MethodMetrics.First(), "Not equal"); - Assert.AreEqual(1, sut.MethodMetrics.Count(), "Wrong number of method metrics"); - } - - /// <summary> - /// A test for Merge - /// </summary> - [TestMethod] - public void Merge_MergeClassWithCoverageQuota_FileIsStored() - { - var assembly = new Assembly("C:\\test\\TestAssembly.dll"); - var sut = new Class("Test", assembly); - var classToMerge = new Class("Test", assembly) - { - CoverageQuota = 15 - }; - - sut.Merge(classToMerge); - - Assert.AreEqual(15, sut.CoverageQuota); - - classToMerge = new Class("Test", assembly) - { - CoverageQuota = 20 - }; - - sut.Merge(classToMerge); - - Assert.AreEqual(20, sut.CoverageQuota); - } - - /// <summary> - /// A test for Equals - /// </summary> - [TestMethod] - public void Equals() - { - Assembly assembly = new Assembly("C:\\test\\TestAssembly.dll"); - string classname = "TestClass"; - - var target1 = new Class(classname, assembly); - var target2 = new Class(classname, assembly); - var target3 = new Class(classname + "123", assembly); - - Assert.IsTrue(target1.Equals(target2), "Objects are not equal"); - Assert.IsFalse(target1.Equals(target3), "Objects are equal"); - Assert.IsFalse(target1.Equals(null), "Objects are equal"); - Assert.IsFalse(target1.Equals(new object()), "Objects are equal"); - } - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/Analysis/MethodMetricTest.cs b/src/ReportGenerator.Console.Test/Parser/Analysis/MethodMetricTest.cs deleted file mode 100644 index 25e6c769..00000000 --- a/src/ReportGenerator.Console.Test/Parser/Analysis/MethodMetricTest.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser.Analysis; - -namespace Palmmedia.ReportGeneratorTest.Parser.Analysis -{ - /// <summary> - /// This is a test class for MethodMetric and is intended - /// to contain all MethodMetric Unit Tests - /// </summary> - [TestClass] - public class MethodMetricTest - { - /// <summary> - /// A test for the Constructor - /// </summary> - [TestMethod] - public void Constructor() - { - MethodMetric sut = new MethodMetric("Test"); - - Assert.AreEqual("Test", sut.Name, "Not equal"); - } - - /// <summary> - /// A test for AddMetric - /// </summary> - [TestMethod] - public void AddMetric_AddSingleMetric_MetricIsStored() - { - MethodMetric sut = new MethodMetric("Test"); - var metric = new Metric("Metric1", null, MetricType.CodeQuality, 10); - - sut.AddMetric(metric); - - Assert.AreEqual(metric, sut.Metrics.First(), "Not equal"); - Assert.AreEqual(1, sut.Metrics.Count(), "Wrong number of metrics"); - } - - /// <summary> - /// A test for Merge - /// </summary> - [TestMethod] - public void Merge_MergeMethodMetric_MetricsAreStored() - { - var metric1 = new Metric("Metric1", null, MetricType.CodeQuality, 10); - var metric2 = new Metric("Metric1", null, MetricType.CodeQuality, 15); - var metric3 = new Metric("Metric2", null, MetricType.CodeQuality, 20); - - MethodMetric sut = new MethodMetric("Test", new[] { metric1 }); - var methodMetricToMerge = new MethodMetric("Test", new[] { metric2, metric3 }); - - sut.Merge(methodMetricToMerge); - - Assert.AreEqual(2, sut.Metrics.Count(), "Wrong number of metrics"); - Assert.AreEqual(metric1, sut.Metrics.First(), "Not equal"); - Assert.AreEqual(15, sut.Metrics.First().Value, "Not equal"); - Assert.AreEqual(metric3, sut.Metrics.ElementAt(1), "Not equal"); - } - - /// <summary> - /// A test for Equals - /// </summary> - [TestMethod] - public void Equals() - { - var target1 = new MethodMetric("Test"); - var target2 = new MethodMetric("Test"); - var target3 = new MethodMetric("Other"); - - Assert.IsTrue(target1.Equals(target2), "Objects are not equal"); - Assert.IsFalse(target1.Equals(target3), "Objects are equal"); - Assert.IsFalse(target1.Equals(null), "Objects are equal"); - Assert.IsFalse(target1.Equals(new object()), "Objects are equal"); - } - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/CoberturaParserTest.cs b/src/ReportGenerator.Console.Test/Parser/CoberturaParserTest.cs deleted file mode 100644 index cbe18a70..00000000 --- a/src/ReportGenerator.Console.Test/Parser/CoberturaParserTest.cs +++ /dev/null @@ -1,166 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Parser.Preprocessing; - -namespace Palmmedia.ReportGeneratorTest.Parser -{ - /// <summary> - /// This is a test class for CoberturaParser and is intended - /// to contain all CoberturaParser Unit Tests - /// </summary> - [TestClass] - public class CoberturaParserTest - { - private static readonly string FilePath1 = Path.Combine(FileManager.GetJavaReportDirectory(), "Cobertura2.1.1.xml"); - - private static IEnumerable<Assembly> assemblies; - - #region Additional test attributes - - // Use ClassInitialize to run code before running the first test in the class - [ClassInitialize] - public static void MyClassInitialize(TestContext testContext) - { - var report = XDocument.Load(FilePath1); - new CoberturaReportPreprocessor(report).Execute(); - assemblies = new CoberturaParser(report).Assemblies; - } - - #endregion - - /// <summary> - /// A test for SupportsBranchCoverage - /// </summary> - [TestMethod] - public void SupportsBranchCoverage() - { - Assert.IsTrue(new CoberturaParser(XDocument.Load(FilePath1)).SupportsBranchCoverage); - } - - /// <summary> - /// A test for NumberOfLineVisits - /// </summary> - [TestMethod] - public void NumberOfLineVisitsTest() - { - var fileAnalysis = GetFileAnalysis(assemblies, "test.TestClass", "C:\\temp\\test\\TestClass.java"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 17).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 20).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 1).LineVisits, "Wrong number of line visits"); - } - - /// <summary> - /// A test for LineVisitStatus - /// </summary> - [TestMethod] - public void LineVisitStatusTest() - { - var fileAnalysis = GetFileAnalysis(assemblies, "test.TestClass", "C:\\temp\\test\\TestClass.java"); - - var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); - Assert.AreEqual(LineVisitStatus.NotCoverable, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 12); - Assert.AreEqual(LineVisitStatus.Covered, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 15); - Assert.AreEqual(LineVisitStatus.PartiallyCovered, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 20); - Assert.AreEqual(LineVisitStatus.NotCovered, line.LineVisitStatus, "Wrong line visit status"); - } - - /// <summary> - /// A test for NumberOfFiles - /// </summary> - [TestMethod] - public void NumberOfFilesTest() - { - Assert.AreEqual(7, assemblies.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for FilesOfClass - /// </summary> - [TestMethod] - public void FilesOfClassTest() - { - Assert.AreEqual(1, assemblies.Single(a => a.Name == "test").Classes.Single(c => c.Name == "test.TestClass").Files.Count(), "Wrong number of files"); - Assert.AreEqual(1, assemblies.Single(a => a.Name == "test").Classes.Single(c => c.Name == "test.GenericClass").Files.Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for ClassesInAssembly - /// </summary> - [TestMethod] - public void ClassesInAssemblyTest() - { - Assert.AreEqual(7, assemblies.SelectMany(a => a.Classes).Count(), "Wrong number of classes"); - } - - /// <summary> - /// A test for Assemblies - /// </summary> - [TestMethod] - public void AssembliesTest() - { - Assert.AreEqual(2, assemblies.Count(), "Wrong number of assemblies"); - } - - /// <summary> - /// A test for GetCoverageQuotaOfClass. - /// </summary> - [TestMethod] - public void GetCoverableLinesOfClassTest() - { - Assert.AreEqual(3, assemblies.Single(a => a.Name == "test").Classes.Single(c => c.Name == "test.AbstractClass").CoverableLines, "Wrong Coverable Lines"); - } - - /// <summary> - /// A test for MethodMetrics - /// </summary> - [TestMethod] - public void MethodMetricsTest() - { - var metrics = assemblies.Single(a => a.Name == "test").Classes.Single(c => c.Name == "test.TestClass").MethodMetrics; - - Assert.AreEqual(4, metrics.Count(), "Wrong number of method metrics"); - Assert.AreEqual("<init>()V", metrics.First().Name, "Wrong name of method"); - Assert.AreEqual(3, metrics.First().Metrics.Count(), "Wrong number of metrics"); - - Assert.AreEqual("Cyclomatic complexity", metrics.First().Metrics.ElementAt(0).Name, "Wrong name of metric"); - Assert.AreEqual(0, metrics.First().Metrics.ElementAt(0).Value, "Wrong value of metric"); - Assert.AreEqual("Line coverage", metrics.First().Metrics.ElementAt(1).Name, "Wrong name of metric"); - Assert.AreEqual(1.0M, metrics.First().Metrics.ElementAt(1).Value, "Wrong value of metric"); - Assert.AreEqual("Branch coverage", metrics.First().Metrics.ElementAt(2).Name, "Wrong name of metric"); - Assert.AreEqual(1.0M, metrics.First().Metrics.ElementAt(2).Value, "Wrong value of metric"); - } - - /// <summary> - /// A test for CodeElements - /// </summary> - [TestMethod] - public void CodeElementsTest() - { - var codeElements = GetFile(assemblies, "test.TestClass", "C:\\temp\\test\\TestClass.java").CodeElements; - Assert.AreEqual(4, codeElements.Count(), "Wrong number of code elements"); - } - - private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "test").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName); - - private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "test").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName) - .AnalyzeFile(); - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/DotCoverParserTest.cs b/src/ReportGenerator.Console.Test/Parser/DotCoverParserTest.cs deleted file mode 100644 index aff04cbe..00000000 --- a/src/ReportGenerator.Console.Test/Parser/DotCoverParserTest.cs +++ /dev/null @@ -1,182 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser; -using Palmmedia.ReportGenerator.Parser.Analysis; - -namespace Palmmedia.ReportGeneratorTest.Parser -{ - /// <summary> - /// This is a test class for DotCoverParser and is intended - /// to contain all DotCoverParser Unit Tests - /// </summary> - [TestClass] - public class DotCoverParserTest - { - private static readonly string FilePath1 = Path.Combine(FileManager.GetCSharpReportDirectory(), "dotCover.xml"); - - private static IEnumerable<Assembly> assemblies; - - #region Additional test attributes - - // You can use the following additional attributes as you write your tests: - - // Use ClassInitialize to run code before running the first test in the class - [ClassInitialize] - public static void MyClassInitialize(TestContext testContext) - { - assemblies = new DotCoverParser(XDocument.Load(FilePath1)).Assemblies; - } - - #endregion - - /// <summary> - /// A test for NumberOfLineVisits - /// </summary> - [TestMethod] - public void NumberOfLineVisitsTest() - { - var fileAnalysis = GetFileAnalysis(assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 10).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 11).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 12).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 23).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - } - - /// <summary> - /// A test for LineVisitStatus - /// </summary> - [TestMethod] - public void LineVisitStatusTest() - { - var fileAnalysis = GetFileAnalysis(assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); - - var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); - Assert.AreEqual(LineVisitStatus.NotCoverable, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 15); - Assert.AreEqual(LineVisitStatus.Covered, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 22); - Assert.AreEqual(LineVisitStatus.NotCovered, line.LineVisitStatus, "Wrong line visit status"); - } - - /// <summary> - /// A test for NumberOfFiles - /// </summary> - [TestMethod] - public void NumberOfFilesTest() - { - Assert.AreEqual(15, assemblies.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for FilesOfClass - /// </summary> - [TestMethod] - public void FilesOfClassTest() - { - Assert.AreEqual(1, assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").Files.Count(), "Wrong number of files"); - Assert.AreEqual(2, assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.PartialClass").Files.Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for ClassesInAssembly - /// </summary> - [TestMethod] - public void ClassesInAssemblyTest() - { - Assert.AreEqual(18, assemblies.SelectMany(a => a.Classes).Count(), "Wrong number of classes"); - } - - /// <summary> - /// A test for Assemblies - /// </summary> - [TestMethod] - public void AssembliesTest() - { - Assert.AreEqual(1, assemblies.Count(), "Wrong number of assemblies"); - } - - /// <summary> - /// A test for GetCoverageQuotaOfClass. - /// </summary> - [TestMethod] - public void GetCoverableLinesOfClassTest() - { - Assert.AreEqual(4, assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.AbstractClass").CoverableLines, "Wrong Coverable Lines"); - } - - /// <summary> - /// A test for GetCoverageQuotaOfClass. - /// </summary> - [TestMethod] - public void GetCoverageQuotaOfClassTest() - { - Assert.AreEqual(66.6m, assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.PartialClassWithAutoProperties").CoverageQuota, "Wrong coverage quota"); - } - - /// <summary> - /// A test for MethodMetrics - /// </summary> - [TestMethod] - public void MethodMetricsTest() - { - Assert.AreEqual(0, assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").MethodMetrics.Count(), "Wrong number of metrics"); - } - - /// <summary> - /// A test for CodeElements - /// </summary> - [TestMethod] - public void CodeElementsTest() - { - var codeElements = GetFile(assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs").CodeElements; - Assert.AreEqual(2, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs").CodeElements; - Assert.AreEqual(4, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs").CodeElements; - Assert.AreEqual(10, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assemblies, "Test.AsyncClass", "C:\\temp\\AsyncClass.cs").CodeElements; - Assert.AreEqual(1, codeElements.Count(), "Wrong number of code elements"); - Assert.AreEqual("SendAsync()", codeElements.First().Name, "Wrong name of code elements"); - } - - private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "Test").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName); - - private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "Test").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName) - .AnalyzeFile(); - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/DynamicCodeCoverageParserTest.cs b/src/ReportGenerator.Console.Test/Parser/DynamicCodeCoverageParserTest.cs deleted file mode 100644 index 591f3f7f..00000000 --- a/src/ReportGenerator.Console.Test/Parser/DynamicCodeCoverageParserTest.cs +++ /dev/null @@ -1,191 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser; -using Palmmedia.ReportGenerator.Parser.Analysis; - -namespace Palmmedia.ReportGeneratorTest.Parser -{ - /// <summary> - /// This is a test class for VisualStudioParser and is intended - /// to contain all DynamicCodeCoverageParser Unit Tests - /// </summary> - [TestClass] - public class DynamicCodeCoverageParserTest - { - private static readonly string FilePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "DynamicCodeCoverage.xml"); - - private static IEnumerable<Assembly> assemblies; - - #region Additional test attributes - - // You can use the following additional attributes as you write your tests: - - // Use ClassInitialize to run code before running the first test in the class - [ClassInitialize] - public static void MyClassInitialize(TestContext testContext) - { - var report = XDocument.Load(FilePath); - assemblies = new DynamicCodeCoverageParser(report).Assemblies; - } - - #endregion - - /// <summary> - /// A test for NumberOfLineVisits - /// </summary> - [TestMethod] - public void NumberOfLineVisitsTest() - { - var fileAnalysis = GetFileAnalysis(assemblies, "TestClass", "C:\\temp\\TestClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 10).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 11).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 12).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 23).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "TestClass2", "C:\\temp\\TestClass2.cs"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "PartialClass", "C:\\temp\\PartialClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "PartialClass", "C:\\temp\\PartialClass2.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - } - - /// <summary> - /// A test for LineVisitStatus - /// </summary> - [TestMethod] - public void LineVisitStatusTest() - { - var fileAnalysis = GetFileAnalysis(assemblies, "TestClass", "C:\\temp\\TestClass.cs"); - - var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); - Assert.AreEqual(LineVisitStatus.NotCoverable, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 15); - Assert.AreEqual(LineVisitStatus.Covered, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 17); - Assert.AreEqual(LineVisitStatus.PartiallyCovered, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 22); - Assert.AreEqual(LineVisitStatus.NotCovered, line.LineVisitStatus, "Wrong line visit status"); - } - - /// <summary> - /// A test for NumberOfFiles - /// </summary> - [TestMethod] - public void NumberOfFilesTest() - { - Assert.AreEqual(11, assemblies.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for FilesOfClass - /// </summary> - [TestMethod] - public void FilesOfClassTest() - { - Assert.AreEqual(1, assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "TestClass").Files.Count(), "Wrong number of files"); - Assert.AreEqual(2, assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "PartialClass").Files.Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for ClassesInAssembly - /// </summary> - [TestMethod] - public void ClassesInAssemblyTest() - { - Assert.AreEqual(13, assemblies.SelectMany(a => a.Classes).Count(), "Wrong number of classes"); - } - - /// <summary> - /// A test for GetCoverageQuotaOfClass. - /// </summary> - [TestMethod] - public void GetCoverableLinesOfClassTest() - { - Assert.AreEqual(4, assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "AbstractClass").CoverableLines, "Wrong Coverable Lines"); - } - - /// <summary> - /// A test for Assemblies - /// </summary> - [TestMethod] - public void AssembliesTest() - { - Assert.AreEqual(1, assemblies.Count(), "Wrong number of assemblies"); - } - - /// <summary> - /// A test for MethodMetrics - /// </summary> - [TestMethod] - public void MethodMetricsTest() - { - var metrics = assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "TestClass").MethodMetrics; - - Assert.AreEqual(2, metrics.Count(), "Wrong number of method metrics"); - Assert.AreEqual("SampleFunction()", metrics.First().Name, "Wrong name of method"); - Assert.AreEqual(2, metrics.First().Metrics.Count(), "Wrong number of metrics"); - - Assert.AreEqual("Blocks covered", metrics.First().Metrics.ElementAt(0).Name, "Wrong name of metric"); - Assert.AreEqual(9, metrics.First().Metrics.ElementAt(0).Value, "Wrong value of metric"); - Assert.AreEqual("Blocks not covered", metrics.First().Metrics.ElementAt(1).Name, "Wrong name of metric"); - Assert.AreEqual(4, metrics.First().Metrics.ElementAt(1).Value, "Wrong value of metric"); - - metrics = assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "AsyncClass").MethodMetrics; - - Assert.AreEqual(1, metrics.Count(), "Wrong number of method metrics"); - Assert.AreEqual("SendAsync()", metrics.First().Name, "Wrong name of method"); - } - - /// <summary> - /// A test for CodeElements - /// </summary> - [TestMethod] - public void CodeElementsTest() - { - var codeElements = GetFile(assemblies, "TestClass", "C:\\temp\\TestClass.cs").CodeElements; - Assert.AreEqual(2, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assemblies, "PartialClass", "C:\\temp\\PartialClass.cs").CodeElements; - Assert.AreEqual(4, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assemblies, "TestClass2", "C:\\temp\\TestClass2.cs").CodeElements; - Assert.AreEqual(6, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assemblies, "AsyncClass", "C:\\temp\\AsyncClass.cs").CodeElements; - Assert.AreEqual(1, codeElements.Count(), "Wrong number of code elements"); - Assert.AreEqual("SendAsync()", codeElements.First().Name, "Wrong name of code elements"); - } - - private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "test.exe").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName); - - private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "test.exe").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName) - .AnalyzeFile(); - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/MProfParserTest.cs b/src/ReportGenerator.Console.Test/Parser/MProfParserTest.cs deleted file mode 100644 index 86f9c882..00000000 --- a/src/ReportGenerator.Console.Test/Parser/MProfParserTest.cs +++ /dev/null @@ -1,153 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser; -using Palmmedia.ReportGenerator.Parser.Analysis; - -namespace Palmmedia.ReportGeneratorTest.Parser -{ - /// <summary> - /// This is a test class for MProfParser and is intended - /// to contain all MProfParser Unit Tests - /// </summary> - [TestClass] - public class MProfParserTest - { - private static readonly string FilePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "mprof-report.xml"); - - private static IEnumerable<Assembly> assemblies; - - #region Additional test attributes - // You can use the following additional attributes as you write your tests: - - // Use ClassInitialize to run code before running the first test in the class - [ClassInitialize] - public static void MyClassInitialize(TestContext testContext) - { - var report = XDocument.Load(FilePath); - assemblies = new MProfParser(report).Assemblies; - } - - #endregion - - /// <summary> - /// A test for NumberOfLineVisits - /// </summary> - [TestMethod] - public void NumberOfLineVisitsTest() - { - var fileAnalysis = GetFileAnalysis(assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 18).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - } - - /// <summary> - /// A test for LineVisitStatus - /// </summary> - [TestMethod] - public void LineVisitStatusTest() - { - var fileAnalysis = GetFileAnalysis(assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); - - var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); - Assert.AreEqual(LineVisitStatus.NotCoverable, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 9); - Assert.AreEqual(LineVisitStatus.Covered, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 23); - Assert.AreEqual(LineVisitStatus.NotCovered, line.LineVisitStatus, "Wrong line visit status"); - } - - /// <summary> - /// A test for NumberOfFiles - /// </summary> - [TestMethod] - public void NumberOfFilesTest() - { - Assert.AreEqual(8, assemblies.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for FilesOfClass - /// </summary> - [TestMethod] - public void FilesOfClassTest() - { - Assert.AreEqual(1, assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").Files.Count(), "Wrong number of files"); - Assert.AreEqual(2, assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.PartialClass").Files.Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for ClassesInAssembly - /// </summary> - [TestMethod] - public void ClassesInAssemblyTest() - { - Assert.AreEqual(12, assemblies.SelectMany(a => a.Classes).Count(), "Wrong number of classes"); - } - - /// <summary> - /// A test for Assemblies - /// </summary> - [TestMethod] - public void AssembliesTest() - { - Assert.AreEqual(1, assemblies.Count(), "Wrong number of assemblies"); - } - - /// <summary> - /// A test for MethodMetrics - /// </summary> - [TestMethod] - public void MethodMetricsTest() - { - Assert.AreEqual(0, assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").MethodMetrics.Count(), "Wrong number of metrics"); - } - - /// <summary> - /// A test for CodeElements - /// </summary> - [TestMethod] - public void CodeElementsTest() - { - var codeElements = GetFile(assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs").CodeElements; - Assert.AreEqual(1, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs").CodeElements; - Assert.AreEqual(2, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs").CodeElements; - Assert.AreEqual(3, codeElements.Count(), "Wrong number of code elements"); - } - - private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "Test").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName); - - private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "Test").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName) - .AnalyzeFile(); - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/MultiReportParserTest.cs b/src/ReportGenerator.Console.Test/Parser/MultiReportParserTest.cs deleted file mode 100644 index c3f929e7..00000000 --- a/src/ReportGenerator.Console.Test/Parser/MultiReportParserTest.cs +++ /dev/null @@ -1,229 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Moq; -using Palmmedia.ReportGenerator.Parser; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Parser.Preprocessing; -using Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch; - -namespace Palmmedia.ReportGeneratorTest.Parser -{ - /// <summary> - /// This is a test class for MultiReportParser and is intended - /// to contain all MultiReportParser Unit Tests - /// </summary> - [TestClass] - public class MultiReportParserTest - { - private static readonly string FilePath1 = Path.Combine(FileManager.GetCSharpReportDirectory(), "Partcover2.2.xml"); - - private static readonly string FilePath2 = Path.Combine(FileManager.GetCSharpReportDirectory(), "Partcover2.3.xml"); - - private static IEnumerable<Assembly> assembliesWithoutPreprocessing; - - private static IEnumerable<Assembly> assembliesWithPreprocessing; - - #region Additional test attributes - - // Use ClassInitialize to run code before running the first test in the class - [ClassInitialize] - public static void MyClassInitialize(TestContext testContext) - { - var multiReportParser = new MultiReportParser(); - multiReportParser.AddParser(new PartCover22Parser(XDocument.Load(FilePath1))); - multiReportParser.AddParser(new PartCover22Parser(XDocument.Load(FilePath1))); - assembliesWithoutPreprocessing = multiReportParser.Assemblies; - - var classSearcherFactory = new ClassSearcherFactory(); - var globalClassSearcher = classSearcherFactory.CreateClassSearcher("C:\\test"); - multiReportParser = new MultiReportParser(); - - var report = XDocument.Load(FilePath1); - new PartCover22ReportPreprocessor(report, classSearcherFactory, globalClassSearcher).Execute(); - multiReportParser.AddParser(new PartCover22Parser(report)); - - report = XDocument.Load(FilePath2); - new PartCover23ReportPreprocessor(report, classSearcherFactory, globalClassSearcher).Execute(); - multiReportParser.AddParser(new PartCover23Parser(report)); - assembliesWithPreprocessing = multiReportParser.Assemblies; - } - - #endregion - - /// <summary> - /// A test for SupportsBranchCoverage - /// </summary> - [TestMethod] - public void SupportsBranchCoverage() - { - var multiReportParser = new MultiReportParser(); - - Assert.IsFalse(multiReportParser.SupportsBranchCoverage); - - var mock = new Mock<IParser>(); - mock.Setup(p => p.SupportsBranchCoverage).Returns(false); - multiReportParser.AddParser(mock.Object); - - Assert.IsFalse(multiReportParser.SupportsBranchCoverage); - - mock = new Mock<IParser>(); - mock.Setup(p => p.SupportsBranchCoverage).Returns(true); - multiReportParser.AddParser(mock.Object); - - Assert.IsTrue(multiReportParser.SupportsBranchCoverage); - } - - /// <summary> - /// A test for NumberOfLineVisits - /// </summary> - [TestMethod] - public void NumberOfLineVisitsTest_WithoutPreprocessing() - { - var fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.TestClass", "C:\\temp\\TestClass.cs"); - Assert.AreEqual(2, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 18).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(4, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(2, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(8, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); - Assert.AreEqual(2, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); - Assert.AreEqual(2, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - } - - /// <summary> - /// A test for NumberOfLineVisits - /// </summary> - [TestMethod] - public void NumberOfLineVisitsTest_WithPreprocessing() - { - var fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.TestClass", "C:\\temp\\TestClass.cs"); - Assert.AreEqual(2, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 18).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); - Assert.AreEqual(6, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(4, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(2, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(8, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); - Assert.AreEqual(2, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); - Assert.AreEqual(2, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - } - - /// <summary> - /// A test for NumberOfFiles - /// </summary> - [TestMethod] - public void NumberOfFilesTest() - { - Assert.AreEqual(5, assembliesWithoutPreprocessing.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for FilesOfClass - /// </summary> - [TestMethod] - public void FilesOfClassTest() - { - Assert.AreEqual(1, assembliesWithoutPreprocessing.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").Files.Count(), "Wrong number of files"); - Assert.AreEqual(2, assembliesWithoutPreprocessing.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.PartialClass").Files.Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for ClassesInAssembly - /// </summary> - [TestMethod] - public void ClassesInAssemblyTest() - { - Assert.AreEqual(7, assembliesWithoutPreprocessing.SelectMany(a => a.Classes).Count(), "Wrong number of classes"); - } - - /// <summary> - /// A test for Assemblies - /// </summary> - [TestMethod] - public void AssembliesTest() - { - Assert.AreEqual(1, assembliesWithoutPreprocessing.Count(), "Wrong number of assemblies"); - } - - /// <summary> - /// A test for MethodMetrics - /// </summary> - [TestMethod] - public void MethodMetricsTest() - { - Assert.AreEqual(0, assembliesWithoutPreprocessing.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").MethodMetrics.Count(), "Wrong number of metrics"); - } - - /// <summary> - /// A test for MethodMetrics - /// </summary> - [TestMethod] - public void OpenCoverMethodMetricsTest() - { - string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiOpenCover.xml"); - var multiReportParser = ParserFactory.CreateParser(new string[] { filePath }, new string[] { }); - Assert.IsInstanceOfType(multiReportParser, typeof(MultiReportParser), "Wrong type"); - - var metrics = multiReportParser.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").MethodMetrics; - - Assert.AreEqual(2, metrics.Count(), "Wrong number of method metrics"); - Assert.AreEqual("System.Void Test.TestClass::SampleFunction()", metrics.First().Name, "Wrong name of method"); - Assert.AreEqual(3, metrics.First().Metrics.Count(), "Wrong number of metrics"); - - Assert.AreEqual("Cyclomatic complexity", metrics.First().Metrics.ElementAt(0).Name, "Wrong name of metric"); - Assert.AreEqual(111, metrics.First().Metrics.ElementAt(0).Value, "Wrong value of metric"); - Assert.AreEqual("Sequence coverage", metrics.First().Metrics.ElementAt(1).Name, "Wrong name of metric"); - Assert.AreEqual(222, metrics.First().Metrics.ElementAt(1).Value, "Wrong value of metric"); - Assert.AreEqual("Branch coverage", metrics.First().Metrics.ElementAt(2).Name, "Wrong name of metric"); - Assert.AreEqual(333, metrics.First().Metrics.ElementAt(2).Value, "Wrong value of metric"); - } - - /// <summary> - /// A test for branches - /// </summary> - [TestMethod] - public void OpenCoverBranchesTest() - { - string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiOpenCover.xml"); - var multiReportParser = ParserFactory.CreateParser(new string[] { filePath }, new string[] { }); - Assert.IsInstanceOfType(multiReportParser, typeof(MultiReportParser), "Wrong type"); - - var fileAnalysis = GetFileAnalysis(multiReportParser.Assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); - - Assert.IsFalse(fileAnalysis.Lines.Single(l => l.LineNumber == 44).CoveredBranches.HasValue, "No covered branches"); - Assert.IsFalse(fileAnalysis.Lines.Single(l => l.LineNumber == 44).TotalBranches.HasValue, "No total branches"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 45).CoveredBranches.Value, "Wrong number of covered branches"); - Assert.AreEqual(2, fileAnalysis.Lines.Single(l => l.LineNumber == 45).TotalBranches.Value, "Wrong number of total branches"); - } - - private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "Test").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName) - .AnalyzeFile(); - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/NCoverParserTest.cs b/src/ReportGenerator.Console.Test/Parser/NCoverParserTest.cs deleted file mode 100644 index 3748656b..00000000 --- a/src/ReportGenerator.Console.Test/Parser/NCoverParserTest.cs +++ /dev/null @@ -1,153 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser; -using Palmmedia.ReportGenerator.Parser.Analysis; - -namespace Palmmedia.ReportGeneratorTest.Parser -{ - /// <summary> - /// This is a test class for NCoverParser and is intended - /// to contain all NCoverParser Unit Tests - /// </summary> - [TestClass] - public class NCoverParserTest - { - private static readonly string FilePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "NCover1.5.8.xml"); - - private static IEnumerable<Assembly> assemblies; - - #region Additional test attributes - // You can use the following additional attributes as you write your tests: - - // Use ClassInitialize to run code before running the first test in the class - [ClassInitialize] - public static void MyClassInitialize(TestContext testContext) - { - var report = XDocument.Load(FilePath); - assemblies = new NCoverParser(report).Assemblies; - } - - #endregion - - /// <summary> - /// A test for NumberOfLineVisits - /// </summary> - [TestMethod] - public void NumberOfLineVisitsTest() - { - var fileAnalysis = GetFileAnalysis(assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 18).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(2, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(4, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - } - - /// <summary> - /// A test for LineVisitStatus - /// </summary> - [TestMethod] - public void LineVisitStatusTest() - { - var fileAnalysis = GetFileAnalysis(assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); - - var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); - Assert.AreEqual(LineVisitStatus.NotCoverable, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 10); - Assert.AreEqual(LineVisitStatus.Covered, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 18); - Assert.AreEqual(LineVisitStatus.NotCovered, line.LineVisitStatus, "Wrong line visit status"); - } - - /// <summary> - /// A test for NumberOfFiles - /// </summary> - [TestMethod] - public void NumberOfFilesTest() - { - Assert.AreEqual(5, assemblies.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for FilesOfClass - /// </summary> - [TestMethod] - public void FilesOfClassTest() - { - Assert.AreEqual(1, assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").Files.Count(), "Wrong number of files"); - Assert.AreEqual(2, assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.PartialClass").Files.Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for ClassesInAssembly - /// </summary> - [TestMethod] - public void ClassesInAssemblyTest() - { - Assert.AreEqual(4, assemblies.SelectMany(a => a.Classes).Count(), "Wrong number of classes"); - } - - /// <summary> - /// A test for Assemblies - /// </summary> - [TestMethod] - public void AssembliesTest() - { - Assert.AreEqual(1, assemblies.Count(), "Wrong number of assemblies"); - } - - /// <summary> - /// A test for MethodMetrics - /// </summary> - [TestMethod] - public void MethodMetricsTest() - { - Assert.AreEqual(0, assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").MethodMetrics.Count(), "Wrong number of metrics"); - } - - /// <summary> - /// A test for CodeElements - /// </summary> - [TestMethod] - public void CodeElementsTest() - { - var codeElements = GetFile(assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs").CodeElements; - Assert.AreEqual(2, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs").CodeElements; - Assert.AreEqual(4, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs").CodeElements; - Assert.AreEqual(5, codeElements.Count(), "Wrong number of code elements"); - } - - private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "Test").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName); - - private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "Test").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName) - .AnalyzeFile(); - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/OpenCoverParserTest.cs b/src/ReportGenerator.Console.Test/Parser/OpenCoverParserTest.cs deleted file mode 100644 index 81ab70b2..00000000 --- a/src/ReportGenerator.Console.Test/Parser/OpenCoverParserTest.cs +++ /dev/null @@ -1,317 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Parser.Preprocessing; -using Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch; - -namespace Palmmedia.ReportGeneratorTest.Parser -{ - /// <summary> - /// This is a test class for OpenCoverParser and is intended - /// to contain all OpenCoverParser Unit Tests - /// </summary> - [TestClass] - public class OpenCoverParserTest - { - private static readonly string FilePath1 = Path.Combine(FileManager.GetCSharpReportDirectory(), "OpenCover.xml"); - - private static readonly string FilePath2 = Path.Combine(FileManager.GetCSharpReportDirectory(), "OpenCoverWithTrackedMethods.xml"); - - private static IEnumerable<Assembly> assembliesWithoutPreprocessing; - - private static IEnumerable<Assembly> assembliesWithPreprocessing; - - private static IEnumerable<Assembly> assembliesWithTrackedMethods; - - #region Additional test attributes - - // You can use the following additional attributes as you write your tests: - - // Use ClassInitialize to run code before running the first test in the class - [ClassInitialize] - public static void MyClassInitialize(TestContext testContext) - { - assembliesWithoutPreprocessing = new OpenCoverParser(XDocument.Load(FilePath1)).Assemblies; - - var report = XDocument.Load(FilePath1); - new OpenCoverReportPreprocessor(report).Execute(); - assembliesWithPreprocessing = new OpenCoverParser(report).Assemblies; - - report = XDocument.Load(FilePath2); - new OpenCoverReportPreprocessor(report).Execute(); - assembliesWithTrackedMethods = new OpenCoverParser(report).Assemblies; - } - - #endregion - - /// <summary> - /// A test for SupportsBranchCoverage - /// </summary> - [TestMethod] - public void SupportsBranchCoverage() - { - Assert.IsTrue(new OpenCoverParser(XDocument.Load(FilePath1)).SupportsBranchCoverage); - } - - /// <summary> - /// A test for NumberOfLineVisits - /// </summary> - [TestMethod] - public void NumberOfLineVisitsTest_WithoutPreprocessing() - { - var fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.TestClass", "C:\\temp\\TestClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 10).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 11).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 12).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 23).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); - Assert.AreEqual(3, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(2, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(4, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits, "Wrong number of line visits"); - Assert.IsFalse(fileAnalysis.Lines.Single(l => l.LineNumber == 44).CoveredBranches.HasValue, "No covered branches"); - Assert.IsFalse(fileAnalysis.Lines.Single(l => l.LineNumber == 44).TotalBranches.HasValue, "No total branches"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 54).CoveredBranches.Value, "Wrong number of covered branches"); - Assert.AreEqual(2, fileAnalysis.Lines.Single(l => l.LineNumber == 54).TotalBranches.Value, "Wrong number of total branches"); - - fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.ClassWithExcludes", "C:\\temp\\ClassWithExcludes.cs"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits (Property is excluded)"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits (Method is excluded)"); - } - - /// <summary> - /// A test for NumberOfLineVisits - /// </summary> - [TestMethod] - public void NumberOfLineVisitsTest_WithPreprocessing() - { - var fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.TestClass", "C:\\temp\\TestClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 10).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 11).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 12).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 23).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); - Assert.AreEqual(3, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(2, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(4, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits, "Wrong number of line visits"); - Assert.IsFalse(fileAnalysis.Lines.Single(l => l.LineNumber == 44).CoveredBranches.HasValue, "No covered branches"); - Assert.IsFalse(fileAnalysis.Lines.Single(l => l.LineNumber == 44).TotalBranches.HasValue, "No total branches"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 54).CoveredBranches.Value, "Wrong number of covered branches"); - Assert.AreEqual(2, fileAnalysis.Lines.Single(l => l.LineNumber == 54).TotalBranches.Value, "Wrong number of total branches"); - - fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.ClassWithExcludes", "C:\\temp\\ClassWithExcludes.cs"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits (Property is excluded)"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits (Method is excluded)"); - } - - /// <summary> - /// A test for NumberOfLineVisits - /// </summary> - [TestMethod] - public void NumberOfLineVisitsTest_WithTrackedMethods() - { - var fileAnalysis = GetFileAnalysis(assembliesWithTrackedMethods, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); - - var line = fileAnalysis.Lines.Single(l => l.LineNumber == 9); - - Assert.AreEqual(2, line.LineVisits, "Wrong number of line visits"); - - Assert.AreEqual(2, line.LineCoverageByTestMethod.Count, "Wrong number of test methods"); - Assert.AreEqual(1, line.LineCoverageByTestMethod.First().Value.LineVisits, "Wrong number of test methods"); - Assert.AreEqual(1, line.LineCoverageByTestMethod.ElementAt(1).Value.LineVisits, "Wrong number of test methods"); - } - - /// <summary> - /// A test for LineVisitStatus - /// </summary> - [TestMethod] - public void LineVisitStatusTest_WithTrackedMethods() - { - var fileAnalysis = GetFileAnalysis(assembliesWithTrackedMethods, "Test.TestClass", "C:\\temp\\TestClass.cs"); - - var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); - - Assert.AreEqual(LineVisitStatus.NotCoverable, line.LineVisitStatus, "Wrong line visit status"); - - Assert.AreEqual(2, line.LineCoverageByTestMethod.Count, "Wrong number of test methods"); - Assert.AreEqual(LineVisitStatus.NotCoverable, line.LineCoverageByTestMethod.First().Value.LineVisitStatus, "Wrong line visit status"); - Assert.AreEqual(LineVisitStatus.NotCoverable, line.LineCoverageByTestMethod.ElementAt(1).Value.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 15); - - Assert.AreEqual(LineVisitStatus.Covered, line.LineVisitStatus, "Wrong line visit status"); - - Assert.AreEqual(2, line.LineCoverageByTestMethod.Count, "Wrong number of test methods"); - Assert.AreEqual(LineVisitStatus.Covered, line.LineCoverageByTestMethod.First().Value.LineVisitStatus, "Wrong line visit status"); - Assert.AreEqual(LineVisitStatus.Covered, line.LineCoverageByTestMethod.ElementAt(1).Value.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 17); - - Assert.AreEqual(LineVisitStatus.PartiallyCovered, line.LineVisitStatus, "Wrong line visit status"); - - Assert.AreEqual(2, line.LineCoverageByTestMethod.Count, "Wrong number of test methods"); - Assert.AreEqual(LineVisitStatus.PartiallyCovered, line.LineCoverageByTestMethod.First().Value.LineVisitStatus, "Wrong line visit status"); - Assert.AreEqual(LineVisitStatus.PartiallyCovered, line.LineCoverageByTestMethod.ElementAt(1).Value.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 22); - - Assert.AreEqual(LineVisitStatus.NotCovered, line.LineVisitStatus, "Wrong line visit status"); - - Assert.AreEqual(2, line.LineCoverageByTestMethod.Count, "Wrong number of test methods"); - Assert.AreEqual(LineVisitStatus.NotCovered, line.LineCoverageByTestMethod.First().Value.LineVisitStatus, "Wrong line visit status"); - Assert.AreEqual(LineVisitStatus.NotCovered, line.LineCoverageByTestMethod.ElementAt(1).Value.LineVisitStatus, "Wrong line visit status"); - } - - /// <summary> - /// A test for NumberOfFiles - /// </summary> - [TestMethod] - public void NumberOfFilesTest() - { - Assert.AreEqual(15, assembliesWithoutPreprocessing.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for FilesOfClass - /// </summary> - [TestMethod] - public void FilesOfClassTest() - { - Assert.AreEqual(1, assembliesWithoutPreprocessing.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").Files.Count(), "Wrong number of files"); - Assert.AreEqual(2, assembliesWithoutPreprocessing.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.PartialClass").Files.Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for ClassesInAssembly - /// </summary> - [TestMethod] - public void ClassesInAssemblyTest() - { - Assert.AreEqual(17, assembliesWithoutPreprocessing.SelectMany(a => a.Classes).Count(), "Wrong number of classes"); - } - - /// <summary> - /// A test for Assemblies - /// </summary> - [TestMethod] - public void AssembliesTest() - { - Assert.AreEqual(1, assembliesWithoutPreprocessing.Count(), "Wrong number of assemblies"); - } - - /// <summary> - /// A test for GetCoverageQuotaOfClass. - /// </summary> - [TestMethod] - public void GetCoverableLinesOfClassTest() - { - Assert.AreEqual(4, assembliesWithoutPreprocessing.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.AbstractClass").CoverableLines, "Wrong Coverable Lines"); - } - - /// <summary> - /// A test for GetCoverageQuotaOfClass. - /// </summary> - [TestMethod] - public void GetCoverageQuotaOfClassTest() - { - Assert.AreEqual(66.6m, assembliesWithoutPreprocessing.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.PartialClassWithAutoProperties").CoverageQuota, "Wrong coverage quota"); - } - - /// <summary> - /// A test for MethodMetrics - /// </summary> - [TestMethod] - public void MethodMetricsTest() - { - var metrics = assembliesWithoutPreprocessing.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").MethodMetrics; - - Assert.AreEqual(2, metrics.Count(), "Wrong number of method metrics"); - Assert.AreEqual("System.Void Test.TestClass::SampleFunction()", metrics.First().Name, "Wrong name of method"); - Assert.AreEqual(5, metrics.First().Metrics.Count(), "Wrong number of metrics"); - - Assert.AreEqual("Cyclomatic complexity", metrics.First().Metrics.ElementAt(0).Name, "Wrong name of metric"); - Assert.AreEqual(3, metrics.First().Metrics.ElementAt(0).Value, "Wrong value of metric"); - Assert.AreEqual("NPath complexity", metrics.First().Metrics.ElementAt(1).Name, "Wrong name of metric"); - Assert.AreEqual(2, metrics.First().Metrics.ElementAt(1).Value, "Wrong value of metric"); - Assert.AreEqual("Sequence coverage", metrics.First().Metrics.ElementAt(2).Name, "Wrong name of metric"); - Assert.AreEqual(75M, metrics.First().Metrics.ElementAt(2).Value, "Wrong value of metric"); - Assert.AreEqual("Branch coverage", metrics.First().Metrics.ElementAt(3).Name, "Wrong name of metric"); - Assert.AreEqual(66.67M, metrics.First().Metrics.ElementAt(3).Value, "Wrong value of metric"); - Assert.AreEqual("Crap Score", metrics.First().Metrics.ElementAt(4).Name, "Wrong name of metric"); - Assert.AreEqual(3.14M, metrics.First().Metrics.ElementAt(4).Value, "Wrong value of metric"); - - metrics = assembliesWithoutPreprocessing.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.AsyncClass").MethodMetrics; - - Assert.AreEqual(1, metrics.Count(), "Wrong number of method metrics"); - Assert.AreEqual("SendAsync()", metrics.First().Name, "Wrong name of method"); - } - - /// <summary> - /// A test for CodeElements - /// </summary> - [TestMethod] - public void CodeElementsTest() - { - var codeElements = GetFile(assembliesWithPreprocessing, "Test.TestClass", "C:\\temp\\TestClass.cs").CodeElements; - Assert.AreEqual(2, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assembliesWithPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass.cs").CodeElements; - Assert.AreEqual(4, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assembliesWithPreprocessing, "Test.TestClass2", "C:\\temp\\TestClass2.cs").CodeElements; - Assert.AreEqual(10, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assembliesWithPreprocessing, "Test.AsyncClass", "C:\\temp\\AsyncClass.cs").CodeElements; - Assert.AreEqual(1, codeElements.Count(), "Wrong number of code elements"); - Assert.AreEqual("SendAsync()", codeElements.First().Name, "Wrong name of code elements"); - } - - private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "Test").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName); - - private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "Test").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName) - .AnalyzeFile(); - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/ParserFactoryTest.cs b/src/ReportGenerator.Console.Test/Parser/ParserFactoryTest.cs deleted file mode 100644 index afd3d944..00000000 --- a/src/ReportGenerator.Console.Test/Parser/ParserFactoryTest.cs +++ /dev/null @@ -1,126 +0,0 @@ -using System.IO; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser; - -namespace Palmmedia.ReportGeneratorTest.Parser -{ - /// <summary> - /// This is a test class for ParserFactory and is intended - /// to contain all ParserFactory Unit Tests - /// </summary> - [TestClass] - public class ParserFactoryTest - { - /// <summary> - /// A test for CreateParser - /// </summary> - [TestMethod] - public void CreateParser_SingleReportFileWithSingleReport_CorrectParserIsReturned() - { - string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "Partcover2.3.xml"); - string parserName = ParserFactory.CreateParser(new string[] { filePath }, new string[] { }).ToString(); - Assert.AreEqual("PartCover23Parser", parserName, "Wrong parser"); - - filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "Partcover2.2.xml"); - parserName = ParserFactory.CreateParser(new string[] { filePath }, new string[] { }).ToString(); - Assert.AreEqual("PartCover22Parser", parserName, "Wrong parser"); - - filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "NCover1.5.8.xml"); - parserName = ParserFactory.CreateParser(new string[] { filePath }, new string[] { }).ToString(); - Assert.AreEqual("NCoverParser", parserName, "Wrong parser"); - - filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "OpenCover.xml"); - parserName = ParserFactory.CreateParser(new string[] { filePath }, new string[] { }).ToString(); - Assert.AreEqual("OpenCoverParser", parserName, "Wrong parser"); - - filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "dotCover.xml"); - parserName = ParserFactory.CreateParser(new string[] { filePath }, new string[] { }).ToString(); - Assert.AreEqual("DotCoverParser", parserName, "Wrong parser"); - - filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "VisualStudio2010.coveragexml"); - parserName = ParserFactory.CreateParser(new string[] { filePath }, new string[] { }).ToString(); - Assert.AreEqual("VisualStudioParser", parserName, "Wrong parser"); - - filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "DynamicCodeCoverage.xml"); - parserName = ParserFactory.CreateParser(new string[] { filePath }, new string[] { }).ToString(); - Assert.AreEqual("DynamicCodeCoverageParser", parserName, "Wrong parser"); - - filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "mprof-report.xml"); - parserName = ParserFactory.CreateParser(new string[] { filePath }, new string[] { }).ToString(); - Assert.AreEqual("MProfParser", parserName, "Wrong parser"); - - filePath = Path.Combine(FileManager.GetJavaReportDirectory(), "Cobertura2.1.1.xml"); - parserName = ParserFactory.CreateParser(new string[] { filePath }, new string[] { }).ToString(); - Assert.AreEqual("CoberturaParser", parserName, "Wrong parser"); - } - - /// <summary> - /// A test for CreateParser - /// </summary> - [TestMethod] - public void CreateParser_SingleReportFileWithSeveralReports_CorrectParserIsReturned() - { - string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiPartcover2.3.xml"); - string parserName = ParserFactory.CreateParser(new string[] { filePath }, new string[] { }).ToString(); - Assert.AreEqual("MultiReportParser (2x PartCover23Parser)", parserName, "Wrong parser"); - - filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiPartcover2.2.xml"); - parserName = ParserFactory.CreateParser(new string[] { filePath }, new string[] { }).ToString(); - Assert.AreEqual("MultiReportParser (2x PartCover22Parser)", parserName, "Wrong parser"); - - filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiNCover1.5.8.xml"); - parserName = ParserFactory.CreateParser(new string[] { filePath }, new string[] { }).ToString(); - Assert.AreEqual("MultiReportParser (2x NCoverParser)", parserName, "Wrong parser"); - - filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiOpenCover.xml"); - parserName = ParserFactory.CreateParser(new string[] { filePath }, new string[] { }).ToString(); - Assert.AreEqual("MultiReportParser (2x OpenCoverParser)", parserName, "Wrong parser"); - - filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultidotCover.xml"); - parserName = ParserFactory.CreateParser(new string[] { filePath }, new string[] { }).ToString(); - Assert.AreEqual("MultiReportParser (2x DotCoverParser)", parserName, "Wrong parser"); - - filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiVisualStudio2010.coveragexml"); - parserName = ParserFactory.CreateParser(new string[] { filePath }, new string[] { }).ToString(); - Assert.AreEqual("MultiReportParser (2x VisualStudioParser)", parserName, "Wrong parser"); - - filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiDynamicCodeCoverage.xml"); - parserName = ParserFactory.CreateParser(new string[] { filePath }, new string[] { }).ToString(); - Assert.AreEqual("MultiReportParser (2x DynamicCodeCoverageParser)", parserName, "Wrong parser"); - } - - /// <summary> - /// A test for CreateParser - /// </summary> - [TestMethod] - public void CreateParser_SeveralReportFilesWithSingleReport_CorrectParserIsReturned() - { - string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "Partcover2.2.xml"); - string filePath2 = Path.Combine(FileManager.GetCSharpReportDirectory(), "Partcover2.3.xml"); - string parserName = ParserFactory.CreateParser(new string[] { filePath, filePath2 }, new string[] { }).ToString(); - Assert.AreEqual("MultiReportParser (1x PartCover22Parser, 1x PartCover23Parser)", parserName, "Wrong parser"); - } - - /// <summary> - /// A test for CreateParser - /// </summary> - [TestMethod] - public void CreateParser_SeveralReportFilesWithSeveralReports_CorrectParserIsReturned() - { - string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "Partcover2.2.xml"); - string filePath2 = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiPartcover2.3.xml"); - string parserName = ParserFactory.CreateParser(new string[] { filePath, filePath2 }, new string[] { }).ToString(); - Assert.AreEqual("MultiReportParser (1x PartCover22Parser, 2x PartCover23Parser)", parserName, "Wrong parser"); - } - - /// <summary> - /// A test for CreateParser - /// </summary> - [TestMethod] - public void CreateParser_NoReports_CorrectParserIsReturned() - { - string parserName = ParserFactory.CreateParser(new string[] { string.Empty }, new string[] { }).ToString(); - Assert.AreEqual(string.Empty, parserName, "Wrong parser"); - } - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/PartCover22ParserTest.cs b/src/ReportGenerator.Console.Test/Parser/PartCover22ParserTest.cs deleted file mode 100644 index e4fce4c5..00000000 --- a/src/ReportGenerator.Console.Test/Parser/PartCover22ParserTest.cs +++ /dev/null @@ -1,194 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Parser.Preprocessing; -using Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch; - -namespace Palmmedia.ReportGeneratorTest.Parser -{ - /// <summary> - /// This is a test class for PartCover22Parser and is intended - /// to contain all PartCover22Parser Unit Tests - /// </summary> - [TestClass] - public class PartCover22ParserTest - { - private static readonly string FilePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "Partcover2.2.xml"); - - private static IEnumerable<Assembly> assembliesWithoutPreprocessing; - - private static IEnumerable<Assembly> assembliesWithPreprocessing; - - #region Additional test attributes - - // You can use the following additional attributes as you write your tests: - - // Use ClassInitialize to run code before running the first test in the class - [ClassInitialize] - public static void MyClassInitialize(TestContext testContext) - { - assembliesWithoutPreprocessing = new PartCover22Parser(XDocument.Load(FilePath)).Assemblies; - - var report = XDocument.Load(FilePath); - var classSearcherFactory = new ClassSearcherFactory(); - var globalClassSearcher = classSearcherFactory.CreateClassSearcher("C:\\test"); - new PartCover22ReportPreprocessor(report, classSearcherFactory, globalClassSearcher).Execute(); - assembliesWithPreprocessing = new PartCover22Parser(report).Assemblies; - } - - #endregion - - /// <summary> - /// A test for NumberOfLineVisits - /// </summary> - [TestMethod] - public void NumberOfLineVisitsTest_WithoutPreprocessing() - { - var fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.TestClass", "C:\\temp\\TestClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 18).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(2, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(4, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - } - - /// <summary> - /// A test for NumberOfLineVisits - /// </summary> - [TestMethod] - public void NumberOfLineVisitsTest_WithPreprocessing() - { - var fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.TestClass", "C:\\temp\\TestClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 18).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); - Assert.AreEqual(3, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(2, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(4, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - } - - /// <summary> - /// A test for LineVisitStatus - /// </summary> - [TestMethod] - public void LineVisitStatusTest() - { - var fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.TestClass", "C:\\temp\\TestClass.cs"); - - var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); - Assert.AreEqual(LineVisitStatus.NotCoverable, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 15); - Assert.AreEqual(LineVisitStatus.Covered, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 18); - Assert.AreEqual(LineVisitStatus.NotCovered, line.LineVisitStatus, "Wrong line visit status"); - } - - /// <summary> - /// A test for NumberOfFiles - /// </summary> - [TestMethod] - public void NumberOfFilesTest() - { - Assert.AreEqual(5, assembliesWithoutPreprocessing.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for FilesOfClass - /// </summary> - [TestMethod] - public void FilesOfClassTest() - { - Assert.AreEqual(1, assembliesWithoutPreprocessing.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").Files.Count(), "Wrong number of files"); - Assert.AreEqual(2, assembliesWithoutPreprocessing.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.PartialClass").Files.Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for ClassesInAssembly - /// </summary> - [TestMethod] - public void ClassesInAssemblyTest() - { - Assert.AreEqual(7, assembliesWithoutPreprocessing.SelectMany(a => a.Classes).Count(), "Wrong number of classes"); - } - - /// <summary> - /// A test for Assemblies - /// </summary> - [TestMethod] - public void AssembliesTest() - { - Assert.AreEqual(1, assembliesWithoutPreprocessing.Count(), "Wrong number of assemblies"); - } - - /// <summary> - /// A test for MethodMetrics - /// </summary> - [TestMethod] - public void MethodMetricsTest() - { - Assert.AreEqual(0, assembliesWithoutPreprocessing.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").MethodMetrics.Count(), "Wrong number of metrics"); - } - - /// <summary> - /// A test for CodeElements - /// </summary> - [TestMethod] - public void CodeElementsTest() - { - var codeElements = GetFile(assembliesWithPreprocessing, "Test.TestClass", "C:\\temp\\TestClass.cs").CodeElements; - Assert.AreEqual(1, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assembliesWithPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass.cs").CodeElements; - Assert.AreEqual(4, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assembliesWithPreprocessing, "Test.TestClass2", "C:\\temp\\TestClass2.cs").CodeElements; - Assert.AreEqual(10, codeElements.Count(), "Wrong number of code elements"); - } - - private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "Test").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName); - - private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "Test").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName) - .AnalyzeFile(); - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/PartCover23ParserTest.cs b/src/ReportGenerator.Console.Test/Parser/PartCover23ParserTest.cs deleted file mode 100644 index 04cd8ab7..00000000 --- a/src/ReportGenerator.Console.Test/Parser/PartCover23ParserTest.cs +++ /dev/null @@ -1,194 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Parser.Preprocessing; -using Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch; - -namespace Palmmedia.ReportGeneratorTest.Parser -{ - /// <summary> - /// This is a test class for PartCover23Parser and is intended - /// to contain all PartCover23Parser Unit Tests - /// </summary> - [TestClass] - public class PartCover23ParserTest - { - private static readonly string FilePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "Partcover2.3.xml"); - - private static IEnumerable<Assembly> assembliesWithoutPreprocessing; - - private static IEnumerable<Assembly> assembliesWithPreprocessing; - - #region Additional test attributes - - // You can use the following additional attributes as you write your tests: - - // Use ClassInitialize to run code before running the first test in the class - [ClassInitialize] - public static void MyClassInitialize(TestContext testContext) - { - assembliesWithoutPreprocessing = new PartCover23Parser(XDocument.Load(FilePath)).Assemblies; - - var report = XDocument.Load(FilePath); - var classSearcherFactory = new ClassSearcherFactory(); - var globalClassSearcher = classSearcherFactory.CreateClassSearcher("C:\\test"); - new PartCover23ReportPreprocessor(report, classSearcherFactory, globalClassSearcher).Execute(); - assembliesWithPreprocessing = new PartCover23Parser(report).Assemblies; - } - - #endregion - - /// <summary> - /// A test for NumberOfLineVisits - /// </summary> - [TestMethod] - public void NumberOfLineVisitsTest_WithoutPreprocessing() - { - var fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.TestClass", "C:\\temp\\TestClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 18).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(2, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(4, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - } - - /// <summary> - /// A test for NumberOfLineVisits - /// </summary> - [TestMethod] - public void NumberOfLineVisitsTest_WithPreprocessing() - { - var fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.TestClass", "C:\\temp\\TestClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 18).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); - Assert.AreEqual(3, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(2, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(4, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - } - - /// <summary> - /// A test for LineVisitStatus - /// </summary> - [TestMethod] - public void LineVisitStatusTest() - { - var fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.TestClass", "C:\\temp\\TestClass.cs"); - - var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); - Assert.AreEqual(LineVisitStatus.NotCoverable, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 15); - Assert.AreEqual(LineVisitStatus.Covered, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 18); - Assert.AreEqual(LineVisitStatus.NotCovered, line.LineVisitStatus, "Wrong line visit status"); - } - - /// <summary> - /// A test for NumberOfFiles - /// </summary> - [TestMethod] - public void NumberOfFilesTest() - { - Assert.AreEqual(5, assembliesWithoutPreprocessing.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for FilesOfClass - /// </summary> - [TestMethod] - public void FilesOfClassTest() - { - Assert.AreEqual(1, assembliesWithoutPreprocessing.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").Files.Count(), "Wrong number of files"); - Assert.AreEqual(2, assembliesWithoutPreprocessing.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.PartialClass").Files.Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for ClassesInAssembly - /// </summary> - [TestMethod] - public void ClassesInAssemblyTest() - { - Assert.AreEqual(7, assembliesWithoutPreprocessing.SelectMany(a => a.Classes).Count(), "Wrong number of classes"); - } - - /// <summary> - /// A test for Assemblies - /// </summary> - [TestMethod] - public void AssembliesTest() - { - Assert.AreEqual(1, assembliesWithoutPreprocessing.Count(), "Wrong number of assemblies"); - } - - /// <summary> - /// A test for MethodMetrics - /// </summary> - [TestMethod] - public void MethodMetricsTest() - { - Assert.AreEqual(0, assembliesWithoutPreprocessing.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").MethodMetrics.Count(), "Wrong number of metrics"); - } - - /// <summary> - /// A test for CodeElements - /// </summary> - [TestMethod] - public void CodeElementsTest() - { - var codeElements = GetFile(assembliesWithPreprocessing, "Test.TestClass", "C:\\temp\\TestClass.cs").CodeElements; - Assert.AreEqual(1, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assembliesWithPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass.cs").CodeElements; - Assert.AreEqual(4, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assembliesWithPreprocessing, "Test.TestClass2", "C:\\temp\\TestClass2.cs").CodeElements; - Assert.AreEqual(10, codeElements.Count(), "Wrong number of code elements"); - } - - private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "Test").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName); - - private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "Test").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName) - .AnalyzeFile(); - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/PartCover23ParserTest_35109.cs b/src/ReportGenerator.Console.Test/Parser/PartCover23ParserTest_35109.cs deleted file mode 100644 index bee11cc0..00000000 --- a/src/ReportGenerator.Console.Test/Parser/PartCover23ParserTest_35109.cs +++ /dev/null @@ -1,195 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Parser.Preprocessing; -using Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch; - -namespace Palmmedia.ReportGeneratorTest.Parser -{ - /// <summary> - /// This is a test class for PartCover23Parser and is intended - /// to contain all PartCover23Parser Unit Tests - /// </summary> - [TestClass] - public class PartCover23ParserTest_35109 - { - private static readonly string FilePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "Partcover2.3.0.35109.xml"); - - private static IEnumerable<Assembly> assembliesWithoutPreprocessing; - - private static IEnumerable<Assembly> assembliesWithPreprocessing; - - #region Additional test attributes - - // You can use the following additional attributes as you write your tests: - - // Use ClassInitialize to run code before running the first test in the class - [ClassInitialize] - public static void MyClassInitialize(TestContext testContext) - { - assembliesWithoutPreprocessing = new PartCover23Parser(XDocument.Load(FilePath)).Assemblies; - - var report = XDocument.Load(FilePath); - - var classSearcherFactory = new ClassSearcherFactory(); - var globalClassSearcher = classSearcherFactory.CreateClassSearcher("C:\\test"); - new PartCover23ReportPreprocessor(report, classSearcherFactory, globalClassSearcher).Execute(); - assembliesWithPreprocessing = new PartCover23Parser(report).Assemblies; - } - - #endregion - - /// <summary> - /// A test for NumberOfLineVisits - /// </summary> - [TestMethod] - public void NumberOfLineVisitsTest_WithoutPreprocessing() - { - var fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.TestClass", "C:\\temp\\TestClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 18).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(2, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(4, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithoutPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - } - - /// <summary> - /// A test for NumberOfLineVisits - /// </summary> - [TestMethod] - public void NumberOfLineVisitsTest_WithPreprocessing() - { - var fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.TestClass", "C:\\temp\\TestClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 18).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); - Assert.AreEqual(3, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(2, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(4, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - } - - /// <summary> - /// A test for LineVisitStatus - /// </summary> - [TestMethod] - public void LineVisitStatusTest() - { - var fileAnalysis = GetFileAnalysis(assembliesWithPreprocessing, "Test.TestClass", "C:\\temp\\TestClass.cs"); - - var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); - Assert.AreEqual(LineVisitStatus.NotCoverable, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 15); - Assert.AreEqual(LineVisitStatus.Covered, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 18); - Assert.AreEqual(LineVisitStatus.NotCovered, line.LineVisitStatus, "Wrong line visit status"); - } - - /// <summary> - /// A test for NumberOfFiles - /// </summary> - [TestMethod] - public void NumberOfFilesTest() - { - Assert.AreEqual(5, assembliesWithoutPreprocessing.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for FilesOfClass - /// </summary> - [TestMethod] - public void FilesOfClassTest() - { - Assert.AreEqual(1, assembliesWithoutPreprocessing.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").Files.Count(), "Wrong number of files"); - Assert.AreEqual(2, assembliesWithoutPreprocessing.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.PartialClass").Files.Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for ClassesInAssembly - /// </summary> - [TestMethod] - public void ClassesInAssemblyTest() - { - Assert.AreEqual(7, assembliesWithoutPreprocessing.SelectMany(a => a.Classes).Count(), "Wrong number of classes"); - } - - /// <summary> - /// A test for Assemblies - /// </summary> - [TestMethod] - public void AssembliesTest() - { - Assert.AreEqual(1, assembliesWithoutPreprocessing.Count(), "Wrong number of assemblies"); - } - - /// <summary> - /// A test for MethodMetrics - /// </summary> - [TestMethod] - public void MethodMetricsTest() - { - Assert.AreEqual(0, assembliesWithoutPreprocessing.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").MethodMetrics.Count(), "Wrong number of metrics"); - } - - /// <summary> - /// A test for CodeElements - /// </summary> - [TestMethod] - public void CodeElementsTest() - { - var codeElements = GetFile(assembliesWithPreprocessing, "Test.TestClass", "C:\\temp\\TestClass.cs").CodeElements; - Assert.AreEqual(1, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assembliesWithPreprocessing, "Test.PartialClass", "C:\\temp\\PartialClass.cs").CodeElements; - Assert.AreEqual(4, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assembliesWithPreprocessing, "Test.TestClass2", "C:\\temp\\TestClass2.cs").CodeElements; - Assert.AreEqual(10, codeElements.Count(), "Wrong number of code elements"); - } - - private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "Test").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName); - - private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "Test").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName) - .AnalyzeFile(); - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/Preprocessing/CodeAnalysis/SourceCodeAnalyzerTest.cs b/src/ReportGenerator.Console.Test/Parser/Preprocessing/CodeAnalysis/SourceCodeAnalyzerTest.cs deleted file mode 100644 index ad685001..00000000 --- a/src/ReportGenerator.Console.Test/Parser/Preprocessing/CodeAnalysis/SourceCodeAnalyzerTest.cs +++ /dev/null @@ -1,113 +0,0 @@ -using System.IO; -using System.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser.Preprocessing.CodeAnalysis; - -namespace Palmmedia.ReportGeneratorTest.Parser.Preprocessing.CodeAnalysis -{ - /// <summary> - /// This is a test class for SourceCodeAnalyzer and is intended - /// to contain all SourceCodeAnalyzer Unit Tests - /// </summary> - [TestClass] - public class SourceCodeAnalyzerTest - { - private static string elementClassFile = Path.Combine(FileManager.GetCSharpCodeDirectory(), "AnalyzerTestClass.cs"); - - /// <summary> - /// A test for GetClassesInFile - /// </summary> - [TestMethod] - public void GetClassesInFile_AllClassesAreReturned() - { - var classes = SourceCodeAnalyzer.GetClassesInFile(Path.Combine(FileManager.GetCSharpCodeDirectory(), "TestClass.cs")); - - Assert.IsNotNull(classes, "Classes must not be null."); - Assert.IsTrue(classes.Contains("Test.TestClass"), "Classes does not contain root class"); - Assert.IsTrue(classes.Contains("Test.TestClassNestedClass"), "Classes does not contain nested class"); - } - - /// <summary> - /// A test for FindMethod - /// </summary> - [TestMethod] - public void FindMethod_SearchExistingMethod_PositionMustNotBeNullAndSupplyCorrectLinenumber() - { - PartCoverMethodElement partCoverMethodElement = new PartCoverMethodElement( - "Test.AnalyzerTestClass", - "DoSomething", - "string (string, string[], System.Guid, string, string, System.Decimal, int, long, stringint, ref int, float, double, bool, unsigned byte, char, object, byte, short, unsigned int, unsigned long, unsigned short, ICSharpCode.NRefactory.Ast.INode)"); - - var methodPosition = SourceCodeAnalyzer.FindSourceElement(elementClassFile, partCoverMethodElement); - - Assert.IsNotNull(methodPosition, "MethodPosition must not be null."); - - Assert.AreEqual(37, methodPosition.Start, "Start line number does not match."); - Assert.AreEqual(40, methodPosition.End, "End line number does not match."); - } - - /// <summary> - /// A test for FindMethod - /// </summary> - [TestMethod] - public void FindMethod_SearchExistingConstructor_PositionMustNotBeNullAndSupplyCorrectLinenumber() - { - PartCoverMethodElement partCoverMethodElement = new PartCoverMethodElement( - "Test.AnalyzerTestClass", - ".ctor", - "void ()"); - - var methodPosition = SourceCodeAnalyzer.FindSourceElement(elementClassFile, partCoverMethodElement); - - Assert.IsNotNull(methodPosition, "MethodPosition must not be null."); - - Assert.AreEqual(10, methodPosition.Start, "Start line number does not match."); - Assert.AreEqual(12, methodPosition.End, "End line number does not match."); - } - - /// <summary> - /// A test for FindMethod - /// </summary> - [TestMethod] - public void FindMethod_SearchNonExistingGenericMethod_PositionIsNull() - { - PartCoverMethodElement partCoverMethodElement = new PartCoverMethodElement( - "TestNamespace.AnalyzerTestClass", - "GenericMethod", - "void (int)"); - - var methodPosition = SourceCodeAnalyzer.FindSourceElement(elementClassFile, partCoverMethodElement); - - Assert.IsNull(methodPosition, "MethodPosition is not null."); - } - - /// <summary> - /// A test for FindProperty - /// </summary> - [TestMethod] - public void FindProperty_SearchExistingProperty_PositionMustNotBeNullAndSupplyCorrectLinenumber() - { - PropertyElement propertyElement = new PropertyElement("Test.AnalyzerTestClass", "get_AutoProperty"); - - var propertyPosition = SourceCodeAnalyzer.FindSourceElement(elementClassFile, propertyElement); - - Assert.IsNotNull(propertyPosition, "PropertyPosition must not be null."); - - Assert.AreEqual(46, propertyPosition.Start, "Start line number does not match."); - Assert.AreEqual(46, propertyPosition.End, "End line number does not match."); - } - - /// <summary> - /// A test for FindProperty - /// </summary> - [TestMethod] - public void FindProperty_SearchNonExistingProperty_PositionIsNull() - { - PropertyElement propertyElement = new PropertyElement("Test.AnalyzerTestClass", "get_DoesNotExist"); - - var propertyPosition = SourceCodeAnalyzer.FindSourceElement(elementClassFile, propertyElement); - - Assert.IsNull(propertyPosition, "PropertyPosition is not null."); - } - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/Preprocessing/FileSearch/ClassSearcherFactoryTest.cs b/src/ReportGenerator.Console.Test/Parser/Preprocessing/FileSearch/ClassSearcherFactoryTest.cs deleted file mode 100644 index f445413d..00000000 --- a/src/ReportGenerator.Console.Test/Parser/Preprocessing/FileSearch/ClassSearcherFactoryTest.cs +++ /dev/null @@ -1,55 +0,0 @@ -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch; - -namespace Palmmedia.ReportGeneratorTest.Parser.Preprocessing.FileSearch -{ - /// <summary> - /// This is a test class for ClassSearcherFactory and is intended - /// to contain all ClassSearcherFactory Unit Tests - /// </summary> - [TestClass] - public class ClassSearcherFactoryTest - { - /// <summary> - /// A test for CreateClassSearcher - /// </summary> - [TestMethod] - public void CreateClassSearcher_PassNull_ClassSearcherWithNullDirectoryIsReturned() - { - var sut = new ClassSearcherFactory(); - - var classSearcher = sut.CreateClassSearcher((string)null); - - Assert.IsNotNull(classSearcher, "ClassSearcher must not be null"); - Assert.IsNull(classSearcher.Directory, "ClassSearcher directory must be null"); - } - - /// <summary> - /// A test for CreateClassSearcher - /// </summary> - [TestMethod] - public void CreateClassSearcher_PassSubdirectory_CachedInstanceIsReturned() - { - var sut = new ClassSearcherFactory(); - - var classSearcher1 = sut.CreateClassSearcher("C:\\temp"); - var classSearcher2 = sut.CreateClassSearcher("C:\\temp\\sub"); - - Assert.AreSame(classSearcher1, classSearcher2, "ClassSearchers are not the same instance."); - } - - /// <summary> - /// A test for CreateClassSearcher - /// </summary> - [TestMethod] - public void CreateClassSearcher_PassParentDirectory_NewInstanceIsReturned() - { - var sut = new ClassSearcherFactory(); - - var classSearcher1 = sut.CreateClassSearcher("C:\\temp"); - var classSearcher2 = sut.CreateClassSearcher("C:\\"); - - Assert.AreNotSame(classSearcher1, classSearcher2, "ClassSearchers are the same instance."); - } - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/Preprocessing/FileSearch/ClassSearcherTest.cs b/src/ReportGenerator.Console.Test/Parser/Preprocessing/FileSearch/ClassSearcherTest.cs deleted file mode 100644 index c0fb7a39..00000000 --- a/src/ReportGenerator.Console.Test/Parser/Preprocessing/FileSearch/ClassSearcherTest.cs +++ /dev/null @@ -1,64 +0,0 @@ -using System.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch; - -namespace Palmmedia.ReportGeneratorTest.Parser.Preprocessing.FileSearch -{ - /// <summary> - /// This is a test class for ClassSearcher and is intended - /// to contain all ClassSearcher Unit Tests - /// </summary> - [TestClass] - public class ClassSearcherTest - { - private static ClassSearcher classSearcher; - - #region Additional test attributes - - // Use ClassInitialize to run code before running the first test in the class - [ClassInitialize] - public static void MyClassInitialize(TestContext testContext) - { - classSearcher = new ClassSearcher("C:\\temp"); - } - - #endregion - - /// <summary> - /// A test for GetFilesOfClass - /// </summary> - [TestMethod] - public void GetFilesOfClass_PartialClassWith2Files_2FilesFound() - { - var files = classSearcher.GetFilesOfClass("Test.PartialClass"); - - Assert.IsNotNull(files, "Files must not be null."); - Assert.IsTrue(files.Contains("C:\\temp\\PartialClass.cs"), "Files does not contain expected file"); - Assert.IsTrue(files.Contains("C:\\temp\\PartialClass2.cs"), "Files does not contain expected file"); - } - - /// <summary> - /// A test for GetFilesOfClass - /// </summary> - [TestMethod] - public void GetFilesOfClass_NestedClass_1FileFound() - { - var files = classSearcher.GetFilesOfClass("Test.TestClassNestedClass"); - - Assert.IsNotNull(files, "Files must not be null."); - Assert.IsTrue(files.Contains("C:\\temp\\TestClass.cs"), "Files does not contain expected file"); - } - - /// <summary> - /// A test for GetFilesOfClass - /// </summary> - [TestMethod] - public void GetFilesOfClass_NotExistingClass_0FilesFound() - { - var files = classSearcher.GetFilesOfClass("Test.Test123"); - - Assert.IsNotNull(files, "Files must not be null."); - Assert.IsFalse(files.Any()); - } - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/Preprocessing/FileSearch/CommonDirectorySearcherTest.cs b/src/ReportGenerator.Console.Test/Parser/Preprocessing/FileSearch/CommonDirectorySearcherTest.cs deleted file mode 100644 index dc97fc80..00000000 --- a/src/ReportGenerator.Console.Test/Parser/Preprocessing/FileSearch/CommonDirectorySearcherTest.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch; - -namespace Palmmedia.ReportGeneratorTest.Parser.Preprocessing.FileSearch -{ - /// <summary> - /// This is a test class for CommonDirectorySearcher and is intended - /// to contain all CommonDirectorySearcher Unit Tests - /// </summary> - [TestClass] - public class CommonDirectorySearcherTest - { - /// <summary> - /// A test for GetCommonDirectory - /// </summary> - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] - public void GetCommonDirectory_PassNull_ArgumentNullExceptionIsThrown() - { - CommonDirectorySearcher.GetCommonDirectory(null); - } - - /// <summary> - /// A test for GetCommonDirectory - /// </summary> - [TestMethod] - public void GetCommonDirectory_EmptyArray_Null() - { - Assert.IsNull(CommonDirectorySearcher.GetCommonDirectory(new string[] { })); - } - - /// <summary> - /// A test for GetCommonDirectory - /// </summary> - [TestMethod] - public void GetCommonDirectory_NoCommonString_EmptyString() - { - Assert.AreEqual(string.Empty, CommonDirectorySearcher.GetCommonDirectory(new[] { "C:\\", "D:\\" })); - } - - /// <summary> - /// A test for GetCommonDirectory - /// </summary> - [TestMethod] - public void GetCommonDirectory_SingleCharacterCommonString_CommonString() - { - Assert.AreEqual("C:\\", CommonDirectorySearcher.GetCommonDirectory(new[] { "C:\\a", "C:\\ab" })); - } - - /// <summary> - /// A test for GetCommonDirectory - /// </summary> - [TestMethod] - public void GetCommonDirectory_SeveralCharacterCommonString_CommonString() - { - Assert.AreEqual("C:\\abc\\", CommonDirectorySearcher.GetCommonDirectory(new[] { "C:\\abc\\1", "C:\\abc\\2", "C:\\abc\\3" })); - } - - /// <summary> - /// A test for GetCommonDirectory - /// </summary> - [TestMethod] - public void GetCommonDirectory_DifferingCase_CommonStringCaseInsensitive() - { - Assert.AreEqual("C:\\abc\\", CommonDirectorySearcher.GetCommonDirectory(new[] { "C:\\Abc\\1", "C:\\abc\\2" }), true); - } - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/Preprocessing/PartCover22ReportPreprocessorTest.cs b/src/ReportGenerator.Console.Test/Parser/Preprocessing/PartCover22ReportPreprocessorTest.cs deleted file mode 100644 index 9fd31fe7..00000000 --- a/src/ReportGenerator.Console.Test/Parser/Preprocessing/PartCover22ReportPreprocessorTest.cs +++ /dev/null @@ -1,48 +0,0 @@ -using System.IO; -using System.Linq; -using System.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser.Preprocessing; -using Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch; - -namespace Palmmedia.ReportGeneratorTest.Parser.Preprocessing -{ - /// <summary> - /// This is a test class for PartCover22ReportPreprocessor and is intended - /// to contain all PartCover22ReportPreprocessor Unit Tests - /// </summary> - [TestClass] - public class PartCover22ReportPreprocessorTest - { - private static readonly string FilePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "Partcover2.2.xml"); - - /// <summary> - /// A test for Execute - /// </summary> - [TestMethod] - public void Execute_SequencePointsOfAutoPropertiesAdded() - { - XDocument report = XDocument.Load(FilePath); - - var classSearcherFactory = new ClassSearcherFactory(); - new PartCover22ReportPreprocessor(report, classSearcherFactory, new ClassSearcher(string.Empty)).Execute(); - - Assert.AreEqual(7, report.Root.Elements("file").Count(), "Wrong number of total files."); - - var gettersAndSetters = report.Root.Elements("type") - .Single(c => c.Attribute("name").Value == "Test.TestClass2") - .Elements("method") - .Where(m => m.Attribute("name").Value.StartsWith("get_") || m.Attribute("name").Value.StartsWith("set_")) - .Elements("code") - .Select(c => c.Element("pt")); - - Assert.IsTrue(gettersAndSetters.Any()); - - foreach (var getterOrSetter in gettersAndSetters) - { - Assert.IsTrue(getterOrSetter.Attribute("fid") != null); - Assert.IsTrue(getterOrSetter.Attribute("sl") != null); - } - } - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/Preprocessing/PartCover23ReportPreprocessorTest.cs b/src/ReportGenerator.Console.Test/Parser/Preprocessing/PartCover23ReportPreprocessorTest.cs deleted file mode 100644 index 1dbfd8f8..00000000 --- a/src/ReportGenerator.Console.Test/Parser/Preprocessing/PartCover23ReportPreprocessorTest.cs +++ /dev/null @@ -1,60 +0,0 @@ -using System.IO; -using System.Linq; -using System.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser.Preprocessing; -using Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch; - -namespace Palmmedia.ReportGeneratorTest.Parser.Preprocessing -{ - /// <summary> - /// This is a test class for PartCover23ReportPreprocessor and is intended - /// to contain all PartCover23ReportPreprocessor Unit Tests - /// </summary> - [TestClass] - public class PartCover23ReportPreprocessorTest - { - private static readonly string FilePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "Partcover2.3.0.35109.xml"); - - /// <summary> - /// A test for Execute - /// </summary> - [TestMethod] - public void Execute_SequencePointsOfAutoPropertiesAndCoverageDataOfUnexecutedMethodsAdded() - { - XDocument report = XDocument.Load(FilePath); - - var classSearcherFactory = new ClassSearcherFactory(); - new PartCover23ReportPreprocessor(report, classSearcherFactory, new ClassSearcher(string.Empty)).Execute(); - - Assert.AreEqual(7, report.Root.Elements("File").Count(), "Wrong number of total files."); - - var gettersAndSetters = report.Root.Elements("Type") - .Single(c => c.Attribute("name").Value == "Test.TestClass2") - .Elements("Method") - .Where(m => m.Attribute("name").Value.StartsWith("get_") || m.Attribute("name").Value.StartsWith("set_")) - .Select(c => c.Element("pt")); - - Assert.IsTrue(gettersAndSetters.Any()); - - foreach (var getterOrSetter in gettersAndSetters) - { - Assert.IsTrue(getterOrSetter.Attribute("fid") != null); - Assert.IsTrue(getterOrSetter.Attribute("sl") != null); - } - - var unexecutedMethod = report.Root.Elements("Type") - .Single(c => c.Attribute("name").Value == "Test.TestClass2") - .Elements("Method") - .Single(m => m.Attribute("name").Value == "UnExecutedMethod"); - - Assert.AreEqual(4, unexecutedMethod.Elements("pt").Count(), "Wrong number of sequence points."); - - foreach (var sequencePoint in unexecutedMethod.Elements("pt")) - { - Assert.IsTrue(sequencePoint.Attribute("fid") != null); - Assert.IsTrue(sequencePoint.Attribute("sl") != null); - } - } - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/VisualStudioParserTest_2010.cs b/src/ReportGenerator.Console.Test/Parser/VisualStudioParserTest_2010.cs deleted file mode 100644 index d82770d9..00000000 --- a/src/ReportGenerator.Console.Test/Parser/VisualStudioParserTest_2010.cs +++ /dev/null @@ -1,170 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser; -using Palmmedia.ReportGenerator.Parser.Analysis; - -namespace Palmmedia.ReportGeneratorTest.Parser -{ - /// <summary> - /// This is a test class for VisualStudioParser and is intended - /// to contain all VisualStudioParser Unit Tests for Visual Studio 2010 - /// </summary> - [TestClass] - public class VisualStudioParserTest_2010 - { - private static readonly string FilePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "VisualStudio2010.coveragexml"); - - private static IEnumerable<Assembly> assemblies; - - #region Additional test attributes - - // You can use the following additional attributes as you write your tests: - - // Use ClassInitialize to run code before running the first test in the class - [ClassInitialize] - public static void MyClassInitialize(TestContext testContext) - { - var report = XDocument.Load(FilePath); - assemblies = new VisualStudioParser(report).Assemblies; - } - - #endregion - - /// <summary> - /// A test for NumberOfLineVisits - /// </summary> - [TestMethod] - public void NumberOfLineVisitsTest() - { - var fileAnalysis = GetFileAnalysis(assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 10).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 11).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 12).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 23).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - } - - /// <summary> - /// A test for LineVisitStatus - /// </summary> - [TestMethod] - public void LineVisitStatusTest() - { - var fileAnalysis = GetFileAnalysis(assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); - - var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); - Assert.AreEqual(LineVisitStatus.NotCoverable, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 15); - Assert.AreEqual(LineVisitStatus.Covered, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 22); - Assert.AreEqual(LineVisitStatus.NotCovered, line.LineVisitStatus, "Wrong line visit status"); - } - - /// <summary> - /// A test for NumberOfFiles - /// </summary> - [TestMethod] - public void NumberOfFilesTest() - { - Assert.AreEqual(7, assemblies.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for FilesOfClass - /// </summary> - [TestMethod] - public void FilesOfClassTest() - { - Assert.AreEqual(1, assemblies.Single(a => a.Name == "Test.exe").Classes.Single(c => c.Name == "Test.TestClass").Files.Count(), "Wrong number of files"); - Assert.AreEqual(2, assemblies.Single(a => a.Name == "Test.exe").Classes.Single(c => c.Name == "Test.PartialClass").Files.Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for ClassesInAssembly - /// </summary> - [TestMethod] - public void ClassesInAssemblyTest() - { - Assert.AreEqual(7, assemblies.SelectMany(a => a.Classes).Count(), "Wrong number of classes"); - } - - /// <summary> - /// A test for Assemblies - /// </summary> - [TestMethod] - public void AssembliesTest() - { - Assert.AreEqual(1, assemblies.Count(), "Wrong number of assemblies"); - } - - /// <summary> - /// A test for MethodMetrics - /// </summary> - [TestMethod] - public void MethodMetricsTest() - { - var metrics = assemblies.Single(a => a.Name == "Test.exe").Classes.Single(c => c.Name == "Test.TestClass").MethodMetrics; - - Assert.AreEqual(2, metrics.Count(), "Wrong number of method metrics"); - Assert.AreEqual("SampleFunction()", metrics.First().Name, "Wrong name of method"); - Assert.AreEqual(2, metrics.First().Metrics.Count(), "Wrong number of metrics"); - - Assert.AreEqual("Blocks covered", metrics.First().Metrics.ElementAt(0).Name, "Wrong name of metric"); - Assert.AreEqual(9, metrics.First().Metrics.ElementAt(0).Value, "Wrong value of metric"); - Assert.AreEqual("Blocks not covered", metrics.First().Metrics.ElementAt(1).Name, "Wrong name of metric"); - Assert.AreEqual(4, metrics.First().Metrics.ElementAt(1).Value, "Wrong value of metric"); - } - - /// <summary> - /// A test for CodeElements - /// </summary> - [TestMethod] - public void CodeElementsTest() - { - var codeElements = GetFile(assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs").CodeElements; - Assert.AreEqual(2, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs").CodeElements; - Assert.AreEqual(4, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs").CodeElements; - Assert.AreEqual(6, codeElements.Count(), "Wrong number of code elements"); - } - - private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "Test.exe").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName); - - private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "Test.exe").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName) - .AnalyzeFile(); - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/VisualStudioParserTest_2012.cs b/src/ReportGenerator.Console.Test/Parser/VisualStudioParserTest_2012.cs deleted file mode 100644 index 710fabee..00000000 --- a/src/ReportGenerator.Console.Test/Parser/VisualStudioParserTest_2012.cs +++ /dev/null @@ -1,166 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser; -using Palmmedia.ReportGenerator.Parser.Analysis; - -namespace Palmmedia.ReportGeneratorTest.Parser -{ - /// <summary> - /// This is a test class for VisualStudioParser and is intended - /// to contain all VisualStudioParser Unit Tests for Visual Studio 2012 - /// </summary> - [TestClass] - public class VisualStudioParserTest_2012 - { - private static readonly string FilePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "VisualStudio2012.coveragexml"); - - private static IEnumerable<Assembly> assemblies; - - #region Additional test attributes - - // You can use the following additional attributes as you write your tests: - - // Use ClassInitialize to run code before running the first test in the class - [ClassInitialize] - public static void MyClassInitialize(TestContext testContext) - { - var report = XDocument.Load(FilePath); - assemblies = new VisualStudioParser(report).Assemblies; - } - - #endregion - - /// <summary> - /// A test for NumberOfLineVisits - /// </summary> - [TestMethod] - public void NumberOfLineVisitsTest() - { - var fileAnalysis = GetFileAnalysis(assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 18).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 26).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - } - - /// <summary> - /// A test for LineVisitStatus - /// </summary> - [TestMethod] - public void LineVisitStatusTest() - { - var fileAnalysis = GetFileAnalysis(assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); - - var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); - Assert.AreEqual(LineVisitStatus.NotCoverable, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 15); - Assert.AreEqual(LineVisitStatus.Covered, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 18); - Assert.AreEqual(LineVisitStatus.NotCovered, line.LineVisitStatus, "Wrong line visit status"); - } - - /// <summary> - /// A test for NumberOfFiles - /// </summary> - [TestMethod] - public void NumberOfFilesTest() - { - Assert.AreEqual(7, assemblies.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for FilesOfClass - /// </summary> - [TestMethod] - public void FilesOfClassTest() - { - Assert.AreEqual(1, assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "Test.TestClass").Files.Count(), "Wrong number of files"); - Assert.AreEqual(2, assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "Test.PartialClass").Files.Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for ClassesInAssembly - /// </summary> - [TestMethod] - public void ClassesInAssemblyTest() - { - Assert.AreEqual(7, assemblies.SelectMany(a => a.Classes).Count(), "Wrong number of classes"); - } - - /// <summary> - /// A test for Assemblies - /// </summary> - [TestMethod] - public void AssembliesTest() - { - Assert.AreEqual(1, assemblies.Count(), "Wrong number of assemblies"); - } - - /// <summary> - /// A test for MethodMetrics - /// </summary> - [TestMethod] - public void MethodMetricsTest() - { - var metrics = assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "Test.TestClass").MethodMetrics; - - Assert.AreEqual(2, metrics.Count(), "Wrong number of method metrics"); - Assert.AreEqual("SampleFunction()", metrics.First().Name, "Wrong name of method"); - Assert.AreEqual(2, metrics.First().Metrics.Count(), "Wrong number of metrics"); - - Assert.AreEqual("Blocks covered", metrics.First().Metrics.ElementAt(0).Name, "Wrong name of metric"); - Assert.AreEqual(8, metrics.First().Metrics.ElementAt(0).Value, "Wrong value of metric"); - Assert.AreEqual("Blocks not covered", metrics.First().Metrics.ElementAt(1).Name, "Wrong name of metric"); - Assert.AreEqual(4, metrics.First().Metrics.ElementAt(1).Value, "Wrong value of metric"); - } - - /// <summary> - /// A test for CodeElements - /// </summary> - [TestMethod] - public void CodeElementsTest() - { - var codeElements = GetFile(assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs").CodeElements; - Assert.AreEqual(2, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs").CodeElements; - Assert.AreEqual(4, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs").CodeElements; - Assert.AreEqual(6, codeElements.Count(), "Wrong number of code elements"); - } - - private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "test.exe").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName); - - private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "test.exe").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName) - .AnalyzeFile(); - } -} diff --git a/src/ReportGenerator.Console.Test/Parser/VisualStudioParserTest_2013.cs b/src/ReportGenerator.Console.Test/Parser/VisualStudioParserTest_2013.cs deleted file mode 100644 index f2e7323b..00000000 --- a/src/ReportGenerator.Console.Test/Parser/VisualStudioParserTest_2013.cs +++ /dev/null @@ -1,188 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser; -using Palmmedia.ReportGenerator.Parser.Analysis; - -namespace Palmmedia.ReportGeneratorTest.Parser -{ - /// <summary> - /// This is a test class for VisualStudioParser and is intended - /// to contain all VisualStudioParser Unit Tests for Visual Studio 2013 - /// </summary> - [TestClass] - public class VisualStudioParserTest_2013 - { - private static readonly string FilePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "VisualStudio2013.coveragexml"); - - private static IEnumerable<Assembly> assemblies; - - #region Additional test attributes - - // You can use the following additional attributes as you write your tests: - - // Use ClassInitialize to run code before running the first test in the class - [ClassInitialize] - public static void MyClassInitialize(TestContext testContext) - { - var report = XDocument.Load(FilePath); - assemblies = new VisualStudioParser(report).Assemblies; - } - - #endregion - - /// <summary> - /// A test for NumberOfLineVisits - /// </summary> - [TestMethod] - public void NumberOfLineVisitsTest() - { - var fileAnalysis = GetFileAnalysis(assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 10).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 11).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 12).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 23).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - - fileAnalysis = GetFileAnalysis(assemblies, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); - Assert.AreEqual(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits, "Wrong number of line visits"); - Assert.AreEqual(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits, "Wrong number of line visits"); - } - - /// <summary> - /// A test for LineVisitStatus - /// </summary> - [TestMethod] - public void LineVisitStatusTest() - { - var fileAnalysis = GetFileAnalysis(assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); - - var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); - Assert.AreEqual(LineVisitStatus.NotCoverable, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 15); - Assert.AreEqual(LineVisitStatus.Covered, line.LineVisitStatus, "Wrong line visit status"); - - line = fileAnalysis.Lines.Single(l => l.LineNumber == 22); - Assert.AreEqual(LineVisitStatus.NotCovered, line.LineVisitStatus, "Wrong line visit status"); - } - - /// <summary> - /// A test for NumberOfFiles - /// </summary> - [TestMethod] - public void NumberOfFilesTest() - { - Assert.AreEqual(11, assemblies.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for FilesOfClass - /// </summary> - [TestMethod] - public void FilesOfClassTest() - { - Assert.AreEqual(1, assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "Test.TestClass").Files.Count(), "Wrong number of files"); - Assert.AreEqual(2, assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "Test.PartialClass").Files.Count(), "Wrong number of files"); - } - - /// <summary> - /// A test for ClassesInAssembly - /// </summary> - [TestMethod] - public void ClassesInAssemblyTest() - { - Assert.AreEqual(13, assemblies.SelectMany(a => a.Classes).Count(), "Wrong number of classes"); - } - - /// <summary> - /// A test for GetCoverageQuotaOfClass. - /// </summary> - [TestMethod] - public void GetCoverableLinesOfClassTest() - { - Assert.AreEqual(4, assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "Test.AbstractClass").CoverableLines, "Wrong Coverable Lines"); - } - - /// <summary> - /// A test for Assemblies - /// </summary> - [TestMethod] - public void AssembliesTest() - { - Assert.AreEqual(1, assemblies.Count(), "Wrong number of assemblies"); - } - - /// <summary> - /// A test for MethodMetrics - /// </summary> - [TestMethod] - public void MethodMetricsTest() - { - var metrics = assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "Test.TestClass").MethodMetrics; - - Assert.AreEqual(2, metrics.Count(), "Wrong number of method metrics"); - Assert.AreEqual("SampleFunction()", metrics.First().Name, "Wrong name of method"); - Assert.AreEqual(2, metrics.First().Metrics.Count(), "Wrong number of metrics"); - - Assert.AreEqual("Blocks covered", metrics.First().Metrics.ElementAt(0).Name, "Wrong name of metric"); - Assert.AreEqual(9, metrics.First().Metrics.ElementAt(0).Value, "Wrong value of metric"); - Assert.AreEqual("Blocks not covered", metrics.First().Metrics.ElementAt(1).Name, "Wrong name of metric"); - Assert.AreEqual(4, metrics.First().Metrics.ElementAt(1).Value, "Wrong value of metric"); - - metrics = assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "Test.AsyncClass").MethodMetrics; - - Assert.AreEqual(1, metrics.Count(), "Wrong number of method metrics"); - Assert.AreEqual("SendAsync()", metrics.First().Name, "Wrong name of method"); - } - - /// <summary> - /// A test for CodeElements - /// </summary> - [TestMethod] - public void CodeElementsTest() - { - var codeElements = GetFile(assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs").CodeElements; - Assert.AreEqual(2, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs").CodeElements; - Assert.AreEqual(4, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs").CodeElements; - Assert.AreEqual(6, codeElements.Count(), "Wrong number of code elements"); - - codeElements = GetFile(assemblies, "Test.AsyncClass", "C:\\temp\\AsyncClass.cs").CodeElements; - Assert.AreEqual(1, codeElements.Count(), "Wrong number of code elements"); - Assert.AreEqual("SendAsync()", codeElements.First().Name, "Wrong name of code elements"); - } - - private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "test.exe").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName); - - private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies - .Single(a => a.Name == "test.exe").Classes - .Single(c => c.Name == className).Files - .Single(f => f.Path == fileName) - .AnalyzeFile(); - } -} diff --git a/src/ReportGenerator.Console.Test/Properties/AssemblyInfo.cs b/src/ReportGenerator.Console.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index c5b4cae4..00000000 --- a/src/ReportGenerator.Console.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Resources; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ReportGeneratorTest")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Palmmedia")] -[assembly: AssemblyProduct("ReportGeneratorTest")] -[assembly: AssemblyCopyright("Copyright © Palmmedia 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM componenets. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("8230ad31-911c-4cc5-a72c-e3035c7d8499")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("3.1.2.0")] -[assembly: AssemblyFileVersion("3.1.2.0")] -[assembly: NeutralResourcesLanguageAttribute("en-US")] diff --git a/src/ReportGenerator.Console.Test/ReportConfigurationBuilderTest.cs b/src/ReportGenerator.Console.Test/ReportConfigurationBuilderTest.cs deleted file mode 100644 index 35abf11a..00000000 --- a/src/ReportGenerator.Console.Test/ReportConfigurationBuilderTest.cs +++ /dev/null @@ -1,112 +0,0 @@ -using System.IO; -using System.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Moq; -using Palmmedia.ReportGenerator; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Reporting; - -namespace Palmmedia.ReportGeneratorTest -{ - /// <summary> - /// This is a test class for ReportConfigurationBuilder and is intended - /// to contain all ReportConfigurationBuilder Unit Tests - /// </summary> - [TestClass] - public class ReportConfigurationBuilderTest - { - private static readonly string ReportPath = Path.Combine(FileManager.GetCSharpReportDirectory(), "OpenCover.xml"); - - private ReportConfigurationBuilder reportConfigurationBuilder; - - private ReportConfiguration configuration; - - #region Additional test attributes - - // You can use the following additional attributes as you write your tests: - - // Use ClassInitialize to run code before running the first test in the class - // [ClassInitialize] - // public static void MyClassInitialize(TestContext testContext) - // { - // } - - // Use ClassCleanup to run code after all tests in a class have run - // [ClassCleanup] - // public static void MyClassCleanup() - // { - // } - - // Use TestInitialize to run code before running each test - [TestInitialize] - public void MyTestInitialize() - { - this.reportConfigurationBuilder = new ReportConfigurationBuilder(new Mock<IReportBuilderFactory>().Object); - } - - // Use TestCleanup to run code after each test has run - [TestCleanup] - public void MyTestCleanup() - { - Assert.IsNotNull(this.configuration.ReportFiles); - Assert.IsNotNull(this.configuration.SourceDirectories); - Assert.IsNotNull(this.configuration.AssemblyFilters); - Assert.IsNotNull(this.configuration.ClassFilters); - } - - #endregion - - [TestMethod] - public void InitWithNamedArguments_OldFilters_AllPropertiesApplied() - { - string[] namedArguments = new string[] - { - "-reports:" + ReportPath, - "-targetdir:C:\\temp", - "-reporttype:Latex", - "-sourcedirs:C:\\temp\\source;C:\\temp\\source2", - "-filters:+Test;-Test", - "-verbosity:" + VerbosityLevel.Info.ToString() - }; - - this.configuration = this.reportConfigurationBuilder.Create(namedArguments); - - Assert.IsTrue(this.configuration.ReportFiles.Contains(ReportPath), "ReportPath does not exist in ReportFiles."); - Assert.AreEqual("C:\\temp", this.configuration.TargetDirectory, "Wrong target directory applied."); - Assert.IsTrue(this.configuration.ReportTypes.Contains("Latex"), "Wrong report type applied."); - Assert.IsTrue(this.configuration.SourceDirectories.Contains("C:\\temp\\source"), "Directory does not exist in Source directories."); - Assert.IsTrue(this.configuration.SourceDirectories.Contains("C:\\temp\\source2"), "Directory does not exist in Source directories."); - Assert.IsTrue(this.configuration.AssemblyFilters.Contains("+Test"), "AssemblyFilters does not exist in ReportFiles."); - Assert.IsTrue(this.configuration.AssemblyFilters.Contains("-Test"), "AssemblyFilters does not exist in ReportFiles."); - Assert.AreEqual(VerbosityLevel.Info, this.configuration.VerbosityLevel, "Wrong verbosity level applied."); - } - - [TestMethod] - public void InitWithNamedArguments_NewFilters_AllPropertiesApplied() - { - string[] namedArguments = new string[] - { - "-reports:" + ReportPath, - "-targetdir:C:\\temp", - "-reporttype:Latex", - "-sourcedirs:C:\\temp\\source;C:\\temp\\source2", - "-assemblyfilters:+Test;-Test", - "-classfilters:+Test2;-Test2", - "-verbosity:" + VerbosityLevel.Info.ToString() - }; - - this.configuration = this.reportConfigurationBuilder.Create(namedArguments); - - Assert.IsTrue(this.configuration.ReportFiles.Contains(ReportPath), "ReportPath does not exist in ReportFiles."); - Assert.AreEqual("C:\\temp", this.configuration.TargetDirectory, "Wrong target directory applied."); - Assert.IsTrue(this.configuration.ReportTypes.Contains("Latex"), "Wrong report type applied."); - Assert.IsTrue(this.configuration.SourceDirectories.Contains("C:\\temp\\source"), "Directory does not exist in Source directories."); - Assert.IsTrue(this.configuration.SourceDirectories.Contains("C:\\temp\\source2"), "Directory does not exist in Source directories."); - Assert.IsTrue(this.configuration.AssemblyFilters.Contains("+Test"), "AssemblyFilters does not exist in ReportFiles."); - Assert.IsTrue(this.configuration.ClassFilters.Contains("+Test2"), "ClassFilters does not exist in ReportFiles."); - Assert.IsTrue(this.configuration.AssemblyFilters.Contains("-Test"), "AssemblyFilters does not exist in ReportFiles."); - Assert.IsTrue(this.configuration.ClassFilters.Contains("-Test2"), "ClassFilters does not exist in ReportFiles."); - Assert.AreEqual(VerbosityLevel.Info, this.configuration.VerbosityLevel, "Wrong verbosity level applied."); - } - } -} diff --git a/src/ReportGenerator.Console.Test/ReportConfigurationTest.cs b/src/ReportGenerator.Console.Test/ReportConfigurationTest.cs deleted file mode 100644 index 972b60b8..00000000 --- a/src/ReportGenerator.Console.Test/ReportConfigurationTest.cs +++ /dev/null @@ -1,280 +0,0 @@ -using System.IO; -using System.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Moq; -using Palmmedia.ReportGenerator; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Reporting; - -namespace Palmmedia.ReportGeneratorTest -{ - /// <summary> - /// This is a test class for ReportConfiguration and is intended - /// to contain all ReportConfiguration Unit Tests - /// </summary> - [TestClass] - public class ReportConfigurationTest - { - private static readonly string ReportPath = Path.Combine(FileManager.GetCSharpReportDirectory(), "OpenCover.xml"); - - private Mock<IReportBuilderFactory> reportBuilderFactoryMock; - - private ReportConfiguration configuration; - - #region Additional test attributes - - // You can use the following additional attributes as you write your tests: - - // Use ClassInitialize to run code before running the first test in the class - // [ClassInitialize] - // public static void MyClassInitialize(TestContext testContext) - // { - // } - - // Use ClassCleanup to run code after all tests in a class have run - // [ClassCleanup] - // public static void MyClassCleanup() - // { - // } - - // Use TestInitialize to run code before running each test - [TestInitialize] - public void MyTestInitialize() - { - this.reportBuilderFactoryMock = new Mock<IReportBuilderFactory>(); - } - - // Use TestCleanup to run code after each test has run - [TestCleanup] - public void MyTestCleanup() - { - Assert.IsNotNull(this.configuration.ReportFiles); - Assert.IsNotNull(this.configuration.SourceDirectories); - Assert.IsNotNull(this.configuration.AssemblyFilters); - Assert.IsNotNull(this.configuration.ClassFilters); - } - - #endregion - - [TestMethod] - public void InitByConstructor_AllDefaultValuesApplied() - { - this.configuration = new ReportConfiguration( - this.reportBuilderFactoryMock.Object, - new[] { ReportPath }, - "C:\\temp", - "C:\\temp\\historic", - new string[] { }, - new string[] { }, - new string[] { }, - new string[] { }, - new string[] { }, - string.Empty, - null); - - Assert.IsTrue(this.configuration.ReportFiles.Contains(ReportPath), "ReportPath does not exist in ReportFiles."); - Assert.AreEqual("C:\\temp", this.configuration.TargetDirectory, "Wrong target directory applied."); - Assert.AreEqual("C:\\temp\\historic", this.configuration.HistoryDirectory, "Wrong target directory applied."); - Assert.IsTrue(this.configuration.ReportTypes.Contains("Html"), "Wrong report type applied."); - Assert.AreEqual(0, this.configuration.SourceDirectories.Count(), "Wrong number of source directories."); - Assert.AreEqual(0, this.configuration.AssemblyFilters.Count(), "Wrong number of AssemblyFilters."); - Assert.AreEqual(0, this.configuration.ClassFilters.Count(), "Wrong number of ClassFilters."); - Assert.AreEqual(VerbosityLevel.Verbose, this.configuration.VerbosityLevel, "Wrong verbosity level applied."); - } - - [TestMethod] - public void InitByConstructor_AllPropertiesApplied() - { - this.configuration = new ReportConfiguration( - this.reportBuilderFactoryMock.Object, - new[] { ReportPath }, - "C:\\temp", - null, - new[] { "Latex", "Xml", "Html" }, - new[] { FileManager.GetCSharpCodeDirectory() }, - new[] { "+Test", "-Test" }, - new[] { "+Test2", "-Test2" }, - new[] { "+Test3", "-Test3" }, - VerbosityLevel.Info.ToString(), - null); - - Assert.IsTrue(this.configuration.ReportFiles.Contains(ReportPath), "ReportPath does not exist in ReportFiles."); - Assert.AreEqual("C:\\temp", this.configuration.TargetDirectory, "Wrong target directory applied."); - Assert.IsTrue(this.configuration.ReportTypes.Contains("Latex"), "Wrong report type applied."); - Assert.IsTrue(this.configuration.ReportTypes.Contains("Xml"), "Wrong report type applied."); - Assert.IsTrue(this.configuration.ReportTypes.Contains("Html"), "Wrong report type applied."); - Assert.IsTrue(this.configuration.SourceDirectories.Contains(FileManager.GetCSharpCodeDirectory()), "Directory does not exist in Source directories."); - Assert.IsTrue(this.configuration.AssemblyFilters.Contains("+Test"), "AssemblyFilters does not exist in ReportFiles."); - Assert.IsTrue(this.configuration.AssemblyFilters.Contains("-Test"), "AssemblyFilters does not exist in ReportFiles."); - Assert.IsTrue(this.configuration.ClassFilters.Contains("+Test2"), "ClassFilters does not exist in ReportFiles."); - Assert.IsTrue(this.configuration.ClassFilters.Contains("-Test2"), "ClassFilters does not exist in ReportFiles."); - Assert.IsTrue(this.configuration.FileFilters.Contains("+Test3"), "FileFilters does not exist in ReportFiles."); - Assert.IsTrue(this.configuration.FileFilters.Contains("-Test3"), "FileFilters does not exist in ReportFiles."); - Assert.AreEqual(VerbosityLevel.Info, this.configuration.VerbosityLevel, "Wrong verbosity level applied."); - } - - [TestMethod] - public void Validate_AllPropertiesApplied_ValidationPasses() - { - this.reportBuilderFactoryMock - .Setup(r => r.GetAvailableReportTypes()) - .Returns(new[] { "Latex", "Xml", "Html", "Something" }); - - this.InitByConstructor_AllPropertiesApplied(); - - Assert.IsTrue(this.configuration.Validate(), "Validation should pass."); - } - - [TestMethod] - public void Validate_NoReport_ValidationFails() - { - this.configuration = new ReportConfiguration( - this.reportBuilderFactoryMock.Object, - new string[] { }, - "C:\\temp", - null, - new[] { "Latex" }, - new[] { FileManager.GetCSharpCodeDirectory() }, - new[] { "+Test", "-Test" }, - new[] { "+Test2", "-Test2" }, - new string[] { }, - VerbosityLevel.Info.ToString(), - null); - - Assert.IsFalse(this.configuration.Validate(), "Validation should fail."); - } - - [TestMethod] - public void Validate_NonExistingReport_ValidationFails() - { - this.configuration = new ReportConfiguration( - this.reportBuilderFactoryMock.Object, - new[] { "123.xml" }, - "C:\\temp", - null, - new[] { "Latex" }, - new[] { FileManager.GetCSharpCodeDirectory() }, - new[] { "+Test", "-Test" }, - new[] { "+Test2", "-Test2" }, - new string[] { }, - VerbosityLevel.Info.ToString(), - null); - - Assert.IsFalse(this.configuration.Validate(), "Validation should fail."); - } - - [TestMethod] - public void Validate_NoTargetDirectory_ValidationFails() - { - this.configuration = new ReportConfiguration( - this.reportBuilderFactoryMock.Object, - new[] { ReportPath }, - string.Empty, - null, - new[] { "Latex" }, - new[] { FileManager.GetCSharpCodeDirectory() }, - new[] { "+Test", "-Test" }, - new[] { "+Test2", "-Test2" }, - new string[] { }, - VerbosityLevel.Info.ToString(), - null); - - Assert.IsFalse(this.configuration.Validate(), "Validation should fail."); - } - - [TestMethod] - public void Validate_InvalidTargetDirectory_ValidationFails() - { - this.configuration = new ReportConfiguration( - this.reportBuilderFactoryMock.Object, - new[] { ReportPath }, - "C:\\temp:?$", - null, - new[] { "Latex" }, - new[] { FileManager.GetCSharpCodeDirectory() }, - new[] { "+Test", "-Test" }, - new[] { "+Test2", "-Test2" }, - new string[] { }, - VerbosityLevel.Info.ToString(), - null); - - Assert.IsFalse(this.configuration.Validate(), "Validation should fail."); - } - - [TestMethod] - public void Validate_InvalidHistoryDirectory_ValidationFails() - { - this.configuration = new ReportConfiguration( - this.reportBuilderFactoryMock.Object, - new[] { ReportPath }, - "C:\\temp", - "C:\\temp:?$", - new[] { "Latex" }, - new[] { FileManager.GetCSharpCodeDirectory() }, - new[] { "+Test", "-Test" }, - new[] { "+Test2", "-Test2" }, - new string[] { }, - VerbosityLevel.Info.ToString(), - null); - - Assert.IsFalse(this.configuration.Validate(), "Validation should fail."); - } - - [TestMethod] - public void Validate_InvalidReportType_ValidationFails() - { - this.configuration = new ReportConfiguration( - this.reportBuilderFactoryMock.Object, - new[] { ReportPath }, - "C:\\temp", - null, - new[] { "DoesNotExist" }, - new[] { FileManager.GetCSharpCodeDirectory() }, - new[] { "+Test", "-Test" }, - new[] { "+Test2", "-Test2" }, - new string[] { }, - VerbosityLevel.Info.ToString(), - null); - - Assert.IsFalse(this.configuration.Validate(), "Validation should fail."); - } - - [TestMethod] - public void Validate_NotExistingSourceDirectory_ValidationFails() - { - this.configuration = new ReportConfiguration( - this.reportBuilderFactoryMock.Object, - new[] { ReportPath }, - "C:\\temp", - null, - new[] { "Latex" }, - new[] { Path.Combine(FileManager.GetCSharpCodeDirectory(), "123456") }, - new[] { "+Test", "-Test" }, - new[] { "+Test2", "-Test2" }, - new string[] { }, - VerbosityLevel.Info.ToString(), - null); - - Assert.IsFalse(this.configuration.Validate(), "Validation should fail."); - } - - [TestMethod] - public void Validate_InvalidFilter_ValidationFails() - { - this.configuration = new ReportConfiguration( - this.reportBuilderFactoryMock.Object, - new[] { ReportPath }, - @"C:\\temp", - null, - new[] { "Latex" }, - new[] { FileManager.GetCSharpCodeDirectory() }, - new[] { "Test" }, - new[] { "Test2" }, - new string[] { }, - VerbosityLevel.Info.ToString(), - null); - - Assert.IsFalse(this.configuration.Validate(), "Validation should fail."); - } - } -} diff --git a/src/ReportGenerator.Console.Test/ReportGenerator.Console.Test.csproj b/src/ReportGenerator.Console.Test/ReportGenerator.Console.Test.csproj deleted file mode 100644 index 113275fe..00000000 --- a/src/ReportGenerator.Console.Test/ReportGenerator.Console.Test.csproj +++ /dev/null @@ -1,152 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.30729</ProductVersion> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{FFCA13D6-B6CE-442A-9F93-149AE9B0AA1B}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>Palmmedia.ReportGeneratorTest</RootNamespace> - <AssemblyName>ReportGeneratorTest</AssemblyName> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <SignAssembly>false</SignAssembly> - <AssemblyOriginatorKeyFile>../PalmmediaKey.snk</AssemblyOriginatorKeyFile> - <FileUpgradeFlags> - </FileUpgradeFlags> - <OldToolsVersion>3.5</OldToolsVersion> - <UpgradeBackupLocation /> - <PublishUrl>publish\</PublishUrl> - <Install>true</Install> - <InstallFrom>Disk</InstallFrom> - <UpdateEnabled>false</UpdateEnabled> - <UpdateMode>Foreground</UpdateMode> - <UpdateInterval>7</UpdateInterval> - <UpdateIntervalUnits>Days</UpdateIntervalUnits> - <UpdatePeriodically>false</UpdatePeriodically> - <UpdateRequired>false</UpdateRequired> - <MapFileExtensions>true</MapFileExtensions> - <ApplicationRevision>0</ApplicationRevision> - <ApplicationVersion>1.0.0.%2a</ApplicationVersion> - <IsWebBootstrapper>false</IsWebBootstrapper> - <UseApplicationTrust>false</UseApplicationTrust> - <BootstrapperEnabled>true</BootstrapperEnabled> - <TargetFrameworkProfile /> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>..\target\bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - <Prefer32Bit>false</Prefer32Bit> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>..\target\bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - <Prefer32Bit>false</Prefer32Bit> - </PropertyGroup> - <ItemGroup> - <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> - <Reference Include="System" /> - <Reference Include="System.ComponentModel.Composition" /> - <Reference Include="System.Core"> - <RequiredTargetFramework>3.5</RequiredTargetFramework> - </Reference> - <Reference Include="System.Xml" /> - <Reference Include="System.Xml.Linq"> - <RequiredTargetFramework>3.5</RequiredTargetFramework> - </Reference> - </ItemGroup> - <ItemGroup> - <Compile Include="Common\FileSearchTest.cs" /> - <Compile Include="Parser\Analysis\BranchTest.cs" /> - <Compile Include="Parser\CoberturaParserTest.cs" /> - <Compile Include="Parser\DotCoverParserTest.cs" /> - <Compile Include="Parser\MProfParserTest.cs" /> - <Compile Include="Parser\Preprocessing\CoberturaReportPreprocessorTest.cs" /> - <Compile Include="Parser\Preprocessing\DotCoverReportPreprocessorTest.cs" /> - <Compile Include="Parser\VisualStudioParserTest_2013.cs" /> - <Compile Include="Parser\VisualStudioParserTest_2012.cs" /> - <Compile Include="Parser\DynamicCodeCoverageParserTest.cs" /> - <Compile Include="Parser\Preprocessing\DynamicCodeCoverageReportPreprocessorTest.cs" /> - <Compile Include="Parser\Preprocessing\VisualStudioReportPreprocessorTest.cs" /> - <Compile Include="Parser\VisualStudioParserTest_2010.cs" /> - <Compile Include="ReportConfigurationBuilderTest.cs" /> - <Compile Include="Parser\Analysis\AssemblyTest.cs" /> - <Compile Include="Parser\Analysis\CodeFileTest.cs" /> - <Compile Include="Parser\Analysis\MethodMetricTest.cs" /> - <Compile Include="Parser\Preprocessing\FileSearch\ClassSearcherFactoryTest.cs" /> - <Compile Include="ReportConfigurationTest.cs" /> - <Compile Include="FileManager.cs" /> - <Compile Include="Parser\Preprocessing\CodeAnalysis\SourceCodeAnalyzerTest.cs" /> - <Compile Include="Parser\Analysis\ClassTest.cs" /> - <Compile Include="Parser\Preprocessing\FileSearch\CommonDirectorySearcherTest.cs" /> - <Compile Include="Parser\OpenCoverParserTest.cs" /> - <Compile Include="Parser\PartCover23ParserTest_35109.cs" /> - <Compile Include="Parser\MultiReportParserTest.cs" /> - <Compile Include="Parser\NCoverParserTest.cs" /> - <Compile Include="Parser\ParserFactoryTest.cs" /> - <Compile Include="Parser\PartCover22ParserTest.cs" /> - <Compile Include="Parser\PartCover23ParserTest.cs" /> - <Compile Include="Parser\Preprocessing\FileSearch\ClassSearcherTest.cs" /> - <Compile Include="Parser\Preprocessing\PartCover23ReportPreprocessorTest.cs" /> - <Compile Include="Parser\Preprocessing\PartCover22ReportPreprocessorTest.cs" /> - <Compile Include="Parser\Preprocessing\OpenCoverReportPreprocessorTest.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="Reporting\MefReportBuilderFactoryTest.cs" /> - <Compile Include="Reporting\DefaultFilterTest.cs" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\ReportGenerator.Console\ReportGenerator.Console.csproj"> - <Project>{BBDF4589-00C7-44C9-97E5-641D708BCA3C}</Project> - <Name>ReportGenerator.Console</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <BootstrapperPackage Include=".NETFramework,Version=v4.0"> - <Visible>False</Visible> - <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName> - <Install>true</Install> - </BootstrapperPackage> - <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> - <Visible>False</Visible> - <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName> - <Install>false</Install> - </BootstrapperPackage> - <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> - <Visible>False</Visible> - <ProductName>.NET Framework 3.5 SP1</ProductName> - <Install>false</Install> - </BootstrapperPackage> - <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1"> - <Visible>False</Visible> - <ProductName>Windows Installer 3.1</ProductName> - <Install>true</Install> - </BootstrapperPackage> - </ItemGroup> - <ItemGroup> - <PackageReference Include="Moq"> - <Version>4.7.99</Version> - </PackageReference> - </ItemGroup> - <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> -</Project> \ No newline at end of file diff --git a/src/ReportGenerator.Console.Test/Reporting/DefaultFilterTest.cs b/src/ReportGenerator.Console.Test/Reporting/DefaultFilterTest.cs deleted file mode 100644 index 7b8b0f99..00000000 --- a/src/ReportGenerator.Console.Test/Reporting/DefaultFilterTest.cs +++ /dev/null @@ -1,89 +0,0 @@ -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Reporting; - -namespace Palmmedia.ReportGeneratorTest.Reporting -{ - /// <summary> - /// This is a test class for DefaultFilter and is intended - /// to contain all DefaultFilter Unit Tests - /// </summary> - [TestClass] - public class DefaultFilterTest - { - [TestMethod] - public void NoFilter_AnyElement_ElementIsAccepted() - { - IFilter filter = new DefaultFilter(new string[] { }); - - Assert.IsTrue(filter.IsElementIncludedInReport("Test"), "Element is expected to be included."); - } - - [TestMethod] - public void OnlyIncludes_MatchingElement_ElementIsAccepted() - { - IFilter filter = new DefaultFilter(new[] { "+Test" }); - - Assert.IsTrue(filter.IsElementIncludedInReport("Test"), "Element is expected to be included."); - } - - [TestMethod] - public void OnlyIncludes_NotMatchingElement_ElementIsNotAccepted() - { - IFilter filter = new DefaultFilter(new[] { "+Test" }); - - Assert.IsFalse(filter.IsElementIncludedInReport("Test123"), "Element is expected to be excluded."); - } - - [TestMethod] - public void OnlyIncludesWithWildcards_MatchingElement_ElementIsAccepted() - { - IFilter filter = new DefaultFilter(new[] { "+Test*" }); - - Assert.IsTrue(filter.IsElementIncludedInReport("Test"), "Element is expected to be included."); - Assert.IsTrue(filter.IsElementIncludedInReport("Test123"), "Element is expected to be included."); - } - - [TestMethod] - public void OnlyIncludesWithWildcards_NotMatchingElement_ElementIsNotAccepted() - { - IFilter filter = new DefaultFilter(new[] { "+Test*" }); - - Assert.IsFalse(filter.IsElementIncludedInReport("PrefixTest"), "Element is expected to be included."); - Assert.IsFalse(filter.IsElementIncludedInReport("PrefixTest123"), "Element is expected to be included."); - } - - [TestMethod] - public void IncludesAndExcludes_MatchingElement_ElementIsAccepted() - { - IFilter filter = new DefaultFilter(new[] { "+Test", "-SomeExclude" }); - - Assert.IsTrue(filter.IsElementIncludedInReport("Test"), "Element is expected to be included."); - } - - [TestMethod] - public void IncludesAndExcludes_NotMatchingElement_ElementIsNotAccepted() - { - IFilter filter = new DefaultFilter(new[] { "+Test", "-Test" }); - - Assert.IsFalse(filter.IsElementIncludedInReport("Test"), "Element is expected to be excluded."); - } - - [TestMethod] - public void IncludesAndExcludesWithWildcards_MatchingElement_ElementIsAccepted() - { - IFilter filter = new DefaultFilter(new[] { "+Test*", "-SomeExclude*" }); - - Assert.IsTrue(filter.IsElementIncludedInReport("Test"), "Element is expected to be included."); - Assert.IsTrue(filter.IsElementIncludedInReport("Test123"), "Element is expected to be included."); - } - - [TestMethod] - public void IncludesAndExcludesWithWildcards_NotMatchingElement_ElementIsNotAccepted() - { - IFilter filter = new DefaultFilter(new[] { "+Test*", "-Tes*" }); - - Assert.IsFalse(filter.IsElementIncludedInReport("Test"), "Element is expected to be included."); - Assert.IsFalse(filter.IsElementIncludedInReport("PrefixTest123"), "Element is expected to be included."); - } - } -} diff --git a/src/ReportGenerator.Console.Test/Reporting/MefReportBuilderFactoryTest.cs b/src/ReportGenerator.Console.Test/Reporting/MefReportBuilderFactoryTest.cs deleted file mode 100644 index c78b09f9..00000000 --- a/src/ReportGenerator.Console.Test/Reporting/MefReportBuilderFactoryTest.cs +++ /dev/null @@ -1,98 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Reporting; - -namespace Palmmedia.ReportGeneratorTest.Reporting -{ - /// <summary> - /// This is a test class for MefReportBuilderFactory and is intended - /// to contain all MefReportBuilderFactory Unit Tests - /// </summary> - [TestClass] - public class MefReportBuilderFactoryTest - { - [TestMethod] - public void GetAvailableReportTypes_AllReportTypesReturned() - { - var factory = new MefReportBuilderFactory(); - - Assert.IsTrue(factory.GetAvailableReportTypes().Count() > 6, "Not all default report builders available."); - } - - [TestMethod] - public void GetReportBuilders_DefaultReportBuilderReturned() - { - var factory = new MefReportBuilderFactory(); - - var reportBuilders = factory.GetReportBuilders(new ReportConfiguration() { TargetDirectory = "C:\\temp", ReportTypes = new[] { "Html" } }); - Assert.AreEqual(1, reportBuilders.Count(), "Default report builder not available."); - - reportBuilders = factory.GetReportBuilders(new ReportConfiguration() { TargetDirectory = "C:\\temp", ReportTypes = new[] { "Latex" } }); - Assert.AreEqual(1, reportBuilders.Count(), "Report builder not available."); - Assert.AreEqual(typeof(AdditionalLatexReportBuilder), reportBuilders.First().GetType(), "Non default report builder should get returned"); - } - - [System.ComponentModel.Composition.Export(typeof(IReportBuilder))] - public class AdditionalLatexReportBuilder : IReportBuilder - { - /// <summary> - /// Gets the type of the report. - /// </summary> - /// <value> - /// The type of the report. - /// </value> - public string ReportType => "Latex"; - - /// <summary> - /// Gets or sets the report configuration. - /// </summary> - /// <value> - /// The report configuration. - /// </value> - public IReportConfiguration ReportConfiguration { get; set; } - - /// <summary> - /// Creates a class report. - /// </summary> - /// <param name="class">The class.</param> - /// <param name="fileAnalyses">The file analyses that correspond to the class.</param> - public void CreateClassReport(Class @class, IEnumerable<FileAnalysis> fileAnalyses) - { - } - - /// <summary> - /// Creates the summary report. - /// </summary> - /// <param name="summaryResult">The summary result.</param> - public void CreateSummaryReport(SummaryResult summaryResult) - { - } - } - - private class ReportConfiguration : IReportConfiguration - { - public string TargetDirectory { get; set; } - - public string HistoryDirectory { get; set; } - - public IEnumerable<string> ReportTypes { get; set; } - - public IEnumerable<string> SourceDirectories { get; set; } - - public IEnumerable<string> AssemblyFilters { get; set; } - - public IEnumerable<string> ClassFilters { get; set; } - - public IEnumerable<string> FileFilters { get; set; } - - public VerbosityLevel VerbosityLevel { get; set; } - - public IEnumerable<HistoricCoverage> OverallHistoricCoverages { get; set; } - - public string Tag { get; set; } - } - } -} diff --git a/src/ReportGenerator.Console/Generator.cs b/src/ReportGenerator.Console/Generator.cs deleted file mode 100644 index 55e5fe6d..00000000 --- a/src/ReportGenerator.Console/Generator.cs +++ /dev/null @@ -1,76 +0,0 @@ -using System; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser; -using Palmmedia.ReportGenerator.Properties; -using Palmmedia.ReportGenerator.Reporting; -using Palmmedia.ReportGenerator.Reporting.History; - -namespace Palmmedia.ReportGenerator -{ - /// <summary> - /// The report generator implementation. - /// </summary> - public class Generator : IReportGenerator - { - /// <summary> - /// The Logger. - /// </summary> - private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(Program)); - - /// <summary> - /// Executes the report generation. - /// </summary> - /// <param name="reportConfiguration">The report configuration.</param> - /// <returns><c>true</c> if report was generated successfully; otherwise <c>false</c>.</returns> - public bool GenerateReport(ReportConfiguration reportConfiguration) - { - if (reportConfiguration == null) - { - throw new ArgumentNullException(nameof(reportConfiguration)); - } - - // set it before validate - LoggerFactory.VerbosityLevel = reportConfiguration.VerbosityLevel; - if (!reportConfiguration.Validate()) - { - return false; - } - - var stopWatch = new System.Diagnostics.Stopwatch(); - stopWatch.Start(); - DateTime executionTime = DateTime.Now; - - var parser = ParserFactory.CreateParser(reportConfiguration.ReportFiles, reportConfiguration.SourceDirectories); - - var overallHistoricCoverages = new System.Collections.Generic.List<Parser.Analysis.HistoricCoverage>(); - var historyStorage = new MefHistoryStorageFactory().GetHistoryStorage(reportConfiguration); - - if (historyStorage != null) - { - new HistoryParser(historyStorage) - .ApplyHistoricCoverage(parser.Assemblies, overallHistoricCoverages); - - reportConfiguration.OverallHistoricCoverages = overallHistoricCoverages; - } - - var filteredAssemblies = new Reporting.ReportGenerator( - parser, - new DefaultFilter(reportConfiguration.AssemblyFilters), - new DefaultFilter(reportConfiguration.ClassFilters), - new DefaultFilter(reportConfiguration.FileFilters), - reportConfiguration.ReportBuilderFactory.GetReportBuilders(reportConfiguration)) - .CreateReport(reportConfiguration.HistoryDirectory != null, overallHistoricCoverages, executionTime, reportConfiguration.Tag); - - if (historyStorage != null) - { - new HistoryReportGenerator(historyStorage) - .CreateReport(filteredAssemblies, executionTime, reportConfiguration.Tag); - } - - stopWatch.Stop(); - Logger.InfoFormat(Resources.ReportGenerationTook, stopWatch.ElapsedMilliseconds / 1000d); - - return true; - } - } -} diff --git a/src/ReportGenerator.Console/GlobalSuppressions.cs b/src/ReportGenerator.Console/GlobalSuppressions.cs deleted file mode 100644 index 61787800..00000000 --- a/src/ReportGenerator.Console/GlobalSuppressions.cs +++ /dev/null @@ -1,65 +0,0 @@ -// This file is used by Code Analysis to maintain SuppressMessage -// attributes that are applied to this project. -// Project-level suppressions either have no target or are given -// a specific target and scoped to a namespace, type, member, etc. -// -// To add a suppression to this file, right-click the message in the -// Error List, point to "Suppress Message(s)", and click -// "In Project Suppression File". -// You do not need to add suppressions to this file manually. - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1703:ResourceStringsShouldBeSpelledCorrectly", MessageId = "danielpalme", Scope = "resource", Target = "Palmmedia.ReportGenerator.Properties.Resources.resources", Justification = "Spelling ist valid.")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1703:ResourceStringsShouldBeSpelledCorrectly", MessageId = "github", Scope = "resource", Target = "Palmmedia.ReportGenerator.Properties.Resources.resources", Justification = "Spelling ist valid.")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1703:ResourceStringsShouldBeSpelledCorrectly", Scope = "resource", Target = "Palmmedia.ReportGenerator.Properties.Help.resources", Justification = "Spelling ist valid.")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Palmmedia", Scope = "namespace", Target = "Palmmedia.ReportGenerator", Justification = "Spelling ist valid.")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Palmmedia", Scope = "namespace", Target = "Palmmedia.ReportGenerator.Common", Justification = "Spelling ist valid.")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Palmmedia", Scope = "namespace", Target = "Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch", Justification = "Spelling ist valid.")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Palmmedia", Scope = "namespace", Target = "Palmmedia.ReportGenerator.MSBuild", Justification = "Spelling ist valid.")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Palmmedia", Scope = "namespace", Target = "Palmmedia.ReportGenerator.Parser", Justification = "Spelling ist valid.")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Palmmedia", Scope = "namespace", Target = "Palmmedia.ReportGenerator.Parser.Analysis", Justification = "Spelling ist valid.")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Palmmedia", Scope = "namespace", Target = "Palmmedia.ReportGenerator.Reporting", Justification = "Spelling ist valid.")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Palmmedia", Scope = "namespace", Target = "Palmmedia.ReportGenerator.Reporting.Rendering", Justification = "Spelling ist valid.")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Palmmedia", Scope = "namespace", Target = "Palmmedia.ReportGenerator.Logging", Justification = "Spelling ist valid.")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Coverages", Scope = "member", Target = "Palmmedia.ReportGenerator.Parser.Analysis.Class.#HistoricCoverages", Justification = "Spelling ist valid.")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1724:TypeNamesShouldNotMatchNamespaces", Scope = "type", Target = "Palmmedia.ReportGenerator.MSBuild.ReportGenerator", Justification = "MsBuild task should have the same name.")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "System.Console.WriteLine(System.String)", Scope = "member", Target = "Palmmedia.ReportGenerator.ReportConfigurationBuilder.#ShowHelp()", Justification = "This is just for layout.")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Palmmedia.ReportGenerator.Logging.ILogger.Error(System.String)", Scope = "member", Target = "Palmmedia.ReportGenerator.Parser.Analysis.CodeFile.#AnalyzeFile()", Justification = "String does not contain any text.")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Palmmedia.ReportGenerator.Logging.ILogger.Debug(System.String)", Scope = "member", Target = "Palmmedia.ReportGenerator.Parser.ParserFactory.#GetParsersOfFile(System.String,Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch.ClassSearcherFactory,Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch.ClassSearcher)", Justification = "String does not contain any text.")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", Scope = "member", Target = "Palmmedia.ReportGenerator.ReportConfigurationBuilder.#ShowHelp()", Justification = "Spelling ist valid.")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Scope = "member", Target = "Palmmedia.ReportGenerator.Reporting.MefReportBuilderFactory.#LoadReportBuilders()", Justification = "Catalogs are disposed when CompositionContainer gets disposed.")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods", MessageId = "System.Reflection.Assembly.LoadFile", Scope = "member", Target = "Palmmedia.ReportGenerator.Reporting.MefReportBuilderFactory.#LoadReportBuilders()", Justification = "Assemblies have to get loaded to support plugins.")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1500:VariableNamesShouldNotMatchFieldNames", MessageId = "metrics", Scope = "member", Target = "Palmmedia.ReportGenerator.Parser.Analysis.MethodMetric.#AddMetrics(System.Collections.Generic.IEnumerable`1<Palmmedia.ReportGenerator.Parser.Analysis.Metric>)")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1500:VariableNamesShouldNotMatchFieldNames", MessageId = "lineAnalysis", Scope = "member", Target = "Palmmedia.ReportGenerator.Parser.Analysis.FileAnalysis.#AddLineAnalysis(Palmmedia.ReportGenerator.Parser.Analysis.LineAnalysis)")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1500:VariableNamesShouldNotMatchFieldNames", MessageId = "lineVisitStatus", Scope = "member", Target = "Palmmedia.ReportGenerator.Parser.Analysis.CodeFile.#AnalyzeFile()")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1500:VariableNamesShouldNotMatchFieldNames", MessageId = "lineVisitStatus", Scope = "member", Target = "Palmmedia.ReportGenerator.Parser.Analysis.CodeFile.#Merge(Palmmedia.ReportGenerator.Parser.Analysis.CodeFile)")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1500:VariableNamesShouldNotMatchFieldNames", MessageId = "methodname", Scope = "member", Target = "Palmmedia.ReportGenerator.Parser.Preprocessing.CodeAnalysis.PartCoverMethodElement.#DoesMethodnameMatch(System.String)")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1500:VariableNamesShouldNotMatchFieldNames", MessageId = "methods", Scope = "member", Target = "Palmmedia.ReportGenerator.Parser.MProfParser.#ProcessFile(Palmmedia.ReportGenerator.Parser.Analysis.Class,System.String)")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1500:VariableNamesShouldNotMatchFieldNames", MessageId = "metrics", Scope = "member", Target = "Palmmedia.ReportGenerator.Parser.Analysis.MethodMetric.#AddMetrics(System.Collections.Generic.IEnumerable`1<Palmmedia.ReportGenerator.Parser.Analysis.Metric>)")] - -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Maintainability", "CA1500:VariableNamesShouldNotMatchFieldNames", MessageId = "parameters", Scope = "member", Target = "Palmmedia.ReportGenerator.Parser.Preprocessing.CodeAnalysis.PartCoverMethodElement.#AreParametersMatching(System.Collections.Generic.ICollection`1<ICSharpCode.NRefactory.CSharp.ParameterDeclaration>)")] diff --git a/src/ReportGenerator.Console/MSBuild/ReportGenerator.cs b/src/ReportGenerator.Console/MSBuild/ReportGenerator.cs index 3661e67e..237067f6 100644 --- a/src/ReportGenerator.Console/MSBuild/ReportGenerator.cs +++ b/src/ReportGenerator.Console/MSBuild/ReportGenerator.cs @@ -1,7 +1,7 @@ using System.Linq; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using Palmmedia.ReportGenerator.Reporting; +using Palmmedia.ReportGenerator.Core; namespace Palmmedia.ReportGenerator.MSBuild { @@ -53,6 +53,14 @@ public class ReportGenerator : Task, ITask /// </value> public ITaskItem[] SourceDirectories { get; set; } + /// <summary> + /// Gets or sets the plugins. + /// </summary> + /// <value> + /// The plugins. + /// </value> + public ITaskItem[] Plugins { get; set; } + /// <summary> /// Gets or sets the assembly filters (old property). /// </summary> @@ -118,13 +126,13 @@ public override bool Execute() ITaskItem[] assemblyFilters = this.AssemblyFilters ?? this.Filters; - ReportConfiguration configuration = new ReportConfiguration( - new MefReportBuilderFactory(), + var configuration = new ReportConfiguration( this.ReportFiles == null ? Enumerable.Empty<string>() : this.ReportFiles.Select(r => r.ItemSpec), this.TargetDirectory, + this.SourceDirectories == null ? Enumerable.Empty<string>() : this.SourceDirectories.Select(r => r.ItemSpec), this.HistoryDirectory, reportTypes, - this.SourceDirectories == null ? Enumerable.Empty<string>() : this.SourceDirectories.Select(r => r.ItemSpec), + this.Plugins == null ? Enumerable.Empty<string>() : this.Plugins.Select(r => r.ItemSpec), assemblyFilters == null ? Enumerable.Empty<string>() : assemblyFilters.Select(r => r.ItemSpec), this.ClassFilters == null ? Enumerable.Empty<string>() : this.ClassFilters.Select(r => r.ItemSpec), this.FileFilters == null ? Enumerable.Empty<string>() : this.FileFilters.Select(r => r.ItemSpec), diff --git a/src/ReportGenerator.Console/Parser/CoberturaParser.cs b/src/ReportGenerator.Console/Parser/CoberturaParser.cs deleted file mode 100644 index d0970e98..00000000 --- a/src/ReportGenerator.Console/Parser/CoberturaParser.cs +++ /dev/null @@ -1,318 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Threading.Tasks; -using System.Xml.Linq; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; - -namespace Palmmedia.ReportGenerator.Parser -{ - /// <summary> - /// Parser for XML reports generated by Cobertura. - /// </summary> - internal class CoberturaParser : ParserBase - { - /// <summary> - /// The Logger. - /// </summary> - private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(CoberturaParser)); - - /// <summary> - /// The module elements of the report. - /// </summary> - private XElement[] modules; - - /// <summary> - /// Initializes a new instance of the <see cref="CoberturaParser"/> class. - /// </summary> - /// <param name="report">The report file as XContainer.</param> - internal CoberturaParser(XContainer report) - { - if (report == null) - { - throw new ArgumentNullException(nameof(report)); - } - - this.modules = report.Descendants("package") - .ToArray(); - - var assemblyNames = this.modules - .Select(m => m.Attribute("name").Value) - .Distinct() - .OrderBy(a => a) - .ToArray(); - - Parallel.ForEach(assemblyNames, assemblyName => this.AddAssembly(this.ProcessAssembly(assemblyName))); - - this.modules = null; - } - - /// <summary> - /// Gets a value indicating whether the used parser supports branch coverage. - /// </summary> - /// <value> - /// <c>true</c> if used parser supports branch coverage; otherwise, <c>false</c>. - /// </value> - public override bool SupportsBranchCoverage => true; - - /// <summary> - /// Extracts the metrics from the given <see cref="XElement">XElements</see>. - /// </summary> - /// <param name="methods">The methods.</param> - /// <param name="class">The class.</param> - private static void SetMethodMetrics(IEnumerable<XElement> methods, Class @class) - { - foreach (var method in methods) - { - string methodName = method.Attribute("name").Value + method.Attribute("signature").Value; - - var metrics = new List<Metric>(); - - var lineRate = method.Attribute("line-rate"); - - if (lineRate != null) - { - metrics.Add(new Metric( - ReportResources.Coverage, - ParserBase.CodeCoverageUri, - MetricType.CoveragePercentual, - Math.Round(decimal.Parse(lineRate.Value, CultureInfo.InvariantCulture), 2, MidpointRounding.AwayFromZero))); - } - - var branchRate = method.Attribute("branch-rate"); - - if (branchRate != null) - { - metrics.Add(new Metric( - ReportResources.BranchCoverage, - ParserBase.CodeCoverageUri, - MetricType.CoveragePercentual, - Math.Round(decimal.Parse(branchRate.Value, CultureInfo.InvariantCulture), 2, MidpointRounding.AwayFromZero))); - } - - var cyclomaticComplexityAttribute = method.Attribute("complexity"); - - if (cyclomaticComplexityAttribute != null) - { - metrics.Insert( - 0, - new Metric( - ReportResources.CyclomaticComplexity, - ParserBase.CyclomaticComplexityUri, - MetricType.CodeQuality, - Math.Round(decimal.Parse(cyclomaticComplexityAttribute.Value, CultureInfo.InvariantCulture), 2, MidpointRounding.AwayFromZero))); - } - - @class.AddMethodMetric(new MethodMetric(methodName, metrics)); - } - } - - /// <summary> - /// Gets the branches by line number. - /// </summary> - /// <param name="lines">The lines.</param> - /// <returns>The branches by line number.</returns> - private static Dictionary<int, ICollection<Branch>> GetBranches(IEnumerable<XElement> lines) - { - var result = new Dictionary<int, ICollection<Branch>>(); - - var branchPoints = lines - .Elements("conditions") - .Elements("condition") - .ToArray(); - - foreach (var branchPoint in branchPoints) - { - int lineNumber = int.Parse(branchPoint.Parent.Parent.Attribute("number").Value, CultureInfo.InvariantCulture); - - string identifier = string.Format( - CultureInfo.InvariantCulture, - "{0}_{1}", - lineNumber, - branchPoint.Attribute("number").Value); - - var branch = new Branch( - branchPoint.Attribute("coverage").Value.Equals("0%") ? 0 : 1, - identifier); - - ICollection<Branch> branches = null; - if (result.TryGetValue(lineNumber, out branches)) - { - HashSet<Branch> branchesHashset = (HashSet<Branch>)branches; - if (branchesHashset.Contains(branch)) - { - // Not perfect for performance, but Hashset has no GetElement method - branchesHashset.First(b => b.Equals(branch)).BranchVisits += branch.BranchVisits; - } - else - { - branches.Add(branch); - } - } - else - { - branches = new HashSet<Branch>(); - branches.Add(branch); - - result.Add(lineNumber, branches); - } - } - - return result; - } - - /// <summary> - /// Extracts the methods/properties of the given <see cref="XElement">XElements</see>. - /// </summary> - /// <param name="codeFile">The code file.</param> - /// <param name="methodsOfFile">The methods of the file.</param> - private static void SetCodeElements(CodeFile codeFile, IEnumerable<XElement> methodsOfFile) - { - foreach (var method in methodsOfFile) - { - string methodName = method.Attribute("name").Value + method.Attribute("signature").Value; - - var line = method.Elements("lines") - .Elements("line") - .FirstOrDefault(); - - if (line != null) - { - int lineNumber = int.Parse(line.Attribute("number").Value, CultureInfo.InvariantCulture); - codeFile.AddCodeElement(new CodeElement(methodName, CodeElementType.Method, lineNumber)); - } - } - } - - /// <summary> - /// Processes the given assembly. - /// </summary> - /// <param name="assemblyName">Name of the assembly.</param> - /// <returns>The <see cref="Assembly"/>.</returns> - private Assembly ProcessAssembly(string assemblyName) - { - Logger.DebugFormat(" " + Resources.CurrentAssembly, assemblyName); - - var classNames = this.modules - .Where(m => m.Attribute("name").Value.Equals(assemblyName)) - .Elements("classes") - .Elements("class") - .Select(c => c.Attribute("name").Value) - .Where(c => !c.Contains("$")) - .Distinct() - .OrderBy(name => name) - .ToArray(); - - var assembly = new Assembly(assemblyName); - - Parallel.ForEach(classNames, className => assembly.AddClass(this.ProcessClass(assembly, className))); - - return assembly; - } - - /// <summary> - /// Processes the given class. - /// </summary> - /// <param name="assembly">The assembly.</param> - /// <param name="className">Name of the class.</param> - /// <returns>The <see cref="Class"/>.</returns> - private Class ProcessClass(Assembly assembly, string className) - { - var files = this.modules - .Where(m => m.Attribute("name").Value.Equals(assembly.Name)) - .Elements("classes") - .Elements("class") - .Where(c => c.Attribute("name").Value.Equals(className)) - .Select(c => c.Attribute("filename").Value) - .Distinct() - .ToArray(); - - var @class = new Class(className, assembly); - - foreach (var file in files) - { - @class.AddFile(this.ProcessFile(@class, file)); - } - - return @class; - } - - /// <summary> - /// Processes the file. - /// </summary> - /// <param name="class">The class.</param> - /// <param name="filePath">The file path.</param> - /// <returns>The <see cref="CodeFile"/>.</returns> - private CodeFile ProcessFile(Class @class, string filePath) - { - var classes = this.modules - .Where(m => m.Attribute("name").Value.Equals(@class.Assembly.Name)) - .Elements("classes") - .Elements("class") - .Where(c => c.Attribute("name").Value.Equals(@class.Name) - || c.Attribute("name").Value.StartsWith(@class.Name + "$", StringComparison.Ordinal)) - .ToArray(); - - var methodsOfFile = classes - .Elements("methods") - .Elements("method") - .ToArray(); - - SetMethodMetrics(methodsOfFile, @class); - - var lines = classes.Elements("lines") - .Elements("line") - .ToArray(); - - var linesOfFile = lines - .Select(line => new - { - LineNumber = int.Parse(line.Attribute("number").Value, CultureInfo.InvariantCulture), - Visits = int.Parse(line.Attribute("hits").Value, CultureInfo.InvariantCulture) - }) - .OrderBy(seqpnt => seqpnt.LineNumber) - .ToArray(); - - var branches = GetBranches(lines); - - int[] coverage = new int[] { }; - LineVisitStatus[] lineVisitStatus = new LineVisitStatus[] { }; - - if (linesOfFile.Length > 0) - { - coverage = new int[linesOfFile[linesOfFile.LongLength - 1].LineNumber + 1]; - lineVisitStatus = new LineVisitStatus[linesOfFile[linesOfFile.LongLength - 1].LineNumber + 1]; - - for (int i = 0; i < coverage.Length; i++) - { - coverage[i] = -1; - } - - foreach (var line in linesOfFile) - { - coverage[line.LineNumber] = line.Visits; - - bool partiallyCovered = false; - - ICollection<Branch> branchesOfLine = null; - if (branches.TryGetValue(line.LineNumber, out branchesOfLine)) - { - partiallyCovered = branchesOfLine.Any(b => b.BranchVisits == 0); - } - - LineVisitStatus statusOfLine = line.Visits > 0 ? (partiallyCovered ? LineVisitStatus.PartiallyCovered : LineVisitStatus.Covered) : LineVisitStatus.NotCovered; - lineVisitStatus[line.LineNumber] = statusOfLine; - } - } - - var codeFile = new CodeFile(filePath, coverage, lineVisitStatus, branches); - - SetCodeElements(codeFile, methodsOfFile); - - return codeFile; - } - } -} diff --git a/src/ReportGenerator.Console/Parser/IParser.cs b/src/ReportGenerator.Console/Parser/IParser.cs deleted file mode 100644 index f1a2b7b8..00000000 --- a/src/ReportGenerator.Console/Parser/IParser.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Collections.Generic; -using Palmmedia.ReportGenerator.Parser.Analysis; - -namespace Palmmedia.ReportGenerator.Parser -{ - /// <summary> - /// Interface for different parsers. - /// </summary> - internal interface IParser - { - /// <summary> - /// Gets the assemblies that have been found in the report. - /// </summary> - /// <value>The assemblies.</value> - IEnumerable<Assembly> Assemblies { get; } - - /// <summary> - /// Gets a value indicating whether the used parser supports branch coverage. - /// </summary> - /// <value> - /// <c>true</c> if used parser supports branch coverage; otherwise, <c>false</c>. - /// </value> - bool SupportsBranchCoverage { get; } - } -} diff --git a/src/ReportGenerator.Console/Parser/MultiReportParser.cs b/src/ReportGenerator.Console/Parser/MultiReportParser.cs deleted file mode 100644 index b4191640..00000000 --- a/src/ReportGenerator.Console/Parser/MultiReportParser.cs +++ /dev/null @@ -1,103 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Text; -using Palmmedia.ReportGenerator.Parser.Analysis; - -namespace Palmmedia.ReportGenerator.Parser -{ - /// <summary> - /// Parser that aggregates several parsers. - /// </summary> - internal class MultiReportParser : ParserBase - { - /// <summary> - /// The names of the aggregated parsers. - /// </summary> - private readonly List<string> parserNames = new List<string>(); - - /// <summary> - /// Indicates whether the used parsers supports branch coverage. - /// </summary> - private bool supportsBranchCoverage = false; - - /// <summary> - /// Gets a value indicating whether the used parser supports branch coverage. - /// </summary> - /// <value> - /// <c>true</c> if used parser supports branch coverage; otherwise, <c>false</c>. - /// </value> - public override bool SupportsBranchCoverage => this.supportsBranchCoverage; - - /// <summary> - /// Returns a <see cref="System.String"/> that represents this instance. - /// </summary> - /// <returns> - /// A <see cref="System.String"/> that represents this instance. - /// </returns> - public override string ToString() - { - if (this.parserNames.Count == 0) - { - return string.Empty; - } - else if (this.parserNames.Count == 1) - { - return this.parserNames[0]; - } - else - { - StringBuilder sb = new StringBuilder(this.GetType().Name); - sb.Append(" ("); - - var groupedParsers = this.parserNames.GroupBy(p => p).OrderBy(pg => pg.Key); - - sb.Append(string.Join( - ", ", - groupedParsers.Select(pg => string.Format(CultureInfo.InvariantCulture, "{0}x {1}", pg.Count(), pg.Key)))); - - sb.Append(")"); - return sb.ToString(); - } - } - - /// <summary> - /// Adds the parser. - /// </summary> - /// <param name="parser">The parser to add.</param> - internal void AddParser(IParser parser) - { - if (parser == null) - { - throw new ArgumentNullException(nameof(parser)); - } - - this.parserNames.Add(parser.ToString()); - this.supportsBranchCoverage |= parser.SupportsBranchCoverage; - - this.MergeAssemblies(parser.Assemblies); - } - - /// <summary> - /// Merges the given assemblies with the existing assemblies. - /// </summary> - /// <param name="assemblies">The assemblies to merge.</param> - private void MergeAssemblies(IEnumerable<Assembly> assemblies) - { - foreach (var assembly in assemblies) - { - var existingAssembly = this.Assemblies.FirstOrDefault(a => a.Name == assembly.Name); - - if (existingAssembly != null) - { - existingAssembly.Merge(assembly); - } - else - { - this.AddAssembly(assembly); - } - } - } - } -} diff --git a/src/ReportGenerator.Console/Parser/ParserFactory.cs b/src/ReportGenerator.Console/Parser/ParserFactory.cs deleted file mode 100644 index 2a6c3013..00000000 --- a/src/ReportGenerator.Console/Parser/ParserFactory.cs +++ /dev/null @@ -1,171 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Xml.Linq; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser.Preprocessing; -using Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch; -using Palmmedia.ReportGenerator.Properties; - -namespace Palmmedia.ReportGenerator.Parser -{ - /// <summary> - /// Initiates the corresponding parser to the given report file. - /// </summary> - internal static class ParserFactory - { - /// <summary> - /// The Logger. - /// </summary> - private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(ParserFactory)); - - /// <summary> - /// Tries to initiate the correct parsers for the given reports. - /// </summary> - /// <param name="reportFiles">The report files to parse.</param> - /// <param name="sourceDirectories">The source directories.</param> - /// <returns> - /// The IParser instance. - /// </returns> - internal static IParser CreateParser(IEnumerable<string> reportFiles, IEnumerable<string> sourceDirectories) - { - if (reportFiles == null) - { - throw new ArgumentNullException(nameof(reportFiles)); - } - - var classSearcherFactory = new ClassSearcherFactory(); - var globalClassSearcher = classSearcherFactory.CreateClassSearcher(sourceDirectories.ToArray()); - - var multiReportParser = new MultiReportParser(); - - foreach (var report in reportFiles) - { - foreach (var parser in GetParsersOfFile(report, classSearcherFactory, globalClassSearcher)) - { - multiReportParser.AddParser(parser); - } - } - - return multiReportParser; - } - - /// <summary> - /// Tries to initiate the correct parsers for the given report. An empty list is returned if no parser has been found. - /// The report may contain several reports. For every report an extra parser is initiated. - /// </summary> - /// <param name="reportFile">The report file to parse.</param> - /// <param name="classSearcherFactory">The class searcher factory.</param> - /// <param name="globalClassSearcher">The global class searcher.</param> - /// <returns> - /// The IParser instances or an empty list if no matching parser has been found. - /// </returns> - private static IEnumerable<IParser> GetParsersOfFile(string reportFile, ClassSearcherFactory classSearcherFactory, ClassSearcher globalClassSearcher) - { - var parsers = new List<IParser>(); - - XContainer report = null; - try - { - Logger.InfoFormat(Resources.LoadingReport, reportFile); - report = XDocument.Load(reportFile); - } - catch (Exception ex) - { - Logger.ErrorFormat(" " + Resources.ErrorDuringReadingReport, reportFile, ex.Message); - return parsers; - } - - if (report.Descendants("CoverageSession").Any()) - { - foreach (var item in report.Descendants("CoverageSession")) - { - Logger.Debug(" " + Resources.PreprocessingReport); - new OpenCoverReportPreprocessor(item).Execute(); - Logger.DebugFormat(" " + Resources.InitiatingParser, "OpenCover"); - parsers.Add(new OpenCoverParser(item)); - } - } - else if (report.Descendants("Root").Where(e => e.Attribute("ReportType") != null && e.Attribute("ReportType").Value == "DetailedXml").Any()) - { - foreach (var item in report.Descendants("Root").Where(e => e.Attribute("ReportType") != null && e.Attribute("ReportType").Value == "DetailedXml")) - { - Logger.Debug(" " + Resources.PreprocessingReport); - new DotCoverReportPreprocessor(item).Execute(); - Logger.DebugFormat(" " + Resources.InitiatingParser, "dotCover"); - parsers.Add(new DotCoverParser(item)); - } - } - else if (report.Descendants("PartCoverReport").Any()) - { - // PartCover 2.2 and PartCover 2.3 reports differ in version attribute, so use this to determine the correct parser - if (report.Descendants("PartCoverReport").First().Attribute("ver") != null) - { - foreach (var item in report.Descendants("PartCoverReport")) - { - Logger.Debug(" " + Resources.PreprocessingReport); - new PartCover22ReportPreprocessor(item, classSearcherFactory, globalClassSearcher).Execute(); - Logger.DebugFormat(" " + Resources.InitiatingParser, "PartCover 2.2"); - parsers.Add(new PartCover22Parser(item)); - } - } - else - { - foreach (var item in report.Descendants("PartCoverReport")) - { - Logger.Debug(" " + Resources.PreprocessingReport); - new PartCover23ReportPreprocessor(item, classSearcherFactory, globalClassSearcher).Execute(); - Logger.DebugFormat(" " + Resources.InitiatingParser, "PartCover 2.3"); - parsers.Add(new PartCover23Parser(item)); - } - } - } - else if (report.Descendants("coverage").Any()) - { - foreach (var item in report.Descendants("coverage")) - { - if (item.Attribute("profilerVersion") != null) - { - Logger.DebugFormat(" " + Resources.InitiatingParser, "NCover"); - parsers.Add(new NCoverParser(item)); - } - else if (item.Attributes().Count() > 1) - { - Logger.Debug(" " + Resources.PreprocessingReport); - new CoberturaReportPreprocessor(item).Execute(); - Logger.DebugFormat(" " + Resources.InitiatingParser, "Cobertura"); - parsers.Add(new CoberturaParser(item)); - } - else - { - Logger.DebugFormat(" " + Resources.InitiatingParser, "mprof"); - parsers.Add(new MProfParser(item)); - } - } - } - else if (report.Descendants("CoverageDSPriv").Any()) - { - foreach (var item in report.Descendants("CoverageDSPriv")) - { - Logger.DebugFormat(" " + Resources.InitiatingParser, "Visual Studio"); - new VisualStudioReportPreprocessor(item).Execute(); - parsers.Add(new VisualStudioParser(item)); - } - } - else if (report.Descendants("results").Any()) - { - foreach (var item in report.Descendants("results")) - { - if (item.Element("modules") != null) - { - Logger.DebugFormat(" " + Resources.InitiatingParser, "Dynamic Code Coverage"); - new DynamicCodeCoverageReportPreprocessor(item).Execute(); - parsers.Add(new DynamicCodeCoverageParser(item)); - } - } - } - - return parsers; - } - } -} diff --git a/src/ReportGenerator.Console/Parser/PartCover22Parser.cs b/src/ReportGenerator.Console/Parser/PartCover22Parser.cs deleted file mode 100644 index 2620a636..00000000 --- a/src/ReportGenerator.Console/Parser/PartCover22Parser.cs +++ /dev/null @@ -1,233 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Text.RegularExpressions; -using System.Threading.Tasks; -using System.Xml.Linq; -using Palmmedia.ReportGenerator.Common; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; - -namespace Palmmedia.ReportGenerator.Parser -{ - /// <summary> - /// Parser for XML reports generated by PartCover 2.2. - /// </summary> - internal class PartCover22Parser : ParserBase - { - /// <summary> - /// Regex to analyze if a method name belongs to a lamda expression. - /// </summary> - private const string LambdaMethodRegex = "<.+>.+__"; - - /// <summary> - /// The Logger. - /// </summary> - private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(PartCover22Parser)); - - /// <summary> - /// Dictionary containing the file ids by the file's path. - /// </summary> - private Dictionary<string, string> fileIdByFilenameDictionary; - - /// <summary> - /// The type elements of the report. - /// </summary> - private XElement[] types; - - /// <summary> - /// The file elements of the report. - /// </summary> - private XElement[] files; - - /// <summary> - /// Initializes a new instance of the <see cref="PartCover22Parser"/> class. - /// </summary> - /// <param name="report">The report file as XContainer.</param> - internal PartCover22Parser(XContainer report) - { - if (report == null) - { - throw new ArgumentNullException(nameof(report)); - } - - this.types = report.Descendants("type").ToArray(); - this.files = report.Descendants("file").ToArray(); - - this.fileIdByFilenameDictionary = this.files.ToDictionary(f => f.Attribute("url").Value, f => f.Attribute("id").Value); - - var assemblyNames = this.types - .Select(type => type.Attribute("asm").Value) - .Distinct() - .OrderBy(value => value) - .ToArray(); - - Parallel.ForEach(assemblyNames, assemblyName => this.AddAssembly(this.ProcessAssembly(assemblyName))); - - this.types = null; - this.files = null; - this.fileIdByFilenameDictionary = null; - } - - /// <summary> - /// Extracts the methods/properties of the given <see cref="XElement">XElements</see>. - /// </summary> - /// <param name="codeFile">The code file.</param> - /// <param name="fileId">The id of the file.</param> - /// <param name="methods">The methods.</param> - private static void SetCodeElements(CodeFile codeFile, string fileId, IEnumerable<XElement> methods) - { - foreach (var method in methods) - { - if (Regex.IsMatch(method.Attribute("name").Value, LambdaMethodRegex)) - { - continue; - } - - string sig = method.Attribute("sig").Value; - string methodName = method.Attribute("name").Value + sig.Substring(sig.LastIndexOf('(')); - - CodeElementType type = CodeElementType.Method; - - if (methodName.StartsWith("get_", StringComparison.OrdinalIgnoreCase) - || methodName.StartsWith("set_", StringComparison.OrdinalIgnoreCase)) - { - type = CodeElementType.Property; - methodName = methodName.Substring(4); - } - - var seqpnt = method - .Elements("code") - .Elements("pt") - .Where(pt => pt.HasAttributeWithValue("fid", fileId)) - .FirstOrDefault(); - - if (seqpnt != null) - { - int line = int.Parse(seqpnt.Attribute("sl").Value, CultureInfo.InvariantCulture); - codeFile.AddCodeElement(new CodeElement(methodName, type, line)); - } - } - } - - /// <summary> - /// Processes the given assembly. - /// </summary> - /// <param name="assemblyName">Name of the assembly.</param> - /// <returns>The <see cref="Assembly"/>.</returns> - private Assembly ProcessAssembly(string assemblyName) - { - Logger.DebugFormat(" " + Resources.CurrentAssembly, assemblyName); - - var classNames = this.types - .Where(type => type.Attribute("asm").Value.Equals(assemblyName) - && !Regex.IsMatch(type.Attribute("name").Value, "<.*>.+__")) - .Select(type => type.Attribute("name").Value) - .OrderBy(name => name) - .Distinct() - .ToArray(); - - var assembly = new Assembly(assemblyName); - - Parallel.ForEach(classNames, className => assembly.AddClass(this.ProcessClass(assembly, className))); - - return assembly; - } - - /// <summary> - /// Processes the given class. - /// </summary> - /// <param name="assembly">The assembly.</param> - /// <param name="className">Name of the class.</param> - /// <returns>The <see cref="Class"/>.</returns> - private Class ProcessClass(Assembly assembly, string className) - { - var fileIdsOfClass = this.types - .Where(type => type.Attribute("asm").Value.Equals(assembly.Name) - && (type.Attribute("name").Value.Equals(className, StringComparison.Ordinal) - || type.Attribute("name").Value.StartsWith(className + "<", StringComparison.Ordinal))) - .Elements("method") - .Elements("code") - .Elements("pt") - .Where(pt => pt.Attribute("fid") != null) - .Select(pt => pt.Attribute("fid").Value) - .Distinct() - .ToHashSet(); - - var filesOfClass = this.files - .Where(file => fileIdsOfClass.Contains(file.Attribute("id").Value)) - .Select(file => file.Attribute("url").Value) - .ToArray(); - - var @class = new Class(className, assembly); - - foreach (var file in filesOfClass) - { - @class.AddFile(this.ProcessFile(@class, file)); - } - - return @class; - } - - /// <summary> - /// Processes the file. - /// </summary> - /// <param name="class">The class.</param> - /// <param name="filePath">The file path.</param> - /// <returns>The <see cref="CodeFile"/>.</returns> - private CodeFile ProcessFile(Class @class, string filePath) - { - string fileId = this.fileIdByFilenameDictionary[filePath]; - - var methods = this.types - .Where(type => type.Attribute("asm").Value.Equals(@class.Assembly.Name) - && (type.Attribute("name").Value.Equals(@class.Name, StringComparison.Ordinal) - || type.Attribute("name").Value.StartsWith(@class.Name + "<", StringComparison.Ordinal))) - .Elements("method") - .ToArray(); - - var seqpntsOfFile = methods.Elements("code") - .Elements("pt") - .Where(seqpnt => seqpnt.HasAttributeWithValue("fid", fileId)) - .Select(seqpnt => new - { - LineNumberStart = int.Parse(seqpnt.Attribute("sl").Value, CultureInfo.InvariantCulture), - LineNumberEnd = seqpnt.Attribute("el") != null ? int.Parse(seqpnt.Attribute("el").Value, CultureInfo.InvariantCulture) : int.Parse(seqpnt.Attribute("sl").Value, CultureInfo.InvariantCulture), - Visits = int.Parse(seqpnt.Attribute("visit").Value, CultureInfo.InvariantCulture) - }) - .OrderBy(seqpnt => seqpnt.LineNumberEnd) - .ToArray(); - - int[] coverage = new int[] { }; - LineVisitStatus[] lineVisitStatus = new LineVisitStatus[] { }; - - if (seqpntsOfFile.Length > 0) - { - coverage = new int[seqpntsOfFile[seqpntsOfFile.LongLength - 1].LineNumberEnd + 1]; - lineVisitStatus = new LineVisitStatus[seqpntsOfFile[seqpntsOfFile.LongLength - 1].LineNumberEnd + 1]; - - for (int i = 0; i < coverage.Length; i++) - { - coverage[i] = -1; - } - - foreach (var seqpnt in seqpntsOfFile) - { - for (int lineNumber = seqpnt.LineNumberStart; lineNumber <= seqpnt.LineNumberEnd; lineNumber++) - { - coverage[lineNumber] = coverage[lineNumber] == -1 ? seqpnt.Visits : coverage[lineNumber] + seqpnt.Visits; - lineVisitStatus[lineNumber] = lineVisitStatus[lineNumber] == LineVisitStatus.Covered || seqpnt.Visits > 0 ? LineVisitStatus.Covered : LineVisitStatus.NotCovered; - } - } - } - - var codeFile = new CodeFile(filePath, coverage, lineVisitStatus); - - SetCodeElements(codeFile, fileId, methods); - - return codeFile; - } - } -} diff --git a/src/ReportGenerator.Console/Parser/PartCover23Parser.cs b/src/ReportGenerator.Console/Parser/PartCover23Parser.cs deleted file mode 100644 index 1d13493a..00000000 --- a/src/ReportGenerator.Console/Parser/PartCover23Parser.cs +++ /dev/null @@ -1,255 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Text.RegularExpressions; -using System.Threading.Tasks; -using System.Xml.Linq; -using Palmmedia.ReportGenerator.Common; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; - -namespace Palmmedia.ReportGenerator.Parser -{ - /// <summary> - /// Parser for XML reports generated by PartCover 2.3 and above. - /// </summary> - internal class PartCover23Parser : ParserBase - { - /// <summary> - /// Regex to analyze if a method name belongs to a lamda expression. - /// </summary> - private const string LambdaMethodRegex = "<.+>.+__"; - - /// <summary> - /// The Logger. - /// </summary> - private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(PartCover23Parser)); - - /// <summary> - /// Dictionary containing the assembly names by id. - /// In PartCover 2.3.0.35109 the assemblies are referenced by an id. - /// Before only their name was required. - /// </summary> - private Dictionary<string, string> assembliesByIdDictionary; - - /// <summary> - /// Dictionary containing the file ids by the file's path. - /// </summary> - private Dictionary<string, string> fileIdByFilenameDictionary; - - /// <summary> - /// The type elements of the report. - /// </summary> - private XElement[] types; - - /// <summary> - /// The file elements of the report. - /// </summary> - private XElement[] files; - - /// <summary> - /// The attribute name to the corresponding assembly. - /// In PartCover 2.3.0.35109 this is "asmref". - /// </summary> - private string assemblyAttribute = "asm"; - - /// <summary> - /// Initializes a new instance of the <see cref="PartCover23Parser"/> class. - /// </summary> - /// <param name="report">The report file as XContainer.</param> - internal PartCover23Parser(XContainer report) - { - if (report == null) - { - throw new ArgumentNullException(nameof(report)); - } - - this.types = report.Descendants("Type").ToArray(); - this.files = report.Descendants("File").ToArray(); - - // Determine which version of PartCover 2.3 has been used. - // In PartCover 2.3.0.35109 the assemblies are referenced by an id and the attribute name in Type elements has changed. - var assemblies = report.Descendants("Assembly"); - if (assemblies.Any() && assemblies.First().Attribute("id") != null) - { - this.assemblyAttribute = "asmref"; - this.assembliesByIdDictionary = assemblies.ToDictionary(a => a.Attribute("id").Value, a => a.Attribute("name").Value); - } - else - { - this.assembliesByIdDictionary = assemblies.ToDictionary(a => a.Attribute("name").Value, a => a.Attribute("name").Value); - } - - this.fileIdByFilenameDictionary = this.files.ToDictionary(f => f.Attribute("url").Value, f => f.Attribute("id").Value); - - var assemblyNames = this.assembliesByIdDictionary.Values - .Distinct() - .OrderBy(a => a) - .ToArray(); - - Parallel.ForEach(assemblyNames, assemblyName => this.AddAssembly(this.ProcessAssembly(assemblyName))); - - this.types = null; - this.files = null; - this.assembliesByIdDictionary = null; - this.fileIdByFilenameDictionary = null; - } - - /// <summary> - /// Extracts the methods/properties of the given <see cref="XElement">XElements</see>. - /// </summary> - /// <param name="codeFile">The code file.</param> - /// <param name="fileId">The id of the file.</param> - /// <param name="methods">The methods.</param> - private static void SetCodeElements(CodeFile codeFile, string fileId, IEnumerable<XElement> methods) - { - foreach (var method in methods) - { - if (Regex.IsMatch(method.Attribute("name").Value, LambdaMethodRegex)) - { - continue; - } - - string sig = method.Attribute("sig").Value; - string methodName = method.Attribute("name").Value + sig.Substring(sig.LastIndexOf('(')); - - CodeElementType type = CodeElementType.Method; - - if (methodName.StartsWith("get_", StringComparison.OrdinalIgnoreCase) - || methodName.StartsWith("set_", StringComparison.OrdinalIgnoreCase)) - { - type = CodeElementType.Property; - methodName = methodName.Substring(4); - } - - var seqpnt = method - .Elements("pt") - .Where(pt => pt.HasAttributeWithValue("fid", fileId)) - .FirstOrDefault(); - - if (seqpnt != null) - { - int line = int.Parse(seqpnt.Attribute("sl").Value, CultureInfo.InvariantCulture); - codeFile.AddCodeElement(new CodeElement(methodName, type, line)); - } - } - } - - /// <summary> - /// Processes the given assembly. - /// </summary> - /// <param name="assemblyName">Name of the assembly.</param> - /// <returns>The <see cref="Assembly"/>.</returns> - private Assembly ProcessAssembly(string assemblyName) - { - Logger.DebugFormat(" " + Resources.CurrentAssembly, assemblyName); - - var classNames = this.types - .Where(type => this.assembliesByIdDictionary[type.Attribute(this.assemblyAttribute).Value].Equals(assemblyName) - && !Regex.IsMatch(type.Attribute("name").Value, "<.*>.+__")) - .Select(type => type.Attribute("name").Value) - .OrderBy(name => name) - .Distinct() - .ToArray(); - - var assembly = new Assembly(assemblyName); - - Parallel.ForEach(classNames, className => assembly.AddClass(this.ProcessClass(assembly, className))); - - return assembly; - } - - /// <summary> - /// Processes the given class. - /// </summary> - /// <param name="assembly">The assembly.</param> - /// <param name="className">Name of the class.</param> - /// <returns>The <see cref="Class"/>.</returns> - private Class ProcessClass(Assembly assembly, string className) - { - var fileIdsOfClass = this.types - .Where(type => this.assembliesByIdDictionary[type.Attribute(this.assemblyAttribute).Value].Equals(assembly.Name) - && (type.Attribute("name").Value.Equals(className, StringComparison.Ordinal) - || type.Attribute("name").Value.StartsWith(className + "<", StringComparison.Ordinal))) - .Elements("Method") - .Elements("pt") - .Where(pt => pt.Attribute("fid") != null) - .Select(pt => pt.Attribute("fid").Value) - .Distinct().ToHashSet(); - - var filesOfClass = this.files - .Where(file => fileIdsOfClass.Contains(file.Attribute("id").Value)) - .Select(file => file.Attribute("url").Value) - .ToArray(); - - var @class = new Class(className, assembly); - - foreach (var file in filesOfClass) - { - @class.AddFile(this.ProcessFile(@class, file)); - } - - return @class; - } - - /// <summary> - /// Processes the file. - /// </summary> - /// <param name="class">The class.</param> - /// <param name="filePath">The file path.</param> - /// <returns>The <see cref="CodeFile"/>.</returns> - private CodeFile ProcessFile(Class @class, string filePath) - { - string fileId = this.fileIdByFilenameDictionary[filePath]; - - var methods = this.types - .Where(type => this.assembliesByIdDictionary[type.Attribute(this.assemblyAttribute).Value].Equals(@class.Assembly.Name) - && (type.Attribute("name").Value.Equals(@class.Name, StringComparison.Ordinal) - || type.Attribute("name").Value.StartsWith(@class.Name + "<", StringComparison.Ordinal))) - .Elements("Method") - .ToArray(); - - var seqpntsOfFile = methods.Elements("pt") - .Where(seqpnt => seqpnt.HasAttributeWithValue("fid", fileId)) - .Select(seqpnt => new - { - LineNumberStart = int.Parse(seqpnt.Attribute("sl").Value, CultureInfo.InvariantCulture), - LineNumberEnd = seqpnt.Attribute("el") != null ? int.Parse(seqpnt.Attribute("el").Value, CultureInfo.InvariantCulture) : int.Parse(seqpnt.Attribute("sl").Value, CultureInfo.InvariantCulture), - Visits = int.Parse(seqpnt.Attribute("visit").Value, CultureInfo.InvariantCulture) - }) - .OrderBy(seqpnt => seqpnt.LineNumberEnd) - .ToArray(); - - int[] coverage = new int[] { }; - LineVisitStatus[] lineVisitStatus = new LineVisitStatus[] { }; - - if (seqpntsOfFile.Length > 0) - { - coverage = new int[seqpntsOfFile[seqpntsOfFile.LongLength - 1].LineNumberEnd + 1]; - lineVisitStatus = new LineVisitStatus[seqpntsOfFile[seqpntsOfFile.LongLength - 1].LineNumberEnd + 1]; - - for (int i = 0; i < coverage.Length; i++) - { - coverage[i] = -1; - } - - foreach (var seqpnt in seqpntsOfFile) - { - for (int lineNumber = seqpnt.LineNumberStart; lineNumber <= seqpnt.LineNumberEnd; lineNumber++) - { - coverage[lineNumber] = coverage[lineNumber] == -1 ? seqpnt.Visits : coverage[lineNumber] + seqpnt.Visits; - lineVisitStatus[lineNumber] = lineVisitStatus[lineNumber] == LineVisitStatus.Covered || seqpnt.Visits > 0 ? LineVisitStatus.Covered : LineVisitStatus.NotCovered; - } - } - } - - var codeFile = new CodeFile(filePath, coverage, lineVisitStatus); - - SetCodeElements(codeFile, fileId, methods); - - return codeFile; - } - } -} diff --git a/src/ReportGenerator.Console/Parser/Preprocessing/CodeAnalysis/PartCoverMethodElement.cs b/src/ReportGenerator.Console/Parser/Preprocessing/CodeAnalysis/PartCoverMethodElement.cs deleted file mode 100644 index c318e417..00000000 --- a/src/ReportGenerator.Console/Parser/Preprocessing/CodeAnalysis/PartCoverMethodElement.cs +++ /dev/null @@ -1,242 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.RegularExpressions; -using ICSharpCode.NRefactory.CSharp; -using ICSharpCode.NRefactory.PatternMatching; - -namespace Palmmedia.ReportGenerator.Parser.Preprocessing.CodeAnalysis -{ - /// <summary> - /// Represents method information extracted from a PartCover report. - /// This class is used to compensate a deficiency of PartCover 2.3.0.35109. - /// PartCover does not record coverage information for unexecuted methods any more. - /// To provide correct reports the line numbers are determined from the source code files instead of - /// PartCover's coverage information. - /// </summary> - internal class PartCoverMethodElement : SourceElement - { - /// <summary> - /// The delimiters between parameters. - /// </summary> - private static readonly string[] ParameterDelimiter = new string[] { ", " }; - - /// <summary> - /// Dictionary containing some type mappings. - /// </summary> - private static readonly Dictionary<string, string> TypeReplacements = InitializeTypeReplacements(); - - /// <summary> - /// The name of the method. - /// </summary> - private readonly string methodname; - - /// <summary> - /// The return type of the method. - /// </summary> - private readonly string returnType; - - /// <summary> - /// The parameters extracted from the method signature contained in the report generated by PartCover. - /// </summary> - private readonly string[] parameters; - - /// <summary> - /// Initializes a new instance of the <see cref="PartCoverMethodElement"/> class. - /// </summary> - /// <param name="classname">The name of the class.</param> - /// <param name="methodname">The name of the method.</param> - /// <param name="signature">The signature of the method.</param> - internal PartCoverMethodElement(string classname, string methodname, string signature) - : base(classname) - { - if (methodname == null) - { - throw new ArgumentNullException(nameof(methodname)); - } - - if (signature == null) - { - throw new ArgumentNullException(nameof(signature)); - } - - this.methodname = methodname; - - var match = Regex.Match(signature, @"(?<returnType>^\S*).*\((?<arguments>.*)\)", RegexOptions.Compiled); - this.returnType = match.Groups["returnType"].Value; - this.parameters = match.Groups["arguments"].Value.Split(ParameterDelimiter, StringSplitOptions.RemoveEmptyEntries); - } - - /// <summary> - /// Gets a value indicating whether this method is a constructor. - /// </summary> - private bool IsConstructor => this.methodname == ".ctor"; - - /// <summary> - /// Determines whether the given <see cref="ICSharpCode.NRefactory.PatternMatching.INode"/> matches the <see cref="SourceElement"/>. - /// </summary> - /// <param name="node">The node.</param> - /// <returns> - /// A <see cref="SourceElementPosition"/> or <c>null</c> if <see cref="SourceElement"/> does not match the <see cref="ICSharpCode.NRefactory.PatternMatching.INode"/>. - /// </returns> - internal override SourceElementPosition GetSourceElementPosition(INode node) - { - if (this.IsConstructor) - { - ConstructorDeclaration constructorDeclaration = node as ConstructorDeclaration; - - if (constructorDeclaration != null) - { - if (!this.DoesMethodnameMatch(constructorDeclaration.Name) - || !this.AreParametersMatching(constructorDeclaration.Parameters)) - { - return null; - } - - if (constructorDeclaration.Body != null) - { - return new SourceElementPosition(constructorDeclaration.Body.StartLocation.Line, constructorDeclaration.Body.EndLocation.Line); - } - } - - return null; - } - - MethodDeclaration methodDeclaration = node as MethodDeclaration; - if (methodDeclaration != null) - { - if (!this.DoesMethodnameMatch(methodDeclaration.Name) - || !AreTypesEqual(this.returnType, methodDeclaration.ReturnType) - || !this.AreParametersMatching(methodDeclaration.Parameters)) - { - return null; - } - - if (methodDeclaration.Body != null) - { - return new SourceElementPosition(methodDeclaration.Body.StartLocation.Line, methodDeclaration.Body.EndLocation.Line); - } - } - - return null; - } - - /// <summary> - /// Determines whether the types are equal. - /// </summary> - /// <param name="expectedType">The expected type.</param> - /// <param name="typeReference">The type reference.</param> - /// <returns><c>true</c> if parameters are equal, otherwise <c>false</c>.</returns> - private static bool AreTypesEqual(string expectedType, AstType typeReference) - { - SimpleType simpleType = typeReference as SimpleType; // Generic types - - if (simpleType != null) - { - if (simpleType.TypeArguments.Count == 1) - { - typeReference = simpleType.TypeArguments.First(); - } - else if (simpleType.TypeArguments.Count >= 2) - { - // This can't be handled correctly - return true; - } - } - - ComposedType composedType = typeReference as ComposedType; // Arrays - - if (composedType != null) - { - if (!expectedType.EndsWith("[]", StringComparison.Ordinal)) - { - return false; - } - else - { - expectedType = expectedType.Replace("[]", string.Empty); - typeReference = composedType.BaseType; - } - } - - if (expectedType.StartsWith("ref ", StringComparison.Ordinal)) - { - expectedType = expectedType.Replace("ref ", string.Empty); - } - - string typeReplacement; - if (TypeReplacements.TryGetValue(expectedType, out typeReplacement)) - { - expectedType = typeReplacement; - } - - // Validate - string typeName = typeReference.ToString(); - if (expectedType.Equals(typeName, StringComparison.OrdinalIgnoreCase) - || ("System." + expectedType).Equals(typeName, StringComparison.OrdinalIgnoreCase) - || expectedType.Substring(expectedType.LastIndexOf('.') + 1).Equals(typeName, StringComparison.OrdinalIgnoreCase)) - { - return true; - } - - return false; - } - - /// <summary> - /// Initializes the type replacements. - /// </summary> - /// <returns>The type replacements.</returns> - private static Dictionary<string, string> InitializeTypeReplacements() - { - var typeReplacements = new Dictionary<string, string>(); - typeReplacements.Add("unsigned byte", "byte"); - typeReplacements.Add("byte", "sbyte"); - typeReplacements.Add("unsigned short", "ushort"); - typeReplacements.Add("unsigned int", "uint"); - typeReplacements.Add("unsigned long", "ulong"); - - return typeReplacements; - } - - /// <summary> - /// Determines whether all parameters match. - /// </summary> - /// <param name="parameters">The parameters.</param> - /// <returns><c>true</c> if all parameters are equal, otherwise <c>false</c>.</returns> - private bool AreParametersMatching(ICollection<ParameterDeclaration> parameters) - { - if (this.parameters.Length != parameters.Count) - { - return false; - } - - for (int i = 0; i < parameters.Count; i++) - { - if (!AreTypesEqual(this.parameters[i], parameters.ElementAt(i).Type)) - { - return false; - } - } - - return true; - } - - /// <summary> - /// Determines whether the method name matches. - /// </summary> - /// <param name="methodname">The name of the method.</param> - /// <returns><c>true</c> if method names are equal, otherwise <c>false</c>.</returns> - private bool DoesMethodnameMatch(string methodname) - { - if (this.IsConstructor) - { - string classname = this.Classname.Substring(this.Classname.LastIndexOf('.') + 1); // Remove namespace declaration - return classname.Equals(methodname); - } - else - { - return this.methodname.Equals(methodname); - } - } - } -} diff --git a/src/ReportGenerator.Console/Parser/Preprocessing/CodeAnalysis/PropertyElement.cs b/src/ReportGenerator.Console/Parser/Preprocessing/CodeAnalysis/PropertyElement.cs deleted file mode 100644 index a2f2e085..00000000 --- a/src/ReportGenerator.Console/Parser/Preprocessing/CodeAnalysis/PropertyElement.cs +++ /dev/null @@ -1,74 +0,0 @@ -using System; -using ICSharpCode.NRefactory.CSharp; -using ICSharpCode.NRefactory.PatternMatching; - -namespace Palmmedia.ReportGenerator.Parser.Preprocessing.CodeAnalysis -{ - /// <summary> - /// Represents a property in a source file. - /// </summary> - internal class PropertyElement : SourceElement - { - /// <summary> - /// Prefix of GET property. - /// </summary> - private const string GetterPrefix = "get_"; - - /// <summary> - /// Prefix of SET property. - /// </summary> - private const string SetterPrefix = "set_"; - - /// <summary> - /// The name of the property. - /// </summary> - private readonly string name; - - /// <summary> - /// Initializes a new instance of the <see cref="PropertyElement"/> class. - /// </summary> - /// <param name="classname">The classname.</param> - /// <param name="name">The name of the property.</param> - internal PropertyElement(string classname, string name) - : base(classname) - { - if (name == null) - { - throw new ArgumentNullException(nameof(name)); - } - - this.name = name; - - // Cut off prefix only if property starts with standard getter ("get_") / setter prefix ("set_") - if (this.name.StartsWith(GetterPrefix, StringComparison.Ordinal)) - { - this.name = name.Substring(GetterPrefix.Length); - } - else if (this.name.StartsWith(SetterPrefix, StringComparison.Ordinal)) - { - this.name = name.Substring(SetterPrefix.Length); - } - } - - /// <summary> - /// Determines whether the given <see cref="ICSharpCode.NRefactory.PatternMatching.INode"/> matches the <see cref="SourceElement"/>. - /// </summary> - /// <param name="node">The node.</param> - /// <returns> - /// A <see cref="SourceElementPosition"/> or <c>null</c> if <see cref="SourceElement"/> does not match the <see cref="ICSharpCode.NRefactory.PatternMatching.INode"/>. - /// </returns> - internal override SourceElementPosition GetSourceElementPosition(INode node) - { - PropertyDeclaration propertyDeclaration = node as PropertyDeclaration; - - if (propertyDeclaration != null && propertyDeclaration.Name.Equals(this.name)) - { - return new SourceElementPosition( - propertyDeclaration.StartLocation.Line, - propertyDeclaration.EndLocation.Line); - } - - return null; - } - } -} diff --git a/src/ReportGenerator.Console/Parser/Preprocessing/CodeAnalysis/SourceCodeAnalyzer.cs b/src/ReportGenerator.Console/Parser/Preprocessing/CodeAnalysis/SourceCodeAnalyzer.cs deleted file mode 100644 index bb7c8727..00000000 --- a/src/ReportGenerator.Console/Parser/Preprocessing/CodeAnalysis/SourceCodeAnalyzer.cs +++ /dev/null @@ -1,220 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using ICSharpCode.NRefactory.CSharp; - -namespace Palmmedia.ReportGenerator.Parser.Preprocessing.CodeAnalysis -{ - /// <summary> - /// Helper class to determine the begin and end line number of source code elements within a source code file. - /// </summary> - internal static class SourceCodeAnalyzer - { - /// <summary> - /// The name of the last source code file that has successfully been parsed. - /// </summary> - private static string lastFilename; - - /// <summary> - /// The <see cref="AstNode"/> of the last source code file that has successfully been parsed. - /// </summary> - private static AstNode lastNode; - - /// <summary> - /// Gets all classes in the given file. - /// </summary> - /// <param name="filename">The filename.</param> - /// <returns>All classes (with full namespace).</returns> - internal static IEnumerable<string> GetClassesInFile(string filename) - { - if (filename == null) - { - throw new ArgumentNullException(nameof(filename)); - } - - AstNode parentNode = GetParentNode(filename); - - if (parentNode == null) - { - return new string[] { }; - } - else - { - return FindClasses(new AstNode[] { parentNode }).Select(c => GetFullClassName(c)).Distinct(); - } - } - - /// <summary> - /// Searches the given source code file for a source element matching the given <see cref="SourceElement"/>. - /// If the source element can be found, a <see cref="SourceElementPosition"/> containing the start and end line numbers is returned. - /// Otherwise <c>null</c> is returned. - /// </summary> - /// <param name="filename">The filename.</param> - /// <param name="sourceElement">The source element.</param> - /// <returns>A <see cref="SourceElementPosition"/> or <c>null</c> if source element can not be found.</returns> - internal static SourceElementPosition FindSourceElement(string filename, SourceElement sourceElement) - { - if (filename == null) - { - throw new ArgumentNullException(nameof(filename)); - } - - if (sourceElement == null) - { - throw new ArgumentNullException(nameof(sourceElement)); - } - - AstNode parentNode = GetParentNode(filename); - - if (parentNode == null) - { - return null; - } - else - { - var matchingClasses = FindClasses(new AstNode[] { parentNode }).Where(c => GetFullClassName(c) == sourceElement.Classname); - - return FindSourceElement(matchingClasses, sourceElement); - } - } - - /// <summary> - /// Searches the given <see cref="ICSharpCode.NRefactory.PatternMatching.INode">INodes</see> recursively for classes. - /// </summary> - /// <param name="nodes">The nodes.</param> - /// <returns>The type declarations corresponding to all classes.</returns> - private static IEnumerable<TypeDeclaration> FindClasses(IEnumerable<AstNode> nodes) - { - var result = new List<TypeDeclaration>(); - - foreach (var node in nodes) - { - var @class = node as TypeDeclaration; - if (@class != null) - { - result.Add(@class); - } - - if (@class != null || node is NamespaceDeclaration || node is SyntaxTree) - { - result.AddRange(FindClasses(node.Children)); - } - } - - return result; - } - - /// <summary> - /// Searches the given <see cref="ICSharpCode.NRefactory.PatternMatching.INode">INodes</see> recursively for the given <see cref="SourceElement"/>. - /// </summary> - /// <param name="nodes">The nodes.</param> - /// <param name="sourceElement">The source element.</param> - /// <returns>A <see cref="SourceElementPosition"/> or <c>null</c> if source element can not be found.</returns> - private static SourceElementPosition FindSourceElement(IEnumerable<AstNode> nodes, SourceElement sourceElement) - { - foreach (var node in nodes) - { - var sourceElementPosition = sourceElement.GetSourceElementPosition(node); - if (sourceElementPosition != null) - { - return sourceElementPosition; - } - } - - foreach (var node in nodes) - { - var sourceElementPosition = FindSourceElement(node.Children, sourceElement); - if (sourceElementPosition != null) - { - return sourceElementPosition; - } - } - - return null; - } - - /// <summary> - /// Gets the topmost <see cref="ICSharpCode.NRefactory.PatternMatching.INode"/> in the given source file. - /// </summary> - /// <param name="filename">The filename.</param> - /// <returns>The topmost <see cref="ICSharpCode.NRefactory.PatternMatching.INode"/> in the given source file.</returns> - private static AstNode GetParentNode(string filename) - { - if (filename.Equals(lastFilename)) - { - return lastNode; - } - else - { - try - { - using (var fs = new FileStream(filename, FileMode.Open, FileAccess.Read)) - { - var parser = new CSharpParser(); - - var syntaxTree = parser.Parse(fs, filename); - - if (parser.HasErrors || syntaxTree == null) - { - return null; - } - - // Cache the node - lastFilename = filename; - lastNode = syntaxTree; - - return lastNode; - } - } - catch (System.IO.IOException) - { - return null; - } - catch (InvalidCastException) - { - // NRefactory does not support .NET 4.6 yet - return null; - } - catch (UnauthorizedAccessException) - { - return null; - } - } - } - - /// <summary> - /// Gets the full name of the class. - /// </summary> - /// <param name="typeDeclaration">The type declaration.</param> - /// <returns>The full name of the class.</returns> - private static string GetFullClassName(TypeDeclaration typeDeclaration) - { - string result = typeDeclaration.Name; - - AstNode current = typeDeclaration; - while (current.Parent != null) - { - current = current.Parent; - - var parentTypeDeclaration = current as TypeDeclaration; - var parentNamespaceDeclaration = current as NamespaceDeclaration; - - if (parentTypeDeclaration != null) - { - result = parentTypeDeclaration.Name + result; - } - else if (parentNamespaceDeclaration != null) - { - result = parentNamespaceDeclaration.Name + "." + result; - } - else - { - break; - } - } - - return result; - } - } -} diff --git a/src/ReportGenerator.Console/Parser/Preprocessing/CodeAnalysis/SourceElement.cs b/src/ReportGenerator.Console/Parser/Preprocessing/CodeAnalysis/SourceElement.cs deleted file mode 100644 index d60463e5..00000000 --- a/src/ReportGenerator.Console/Parser/Preprocessing/CodeAnalysis/SourceElement.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using ICSharpCode.NRefactory.PatternMatching; - -namespace Palmmedia.ReportGenerator.Parser.Preprocessing.CodeAnalysis -{ - /// <summary> - /// Represents an element in a source code file. - /// </summary> - internal abstract class SourceElement - { - /// <summary> - /// Initializes a new instance of the <see cref="SourceElement"/> class. - /// </summary> - /// <param name="classname">The classname.</param> - internal SourceElement(string classname) - { - if (classname == null) - { - throw new ArgumentNullException(nameof(classname)); - } - - this.Classname = classname; - } - - /// <summary> - /// Gets the classname. - /// </summary> - /// <value>The classname.</value> - internal string Classname { get; } - - /// <summary> - /// Determines whether the given <see cref="ICSharpCode.NRefactory.PatternMatching.INode"/> matches the <see cref="SourceElement"/>. - /// </summary> - /// <param name="node">The node.</param> - /// <returns>A <see cref="SourceElementPosition"/> or <c>null</c> if <see cref="SourceElement"/> does not match the <see cref="ICSharpCode.NRefactory.PatternMatching.INode"/>.</returns> - internal abstract SourceElementPosition GetSourceElementPosition(INode node); - } -} diff --git a/src/ReportGenerator.Console/Parser/Preprocessing/CodeAnalysis/SourceElementPosition.cs b/src/ReportGenerator.Console/Parser/Preprocessing/CodeAnalysis/SourceElementPosition.cs deleted file mode 100644 index 44744a20..00000000 --- a/src/ReportGenerator.Console/Parser/Preprocessing/CodeAnalysis/SourceElementPosition.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace Palmmedia.ReportGenerator.Parser.Preprocessing.CodeAnalysis -{ - /// <summary> - /// Contains information about the position of a method/property within a source code file. - /// </summary> - internal class SourceElementPosition - { - /// <summary> - /// Initializes a new instance of the <see cref="SourceElementPosition"/> class. - /// </summary> - /// <param name="start">The start line number.</param> - /// <param name="end">The end line number.</param> - internal SourceElementPosition(int start, int end) - { - this.Start = start; - this.End = end; - } - - /// <summary> - /// Gets the start line number. - /// </summary> - internal int Start { get; } - - /// <summary> - /// Gets the end line number - /// </summary> - internal int End { get; } - } -} diff --git a/src/ReportGenerator.Console/Parser/Preprocessing/FileSearch/ClassSearcher.cs b/src/ReportGenerator.Console/Parser/Preprocessing/FileSearch/ClassSearcher.cs deleted file mode 100644 index c0e6ba9a..00000000 --- a/src/ReportGenerator.Console/Parser/Preprocessing/FileSearch/ClassSearcher.cs +++ /dev/null @@ -1,104 +0,0 @@ -using System.Collections.Generic; -using System.IO; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser.Preprocessing.CodeAnalysis; -using Palmmedia.ReportGenerator.Properties; - -namespace Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch -{ - /// <summary> - /// Searches one directory for class files. - /// </summary> - internal class ClassSearcher - { - /// <summary> - /// The Logger. - /// </summary> - private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(ClassSearcher)); - - /// <summary> - /// Dictionary containing the files a class is defined in by its classname. - /// </summary> - private readonly Dictionary<string, HashSet<string>> filesByClassName = new Dictionary<string, HashSet<string>>(); - - /// <summary> - /// Indicates whether file search was executed. - /// </summary> - private bool initialized; - - /// <summary> - /// Initializes a new instance of the <see cref="ClassSearcher"/> class. - /// </summary> - /// <param name="directory">The directory that should be searched for class files.</param> - internal ClassSearcher(string directory) - { - this.Directory = directory; - } - - /// <summary> - /// Initializes a new instance of the <see cref="ClassSearcher"/> class. - /// </summary> - protected ClassSearcher() - { - } - - /// <summary> - /// Gets the directory that should be searched for class files. - /// </summary> - internal string Directory { get; } - - /// <summary> - /// Gets the files the given class is defined in. - /// </summary> - /// <param name="className">Name of the class (with full namespace).</param> - /// <returns>The files the class is defined in.</returns> - internal virtual IEnumerable<string> GetFilesOfClass(string className) - { - if (!this.initialized) - { - this.SearchClassFiles(); - this.initialized = true; - } - - HashSet<string> filesOfClass; - - if (this.filesByClassName.TryGetValue(className, out filesOfClass)) - { - return filesOfClass; - } - else - { - return new string[] { }; - } - } - - /// <summary> - /// Searches the class files. - /// </summary> - private void SearchClassFiles() - { - if (!System.IO.Directory.Exists(this.Directory)) - { - return; - } - - Logger.DebugFormat(" " + Resources.IndexingClasses, new DirectoryInfo(this.Directory).FullName); - - foreach (var file in SafeDirectorySearcher.EnumerateFiles(this.Directory, "*.cs", SearchOption.AllDirectories)) - { - foreach (var classInFile in SourceCodeAnalyzer.GetClassesInFile(file)) - { - HashSet<string> filesOfClass = null; - - if (!this.filesByClassName.TryGetValue(classInFile, out filesOfClass)) - { - filesOfClass = new HashSet<string>(); - this.filesByClassName.Add(classInFile, filesOfClass); - } - - filesOfClass.Add(file); - } - } - } - } -} \ No newline at end of file diff --git a/src/ReportGenerator.Console/Parser/Preprocessing/FileSearch/ClassSearcherFactory.cs b/src/ReportGenerator.Console/Parser/Preprocessing/FileSearch/ClassSearcherFactory.cs deleted file mode 100644 index a8adb98d..00000000 --- a/src/ReportGenerator.Console/Parser/Preprocessing/FileSearch/ClassSearcherFactory.cs +++ /dev/null @@ -1,53 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -namespace Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch -{ - /// <summary> - /// Factory which provides <see cref="ClassSearcher"/> instances. - /// Instances are cached and reused if the directory of a <see cref="ClassSearcher"/> starts with the desired path. - /// This avoids scanning the same directory several times. - /// </summary> - internal class ClassSearcherFactory - { - /// <summary> - /// The cached <see cref="ClassSearcher">ClassSearchers</see>. - /// </summary> - private readonly List<ClassSearcher> cachedClassSearchers = new List<ClassSearcher>(); - - /// <summary> - /// Creates the class searcher. - /// </summary> - /// <param name="directory">The directory that should be searched for class files.</param> - /// <returns>The class searcher.</returns> - internal ClassSearcher CreateClassSearcher(string directory) - { - if (string.IsNullOrEmpty(directory)) - { - return new ClassSearcher(null); - } - - var cachedClassSearcher = this.cachedClassSearchers.FirstOrDefault(c => c.Directory != null && directory.StartsWith(c.Directory, StringComparison.OrdinalIgnoreCase)); - - if (cachedClassSearcher == null) - { - cachedClassSearcher = new ClassSearcher(directory); - this.cachedClassSearchers.Add(cachedClassSearcher); - } - - return cachedClassSearcher; - } - - /// <summary> - /// Creates the class searcher. - /// </summary> - /// <param name="directories">The directories that should be searched for class files.</param> - /// <returns>The class searcher.</returns> - internal ClassSearcher CreateClassSearcher(params string[] directories) - { - var classSearchers = directories.Select(d => this.CreateClassSearcher(d)).ToArray(); - return new MultiDirectoryClassSearcher(classSearchers); - } - } -} \ No newline at end of file diff --git a/src/ReportGenerator.Console/Parser/Preprocessing/FileSearch/CommonDirectorySearcher.cs b/src/ReportGenerator.Console/Parser/Preprocessing/FileSearch/CommonDirectorySearcher.cs deleted file mode 100644 index fd1d21f5..00000000 --- a/src/ReportGenerator.Console/Parser/Preprocessing/FileSearch/CommonDirectorySearcher.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -namespace Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch -{ - /// <summary> - /// Searches a list of paths for the longest common directory. - /// </summary> - internal static class CommonDirectorySearcher - { - /// <summary> - /// Gets the longest common directory of the given paths. - /// </summary> - /// <param name="files">The files.</param> - /// <returns>The longest common directory of the given paths.</returns> - internal static string GetCommonDirectory(IEnumerable<string> files) - { - if (files == null) - { - throw new ArgumentNullException(nameof(files)); - } - - if (!files.Any()) - { - return null; - } - - string commonPrefix = string.Empty; - - char[] firstValueChars = files.First().ToCharArray(); - - foreach (var currentChar in firstValueChars) - { - string currentPrefix = commonPrefix + currentChar; - - if (files.Any(v => !v.StartsWith(currentPrefix, StringComparison.OrdinalIgnoreCase))) - { - return commonPrefix; - } - else - { - commonPrefix = currentPrefix; - } - } - - return commonPrefix.Substring(0, commonPrefix.LastIndexOf('\\') + 1); - } - } -} diff --git a/src/ReportGenerator.Console/Parser/Preprocessing/FileSearch/MultiDirectoryClassSearcher.cs b/src/ReportGenerator.Console/Parser/Preprocessing/FileSearch/MultiDirectoryClassSearcher.cs deleted file mode 100644 index 9e4c73c2..00000000 --- a/src/ReportGenerator.Console/Parser/Preprocessing/FileSearch/MultiDirectoryClassSearcher.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -namespace Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch -{ - /// <summary> - /// Searches several directories for class files. - /// </summary> - internal class MultiDirectoryClassSearcher : ClassSearcher - { - /// <summary> - /// The <see cref="ClassSearcher">ClassSearchers</see>. - /// </summary> - private readonly IEnumerable<ClassSearcher> classSearchers; - - /// <summary> - /// Initializes a new instance of the <see cref="MultiDirectoryClassSearcher"/> class. - /// </summary> - /// <param name="classSearchers">The <see cref="ClassSearcher">ClassSearchers</see>.</param> - internal MultiDirectoryClassSearcher(IEnumerable<ClassSearcher> classSearchers) - { - if (classSearchers == null) - { - throw new ArgumentNullException(nameof(classSearchers)); - } - - this.classSearchers = classSearchers; - } - - /// <summary> - /// Gets the files the given class is defined in. - /// </summary> - /// <param name="className">Name of the class (with full namespace).</param> - /// <returns>The files the class is defined in.</returns> - internal override IEnumerable<string> GetFilesOfClass(string className) => this.classSearchers - .SelectMany(c => c.GetFilesOfClass(className)) - .Distinct(); - } -} \ No newline at end of file diff --git a/src/ReportGenerator.Console/Parser/Preprocessing/FileSearch/SafeDirectorySearcher.cs b/src/ReportGenerator.Console/Parser/Preprocessing/FileSearch/SafeDirectorySearcher.cs deleted file mode 100644 index 51634918..00000000 --- a/src/ReportGenerator.Console/Parser/Preprocessing/FileSearch/SafeDirectorySearcher.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; - -namespace Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch -{ - /// <summary> - /// Searches directories for files and ignores directories that are not accessible. - /// </summary> - internal static class SafeDirectorySearcher - { - /// <summary> - /// Returns an enumerable collection of files names that match a search patter in a specified path. - /// Directories that can not be accessed are ignored. - /// </summary> - /// <param name="path">The path.</param> - /// <param name="searchPattern">The search pattern.</param> - /// <param name="searchOption">The search option.</param> - /// <returns>The found files.</returns> - internal static IEnumerable<string> EnumerateFiles(string path, string searchPattern, SearchOption searchOption) - { - try - { - var dirFiles = Enumerable.Empty<string>(); - if (searchOption == SearchOption.AllDirectories) - { - dirFiles = Directory.EnumerateDirectories(path) - .SelectMany(x => EnumerateFiles(x, searchPattern, searchOption)); - } - - return dirFiles.Concat(Directory.EnumerateFiles(path, searchPattern)); - } - catch (UnauthorizedAccessException) - { - return Enumerable.Empty<string>(); - } - catch (IOException) - { - return Enumerable.Empty<string>(); - } - } - } -} diff --git a/src/ReportGenerator.Console/Parser/Preprocessing/PartCover22ReportPreprocessor.cs b/src/ReportGenerator.Console/Parser/Preprocessing/PartCover22ReportPreprocessor.cs deleted file mode 100644 index 5921a1af..00000000 --- a/src/ReportGenerator.Console/Parser/Preprocessing/PartCover22ReportPreprocessor.cs +++ /dev/null @@ -1,124 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Xml.Linq; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser.Preprocessing.CodeAnalysis; -using Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch; -using Palmmedia.ReportGenerator.Properties; - -namespace Palmmedia.ReportGenerator.Parser.Preprocessing -{ - /// <summary> - /// Preprocessor for PartCover 2.2 reports. - /// </summary> - internal class PartCover22ReportPreprocessor : ReportPreprocessorBase - { - /// <summary> - /// The Logger. - /// </summary> - private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(PartCover22ReportPreprocessor)); - - /// <summary> - /// Initializes a new instance of the <see cref="PartCover22ReportPreprocessor"/> class. - /// </summary> - /// <param name="report">The report.</param> - /// <param name="classSearcherFactory">The class searcher factory.</param> - /// <param name="globalClassSearcher">The global class searcher.</param> - internal PartCover22ReportPreprocessor(XContainer report, ClassSearcherFactory classSearcherFactory, ClassSearcher globalClassSearcher) - : base(report, classSearcherFactory, globalClassSearcher) - { - } - - /// <summary> - /// Executes the preprocessing of the report. - /// </summary> - internal override void Execute() - { - var filenameByFileIdDictionary = this.Report - .Descendants("file") - .ToDictionary(f => f.Attribute("id").Value, f => f.Attribute("url").Value); - - this.AddCoverageDataOfAutoProperties(filenameByFileIdDictionary); - } - - /// <summary> - /// Adds a new source code file to the report. - /// </summary> - /// <param name="filesContainer">The files container.</param> - /// <param name="fileId">The file id.</param> - /// <param name="file">The file path.</param> - protected override void AddNewFile(XContainer filesContainer, string fileId, string file) - { - XDocument document = filesContainer as XDocument; - - if (document != null) - { - document.Root.Add(new XElement("file", new XAttribute("id", fileId), new XAttribute("url", file))); - } - else - { - filesContainer.Add(new XElement("file", new XAttribute("id", fileId), new XAttribute("url", file))); - } - } - - /// <summary> - /// Updates the property element. - /// </summary> - /// <param name="property">The property.</param> - /// <param name="elementPosition">The element position.</param> - /// <param name="fileId">The file id.</param> - private static void UpdatePropertyElement(XContainer property, SourceElementPosition elementPosition, string fileId) - { - foreach (var pt in property.Element("code").Elements().Take(1)) - { - pt.Add(new XAttribute("sl", elementPosition.Start)); - pt.Add(new XAttribute("fid", fileId)); - } - } - - /// <summary> - /// Adds the coverage data of auto properties. - /// </summary> - /// <param name="filenameByFileIdDictionary">Dictionary containing all files used in the report by their corresponding id.</param> - private void AddCoverageDataOfAutoProperties(Dictionary<string, string> filenameByFileIdDictionary) - { - Func<string, bool> isProperty = v => v.StartsWith("get_", StringComparison.Ordinal) || v.StartsWith("set_", StringComparison.Ordinal); - - var unexecutedProperties = this.Report.Descendants("type") - .Where(type => !type.Attribute("name").Value.Contains("__")) - .Elements("method") - .Where(m => isProperty(m.Attribute("name").Value) && !m.Element("code").Elements().Any(pt => pt.Attribute("sl") != null)) - .ToArray(); - - long counter = 0; - foreach (var property in unexecutedProperties) - { - var propertyElement = new PropertyElement(property.Parent.Attribute("name").Value, property.Attribute("name").Value); - - // Get files in which property could be defined - var fileIds = property.Parent.Descendants("pt") - .Where(p => p.Attribute("fid") != null) - .Select(p => p.Attribute("fid").Value) - .Distinct() - .ToArray(); - - if (this.SearchElement( - propertyElement, - filenameByFileIdDictionary, - fileIds, - property, - UpdatePropertyElement, - this.Report)) - { - counter++; - } - } - - if (unexecutedProperties.LongLength > 0) - { - Logger.DebugFormat(" " + Resources.AddedCoverageInformationOfProperties, counter, unexecutedProperties.LongLength); - } - } - } -} diff --git a/src/ReportGenerator.Console/Parser/Preprocessing/PartCover23ReportPreprocessor.cs b/src/ReportGenerator.Console/Parser/Preprocessing/PartCover23ReportPreprocessor.cs deleted file mode 100644 index 97c453e0..00000000 --- a/src/ReportGenerator.Console/Parser/Preprocessing/PartCover23ReportPreprocessor.cs +++ /dev/null @@ -1,205 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Xml.Linq; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser.Preprocessing.CodeAnalysis; -using Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch; -using Palmmedia.ReportGenerator.Properties; - -namespace Palmmedia.ReportGenerator.Parser.Preprocessing -{ - /// <summary> - /// Preprocessor for PartCover 2.3 reports. - /// </summary> - internal class PartCover23ReportPreprocessor : ReportPreprocessorBase - { - /// <summary> - /// The Logger. - /// </summary> - private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(PartCover23ReportPreprocessor)); - - /// <summary> - /// Initializes a new instance of the <see cref="PartCover23ReportPreprocessor"/> class. - /// </summary> - /// <param name="report">The report.</param> - /// <param name="classSearcherFactory">The class searcher factory.</param> - /// <param name="globalClassSearcher">The global class searcher.</param> - internal PartCover23ReportPreprocessor(XContainer report, ClassSearcherFactory classSearcherFactory, ClassSearcher globalClassSearcher) - : base(report, classSearcherFactory, globalClassSearcher) - { - } - - /// <summary> - /// Executes the preprocessing of the report. - /// </summary> - internal override void Execute() - { - var filenameByFileIdDictionary = this.Report - .Descendants("File") - .ToDictionary(f => f.Attribute("id").Value, f => f.Attribute("url").Value); - - this.AddCoverageDataOfUnexecutedMethods(filenameByFileIdDictionary); - this.AddCoverageDataOfAutoProperties(filenameByFileIdDictionary); - } - - /// <summary> - /// Adds a new source code file to the report. - /// </summary> - /// <param name="filesContainer">The files container.</param> - /// <param name="fileId">The file id.</param> - /// <param name="file">The file path.</param> - protected override void AddNewFile(XContainer filesContainer, string fileId, string file) - { - XDocument document = filesContainer as XDocument; - - if (document != null) - { - document.Root.Add(new XElement("File", new XAttribute("id", fileId), new XAttribute("url", file))); - } - else - { - filesContainer.Add(new XElement("File", new XAttribute("id", fileId), new XAttribute("url", file))); - } - } - - /// <summary> - /// Updates the method element. - /// </summary> - /// <param name="method">The method.</param> - /// <param name="elementPosition">The element position.</param> - /// <param name="fileId">The file id.</param> - private static void UpdateMethodElement(XContainer method, SourceElementPosition elementPosition, string fileId) - { - for (int i = elementPosition.Start; i <= elementPosition.End; i++) - { - var seqpnt = new XElement( - "pt", - new XAttribute("visit", "0"), - new XAttribute("fid", fileId), - new XAttribute("sl", i)); - - method.Add(seqpnt); - } - } - - /// <summary> - /// Updates the property element. - /// </summary> - /// <param name="property">The property.</param> - /// <param name="elementPosition">The element position.</param> - /// <param name="fileId">The file id.</param> - private static void UpdatePropertyElement(XContainer property, SourceElementPosition elementPosition, string fileId) - { - if (!property.Elements().Any()) - { - var seqpnt = new XElement( - "pt", - new XAttribute("visit", "0"), - new XAttribute("fid", fileId), - new XAttribute("sl", elementPosition.Start)); - - property.Add(seqpnt); - } - else - { - foreach (var pt in property.Elements().Take(1)) - { - pt.Add(new XAttribute("sl", elementPosition.Start)); - pt.Add(new XAttribute("fid", fileId)); - } - } - } - - /// <summary> - /// Adds the coverage data of unexecuted methods. - /// </summary> - /// <param name="filenameByFileIdDictionary">Dictionary containing all files used in the report by their corresponding id.</param> - private void AddCoverageDataOfUnexecutedMethods(Dictionary<string, string> filenameByFileIdDictionary) - { - var unexecutedMethods = this.Report.Descendants("Type") - .Where(type => !type.Attribute("name").Value.Contains("__")) - .Elements("Method") - .Where(m => !m.Attribute("name").Value.StartsWith("get_", StringComparison.Ordinal) && !m.Attribute("name").Value.StartsWith("set_", StringComparison.Ordinal)) - .Where(m => !m.Elements().Any()) - .ToArray(); - - long counter = 0; - foreach (var method in unexecutedMethods) - { - PartCoverMethodElement partCoverMethodElement = new PartCoverMethodElement( - method.Parent.Attribute("name").Value, - method.Attribute("name").Value, - method.Attribute("sig").Value); - - // Get files in which property could be defined - var fileIds = method.Parent.Descendants("pt") - .Where(p => p.Attribute("fid") != null) - .Select(p => p.Attribute("fid").Value) - .Distinct() - .ToArray(); - - if (this.SearchElement( - partCoverMethodElement, - filenameByFileIdDictionary, - fileIds, - method, - UpdateMethodElement, - this.Report)) - { - counter++; - } - } - - if (unexecutedMethods.LongLength > 0) - { - Logger.DebugFormat(" " + Resources.AddedCoverageInformationUnexecutedMethods, counter, unexecutedMethods.LongLength); - } - } - - /// <summary> - /// Adds the coverage data of auto properties. - /// </summary> - /// <param name="filenameByFileIdDictionary">Dictionary containing all files used in the report by their corresponding id.</param> - private void AddCoverageDataOfAutoProperties(Dictionary<string, string> filenameByFileIdDictionary) - { - Func<string, bool> isProperty = v => v.StartsWith("get_", StringComparison.Ordinal) || v.StartsWith("set_", StringComparison.Ordinal); - - var unexecutedProperties = this.Report.Descendants("Type") - .Where(type => !type.Attribute("name").Value.Contains("__")) - .Elements("Method") - .Where(m => isProperty(m.Attribute("name").Value) - && (!m.Elements().Any() || !m.Elements().Any(pt => pt.Attribute("sl") != null))) - .ToArray(); - - long counter = 0; - foreach (var property in unexecutedProperties) - { - var propertyElement = new PropertyElement(property.Parent.Attribute("name").Value, property.Attribute("name").Value); - - // Get files in which property could be defined - var fileIds = property.Parent.Descendants("pt") - .Where(p => p.Attribute("fid") != null) - .Select(p => p.Attribute("fid").Value) - .Distinct() - .ToArray(); - - if (this.SearchElement( - propertyElement, - filenameByFileIdDictionary, - fileIds, - property, - UpdatePropertyElement, - this.Report)) - { - counter++; - } - } - - if (unexecutedProperties.LongLength > 0) - { - Logger.DebugFormat(" " + Resources.AddedCoverageInformationOfProperties, counter, unexecutedProperties.LongLength); - } - } - } -} diff --git a/src/ReportGenerator.Console/Parser/Preprocessing/ReportPreprocessorBase.cs b/src/ReportGenerator.Console/Parser/Preprocessing/ReportPreprocessorBase.cs deleted file mode 100644 index d0ad072b..00000000 --- a/src/ReportGenerator.Console/Parser/Preprocessing/ReportPreprocessorBase.cs +++ /dev/null @@ -1,168 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Xml.Linq; -using Palmmedia.ReportGenerator.Parser.Preprocessing.CodeAnalysis; -using Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch; - -namespace Palmmedia.ReportGenerator.Parser.Preprocessing -{ - /// <summary> - /// Base class for report preprocessing. - /// </summary> - internal abstract class ReportPreprocessorBase - { - /// <summary> - /// The <see cref="ClassSearcherFactory"/> used to create instances of <see cref="ClassSearcher"/>. - /// </summary> - private readonly ClassSearcherFactory classSearcherFactory; - - /// <summary> - /// The global <see cref="ClassSearcher"/> instance which is instantiated depending on the source directories entered by the user. - /// </summary> - private readonly ClassSearcher globalClassSearcher; - - /// <summary> - /// The id of the last added file. - /// </summary> - private int currentFileId = int.MaxValue; - - /// <summary> - /// Initializes a new instance of the <see cref="ReportPreprocessorBase"/> class. - /// </summary> - /// <param name="report">The report.</param> - /// <param name="classSearcherFactory">The class searcher factory.</param> - /// <param name="globalClassSearcher">The global class searcher.</param> - internal ReportPreprocessorBase(XContainer report, ClassSearcherFactory classSearcherFactory, ClassSearcher globalClassSearcher) - { - this.Report = report; - this.classSearcherFactory = classSearcherFactory; - this.globalClassSearcher = globalClassSearcher; - } - - /// <summary> - /// Gets the report file as XContainer. - /// </summary> - protected XContainer Report { get; } - - /// <summary> - /// Gets or sets the <see cref="ClassSearcher"/> instance which is instantiated during preprocessing depending on the source directories used in the report. - /// </summary> - protected ClassSearcher ClassSearcher { get; set; } - - /// <summary> - /// Executes the preprocessing of the report. - /// </summary> - internal abstract void Execute(); - - /// <summary> - /// Adds a new source code file to the report. - /// </summary> - /// <param name="filesContainer">The files container.</param> - /// <param name="fileId">The file id.</param> - /// <param name="file">The file path.</param> - protected abstract void AddNewFile(XContainer filesContainer, string fileId, string file); - - /// <summary> - /// Searches the given source element (e.g. property) and updates the report if element can be found in source code files. - /// </summary> - /// <param name="sourceElement">The source element.</param> - /// <param name="filenameByFileIdDictionary">Dictionary containing all files used in the report by their corresponding id.</param> - /// <param name="fileIdsOfClass">The file ids of class.</param> - /// <param name="reportElement">The report element.</param> - /// <param name="updateReportElement">Action that updates the report element.</param> - /// <param name="filesContainer">The files container.</param> - /// <returns><c>true</c> if source element has been found.</returns> - protected bool SearchElement( - SourceElement sourceElement, - Dictionary<string, string> filenameByFileIdDictionary, - IEnumerable<string> fileIdsOfClass, - XContainer reportElement, - Action<XContainer, SourceElementPosition, string> updateReportElement, - XContainer filesContainer) - { - Func<bool> searchSourceElement = () => - { - foreach (var fileId in fileIdsOfClass) - { - var elementPosition = SourceCodeAnalyzer.FindSourceElement(filenameByFileIdDictionary[fileId], sourceElement); - - if (elementPosition != null) - { - updateReportElement(reportElement, elementPosition, fileId); - return true; - } - } - - return false; - }; - - // Search files from module first - if (!searchSourceElement()) - { - // Property has not been found in classes of module, now search the common directory - if (this.ClassSearcher == null) - { - this.ClassSearcher = this.classSearcherFactory.CreateClassSearcher(CommonDirectorySearcher.GetCommonDirectory(filenameByFileIdDictionary.Values)); - } - - fileIdsOfClass = this.TryToFindFileIdsOfClass( - this.ClassSearcher, - sourceElement.Classname, - filenameByFileIdDictionary, - filesContainer); - - // Property has not been found in common directory, now search the global directory - if (!searchSourceElement()) - { - fileIdsOfClass = this.TryToFindFileIdsOfClass( - this.globalClassSearcher, - sourceElement.Classname, - filenameByFileIdDictionary, - filesContainer); - return searchSourceElement(); - } - } - - return true; - } - - /// <summary> - /// Tries to find file ids of class. - /// </summary> - /// <param name="classSearcher">The class searcher.</param> - /// <param name="className">Name of the class.</param> - /// <param name="filenameByFileIdDictionary">Dictionary containing all files used in the report by their corresponding id.</param> - /// <param name="filesContainer">The files container.</param> - /// <returns>The ids of the files the class is defined in.</returns> - private IEnumerable<string> TryToFindFileIdsOfClass(ClassSearcher classSearcher, string className, Dictionary<string, string> filenameByFileIdDictionary, XContainer filesContainer) - { - IEnumerable<string> files = classSearcher.GetFilesOfClass(className.Replace("/", string.Empty)); - - var fileIds = new List<string>(); - foreach (var file in files) - { - var existingFileId = filenameByFileIdDictionary.Where(kv => kv.Value == file).Select(kv => kv.Key).FirstOrDefault(); - if (existingFileId != null) - { - fileIds.Add(existingFileId); - } - else - { - // Update dictionary - string newFileId = this.currentFileId.ToString(CultureInfo.InvariantCulture); - filenameByFileIdDictionary.Add(newFileId, file); - fileIds.Add(newFileId); - - // Update report - this.AddNewFile(filesContainer, newFileId, file); - - this.currentFileId--; - } - } - - return fileIds; - } - } -} diff --git a/src/ReportGenerator.Console/Program.cs b/src/ReportGenerator.Console/Program.cs index 905c29ea..25bc54f8 100644 --- a/src/ReportGenerator.Console/Program.cs +++ b/src/ReportGenerator.Console/Program.cs @@ -1,8 +1,4 @@ -using System; -using System.Linq; -using Palmmedia.ReportGenerator.Reporting; - -namespace Palmmedia.ReportGenerator +namespace Palmmedia.ReportGenerator { /// <summary> /// Command line access to the ReportBuilder. @@ -16,17 +12,7 @@ internal class Program /// <returns>Return code indicating success/failure.</returns> internal static int Main(string[] args) { - var reportConfigurationBuilder = new ReportConfigurationBuilder(new MefReportBuilderFactory()); - if (args.Length < 2) - { - reportConfigurationBuilder.ShowHelp(); - return 1; - } - - args = args.Select(a => a.EndsWith("\"", StringComparison.OrdinalIgnoreCase) ? a.TrimEnd('\"') + "\\" : a).ToArray(); - - ReportConfiguration configuration = reportConfigurationBuilder.Create(args); - return new Generator().GenerateReport(configuration) ? 0 : 1; + return Core.Program.Main(args); } } } diff --git a/src/ReportGenerator.Console/ProgrammIcon.ico b/src/ReportGenerator.Console/ProgramIcon.ico similarity index 100% rename from src/ReportGenerator.Console/ProgrammIcon.ico rename to src/ReportGenerator.Console/ProgramIcon.ico diff --git a/src/ReportGenerator.Console/Properties/AssemblyInfo.cs b/src/ReportGenerator.Console/Properties/AssemblyInfo.cs index 98ce1708..b08d1e91 100644 --- a/src/ReportGenerator.Console/Properties/AssemblyInfo.cs +++ b/src/ReportGenerator.Console/Properties/AssemblyInfo.cs @@ -1,42 +1,35 @@ -using System; -using System.Reflection; -using System.Resources; +using System.Reflection; using System.Runtime.InteropServices; -// Allgemeine Informationen über eine Assembly werden über die folgenden -// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -// die mit einer Assembly verknüpft sind. -[assembly: AssemblyTitle("ReportGenerator")] +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("ReportGenerator.Console")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Palmmedia")] -[assembly: AssemblyProduct("ReportGenerator")] -[assembly: AssemblyCopyright("Copyright © Palmmedia 2018")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("ReportGenerator.Console")] +[assembly: AssemblyCopyright("Copyright © 2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar -// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von -// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest. +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] -// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird -[assembly: Guid("194b5145-bef2-4414-8dcf-2045075bae2d")] +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("19a59768-9410-440d-a857-a1b5d44787b8")] -// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: +// Version information for an assembly consists of the following four values: // -// Hauptversion -// Nebenversion -// Buildnummer +// Major Version +// Minor Version +// Build Number // Revision // -// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern -// übernehmen, indem Sie "*" eingeben: +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.1.2.0")] -[assembly: AssemblyFileVersion("3.1.2.0")] -[assembly: NeutralResourcesLanguageAttribute("en-US")] - -[assembly: CLSCompliant(true)] -[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("ReportGeneratorTest")] -[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicProxyGenAssembly2")] \ No newline at end of file +[assembly: AssemblyVersion("4.0.0.0")] +[assembly: AssemblyFileVersion("4.0.0.0")] diff --git a/src/ReportGenerator.Console/Properties/Settings.Designer.cs b/src/ReportGenerator.Console/Properties/Settings.Designer.cs deleted file mode 100644 index 4ca045b4..00000000 --- a/src/ReportGenerator.Console/Properties/Settings.Designer.cs +++ /dev/null @@ -1,35 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// </auto-generated> -//------------------------------------------------------------------------------ - -namespace Palmmedia.ReportGenerator.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("100")] - public int MaximumOfHistoricCoverageFiles { - get { - return ((int)(this["MaximumOfHistoricCoverageFiles"])); - } - } - } -} diff --git a/src/ReportGenerator.Console/Properties/Settings.settings b/src/ReportGenerator.Console/Properties/Settings.settings deleted file mode 100644 index d51abb44..00000000 --- a/src/ReportGenerator.Console/Properties/Settings.settings +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> -<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Palmmedia.ReportGenerator.Properties" GeneratedClassName="Settings"> - <Profiles /> - <Settings> - <Setting Name="MaximumOfHistoricCoverageFiles" Type="System.Int32" Scope="Application"> - <Value Profile="(Default)">100</Value> - </Setting> - </Settings> -</SettingsFile> \ No newline at end of file diff --git a/src/ReportGenerator.Console/ReportConfiguration.cs b/src/ReportGenerator.Console/ReportConfiguration.cs deleted file mode 100644 index a5362cb0..00000000 --- a/src/ReportGenerator.Console/ReportConfiguration.cs +++ /dev/null @@ -1,329 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using Palmmedia.ReportGenerator.Common; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; -using Palmmedia.ReportGenerator.Reporting; - -namespace Palmmedia.ReportGenerator -{ - /// <summary> - /// Provides all parameters that are required for report generation. - /// </summary> - public class ReportConfiguration : IReportConfiguration - { - /// <summary> - /// The Logger. - /// </summary> - private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(ReportConfiguration)); - - /// <summary> - /// The report files. - /// </summary> - private List<string> reportFiles = new List<string>(); - - /// <summary> - /// The report file pattern that could not be parsed. - /// </summary> - private List<string> failedReportFilePatterns = new List<string>(); - - /// <summary> - /// The report file pattern that could not be parsed. - /// </summary> - private IEnumerable<HistoricCoverage> overallHistoricCoverages = new List<HistoricCoverage>(); - - /// <summary> - /// Determines whether the verbosity level was successfully parsed during initialization. - /// </summary> - private bool verbosityLevelValid = true; - - /// <summary> - /// Initializes a new instance of the <see cref="ReportConfiguration" /> class. - /// </summary> - /// <param name="reportBuilderFactory">The report builder factory.</param> - /// <param name="reportFilePatterns">The report file patterns.</param> - /// <param name="targetDirectory">The target directory.</param> - /// <param name="historyDirectory">The history directory.</param> - /// <param name="reportTypes">The report types.</param> - /// <param name="sourceDirectories">The source directories.</param> - /// <param name="assemblyFilters">The assembly filters.</param> - /// <param name="classFilters">The class filters.</param> - /// <param name="fileFilters">The file filters.</param> - /// <param name="verbosityLevel">The verbosity level.</param> - /// <param name="tag">The custom tag (e.g. build number).</param> - public ReportConfiguration( - IReportBuilderFactory reportBuilderFactory, - IEnumerable<string> reportFilePatterns, - string targetDirectory, - string historyDirectory, - IEnumerable<string> reportTypes, - IEnumerable<string> sourceDirectories, - IEnumerable<string> assemblyFilters, - IEnumerable<string> classFilters, - IEnumerable<string> fileFilters, - string verbosityLevel, - string tag) - { - if (reportBuilderFactory == null) - { - throw new ArgumentNullException(nameof(reportBuilderFactory)); - } - - if (reportFilePatterns == null) - { - throw new ArgumentNullException(nameof(reportFilePatterns)); - } - - if (targetDirectory == null) - { - throw new ArgumentNullException(nameof(targetDirectory)); - } - - if (reportTypes == null) - { - throw new ArgumentNullException(nameof(reportTypes)); - } - - if (sourceDirectories == null) - { - throw new ArgumentNullException(nameof(sourceDirectories)); - } - - if (assemblyFilters == null) - { - throw new ArgumentNullException(nameof(assemblyFilters)); - } - - if (classFilters == null) - { - throw new ArgumentNullException(nameof(classFilters)); - } - - if (fileFilters == null) - { - throw new ArgumentNullException(nameof(fileFilters)); - } - - this.ReportBuilderFactory = reportBuilderFactory; - foreach (var reportFilePattern in reportFilePatterns) - { - try - { - this.reportFiles.AddRange(FileSearch.GetFiles(reportFilePattern)); - } - catch (Exception) - { - this.failedReportFilePatterns.Add(reportFilePattern); - } - } - - this.TargetDirectory = targetDirectory; - this.HistoryDirectory = historyDirectory; - - if (reportTypes.Any()) - { - this.ReportTypes = reportTypes; - } - else - { - this.ReportTypes = new[] { "Html" }; - } - - this.SourceDirectories = sourceDirectories; - this.AssemblyFilters = assemblyFilters; - this.ClassFilters = classFilters; - this.FileFilters = fileFilters; - - if (verbosityLevel != null) - { - VerbosityLevel parsedVerbosityLevel = VerbosityLevel.Verbose; - this.verbosityLevelValid = Enum.TryParse<VerbosityLevel>(verbosityLevel, true, out parsedVerbosityLevel); - this.VerbosityLevel = parsedVerbosityLevel; - } - - this.Tag = tag; - } - - /// <summary> - /// Gets the report builder factory. - /// </summary> - public IReportBuilderFactory ReportBuilderFactory { get; } - - /// <summary> - /// Gets the report files. - /// </summary> - public IEnumerable<string> ReportFiles => this.reportFiles; - - /// <summary> - /// Gets the target directory. - /// </summary> - public string TargetDirectory { get; } - - /// <summary> - /// Gets the history directory. - /// </summary> - public string HistoryDirectory { get; } - - /// <summary> - /// Gets the type of the report. - /// </summary> - public IEnumerable<string> ReportTypes { get; } - - /// <summary> - /// Gets the source directories. - /// </summary> - public IEnumerable<string> SourceDirectories { get; } - - /// <summary> - /// Gets the assembly filters. - /// </summary> - public IEnumerable<string> AssemblyFilters { get; } - - /// <summary> - /// Gets the class filters. - /// </summary> - public IEnumerable<string> ClassFilters { get; } - - /// <summary> - /// Gets the file filters. - /// </summary> - public IEnumerable<string> FileFilters { get; } - - /// <summary> - /// Gets the verbosity level. - /// </summary> - public VerbosityLevel VerbosityLevel { get; } - - /// <summary> - /// Gets the custom tag (e.g. build number). - /// </summary> - public string Tag { get; } - - /// <summary> - /// Gets or sets all historic coverage elements. - /// </summary> - public IEnumerable<HistoricCoverage> OverallHistoricCoverages - { - get - { - return this.overallHistoricCoverages; - } - - set - { - this.overallHistoricCoverages = value ?? this.overallHistoricCoverages; - } - } - - /// <summary> - /// Validates all parameters. - /// </summary> - /// <returns> - /// <c>true</c> if all parameters are in a valid state; otherwise <c>false</c>. - /// </returns> - internal bool Validate() - { - bool result = true; - - if (this.failedReportFilePatterns.Count > 0) - { - foreach (var failedReportFilePattern in this.failedReportFilePatterns) - { - Logger.ErrorFormat(Resources.FailedReportFilePattern, failedReportFilePattern); - } - - result &= false; - } - - if (!this.ReportFiles.Any()) - { - Logger.Error(Resources.NoReportFiles); - result &= false; - } - else - { - foreach (var file in this.ReportFiles) - { - if (!File.Exists(file)) - { - Logger.ErrorFormat(Resources.NotExistingReportFile, file); - result &= false; - } - } - } - - if (string.IsNullOrEmpty(this.TargetDirectory)) - { - Logger.Error(Resources.NoTargetDirectory); - result &= false; - } - else if (!Directory.Exists(this.TargetDirectory)) - { - try - { - Directory.CreateDirectory(this.TargetDirectory); - } - catch (Exception ex) - { - Logger.ErrorFormat(Resources.TargetDirectoryCouldNotBeCreated, this.TargetDirectory, ex.Message); - result &= false; - } - } - - if (!string.IsNullOrEmpty(this.HistoryDirectory) && !Directory.Exists(this.HistoryDirectory)) - { - try - { - Directory.CreateDirectory(this.HistoryDirectory); - } - catch (Exception ex) - { - Logger.ErrorFormat(Resources.HistoryDirectoryCouldNotBeCreated, this.HistoryDirectory, ex.Message); - result &= false; - } - } - - var availableReportTypes = this.ReportBuilderFactory.GetAvailableReportTypes(); - - foreach (var reportType in this.ReportTypes) - { - if (!availableReportTypes.Contains(reportType, StringComparer.OrdinalIgnoreCase)) - { - Logger.ErrorFormat(Resources.UnknownReportType, reportType); - result &= false; - } - } - - foreach (var directory in this.SourceDirectories) - { - if (!Directory.Exists(directory)) - { - Logger.ErrorFormat(Resources.SourceDirectoryDoesNotExist, directory); - result &= false; - } - } - - foreach (var filter in this.AssemblyFilters) - { - if (string.IsNullOrEmpty(filter) - || (!filter.StartsWith("+", StringComparison.OrdinalIgnoreCase) - && !filter.StartsWith("-", StringComparison.OrdinalIgnoreCase))) - { - Logger.ErrorFormat(Resources.InvalidFilter, filter); - result &= false; - } - } - - if (!this.verbosityLevelValid) - { - Logger.Error(Resources.UnknownVerbosityLevel); - result &= false; - } - - return result; - } - } -} diff --git a/src/ReportGenerator.Console/ReportConfigurationBuilder.cs b/src/ReportGenerator.Console/ReportConfigurationBuilder.cs deleted file mode 100644 index 00ffe4f3..00000000 --- a/src/ReportGenerator.Console/ReportConfigurationBuilder.cs +++ /dev/null @@ -1,217 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Reflection; -using System.Text.RegularExpressions; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Properties; -using Palmmedia.ReportGenerator.Reporting; - -namespace Palmmedia.ReportGenerator -{ - /// <summary> - /// Builder for <see cref="ReportConfiguration"/>. - /// Creates instances of <see cref="ReportConfiguration"/> based on command line parameters. - /// </summary> - internal class ReportConfigurationBuilder - { - /// <summary> - /// The report builder factory. - /// </summary> - private readonly IReportBuilderFactory reportBuilderFactory; - - /// <summary> - /// Initializes a new instance of the <see cref="ReportConfigurationBuilder"/> class. - /// </summary> - /// <param name="reportBuilderFactory">The report builder factory.</param> - internal ReportConfigurationBuilder( - IReportBuilderFactory reportBuilderFactory) - { - if (reportBuilderFactory == null) - { - throw new ArgumentNullException(nameof(reportBuilderFactory)); - } - - this.reportBuilderFactory = reportBuilderFactory; - } - - /// <summary> - /// Initializes a new instance of the <see cref="ReportConfiguration"/> class. - /// </summary> - /// <param name="args">The command line arguments.</param> - /// <returns>The report configuration.</returns> - internal ReportConfiguration Create(string[] args) - { - if (args == null) - { - throw new ArgumentNullException(nameof(args)); - } - - var namedArguments = new Dictionary<string, string>(); - - foreach (var arg in args) - { - var match = Regex.Match(arg, "-(?<key>\\w{2,}):(?<value>.+)"); - - if (match.Success) - { - namedArguments[match.Groups["key"].Value.ToUpperInvariant()] = match.Groups["value"].Value; - } - } - - var reportFilePatterns = new string[] { }; - string targetDirectory = string.Empty; - string historyDirectory = null; - var reportTypes = new string[] { }; - var sourceDirectories = new string[] { }; - var assemblyFilters = new string[] { }; - var classFilters = new string[] { }; - var fileFilters = new string[] { }; - string verbosityLevel = null; - string tag = null; - - string value = null; - - if (namedArguments.TryGetValue("REPORTS", out value)) - { - reportFilePatterns = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); - } - - if (namedArguments.TryGetValue("TARGETDIR", out value)) - { - targetDirectory = value; - } - - if (namedArguments.TryGetValue("HISTORYDIR", out value)) - { - historyDirectory = value; - } - - if (namedArguments.TryGetValue("REPORTTYPES", out value)) - { - reportTypes = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); - } - else if (namedArguments.TryGetValue("REPORTTYPE", out value)) - { - reportTypes = new[] { value }; - } - - if (namedArguments.TryGetValue("SOURCEDIRS", out value)) - { - sourceDirectories = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); - } - - if (namedArguments.TryGetValue("ASSEMBLYFILTERS", out value)) - { - assemblyFilters = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); - } - else if (namedArguments.TryGetValue("FILTERS", out value)) - { - assemblyFilters = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); - } - - if (namedArguments.TryGetValue("CLASSFILTERS", out value)) - { - classFilters = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); - } - - if (namedArguments.TryGetValue("FILEFILTERS", out value)) - { - fileFilters = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); - } - - if (namedArguments.TryGetValue("VERBOSITY", out value)) - { - verbosityLevel = value; - } - - if (namedArguments.TryGetValue("TAG", out value)) - { - tag = value; - } - - return new ReportConfiguration( - this.reportBuilderFactory, - reportFilePatterns, - targetDirectory, - historyDirectory, - reportTypes, - sourceDirectories, - assemblyFilters, - classFilters, - fileFilters, - verbosityLevel, - tag); - } - - /// <summary> - /// Shows the help of the program. - /// </summary> - internal void ShowHelp() - { - var availableReportTypes = this.reportBuilderFactory.GetAvailableReportTypes(); - - Console.WriteLine(); - Console.WriteLine(typeof(ReportConfigurationBuilder).Assembly.GetName().Name + " " - + typeof(ReportConfigurationBuilder).Assembly.GetName().Version); - - AssemblyCopyrightAttribute assemblyCopyrightAttribute = typeof(ReportConfigurationBuilder).Assembly - .GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false) - .Cast<AssemblyCopyrightAttribute>() - .FirstOrDefault(); - - if (assemblyCopyrightAttribute != null) - { - Console.WriteLine(assemblyCopyrightAttribute.Copyright); - } - - Console.WriteLine(); - Console.WriteLine(Help.Parameters); - Console.WriteLine(" " + Help.Parameters1); - Console.WriteLine(" " + Help.Parameters2); - Console.WriteLine(string.Format(CultureInfo.InvariantCulture, " " + Help.Parameters3, string.Join("|", availableReportTypes.Take(3).Union(new[] { "..." })))); - Console.WriteLine(" " + Help.Parameters4); - Console.WriteLine(" " + Help.Parameters5); - Console.WriteLine(" " + Help.Parameters6); - Console.WriteLine(" " + Help.Parameters7); - Console.WriteLine(" " + Help.Parameters8); - Console.WriteLine(string.Format(CultureInfo.InvariantCulture, " " + Help.Parameters9, string.Join("|", Enum.GetNames(typeof(VerbosityLevel))))); - Console.WriteLine(" " + Help.Parameters10); - - Console.WriteLine(); - Console.WriteLine(Help.Explanations); - Console.WriteLine(" " + Help.Explanations1); - Console.WriteLine(" " + Help.Explanations2); - Console.WriteLine(" " + Help.Explanations3); - Console.WriteLine(string.Format(CultureInfo.InvariantCulture, " " + Help.ReportTypeValues, string.Join(", ", availableReportTypes))); - Console.WriteLine(" " + Help.Explanations4); - Console.WriteLine(" " + Help.Explanations5); - Console.WriteLine(" " + Help.Explanations6); - Console.WriteLine(" " + Help.Explanations7); - Console.WriteLine(" " + Help.Explanations8); - Console.WriteLine(" " + Help.Explanations9); - Console.WriteLine(" " + Help.Explanations10); - Console.WriteLine(" " + Help.Explanations11); - Console.WriteLine(" " + Help.Explanations12); - Console.WriteLine(string.Format(CultureInfo.InvariantCulture, " " + Help.VerbosityValues, string.Join(", ", Enum.GetNames(typeof(VerbosityLevel))))); - Console.WriteLine(" " + Help.Explanations13); - - Console.WriteLine(); - Console.WriteLine(Help.DefaultValues); - Console.WriteLine(" -reporttypes:Html"); - Console.WriteLine(" -assemblyfilters:+*"); - Console.WriteLine(" -classfilters:+*"); - Console.WriteLine(" -filefilters:+*"); - Console.WriteLine(" -verbosity:" + VerbosityLevel.Verbose); - - Console.WriteLine(); - Console.WriteLine(Help.Examples); - Console.WriteLine(" \"-reports:coverage.xml\" \"-targetdir:C:\\report\""); - Console.WriteLine(" \"-reports:target\\*\\*.xml\" \"-targetdir:C:\\report\" -reporttypes:Latex;HtmlSummary -tag:v1.4.5"); - Console.WriteLine(" \"-reports:coverage1.xml;coverage2.xml\" \"-targetdir:report\""); - Console.WriteLine(" \"-reports:coverage.xml\" \"-targetdir:C:\\report\" -reporttypes:Latex \"-sourcedirs:C:\\MyProject\""); - Console.WriteLine(" \"-reports:coverage.xml\" \"-targetdir:C:\\report\" \"-sourcedirs:C:\\MyProject1;C:\\MyProject2\" \"-assemblyfilters:+Included;-Excluded.*\""); - } - } -} \ No newline at end of file diff --git a/src/ReportGenerator.Console/ReportGenerator.Console.Net.csproj b/src/ReportGenerator.Console/ReportGenerator.Console.Net.csproj new file mode 100644 index 00000000..a24ce5a1 --- /dev/null +++ b/src/ReportGenerator.Console/ReportGenerator.Console.Net.csproj @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProjectGuid>{19A59768-9410-440D-A857-A1B5D44787B8}</ProjectGuid> + <OutputType>Exe</OutputType> + <RootNamespace>Palmmedia.ReportGenerator</RootNamespace> + <AssemblyName>ReportGenerator</AssemblyName> + <TargetFrameworkVersion>v4.7</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>..\target\bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>..\target\bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup> + <StartupObject>Palmmedia.ReportGenerator.Program</StartupObject> + </PropertyGroup> + <PropertyGroup> + <ApplicationIcon>ProgramIcon.ico</ApplicationIcon> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Data" /> + <Reference Include="System.Net.Http" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="MSBuild\ReportGenerator.cs" /> + <Compile Include="Program.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <None Include="App.config" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\ReportGenerator.Core\ReportGenerator.Core.csproj"> + <Project>{8dbcf22a-18a3-4a50-899d-8af6ed9975d0}</Project> + <Name>ReportGenerator.Core</Name> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <Content Include="..\..\LICENSE.txt"> + <Link>LICENSE.txt</Link> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> + <Content Include="..\Readme.txt"> + <Link>Readme.txt</Link> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> + <Content Include="ProgramIcon.ico" /> + </ItemGroup> + <ItemGroup> + <PackageReference Include="Microsoft.Build.Utilities.Core"> + <Version>15.8.166</Version> + </PackageReference> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> +</Project> \ No newline at end of file diff --git a/src/ReportGenerator.Console/ReportGenerator.Console.csproj b/src/ReportGenerator.Console/ReportGenerator.Console.csproj deleted file mode 100644 index afab2c73..00000000 --- a/src/ReportGenerator.Console/ReportGenerator.Console.csproj +++ /dev/null @@ -1,261 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.30729</ProductVersion> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{BBDF4589-00C7-44C9-97E5-641D708BCA3C}</ProjectGuid> - <OutputType>Exe</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>Palmmedia.ReportGenerator</RootNamespace> - <AssemblyName>ReportGenerator</AssemblyName> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - <IsWebBootstrapper>false</IsWebBootstrapper> - <SignAssembly>false</SignAssembly> - <AssemblyOriginatorKeyFile>../PalmmediaKey.snk</AssemblyOriginatorKeyFile> - <ApplicationIcon>ProgrammIcon.ico</ApplicationIcon> - <FileUpgradeFlags> - </FileUpgradeFlags> - <OldToolsVersion>3.5</OldToolsVersion> - <UpgradeBackupLocation /> - <PublishUrl>publish\</PublishUrl> - <Install>true</Install> - <InstallFrom>Disk</InstallFrom> - <UpdateEnabled>false</UpdateEnabled> - <UpdateMode>Foreground</UpdateMode> - <UpdateInterval>7</UpdateInterval> - <UpdateIntervalUnits>Days</UpdateIntervalUnits> - <UpdatePeriodically>false</UpdatePeriodically> - <UpdateRequired>false</UpdateRequired> - <MapFileExtensions>true</MapFileExtensions> - <ApplicationRevision>0</ApplicationRevision> - <ApplicationVersion>1.0.0.%2a</ApplicationVersion> - <UseApplicationTrust>false</UseApplicationTrust> - <BootstrapperEnabled>true</BootstrapperEnabled> - <TargetFrameworkProfile /> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>..\target\bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <DocumentationFile> - </DocumentationFile> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>..\target\bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <DocumentationFile>..\target\bin\Release\ReportGenerator.XML</DocumentationFile> - <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> - <RunCodeAnalysis>true</RunCodeAnalysis> - </PropertyGroup> - <PropertyGroup> - <StartupObject>Palmmedia.ReportGenerator.Program</StartupObject> - </PropertyGroup> - <ItemGroup> - <Reference Include="Microsoft.Build.Framework" /> - <Reference Include="Microsoft.Build.Utilities.v4.0" /> - <Reference Include="System" /> - <Reference Include="System.ComponentModel.Composition" /> - <Reference Include="System.Core"> - <RequiredTargetFramework>3.5</RequiredTargetFramework> - </Reference> - <Reference Include="System.Xml" /> - <Reference Include="System.Xml.Linq"> - <RequiredTargetFramework>3.5</RequiredTargetFramework> - </Reference> - </ItemGroup> - <ItemGroup> - <Compile Include="Common\FileSearch.cs" /> - <Compile Include="IReportGenerator.cs" /> - <Compile Include="Logging\ConsoleLogger.cs" /> - <Compile Include="Logging\ConsoleLoggerFactory.cs" /> - <Compile Include="Logging\ILogger.cs" /> - <Compile Include="Logging\ILoggerFactory.cs" /> - <Compile Include="Logging\LoggerFactory.cs" /> - <Compile Include="Parser\Analysis\Branch.cs" /> - <Compile Include="Parser\Analysis\CodeElement.cs" /> - <Compile Include="Parser\Analysis\HistoricCoverage.cs" /> - <Compile Include="Parser\Analysis\CodeElementType.cs" /> - <Compile Include="Parser\Analysis\MetricType.cs" /> - <Compile Include="Parser\Analysis\SummaryResult.cs" /> - <Compile Include="Parser\Analysis\LineAnalysis.cs" /> - <Compile Include="Parser\Analysis\TestMethod.cs" /> - <Compile Include="Parser\Analysis\CoverageByTrackedMethod.cs" /> - <Compile Include="Parser\DynamicCodeCoverageParser.cs" /> - <Compile Include="Parser\DotCoverParser.cs" /> - <Compile Include="Parser\CoberturaParser.cs" /> - <Compile Include="Parser\Preprocessing\DynamicCodeCoverageReportPreprocessor.cs" /> - <Compile Include="Parser\Preprocessing\DotCoverReportPreprocessor.cs" /> - <Compile Include="Parser\Preprocessing\CoberturaReportPreprocessor.cs" /> - <Compile Include="Parser\Preprocessing\VisualStudioReportPreprocessor.cs" /> - <Compile Include="Parser\Preprocessing\FileSearch\SafeDirectorySearcher.cs" /> - <Compile Include="Parser\MProfParser.cs" /> - <Compile Include="Parser\VisualStudioParser.cs" /> - <Compile Include="Properties\ReportResources.Designer.cs"> - <DependentUpon>ReportResources.resx</DependentUpon> - <AutoGen>True</AutoGen> - <DesignTime>True</DesignTime> - </Compile> - <Compile Include="Properties\Settings.Designer.cs"> - <AutoGen>True</AutoGen> - <DesignTimeSharedInput>True</DesignTimeSharedInput> - <DependentUpon>Settings.settings</DependentUpon> - </Compile> - <Compile Include="ReportConfigurationBuilder.cs" /> - <Compile Include="Properties\Help.Designer.cs"> - <AutoGen>True</AutoGen> - <DesignTime>True</DesignTime> - <DependentUpon>Help.resx</DependentUpon> - </Compile> - <Compile Include="Parser\Analysis\CodeFile.cs" /> - <Compile Include="Parser\Analysis\CoverageType.cs" /> - <Compile Include="Common\LinqExtensions.cs" /> - <Compile Include="Parser\Preprocessing\FileSearch\ClassSearcherFactory.cs" /> - <Compile Include="Parser\Preprocessing\FileSearch\MultiDirectoryClassSearcher.cs" /> - <Compile Include="ReportConfiguration.cs" /> - <Compile Include="GlobalSuppressions.cs" /> - <Compile Include="MSBuild\ReportGenerator.cs" /> - <Compile Include="Parser\Preprocessing\CodeAnalysis\PropertyElement.cs" /> - <Compile Include="Parser\Preprocessing\CodeAnalysis\SourceElement.cs" /> - <Compile Include="Parser\Preprocessing\FileSearch\ClassSearcher.cs" /> - <Compile Include="Parser\Preprocessing\FileSearch\CommonDirectorySearcher.cs" /> - <Compile Include="Parser\Analysis\MethodMetric.cs" /> - <Compile Include="Parser\Analysis\Metric.cs" /> - <Compile Include="Parser\OpenCoverParser.cs" /> - <Compile Include="Parser\IParser.cs" /> - <Compile Include="Parser\Preprocessing\ReportPreprocessorBase.cs" /> - <Compile Include="Parser\Preprocessing\PartCover23ReportPreprocessor.cs" /> - <Compile Include="Parser\Preprocessing\PartCover22ReportPreprocessor.cs" /> - <Compile Include="Parser\Preprocessing\OpenCoverReportPreprocessor.cs" /> - <Compile Include="Program.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="Parser\Analysis\FileAnalysis.cs" /> - <Compile Include="Parser\Analysis\ShortLineAnalysis.cs" /> - <Compile Include="Parser\Analysis\LineVisitStatus.cs" /> - <Compile Include="Generator.cs" /> - <Compile Include="Reporting\DefaultFilter.cs" /> - <Compile Include="Reporting\FileUnblocker.cs" /> - <Compile Include="Reporting\History\FileHistoryStorage.cs" /> - <Compile Include="Reporting\History\HistoryParser.cs" /> - <Compile Include="Reporting\History\IHistoryStorage.cs" /> - <Compile Include="Reporting\History\MefHistoryStorageFactory.cs" /> - <Compile Include="Reporting\IFilter.cs" /> - <Compile Include="Reporting\IReportBuilder.cs" /> - <Compile Include="Properties\Resources.Designer.cs"> - <AutoGen>True</AutoGen> - <DesignTime>True</DesignTime> - <DependentUpon>Resources.resx</DependentUpon> - </Compile> - <Compile Include="Reporting\IReportBuilderFactory.cs" /> - <Compile Include="Reporting\IReportConfiguration.cs" /> - <Compile Include="Reporting\MefHelper.cs" /> - <Compile Include="Reporting\MefReportBuilderFactory.cs" /> - <Compile Include="Reporting\History\HistoryReportGenerator.cs" /> - <Compile Include="Reporting\ReportGenerator.cs" /> - <Compile Include="Logging\VerbosityLevel.cs" /> - </ItemGroup> - <ItemGroup> - <Compile Include="Parser\Analysis\Class.cs" /> - <Compile Include="Parser\Analysis\Assembly.cs" /> - <Compile Include="Parser\Preprocessing\CodeAnalysis\SourceCodeAnalyzer.cs" /> - <Compile Include="Parser\Preprocessing\CodeAnalysis\PartCoverMethodElement.cs" /> - <Compile Include="Parser\Preprocessing\CodeAnalysis\SourceElementPosition.cs" /> - <Compile Include="Parser\MultiReportParser.cs" /> - <Compile Include="Parser\NCoverParser.cs" /> - <Compile Include="Parser\ParserBase.cs" /> - <Compile Include="Parser\ParserFactory.cs" /> - <Compile Include="Parser\PartCover22Parser.cs" /> - <Compile Include="Parser\PartCover23Parser.cs" /> - </ItemGroup> - <ItemGroup> - <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> - <Visible>False</Visible> - <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName> - <Install>true</Install> - </BootstrapperPackage> - <BootstrapperPackage Include="Microsoft.Net.Framework.2.0"> - <Visible>False</Visible> - <ProductName>.NET Framework 2.0 %28x86%29</ProductName> - <Install>false</Install> - </BootstrapperPackage> - <BootstrapperPackage Include="Microsoft.Net.Framework.3.0"> - <Visible>False</Visible> - <ProductName>.NET Framework 3.0 %28x86%29</ProductName> - <Install>false</Install> - </BootstrapperPackage> - <BootstrapperPackage Include="Microsoft.Net.Framework.3.5"> - <Visible>False</Visible> - <ProductName>.NET Framework 3.5</ProductName> - <Install>false</Install> - </BootstrapperPackage> - <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> - <Visible>False</Visible> - <ProductName>.NET Framework 3.5 SP1</ProductName> - <Install>false</Install> - </BootstrapperPackage> - <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1"> - <Visible>False</Visible> - <ProductName>Windows Installer 3.1</ProductName> - <Install>true</Install> - </BootstrapperPackage> - </ItemGroup> - <ItemGroup> - <Content Include="..\..\LICENSE.txt"> - <Link>LICENSE.txt</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> - <Content Include="..\Readme.txt"> - <Link>Readme.txt</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> - <Content Include="ProgrammIcon.ico" /> - </ItemGroup> - <ItemGroup> - <None Include="app.config" /> - <None Include="Properties\Settings.settings"> - <Generator>SettingsSingleFileGenerator</Generator> - <LastGenOutput>Settings.Designer.cs</LastGenOutput> - </None> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Properties\Help.resx"> - <Generator>ResXFileCodeGenerator</Generator> - <LastGenOutput>Help.Designer.cs</LastGenOutput> - <SubType>Designer</SubType> - </EmbeddedResource> - <EmbeddedResource Include="Properties\ReportResources.resx"> - <Generator>PublicResXFileCodeGenerator</Generator> - <LastGenOutput>ReportResources.Designer.cs</LastGenOutput> - <SubType>Designer</SubType> - </EmbeddedResource> - <EmbeddedResource Include="Properties\Resources.resx"> - <Generator>ResXFileCodeGenerator</Generator> - <LastGenOutput>Resources.Designer.cs</LastGenOutput> - <SubType>Designer</SubType> - </EmbeddedResource> - </ItemGroup> - <ItemGroup> - <PackageReference Include="ICSharpCode.NRefactory"> - <Version>5.5.1</Version> - </PackageReference> - </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> -</Project> \ No newline at end of file diff --git a/src/ReportGenerator.Console/Reporting/History/MefHistoryStorageFactory.cs b/src/ReportGenerator.Console/Reporting/History/MefHistoryStorageFactory.cs deleted file mode 100644 index 9aad09a7..00000000 --- a/src/ReportGenerator.Console/Reporting/History/MefHistoryStorageFactory.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System.Linq; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Properties; - -namespace Palmmedia.ReportGenerator.Reporting.History -{ - /// <summary> - /// Factory of <see cref="IHistoryStorage"/> based on MEF. - /// </summary> - internal class MefHistoryStorageFactory - { - /// <summary> - /// The Logger. - /// </summary> - private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(MefHistoryStorageFactory)); - - /// <summary> - /// Gets the history storage. - /// </summary> - /// <param name="reportConfiguration">The report configuration.</param> - /// <returns> - /// The history storage or <code>null</code> if no storage exists. - /// </returns> - public IHistoryStorage GetHistoryStorage(ReportConfiguration reportConfiguration) - { - var storages = MefHelper.LoadInstancesOfType<IHistoryStorage>().ToArray(); - - if (storages.Length == 1) - { - return storages[0]; - } - else if (storages.Length > 1) - { - Logger.WarnFormat(Resources.SeveralCustomHistoryStorages); - } - else if (reportConfiguration.HistoryDirectory != null) - { - return new FileHistoryStorage(reportConfiguration.HistoryDirectory); - } - - return null; - } - } -} diff --git a/src/ReportGenerator.Console/Reporting/MefHelper.cs b/src/ReportGenerator.Console/Reporting/MefHelper.cs deleted file mode 100644 index 1b4f3aff..00000000 --- a/src/ReportGenerator.Console/Reporting/MefHelper.cs +++ /dev/null @@ -1,66 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.Composition.Hosting; -using System.IO; -using System.Linq; -using System.Reflection; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Properties; - -namespace Palmmedia.ReportGenerator.Reporting -{ - /// <summary> - /// Helper methods for MEF. - /// </summary> - internal static class MefHelper - { - /// <summary> - /// The Logger. - /// </summary> - private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(MefHelper)); - - /// <summary> - /// Creates instances of all matching types found in all DLLs. - /// </summary> - /// <typeparam name="T">The type.</typeparam> - /// <returns>The instances.</returns> - public static IEnumerable<T> LoadInstancesOfType<T>() - { - using (AggregateCatalog aggregateCatalog = new AggregateCatalog()) - { - foreach (var file in new FileInfo(typeof(MefHelper).Assembly.Location).Directory.EnumerateFiles("*.dll")) - { - try - { - // Unblock files, this prevents FileLoadException (e.g. if file was extracted from a ZIP archive) - FileUnblocker.Unblock(file.FullName); - - var assemblyCatalog = new AssemblyCatalog(Assembly.LoadFrom(file.FullName)); - assemblyCatalog.Parts.ToArray(); // This may throw ReflectionTypeLoadException - aggregateCatalog.Catalogs.Add(assemblyCatalog); - } - catch (FileLoadException) - { - Logger.ErrorFormat(Resources.FileLoadError, file.FullName); - throw; - } - catch (ReflectionTypeLoadException ex) - { - if (!file.Name.Equals("ICSharpCode.NRefactory.Cecil.dll", StringComparison.OrdinalIgnoreCase)) - { - string errors = string.Join(Environment.NewLine, ex.LoaderExceptions.Select(e => "-" + e.Message)); - Logger.ErrorFormat(Resources.FileReflectionLoadError, file.FullName, errors); - } - - // Ignore assemblies that throw this exception - } - } - - using (var container = new CompositionContainer(aggregateCatalog)) - { - return container.GetExportedValues<T>(); - } - } - } - } -} diff --git a/src/ReportGenerator.Console/Reporting/ReportGenerator.cs b/src/ReportGenerator.Console/Reporting/ReportGenerator.cs deleted file mode 100644 index a939d3f7..00000000 --- a/src/ReportGenerator.Console/Reporting/ReportGenerator.cs +++ /dev/null @@ -1,195 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; - -namespace Palmmedia.ReportGenerator.Reporting -{ - /// <summary> - /// Converts a coverage report generated by PartCover, OpenCover or NCover into a readable report. - /// In contrast to the XSLT-Transformation included in PartCover, the report is more detailed. - /// It does not only show the coverage quota, but also includes the source code and visualizes which line has been covered. - /// </summary> - internal class ReportGenerator - { - /// <summary> - /// The Logger. - /// </summary> - private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(ReportGenerator)); - - /// <summary> - /// The parser to use. - /// </summary> - private readonly IParser parser; - - /// <summary> - /// The renderers. - /// </summary> - private readonly IEnumerable<IReportBuilder> renderers; - - /// <summary> - /// The assembly filter. - /// </summary> - private readonly IFilter assemblyFilter; - - /// <summary> - /// The class filter. - /// </summary> - private readonly IFilter classFilter; - - /// <summary> - /// The file filter. - /// </summary> - private readonly IFilter fileFilter; - - /// <summary> - /// Initializes a new instance of the <see cref="ReportGenerator" /> class. - /// </summary> - /// <param name="parser">The IParser to use.</param> - /// <param name="assemblyFilter">The assembly filter.</param> - /// <param name="classFilter">The class filter.</param> - /// <param name="fileFilter">The file filter.</param> - /// <param name="renderers">The renderers.</param> - internal ReportGenerator(IParser parser, IFilter assemblyFilter, IFilter classFilter, IFilter fileFilter, IEnumerable<IReportBuilder> renderers) - { - if (parser == null) - { - throw new ArgumentNullException(nameof(parser)); - } - - if (assemblyFilter == null) - { - throw new ArgumentNullException(nameof(assemblyFilter)); - } - - if (classFilter == null) - { - throw new ArgumentNullException(nameof(classFilter)); - } - - if (fileFilter == null) - { - throw new ArgumentNullException(nameof(fileFilter)); - } - - if (renderers == null) - { - throw new ArgumentNullException(nameof(renderers)); - } - - this.parser = parser; - this.assemblyFilter = assemblyFilter; - this.classFilter = classFilter; - this.fileFilter = fileFilter; - this.renderers = renderers; - } - - /// <summary> - /// Starts the generation of the report. - /// </summary> - /// <param name="addHistoricCoverage">if set to <c>true</c> historic coverage information is added to classes.</param> - /// <param name="overallHistoricCoverages">All historic coverage elements.</param> - /// <param name="executionTime">The execution time.</param> - /// <param name="tag">The custom tag (e.g. build number).</param> - /// <returns>The filters assemblies.</returns> - internal IEnumerable<Assembly> CreateReport(bool addHistoricCoverage, List<HistoricCoverage> overallHistoricCoverages, DateTime executionTime, string tag) - { - var filteredAssemblies = this.parser.Assemblies - .Where(a => this.assemblyFilter.IsElementIncludedInReport(a.Name)) - .Select(a => - { - var newAssembly = new Assembly(a.Name); - foreach (var @class in a.Classes) - { - if (classFilter.IsElementIncludedInReport(@class.Name)) - { - // If all files are removed by filters, then the whole class gets removed/not added - bool hasFiles = @class.Files.Any(); - - foreach (var file in @class.Files.Where(f => !this.fileFilter.IsElementIncludedInReport(f.Path))) - { - @class.RemoveFile(file); - } - - if (!hasFiles || @class.Files.Any()) - { - newAssembly.AddClass(@class); - } - } - } - - return newAssembly; - }) - .ToArray(); - - int numberOfClasses = filteredAssemblies.Sum(a => a.Classes.Count()); - - Logger.InfoFormat(Resources.AnalyzingClasses, numberOfClasses); - - int counter = 0; - - foreach (var assembly in filteredAssemblies) - { - foreach (var @class in assembly.Classes) - { - counter++; - - Logger.DebugFormat( - " " + Resources.CreatingReport, - counter, - numberOfClasses, - @class.Assembly.ShortName, - @class.Name); - - var fileAnalyses = @class.Files.Select(f => f.AnalyzeFile()).ToArray(); - - if (addHistoricCoverage) - { - var historicCoverage = new HistoricCoverage(@class, executionTime, tag); - @class.AddHistoricCoverage(historicCoverage); - overallHistoricCoverages.Add(historicCoverage); - } - - foreach (var renderer in this.renderers) - { - try - { - renderer.CreateClassReport(@class, fileAnalyses); - } - catch (Exception ex) - { - Logger.ErrorFormat( - " " + Resources.ErrorDuringRenderingClassReport, - @class.Name, - renderer.ReportType, - ex.Message); - } - } - } - } - - Logger.Debug(" " + Resources.CreatingSummary); - SummaryResult summaryResult = new SummaryResult(filteredAssemblies, this.parser.ToString(), this.parser.SupportsBranchCoverage); - - foreach (var renderer in this.renderers) - { - try - { - renderer.CreateSummaryReport(summaryResult); - } - catch (Exception ex) - { - Logger.ErrorFormat( - " " + Resources.ErrorDuringRenderingSummaryReport, - renderer.ReportType, - ex.Message); - } - } - - return filteredAssemblies; - } - } -} \ No newline at end of file diff --git a/src/ReportGenerator.Console/app.config b/src/ReportGenerator.Console/app.config index 0c121573..016d28fc 100644 --- a/src/ReportGenerator.Console/app.config +++ b/src/ReportGenerator.Console/app.config @@ -1,27 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8" ?> <configuration> - <configSections> - <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <section name="Palmmedia.ReportGenerator.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> - <section name="Palmmedia.ReportGenerator.Reporting.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> - </sectionGroup> - </configSections> - <applicationSettings> - <Palmmedia.ReportGenerator.Properties.Settings> - <setting name="MaximumOfHistoricCoverageFiles" serializeAs="String"> - <value>100</value> - </setting> - </Palmmedia.ReportGenerator.Properties.Settings> - <Palmmedia.ReportGenerator.Reporting.Properties.Settings> - <setting name="MetricThresholdForNPathComplexity" serializeAs="String"> - <value>200</value> - </setting> - <setting name="MetricThresholdForCrapScore" serializeAs="String"> - <value>30</value> - </setting> - <setting name="MetricThresholdForCyclomaticComplexity" serializeAs="String"> - <value>15</value> - </setting> - </Palmmedia.ReportGenerator.Reporting.Properties.Settings> - </applicationSettings> + <startup> + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" /> + </startup> </configuration> \ No newline at end of file diff --git a/src/ReportGenerator.Core.Test/Common/GlobbingFileSearchTest.cs b/src/ReportGenerator.Core.Test/Common/GlobbingFileSearchTest.cs new file mode 100644 index 00000000..1acac844 --- /dev/null +++ b/src/ReportGenerator.Core.Test/Common/GlobbingFileSearchTest.cs @@ -0,0 +1,62 @@ +using System; +using System.IO; +using System.Linq; +using Palmmedia.ReportGenerator.Core.Common; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test.Common +{ + /// <summary> + /// This is a test class for GlobbingFileSearch and is intended + /// to contain all GlobbingFileSearch Unit Tests + /// </summary> + [Collection("FileManager")] + public class GlobbingFileSearchTest + { + [Fact] + public void GetFiles_EmptyDirectory_NoFilesFound() + { + Directory.CreateDirectory("tmp"); + + var files = GlobbingFileSearch.GetFiles(Path.Combine("tmp", "*")).ToArray(); + Assert.Empty(files); + + Directory.Delete("tmp"); + } + + [Fact] + public void GetFiles_SingleDirectory_XmlFilesFound() + { + var files = GlobbingFileSearch.GetFiles(Path.Combine(FileManager.GetCSharpReportDirectory(), "*.xml")).ToArray(); + Assert.Equal(20, files.Length); + } + + [Fact] + public void GetFiles_MultiDirectory_AllFilesFound() + { + var files = GlobbingFileSearch.GetFiles(Path.Combine(FileManager.GetFilesDirectory(), "*", "*", "*")).ToArray(); + Assert.True(files.Length >= 39); + } + + [Fact] + public void GetFiles_MultiDirectory_MatchingFilesFound() + { + var files = GlobbingFileSearch.GetFiles(Path.Combine(FileManager.GetFilesDirectory(), "CSharp", "*roject*", "*lyzer*.cs")).ToArray(); + Assert.Single(files); + } + + [Fact] + public void GetFiles_RelativePath_DllFound() + { + var files = GlobbingFileSearch.GetFiles("..\\*\\*.dll").ToArray(); + Assert.Contains(files, f => f.EndsWith(this.GetType().Assembly.GetName().Name + ".dll", StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public void GetFiles_UncPath_NoFilesFound() + { + var files = GlobbingFileSearch.GetFiles(@"\\UncPath\DoesNotExist\*.xml").ToArray(); + Assert.Empty(files); + } + } +} diff --git a/src/ReportGenerator.Core.Test/Common/WildCardFileSearchTest.cs b/src/ReportGenerator.Core.Test/Common/WildCardFileSearchTest.cs new file mode 100644 index 00000000..4d1250af --- /dev/null +++ b/src/ReportGenerator.Core.Test/Common/WildCardFileSearchTest.cs @@ -0,0 +1,92 @@ +using System; +using System.IO; +using System.Linq; +using Palmmedia.ReportGenerator.Core.Common; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test.Common +{ + /// <summary> + /// This is a test class for FileSearch and is intended + /// to contain all FileSearch Unit Tests + /// </summary> + [Collection("FileManager")] + public class WildCardFileSearchTest + { + [Fact] + public void GetFiles_FilePatternNull_ArgumentException() + { + Assert.Throws<ArgumentException>(() => WildCardFileSearch.GetFiles(null).ToArray()); + } + + [Fact] + public void GetFiles_FilePatternEmtpy_ArgumentException() + { + Assert.Throws<ArgumentException>(() => WildCardFileSearch.GetFiles(string.Empty).ToArray()); + } + + [Fact] + public void GetFiles_FilePatternInvalid_ArgumentException() + { + Assert.Throws<ArgumentException>(() => WildCardFileSearch.GetFiles("\t").ToArray()); + } + + [Fact] + public void GetFiles_OnlyDriveWithoutFilePattern_ArgumentException() + { + Assert.Throws<ArgumentException>(() => WildCardFileSearch.GetFiles("C:\\").ToArray()); + } + + [Fact] + public void GetFiles_OnlyUNCPathWithoutFilePattern_ArgumentException() + { + Assert.Throws<ArgumentException>(() => WildCardFileSearch.GetFiles("\\test").ToArray()); + } + + [Fact] + public void GetFiles_EmptyDirectory_NoFilesFound() + { + Directory.CreateDirectory("tmp"); + + var files = WildCardFileSearch.GetFiles(Path.Combine("tmp", "*")).ToArray(); + Assert.Empty(files); + + Directory.Delete("tmp"); + } + + [Fact] + public void GetFiles_SingleDirectory_XmlFilesFound() + { + var files = WildCardFileSearch.GetFiles(Path.Combine(FileManager.GetCSharpReportDirectory(), "*.xml")).ToArray(); + Assert.Equal(20, files.Length); + } + + [Fact] + public void GetFiles_MultiDirectory_AllFilesFound() + { + var files = WildCardFileSearch.GetFiles(Path.Combine(FileManager.GetFilesDirectory(), "*", "*", "*")).ToArray(); + Assert.True(files.Length >= 39); + } + + [Fact] + public void GetFiles_MultiDirectory_MatchingFilesFound() + { + var files = WildCardFileSearch.GetFiles(Path.Combine(FileManager.GetFilesDirectory(), "CSharp", "*roject*", "*lyzer*.cs")).ToArray(); + Assert.Single(files); + } + + [Fact] + public void GetFiles_RelativePath_DllFound() + { + var files = WildCardFileSearch.GetFiles("..\\*\\*.dll").ToArray(); + Assert.Contains(files, f => f.EndsWith(this.GetType().Assembly.GetName().Name + ".dll", StringComparison.OrdinalIgnoreCase)); + } + + [Fact] + public void GetFiles_UncPath_NoFilesFound() + { + var files = WildCardFileSearch.GetFiles(@"\\DoesNotExist\*.xml").ToArray(); + Assert.Empty(files); + } + } +} diff --git a/src/ReportGenerator.Console.Test/FileManager.cs b/src/ReportGenerator.Core.Test/FileManager.cs similarity index 61% rename from src/ReportGenerator.Console.Test/FileManager.cs rename to src/ReportGenerator.Core.Test/FileManager.cs index 6ac10d1b..11bcff5c 100644 --- a/src/ReportGenerator.Console.Test/FileManager.cs +++ b/src/ReportGenerator.Core.Test/FileManager.cs @@ -1,16 +1,14 @@ using System.IO; using System.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; -namespace Palmmedia.ReportGeneratorTest +namespace Palmmedia.ReportGenerator.Core.Test { - [TestClass] - public static class FileManager + public class FileManager { private const string TEMPDIRECTORY = @"C:\temp"; - [AssemblyInitialize] - public static void CopyTestClasses(TestContext context) + public FileManager() { if (!Directory.Exists(TEMPDIRECTORY)) { @@ -39,37 +37,6 @@ public static void CopyTestClasses(TestContext context) } } - [AssemblyCleanup] - public static void DeleteTestClasses() - { - if (Directory.Exists(TEMPDIRECTORY)) - { - var files = new DirectoryInfo(TEMPDIRECTORY).GetFiles("*.cs") - .Concat(new DirectoryInfo(TEMPDIRECTORY).GetFiles("*.fs")) - .Concat(new DirectoryInfo(TEMPDIRECTORY).GetFiles("*.java")); - - foreach (var fileInfo in files) - { - File.Delete(fileInfo.FullName); - } - - string javaDir = Path.Combine(TEMPDIRECTORY, "test"); - files = new DirectoryInfo(javaDir).GetFiles("*.java"); - - foreach (var fileInfo in files) - { - File.Delete(fileInfo.FullName); - } - - Directory.Delete(javaDir); - - if (!Directory.EnumerateFiles(TEMPDIRECTORY).Any()) - { - Directory.Delete(TEMPDIRECTORY); - } - } - } - internal static string GetCSharpReportDirectory() => Path.Combine(GetFilesDirectory(), "CSharp", "Reports"); internal static string GetFSharpReportDirectory() => Path.Combine(GetFilesDirectory(), "FSharp", "Reports"); @@ -88,4 +55,12 @@ internal static string GetFilesDirectory() return Path.Combine(baseDirectory, "Testprojects"); } } + + [CollectionDefinition("FileManager")] + public class FileManagerCollection : ICollectionFixture<FileManager>, ICollectionFixture<LimitedVerbosityFixture> + { + // This class has no code, and is never created. Its purpose is simply + // to be the place to apply [CollectionDefinition] and all the + // ICollectionFixture<> interfaces. + } } diff --git a/src/ReportGenerator.Core.Test/LimitedVerbosityFixture.cs b/src/ReportGenerator.Core.Test/LimitedVerbosityFixture.cs new file mode 100644 index 00000000..85eb2261 --- /dev/null +++ b/src/ReportGenerator.Core.Test/LimitedVerbosityFixture.cs @@ -0,0 +1,12 @@ +using Palmmedia.ReportGenerator.Core.Logging; + +namespace Palmmedia.ReportGenerator.Core.Test +{ + public class LimitedVerbosityFixture + { + public LimitedVerbosityFixture() + { + new ConsoleLoggerFactory().VerbosityLevel = VerbosityLevel.Warning; + } + } +} \ No newline at end of file diff --git a/src/ReportGenerator.Console.Test/Parser/Analysis/AssemblyTest.cs b/src/ReportGenerator.Core.Test/Parser/Analysis/AssemblyTest.cs similarity index 57% rename from src/ReportGenerator.Console.Test/Parser/Analysis/AssemblyTest.cs rename to src/ReportGenerator.Core.Test/Parser/Analysis/AssemblyTest.cs index 5062212b..7eb4de2a 100644 --- a/src/ReportGenerator.Console.Test/Parser/Analysis/AssemblyTest.cs +++ b/src/ReportGenerator.Core.Test/Parser/Analysis/AssemblyTest.cs @@ -1,34 +1,33 @@ using System.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Xunit; -namespace Palmmedia.ReportGeneratorTest.Parser.Analysis +namespace Palmmedia.ReportGenerator.Core.Test.Parser.Analysis { /// <summary> /// This is a test class for Assembly and is intended /// to contain all Assembly Unit Tests /// </summary> - [TestClass] public class AssemblyTest { /// <summary> /// A test for the Constructor /// </summary> - [TestMethod] + [Fact] public void Constructor() { string assemblyName = "C:\\test\\TestAssembly.dll"; var sut = new Assembly(assemblyName); - Assert.AreEqual(assemblyName, sut.Name, "Not equal"); - Assert.AreEqual("TestAssembly.dll", sut.ShortName, "Not equal"); + Assert.Equal(assemblyName, sut.Name); + Assert.Equal("TestAssembly.dll", sut.ShortName); } /// <summary> /// A test for AddClass /// </summary> - [TestMethod] + [Fact] public void AddClass_AddSingleClass_ClassIsStored() { var sut = new Assembly("C:\\test\\TestAssembly.dll"); @@ -36,32 +35,33 @@ public void AddClass_AddSingleClass_ClassIsStored() sut.AddClass(@class); - Assert.AreEqual(@class, sut.Classes.First(), "Not equal"); - Assert.AreEqual(1, sut.Classes.Count(), "Wrong number of classes"); + Assert.Equal(@class, sut.Classes.First()); + Assert.Single(sut.Classes); } /// <summary> /// A test for Merge /// </summary> - [TestMethod] + [Fact] public void Merge_MergeAssemblyWithOneClass_ClassIsStored() { var sut = new Assembly("C:\\test\\TestAssembly.dll"); var assemblyToMerge = new Assembly("C:\\test\\TestAssembly.dll"); - var @class = new Class("Test", sut); + var @class = new Class("Test", assemblyToMerge); assemblyToMerge.AddClass(@class); sut.Merge(assemblyToMerge); - Assert.AreEqual(@class, sut.Classes.First(), "Not equal"); - Assert.AreEqual(1, sut.Classes.Count(), "Wrong number of classes"); + Assert.Equal(@class, sut.Classes.First()); + Assert.Single(sut.Classes); + Assert.Same(sut.Classes.First().Assembly, sut); } /// <summary> /// A test for Equals /// </summary> - [TestMethod] - public void Equals() + [Fact] + public void Assembley_Equals() { string assemblyName = "C:\\test\\TestAssembly.dll"; @@ -69,10 +69,10 @@ public void Equals() var target2 = new Assembly(assemblyName); var target3 = new Assembly("Test.dll"); - Assert.IsTrue(target1.Equals(target2), "Objects are not equal"); - Assert.IsFalse(target1.Equals(target3), "Objects are equal"); - Assert.IsFalse(target1.Equals(null), "Objects are equal"); - Assert.IsFalse(target1.Equals(new object()), "Objects are equal"); + Assert.True(target1.Equals(target2), "Objects are not equal"); + Assert.False(target1.Equals(target3), "Objects are equal"); + Assert.False(target1.Equals(null), "Objects are equal"); + Assert.False(target1.Equals(new object()), "Objects are equal"); } } } diff --git a/src/ReportGenerator.Core.Test/Parser/Analysis/BranchTest.cs b/src/ReportGenerator.Core.Test/Parser/Analysis/BranchTest.cs new file mode 100644 index 00000000..4161823b --- /dev/null +++ b/src/ReportGenerator.Core.Test/Parser/Analysis/BranchTest.cs @@ -0,0 +1,39 @@ +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test.Parser.Analysis +{ + /// <summary> + /// This is a test class for Branch and is intended + /// to contain all Branch Unit Tests + /// </summary> + public class BranchTest + { + /// <summary> + /// A test for the Constructor + /// </summary> + [Fact] + public void Constructor() + { + var sut = new Branch(10, "Test"); + + Assert.Equal(10, sut.BranchVisits); + } + + /// <summary> + /// A test for Equals + /// </summary> + [Fact] + public void Branch_Equals() + { + var target1 = new Branch(10, "Test"); + var target2 = new Branch(11, "Test"); + var target3 = new Branch(10, "Test123"); + + Assert.True(target1.Equals(target2), "Objects are not equal"); + Assert.False(target1.Equals(target3), "Objects are equal"); + Assert.False(target1.Equals(null), "Objects are equal"); + Assert.False(target1.Equals(new object()), "Objects are equal"); + } + } +} diff --git a/src/ReportGenerator.Core.Test/Parser/Analysis/ClassTest.cs b/src/ReportGenerator.Core.Test/Parser/Analysis/ClassTest.cs new file mode 100644 index 00000000..5dc46e0e --- /dev/null +++ b/src/ReportGenerator.Core.Test/Parser/Analysis/ClassTest.cs @@ -0,0 +1,89 @@ +using System.Linq; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test.Parser.Analysis +{ + /// <summary> + /// This is a test class for ClassTest and is intended + /// to contain all ClassTest Unit Tests + /// </summary> + public class ClassTest + { + /// <summary> + /// A test for the Constructor + /// </summary> + [Fact] + public void Constructor() + { + Assembly assembly = new Assembly("C:\\test\\TestAssembly.dll"); + string classname = "TestClass"; + + var sut = new Class(classname, assembly); + + Assert.Equal(assembly, sut.Assembly); + Assert.Equal(classname, sut.Name); + } + + /// <summary> + /// A test for AddFile + /// </summary> + [Fact] + public void AddFile_AddSingleFile_FileIsStored() + { + var assembly = new Assembly("C:\\test\\TestAssembly.dll"); + var sut = new Class("Test", assembly); + var file = new CodeFile("C:\\temp\\Program.cs", new int[0], new LineVisitStatus[0]); + sut.AddFile(file); + + Assert.Equal(file, sut.Files.First()); + Assert.Single(sut.Files); + } + + /// <summary> + /// A test for Merge + /// </summary> + [Fact] + public void Merge_MergeClassWithCoverageQuota_CoverageQuotaApplied() + { + var assembly = new Assembly("C:\\test\\TestAssembly.dll"); + var sut = new Class("Test", assembly); + var classToMerge = new Class("Test", assembly) + { + CoverageQuota = 15 + }; + + sut.Merge(classToMerge); + + Assert.Equal(15, sut.CoverageQuota); + + classToMerge = new Class("Test", assembly) + { + CoverageQuota = 20 + }; + + sut.Merge(classToMerge); + + Assert.Equal(20, sut.CoverageQuota); + } + + /// <summary> + /// A test for Equals + /// </summary> + [Fact] + public void Class_Equals() + { + Assembly assembly = new Assembly("C:\\test\\TestAssembly.dll"); + string classname = "TestClass"; + + var target1 = new Class(classname, assembly); + var target2 = new Class(classname, assembly); + var target3 = new Class(classname + "123", assembly); + + Assert.True(target1.Equals(target2), "Objects are not equal"); + Assert.False(target1.Equals(target3), "Objects are equal"); + Assert.False(target1.Equals(null), "Objects are equal"); + Assert.False(target1.Equals(new object()), "Objects are equal"); + } + } +} diff --git a/src/ReportGenerator.Console.Test/Parser/Analysis/CodeFileTest.cs b/src/ReportGenerator.Core.Test/Parser/Analysis/CodeFileTest.cs similarity index 65% rename from src/ReportGenerator.Console.Test/Parser/Analysis/CodeFileTest.cs rename to src/ReportGenerator.Core.Test/Parser/Analysis/CodeFileTest.cs index 45e71687..7adf1c98 100644 --- a/src/ReportGenerator.Console.Test/Parser/Analysis/CodeFileTest.cs +++ b/src/ReportGenerator.Core.Test/Parser/Analysis/CodeFileTest.cs @@ -1,36 +1,36 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Xunit; -namespace Palmmedia.ReportGeneratorTest.Parser.Analysis +namespace Palmmedia.ReportGenerator.Core.Test.Parser.Analysis { /// <summary> /// This is a test class for CodeFile and is intended /// to contain all CodeFile Unit Tests /// </summary> - [TestClass] + [Collection("FileManager")] public class CodeFileTest { /// <summary> /// A test for the Constructor /// </summary> - [TestMethod] + [Fact] public void Constructor() { var sut = new CodeFile("C:\\temp\\Program.cs", new int[] { -1, 0, 2 }, new LineVisitStatus[] { LineVisitStatus.NotCoverable, LineVisitStatus.NotCovered, LineVisitStatus.Covered }); - Assert.AreEqual(2, sut.CoverableLines, "Not equal"); - Assert.AreEqual(1, sut.CoveredLines, "Not equal"); + Assert.Equal(2, sut.CoverableLines); + Assert.Equal(1, sut.CoveredLines); - Assert.IsNull(sut.CoveredBranches, "Not null"); - Assert.IsNull(sut.TotalBranches, "Not null"); + Assert.Null(sut.CoveredBranches); + Assert.Null(sut.TotalBranches); } /// <summary> /// A test for the Constructor /// </summary> - [TestMethod] + [Fact] public void Constructor_WithBranches() { var branches = new Dictionary<int, ICollection<Branch>>() @@ -41,14 +41,32 @@ public void Constructor_WithBranches() var sut = new CodeFile("C:\\temp\\Program.cs", new int[] { -1, -1, -1, 0, 0, 0, 1, 1, 1 }, new LineVisitStatus[] { LineVisitStatus.NotCoverable, LineVisitStatus.NotCoverable, LineVisitStatus.NotCoverable, LineVisitStatus.NotCovered, LineVisitStatus.NotCovered, LineVisitStatus.NotCovered, LineVisitStatus.Covered, LineVisitStatus.Covered, LineVisitStatus.Covered }, branches); - Assert.AreEqual(2, sut.CoveredBranches, "Not equal"); - Assert.AreEqual(4, sut.TotalBranches, "Not equal"); + Assert.Equal(2, sut.CoveredBranches); + Assert.Equal(4, sut.TotalBranches); } /// <summary> /// A test for Merge /// </summary> - [TestMethod] + [Fact] + public void Merge_MergeOneMethodMetric_MethodMetricIsStored() + { + var sut = new CodeFile("C:\\temp\\Program.cs", new int[] { -1, -1, -1, 0, 0, 0, 1, 1, 1 }, new LineVisitStatus[] { LineVisitStatus.NotCoverable, LineVisitStatus.NotCoverable, LineVisitStatus.NotCoverable, LineVisitStatus.NotCovered, LineVisitStatus.NotCovered, LineVisitStatus.NotCovered, LineVisitStatus.Covered, LineVisitStatus.Covered, LineVisitStatus.Covered }); + var methodMetric = new MethodMetric("Test", "Test", Enumerable.Empty<Metric>()); + sut.AddMethodMetric(methodMetric); + + var codeFileToMerge = new CodeFile("C:\\temp\\Program.cs", new int[] { -1, 0, 1, -1, 0, 1, -1, 0, 1, -1, 0, 1 }, new LineVisitStatus[] { LineVisitStatus.NotCoverable, LineVisitStatus.NotCovered, LineVisitStatus.Covered, LineVisitStatus.NotCoverable, LineVisitStatus.NotCovered, LineVisitStatus.Covered, LineVisitStatus.NotCoverable, LineVisitStatus.NotCovered, LineVisitStatus.Covered, LineVisitStatus.NotCoverable, LineVisitStatus.NotCovered, LineVisitStatus.Covered }); + + sut.Merge(codeFileToMerge); + + Assert.Equal(methodMetric, sut.MethodMetrics.First()); + Assert.Single(sut.MethodMetrics); + } + + /// <summary> + /// A test for Merge + /// </summary> + [Fact] public void Merge_CodeFileToMergeHasNoBranches_BranchCoverageInformationIsUpdated() { var branches = new Dictionary<int, ICollection<Branch>>() @@ -62,14 +80,14 @@ public void Merge_CodeFileToMergeHasNoBranches_BranchCoverageInformationIsUpdate sut.Merge(codeFileToMerge); - Assert.AreEqual(2, sut.CoveredBranches, "Not equal"); - Assert.AreEqual(4, sut.TotalBranches, "Not equal"); + Assert.Equal(2, sut.CoveredBranches); + Assert.Equal(4, sut.TotalBranches); } /// <summary> /// A test for Merge /// </summary> - [TestMethod] + [Fact] public void Merge_TargetCodeFileHasNoBranches_BranchCoverageInformationIsUpdated() { var branches = new Dictionary<int, ICollection<Branch>>() @@ -83,14 +101,14 @@ public void Merge_TargetCodeFileHasNoBranches_BranchCoverageInformationIsUpdated sut.Merge(codeFileToMerge); - Assert.AreEqual(2, sut.CoveredBranches, "Not equal"); - Assert.AreEqual(4, sut.TotalBranches, "Not equal"); + Assert.Equal(2, sut.CoveredBranches); + Assert.Equal(4, sut.TotalBranches); } /// <summary> /// A test for Merge /// </summary> - [TestMethod] + [Fact] public void Merge_MergeCodeFileWithEqualLengthCoverageArray_CoverageInformationIsUpdated() { var sut = new CodeFile("C:\\temp\\Program.cs", new int[] { -1, -1, -1, 0, 0, 0, 1, 1, 1 }, new LineVisitStatus[] { LineVisitStatus.NotCoverable, LineVisitStatus.NotCoverable, LineVisitStatus.NotCoverable, LineVisitStatus.NotCovered, LineVisitStatus.NotCovered, LineVisitStatus.NotCovered, LineVisitStatus.Covered, LineVisitStatus.Covered, LineVisitStatus.Covered }); @@ -100,19 +118,19 @@ public void Merge_MergeCodeFileWithEqualLengthCoverageArray_CoverageInformationI sut.Merge(codeFileToMerge); - Assert.AreEqual(8, sut.CoverableLines, "Not equal"); - Assert.AreEqual(5, sut.CoveredLines, "Not equal"); + Assert.Equal(8, sut.CoverableLines); + Assert.Equal(5, sut.CoveredLines); - Assert.IsNull(sut.CoveredBranches, "Not null"); - Assert.IsNull(sut.TotalBranches, "Not null"); + Assert.Null(sut.CoveredBranches); + Assert.Null(sut.TotalBranches); - Assert.IsTrue(sut.TestMethods.Contains(testMethod)); + Assert.Contains(testMethod, sut.TestMethods); } /// <summary> /// A test for Merge /// </summary> - [TestMethod] + [Fact] public void Merge_MergeCodeFileWithLongerCoverageArray_CoverageInformationIsUpdated() { var branches = new Dictionary<int, ICollection<Branch>>() @@ -135,52 +153,52 @@ public void Merge_MergeCodeFileWithLongerCoverageArray_CoverageInformationIsUpda sut.Merge(codeFileToMerge); - Assert.AreEqual(10, sut.CoverableLines, "Not equal"); - Assert.AreEqual(6, sut.CoveredLines, "Not equal"); + Assert.Equal(10, sut.CoverableLines); + Assert.Equal(6, sut.CoveredLines); - Assert.AreEqual(4, sut.CoveredBranches, "Not equal"); - Assert.AreEqual(7, sut.TotalBranches, "Not equal"); + Assert.Equal(4, sut.CoveredBranches); + Assert.Equal(7, sut.TotalBranches); } /// <summary> /// A test for AnalyzeFile /// </summary> - [TestMethod] + [Fact] public void AnalyzeFile_ExistingFile_AnalysisIsReturned() { var sut = new CodeFile("C:\\temp\\Program.cs", new int[] { -2, -1, 0, 1, 2 }, new LineVisitStatus[] { LineVisitStatus.NotCoverable, LineVisitStatus.NotCoverable, LineVisitStatus.NotCovered, LineVisitStatus.PartiallyCovered, LineVisitStatus.Covered }); - Assert.IsNull(sut.TotalLines); + Assert.Null(sut.TotalLines); var fileAnalysis = sut.AnalyzeFile(); - Assert.IsNotNull(fileAnalysis); - Assert.IsNull(fileAnalysis.Error); - Assert.AreEqual(fileAnalysis.Path, fileAnalysis.Path); - Assert.AreEqual(84, sut.TotalLines); - Assert.AreEqual(84, fileAnalysis.Lines.Count()); + Assert.NotNull(fileAnalysis); + Assert.Null(fileAnalysis.Error); + Assert.Equal(fileAnalysis.Path, fileAnalysis.Path); + Assert.Equal(84, sut.TotalLines); + Assert.Equal(84, fileAnalysis.Lines.Count()); - Assert.AreEqual(1, fileAnalysis.Lines.ElementAt(0).LineNumber); - Assert.AreEqual(-1, fileAnalysis.Lines.ElementAt(0).LineVisits); - Assert.AreEqual(LineVisitStatus.NotCoverable, fileAnalysis.Lines.ElementAt(0).LineVisitStatus); + Assert.Equal(1, fileAnalysis.Lines.ElementAt(0).LineNumber); + Assert.Equal(-1, fileAnalysis.Lines.ElementAt(0).LineVisits); + Assert.Equal(LineVisitStatus.NotCoverable, fileAnalysis.Lines.ElementAt(0).LineVisitStatus); - Assert.AreEqual(2, fileAnalysis.Lines.ElementAt(1).LineNumber); - Assert.AreEqual(0, fileAnalysis.Lines.ElementAt(1).LineVisits); - Assert.AreEqual(LineVisitStatus.NotCovered, fileAnalysis.Lines.ElementAt(1).LineVisitStatus); + Assert.Equal(2, fileAnalysis.Lines.ElementAt(1).LineNumber); + Assert.Equal(0, fileAnalysis.Lines.ElementAt(1).LineVisits); + Assert.Equal(LineVisitStatus.NotCovered, fileAnalysis.Lines.ElementAt(1).LineVisitStatus); - Assert.AreEqual(3, fileAnalysis.Lines.ElementAt(2).LineNumber); - Assert.AreEqual(1, fileAnalysis.Lines.ElementAt(2).LineVisits); - Assert.AreEqual(LineVisitStatus.PartiallyCovered, fileAnalysis.Lines.ElementAt(2).LineVisitStatus); + Assert.Equal(3, fileAnalysis.Lines.ElementAt(2).LineNumber); + Assert.Equal(1, fileAnalysis.Lines.ElementAt(2).LineVisits); + Assert.Equal(LineVisitStatus.PartiallyCovered, fileAnalysis.Lines.ElementAt(2).LineVisitStatus); - Assert.AreEqual(4, fileAnalysis.Lines.ElementAt(3).LineNumber); - Assert.AreEqual(2, fileAnalysis.Lines.ElementAt(3).LineVisits); - Assert.AreEqual(LineVisitStatus.Covered, fileAnalysis.Lines.ElementAt(3).LineVisitStatus); + Assert.Equal(4, fileAnalysis.Lines.ElementAt(3).LineNumber); + Assert.Equal(2, fileAnalysis.Lines.ElementAt(3).LineVisits); + Assert.Equal(LineVisitStatus.Covered, fileAnalysis.Lines.ElementAt(3).LineVisitStatus); } /// <summary> /// A test for AnalyzeFile /// </summary> - [TestMethod] + [Fact] public void AnalyzeFile_ExistingFileWithTrackedMethods_AnalysisIsReturned() { var sut = new CodeFile("C:\\temp\\Program.cs", new int[] { -2, -1, 0, 1 }, new LineVisitStatus[] { LineVisitStatus.NotCoverable, LineVisitStatus.NotCoverable, LineVisitStatus.NotCovered, LineVisitStatus.Covered }); @@ -189,73 +207,73 @@ public void AnalyzeFile_ExistingFileWithTrackedMethods_AnalysisIsReturned() var fileAnalysis = sut.AnalyzeFile(); - Assert.AreEqual(2, fileAnalysis.Lines.First().LineCoverageByTestMethod[testMethod].LineVisits); - Assert.AreEqual(LineVisitStatus.Covered, fileAnalysis.Lines.First().LineCoverageByTestMethod[testMethod].LineVisitStatus); + Assert.Equal(2, fileAnalysis.Lines.First().LineCoverageByTestMethod[testMethod].LineVisits); + Assert.Equal(LineVisitStatus.Covered, fileAnalysis.Lines.First().LineCoverageByTestMethod[testMethod].LineVisitStatus); } /// <summary> /// A test for AnalyzeFile /// </summary> - [TestMethod] + [Fact] public void AnalyzeFile_NonExistingFile_AnalysisIsReturned() { var sut = new CodeFile("C:\\temp\\Other.cs", new int[] { -2, -1, 0, 1 }, new LineVisitStatus[] { LineVisitStatus.NotCoverable, LineVisitStatus.NotCoverable, LineVisitStatus.NotCovered, LineVisitStatus.Covered }); - Assert.IsNull(sut.TotalLines); + Assert.Null(sut.TotalLines); var fileAnalysis = sut.AnalyzeFile(); - Assert.IsNotNull(fileAnalysis); - Assert.IsNotNull(fileAnalysis.Error); - Assert.AreEqual(fileAnalysis.Path, fileAnalysis.Path); - Assert.IsNull(sut.TotalLines); - Assert.AreEqual(0, fileAnalysis.Lines.Count()); + Assert.NotNull(fileAnalysis); + Assert.NotNull(fileAnalysis.Error); + Assert.Equal(fileAnalysis.Path, fileAnalysis.Path); + Assert.Null(sut.TotalLines); + Assert.Empty(fileAnalysis.Lines); } /// <summary> /// A test for Equals /// </summary> - [TestMethod] - public void Equals() + [Fact] + public void CodeFile_Equals() { var target1 = new CodeFile("C:\\temp\\Program.cs", new int[0], new LineVisitStatus[0]); var target2 = new CodeFile("C:\\temp\\Program.cs", new int[0], new LineVisitStatus[0]); var target3 = new CodeFile("C:\\temp\\Other.cs", new int[0], new LineVisitStatus[0]); - Assert.IsTrue(target1.Equals(target2), "Objects are not equal"); - Assert.IsFalse(target1.Equals(target3), "Objects are equal"); - Assert.IsFalse(target1.Equals(null), "Objects are equal"); - Assert.IsFalse(target1.Equals(new object()), "Objects are equal"); + Assert.True(target1.Equals(target2), "Objects are not equal"); + Assert.False(target1.Equals(target3), "Objects are equal"); + Assert.False(target1.Equals(null), "Objects are equal"); + Assert.False(target1.Equals(new object()), "Objects are equal"); } /// <summary> /// A test for AddCoverageByTestMethod /// </summary> - [TestMethod] + [Fact] public void AddCoverageByTestMethod_AddCoverageByTestMethodForExistingMethod_CoverageInformationIsMerged() { var sut = new CodeFile("C:\\temp\\Program.cs", new int[0], new LineVisitStatus[0]); var testMethod = new TestMethod("TestFull", "Test"); - var coverageByTrackedMethod = new CoverageByTrackedMethod() { Coverage = new int[] { -1, -1, -1, -1, 0, 0, 0, 1, 1, 1 }, LineVisitStatus = new LineVisitStatus[] { LineVisitStatus.NotCoverable, LineVisitStatus.NotCoverable, LineVisitStatus.NotCoverable, LineVisitStatus.NotCoverable, LineVisitStatus.NotCovered, LineVisitStatus.NotCovered, LineVisitStatus.NotCovered, LineVisitStatus.Covered, LineVisitStatus.Covered, LineVisitStatus.Covered } }; - var repeatedCoverageByTrackedMethod = new CoverageByTrackedMethod() { Coverage = new int[] { -1, 0, 1, -1, 1, 0, 1, -1, 1, 0 }, LineVisitStatus = new LineVisitStatus[] { LineVisitStatus.NotCoverable, LineVisitStatus.NotCovered, LineVisitStatus.Covered, LineVisitStatus.NotCoverable, LineVisitStatus.Covered, LineVisitStatus.NotCovered, LineVisitStatus.Covered, LineVisitStatus.NotCoverable, LineVisitStatus.Covered, LineVisitStatus.NotCovered } }; + var coverageByTrackedMethod = new CoverageByTrackedMethod() { Coverage = new int[] { -1, -1, -1, -1, 0, 0, 0, 1, 1, 1 }, LineVisitStatus = new LineVisitStatus[] { LineVisitStatus.NotCoverable, LineVisitStatus.NotCoverable, LineVisitStatus.NotCoverable, LineVisitStatus.NotCoverable, LineVisitStatus.NotCovered, LineVisitStatus.NotCovered, LineVisitStatus.NotCovered, LineVisitStatus.Covered, LineVisitStatus.Covered, LineVisitStatus.Covered } }; + var repeatedCoverageByTrackedMethod = new CoverageByTrackedMethod() { Coverage = new int[] { -1, 0, 1, -1, 1, 0, 1, -1, 1, 0 }, LineVisitStatus = new LineVisitStatus[] { LineVisitStatus.NotCoverable, LineVisitStatus.NotCovered, LineVisitStatus.Covered, LineVisitStatus.NotCoverable, LineVisitStatus.Covered, LineVisitStatus.NotCovered, LineVisitStatus.Covered, LineVisitStatus.NotCoverable, LineVisitStatus.Covered, LineVisitStatus.NotCovered } }; sut.AddCoverageByTestMethod(testMethod, coverageByTrackedMethod); sut.AddCoverageByTestMethod(testMethod, repeatedCoverageByTrackedMethod); - Assert.IsTrue(sut.TestMethods.Contains(testMethod)); + Assert.Contains(testMethod, sut.TestMethods); // using AnalyseFile() to retrieve merged coverage by test method var lineAnalyses = sut.AnalyzeFile().Lines; var testMethodCoverage = lineAnalyses.Take(9).Select(l => l.LineCoverageByTestMethod).ToArray(); - Assert.IsTrue(testMethodCoverage.All(coverage => coverage.ContainsKey(testMethod)), "All lines should be covered by given test method"); + Assert.True(testMethodCoverage.All(coverage => coverage.ContainsKey(testMethod)), "All lines should be covered by given test method"); var actualLineVisits = testMethodCoverage.Select(c => c[testMethod].LineVisits).ToArray(); var actualLineVisitStatuses = testMethodCoverage.Select(c => c[testMethod].LineVisitStatus).ToArray(); - CollectionAssert.AreEqual(new int[] { 0, 1, -1, 1, 0, 1, 1, 2, 1 }, actualLineVisits, "LineVisits does not match"); - CollectionAssert.AreEqual(new LineVisitStatus[] { LineVisitStatus.NotCovered, LineVisitStatus.Covered, LineVisitStatus.NotCoverable, LineVisitStatus.Covered, LineVisitStatus.NotCovered, LineVisitStatus.Covered, LineVisitStatus.Covered, LineVisitStatus.Covered, LineVisitStatus.Covered }, actualLineVisitStatuses, "LineVisitStatus does not match"); + Assert.Equal(new int[] { 0, 1, -1, 1, 0, 1, 1, 2, 1 }, actualLineVisits); + Assert.Equal(new LineVisitStatus[] { LineVisitStatus.NotCovered, LineVisitStatus.Covered, LineVisitStatus.NotCoverable, LineVisitStatus.Covered, LineVisitStatus.NotCovered, LineVisitStatus.Covered, LineVisitStatus.Covered, LineVisitStatus.Covered, LineVisitStatus.Covered }, actualLineVisitStatuses); } } } diff --git a/src/ReportGenerator.Core.Test/Parser/Analysis/MethodMetricTest.cs b/src/ReportGenerator.Core.Test/Parser/Analysis/MethodMetricTest.cs new file mode 100644 index 00000000..f48d12e7 --- /dev/null +++ b/src/ReportGenerator.Core.Test/Parser/Analysis/MethodMetricTest.cs @@ -0,0 +1,102 @@ +using System.Linq; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test.Parser.Analysis +{ + /// <summary> + /// This is a test class for MethodMetric and is intended + /// to contain all MethodMetric Unit Tests + /// </summary> + public class MethodMetricTest + { + /// <summary> + /// A test for the Constructor + /// </summary> + [Fact] + public void Constructor() + { + MethodMetric sut = new MethodMetric("Test", "Test2", Enumerable.Empty<Metric>()); + + Assert.Equal("Test", sut.FullName); + Assert.Equal("Test2", sut.ShortName); + } + + /// <summary> + /// A test for AddMetric + /// </summary> + [Fact] + public void AddMetric_AddSingleMetric_MetricIsStored() + { + MethodMetric sut = new MethodMetric("Test", "Test", Enumerable.Empty<Metric>()); + var metric = new Metric("Metric1", null, MetricType.CodeQuality, 10); + + sut.AddMetric(metric); + + Assert.Equal(metric, sut.Metrics.First()); + Assert.Single(sut.Metrics); + } + + /// <summary> + /// A test for Merge + /// </summary> + [Fact] + public void Merge_MergeMethodMetric_MetricsAreStored() + { + var metric1_1 = new Metric("Metric1", null, MetricType.CodeQuality, 10); + var metric1_2 = new Metric("Metric1", null, MetricType.CodeQuality, 15); + var metric2 = new Metric("Metric2", null, MetricType.CodeQuality, 20); + var metric3_1 = new Metric("Metric3", null, MetricType.CodeQuality, null); + var metric3_2 = new Metric("Metric3", null, MetricType.CodeQuality, null); + var metric4_1 = new Metric("Metric4", null, MetricType.CodeQuality, null); + var metric4_2 = new Metric("Metric4", null, MetricType.CodeQuality, 10); + var metric5_1 = new Metric("Metric5", null, MetricType.CodeQuality, 30); + var metric5_2 = new Metric("Metric5", null, MetricType.CodeQuality, null); + + MethodMetric sut = new MethodMetric("Test", "Test", new[] { metric1_1, metric3_1, metric4_1, metric5_1 }); + var methodMetricToMerge = new MethodMetric("Test", "Test", new[] { metric1_2, metric2, metric3_2, metric4_2, metric5_2 }); + + sut.Merge(methodMetricToMerge); + + Assert.Equal(5, sut.Metrics.Count()); + Assert.Equal(metric1_1, sut.Metrics.First()); + Assert.Equal(15, sut.Metrics.First().Value); + + var metric = sut.Metrics.Single(m => m.Name == "Metric2"); + Assert.Equal(metric2, metric); + Assert.Equal(20, metric.Value); + + metric = sut.Metrics.Single(m => m.Name == "Metric3"); + Assert.Equal(metric3_1, metric); + Assert.Null(metric.Value); + + metric = sut.Metrics.Single(m => m.Name == "Metric4"); + Assert.Equal(metric4_1, metric); + Assert.Equal(10, metric.Value); + + metric = sut.Metrics.Single(m => m.Name == "Metric5"); + Assert.Equal(metric5_1, metric); + Assert.Equal(30, metric.Value); + } + + /// <summary> + /// A test for Equals + /// </summary> + [Fact] + public void MethodMetric_Equals() + { + var target1 = new MethodMetric("Test", "Test", Enumerable.Empty<Metric>()); + var target2 = new MethodMetric("Test", "Test", Enumerable.Empty<Metric>()); + var target3 = new MethodMetric("Other", "Other", Enumerable.Empty<Metric>()); + var target4 = new MethodMetric("Test", "Test", Enumerable.Empty<Metric>()) + { Line = 3 }; + + Assert.True(target1.Equals(target2), "Objects are not equal"); + Assert.False(target1.Equals(target3), "Objects are equal"); + Assert.False(target1.Equals(target4), "Objects are equal"); + Assert.True(target4.Equals(target4), "Objects are not equal"); + Assert.False(target1.Equals(null), "Objects are equal"); + Assert.False(target1.Equals(new object()), "Objects are equal"); + } + } +} diff --git a/src/ReportGenerator.Core.Test/Parser/CoberturaParserTest.cs b/src/ReportGenerator.Core.Test/Parser/CoberturaParserTest.cs new file mode 100644 index 00000000..adfc9b0c --- /dev/null +++ b/src/ReportGenerator.Core.Test/Parser/CoberturaParserTest.cs @@ -0,0 +1,165 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Xml.Linq; +using Moq; +using Palmmedia.ReportGenerator.Core.Parser; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Palmmedia.ReportGenerator.Core.Parser.Preprocessing; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test.Parser +{ + /// <summary> + /// This is a test class for CoberturaParser and is intended + /// to contain all CoberturaParser Unit Tests + /// </summary> + [Collection("FileManager")] + public class CoberturaParserTest + { + private static readonly string FilePath1 = Path.Combine(FileManager.GetJavaReportDirectory(), "Cobertura2.1.1.xml"); + + private ParserResult parserResult; + + public CoberturaParserTest() + { + var filterMock = new Mock<IFilter>(); + filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny<string>())).Returns(true); + + var report = XDocument.Load(FilePath1); + new CoberturaReportPreprocessor().Execute(report); + this.parserResult = new CoberturaParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report); + } + + /// <summary> + /// A test for SupportsBranchCoverage + /// </summary> + [Fact] + public void SupportsBranchCoverage() + { + Assert.True(this.parserResult.SupportsBranchCoverage); + } + + /// <summary> + /// A test for NumberOfLineVisits + /// </summary> + [Fact] + public void NumberOfLineVisitsTest() + { + var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "test.TestClass", "C:\\temp\\test\\TestClass.java"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 17).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 20).LineVisits); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 1).LineVisits); + } + + /// <summary> + /// A test for LineVisitStatus + /// </summary> + [Fact] + public void LineVisitStatusTest() + { + var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "test.TestClass", "C:\\temp\\test\\TestClass.java"); + + var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); + Assert.Equal(LineVisitStatus.NotCoverable, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 12); + Assert.Equal(LineVisitStatus.Covered, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 15); + Assert.Equal(LineVisitStatus.PartiallyCovered, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 20); + Assert.Equal(LineVisitStatus.NotCovered, line.LineVisitStatus); + } + + /// <summary> + /// A test for NumberOfFiles + /// </summary> + [Fact] + public void NumberOfFilesTest() + { + Assert.Equal(7, this.parserResult.Assemblies.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count()); + } + + /// <summary> + /// A test for FilesOfClass + /// </summary> + [Fact] + public void FilesOfClassTest() + { + Assert.Single(this.parserResult.Assemblies.Single(a => a.Name == "test").Classes.Single(c => c.Name == "test.TestClass").Files); + Assert.Single(this.parserResult.Assemblies.Single(a => a.Name == "test").Classes.Single(c => c.Name == "test.GenericClass").Files); + } + + /// <summary> + /// A test for ClassesInAssembly + /// </summary> + [Fact] + public void ClassesInAssemblyTest() + { + Assert.Equal(7, this.parserResult.Assemblies.SelectMany(a => a.Classes).Count()); + } + + /// <summary> + /// A test for Assemblies + /// </summary> + [Fact] + public void AssembliesTest() + { + Assert.Equal(2, this.parserResult.Assemblies.Count()); + } + + /// <summary> + /// A test for GetCoverageQuotaOfClass. + /// </summary> + [Fact] + public void GetCoverableLinesOfClassTest() + { + Assert.Equal(3, this.parserResult.Assemblies.Single(a => a.Name == "test").Classes.Single(c => c.Name == "test.AbstractClass").CoverableLines); + } + + /// <summary> + /// A test for MethodMetrics + /// </summary> + [Fact] + public void MethodMetricsTest() + { + var metrics = this.parserResult.Assemblies.Single(a => a.Name == "test").Classes.Single(c => c.Name == "test.TestClass").Files.Single(f => f.Path == "C:\\temp\\test\\TestClass.java").MethodMetrics; + + Assert.Equal(4, metrics.Count()); + Assert.Equal("<init>()V", metrics.First().FullName); + Assert.Equal(3, metrics.First().Metrics.Count()); + + Assert.Equal("Cyclomatic complexity", metrics.First().Metrics.ElementAt(0).Name); + Assert.Equal(0, metrics.First().Metrics.ElementAt(0).Value); + Assert.Equal("Line coverage", metrics.First().Metrics.ElementAt(1).Name); + Assert.Equal(100.0M, metrics.First().Metrics.ElementAt(1).Value); + Assert.Equal("Branch coverage", metrics.First().Metrics.ElementAt(2).Name); + Assert.Equal(100.0M, metrics.First().Metrics.ElementAt(2).Value); + } + + /// <summary> + /// A test for CodeElements + /// </summary> + [Fact] + public void CodeElementsTest() + { + var codeElements = GetFile(this.parserResult.Assemblies, "test.TestClass", "C:\\temp\\test\\TestClass.java").CodeElements; + Assert.Equal(4, codeElements.Count()); + } + + private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "test").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName); + + private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "test").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName) + .AnalyzeFile(); + } +} diff --git a/src/ReportGenerator.Core.Test/Parser/CoverageReportParserTest.cs b/src/ReportGenerator.Core.Test/Parser/CoverageReportParserTest.cs new file mode 100644 index 00000000..46dd5800 --- /dev/null +++ b/src/ReportGenerator.Core.Test/Parser/CoverageReportParserTest.cs @@ -0,0 +1,160 @@ +using System.IO; +using System.Linq; +using Moq; +using Palmmedia.ReportGenerator.Core.Parser; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test.Parser +{ + /// <summary> + /// This is a test class for CoverageReportParser and is intended + /// to contain all CoverageReportParser Unit Tests + /// </summary> + [Collection("FileManager")] + public class CoverageReportParserTest + { + private Mock<IFilter> filterMock = new Mock<IFilter>(); + + public CoverageReportParserTest() + { + this.filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny<string>())).Returns(true); + } + + /// <summary> + /// A test for ParseFiles + /// </summary> + [Fact] + public void ParseFiles_SingleReportFileWithSingleReport_PartCoverNotSupported() + { + string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "Partcover2.3.xml"); + Assert.Throws<UnsupportedParserException>(() => new CoverageReportParser(1, new string[0], this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath })); + + filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "Partcover2.2.xml"); + Assert.Throws<UnsupportedParserException>(() => new CoverageReportParser(1, new string[0], this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath })); + } + + /// <summary> + /// A test for ParseFiles + /// </summary> + [Fact] + public void ParseFiles_SingleReportFileWithSingleReport_CorrectParserIsReturned() + { + string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "NCover1.5.8.xml"); + var parserResult = new CoverageReportParser(1, new string[] { "C:\\somedirectory" }, this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }); + Assert.Equal("NCoverParser", parserResult.ParserName); + Assert.Equal(0, parserResult.SourceDirectories.Count); + + filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "OpenCover.xml"); + parserResult = new CoverageReportParser(1, new string[] { "C:\\somedirectory" }, this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }); + Assert.Equal("OpenCoverParser", parserResult.ParserName); + Assert.Equal(0, parserResult.SourceDirectories.Count); + + filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "dotCover.xml"); + parserResult = new CoverageReportParser(1, new string[] { "C:\\somedirectory" }, this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }); + Assert.Equal("DotCoverParser", parserResult.ParserName); + Assert.Equal(0, parserResult.SourceDirectories.Count); + + filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "VisualStudio2010.coveragexml"); + parserResult = new CoverageReportParser(1, new string[] { "C:\\somedirectory" }, this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }); + Assert.Equal("VisualStudioParser", parserResult.ParserName); + Assert.Equal(0, parserResult.SourceDirectories.Count); + + filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "DynamicCodeCoverage.xml"); + parserResult = new CoverageReportParser(1, new string[] { "C:\\somedirectory" }, this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }); + Assert.Equal("DynamicCodeCoverageParser", parserResult.ParserName); + Assert.Equal(0, parserResult.SourceDirectories.Count); + + filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "mprof-report.xml"); + parserResult = new CoverageReportParser(1, new string[] { "C:\\somedirectory" }, this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }); + Assert.Equal("MProfParser", parserResult.ParserName); + Assert.Equal(0, parserResult.SourceDirectories.Count); + + filePath = Path.Combine(FileManager.GetJavaReportDirectory(), "Cobertura2.1.1.xml"); + parserResult = new CoverageReportParser(1, new string[] { "C:\\somedirectory" }, this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }); + Assert.Equal("CoberturaParser", parserResult.ParserName); + Assert.Equal(1, parserResult.SourceDirectories.Count); + Assert.Equal("C:/temp", parserResult.SourceDirectories.First()); + + filePath = Path.Combine(FileManager.GetJavaReportDirectory(), "JaCoCo0.8.3.xml"); + parserResult = new CoverageReportParser(1, new string[] { "C:\\somedirectory" }, this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }); + Assert.Equal("JaCoCoParser", parserResult.ParserName); + Assert.Equal(1, parserResult.SourceDirectories.Count); + Assert.Equal("C:\\somedirectory", parserResult.SourceDirectories.First()); + } + + /// <summary> + /// A test for ParseFiles + /// </summary> + [Fact] + public void ParseFiles_SingleReportFileWithSeveralReports_PartCoverNotSupported() + { + string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiPartcover2.3.xml"); + Assert.Throws<UnsupportedParserException>(() => new CoverageReportParser(1, new string[0], this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath })); + + filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiPartcover2.2.xml"); + Assert.Throws<UnsupportedParserException>(() => new CoverageReportParser(1, new string[0], this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath })); + } + + /// <summary> + /// A test for ParseFiles + /// </summary> + [Fact] + public void ParseFiles_SingleReportFileWithSeveralReports_CorrectParserIsReturned() + { + string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiNCover1.5.8.xml"); + string parserName = new CoverageReportParser(1, new string[0], this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }).ParserName; + Assert.Equal("MultiReportParser (2x NCoverParser)", parserName); + + filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiOpenCover.xml"); + parserName = new CoverageReportParser(1, new string[0], this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }).ParserName; + Assert.Equal("MultiReportParser (2x OpenCoverParser)", parserName); + + filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultidotCover.xml"); + parserName = new CoverageReportParser(1, new string[0], this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }).ParserName; + Assert.Equal("MultiReportParser (2x DotCoverParser)", parserName); + + filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiVisualStudio2010.coveragexml"); + parserName = new CoverageReportParser(1, new string[0], this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }).ParserName; + Assert.Equal("MultiReportParser (2x VisualStudioParser)", parserName); + + filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiDynamicCodeCoverage.xml"); + parserName = new CoverageReportParser(1, new string[0], this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath }).ParserName; + Assert.Equal("MultiReportParser (2x DynamicCodeCoverageParser)", parserName); + } + + /// <summary> + /// A test for ParseFiles + /// </summary> + [Fact] + public void ParseFiles_SeveralReportFilesWithSingleReport_CorrectParserIsReturned() + { + string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "OpenCover.xml"); + string filePath2 = Path.Combine(FileManager.GetCSharpReportDirectory(), "NCover1.5.8.xml"); + string parserName = new CoverageReportParser(1, new string[0], this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath, filePath2 }).ParserName; + Assert.Equal("MultiReportParser (1x NCoverParser, 1x OpenCoverParser)", parserName); + } + + /// <summary> + /// A test for ParseFiles + /// </summary> + [Fact] + public void ParseFiles_SeveralReportFilesWithSeveralReports_CorrectParserIsReturned() + { + string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "NCover1.5.8.xml"); + string filePath2 = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiOpenCover.xml"); + string parserName = new CoverageReportParser(1, new string[0], this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).ParseFiles(new string[] { filePath, filePath2 }).ParserName; + Assert.Equal("MultiReportParser (1x NCoverParser, 2x OpenCoverParser)", parserName); + } + + /// <summary> + /// A test for ParseFiles + /// </summary> + [Fact] + public void ParseFiles_NoReports_CorrectParserIsReturned() + { + string parserName = new CoverageReportParser(1, new string[0], this.filterMock.Object, this.filterMock.Object, this.filterMock.Object).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 new file mode 100644 index 00000000..a8c3f111 --- /dev/null +++ b/src/ReportGenerator.Core.Test/Parser/DotCoverParserTest.cs @@ -0,0 +1,179 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Xml.Linq; +using Moq; +using Palmmedia.ReportGenerator.Core.Parser; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test.Parser +{ + /// <summary> + /// This is a test class for DotCoverParser and is intended + /// to contain all DotCoverParser Unit Tests + /// </summary> + [Collection("FileManager")] + public class DotCoverParserTest + { + private static readonly string FilePath1 = Path.Combine(FileManager.GetCSharpReportDirectory(), "dotCover.xml"); + + private ParserResult parserResult; + + public DotCoverParserTest() + { + var filterMock = new Mock<IFilter>(); + filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny<string>())).Returns(true); + + this.parserResult = new DotCoverParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(XDocument.Load(FilePath1)); + } + + /// <summary> + /// A test for NumberOfLineVisits + /// </summary> + [Fact] + public void NumberOfLineVisitsTest() + { + var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 10).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 11).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 12).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 23).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + } + + /// <summary> + /// A test for LineVisitStatus + /// </summary> + [Fact] + public void LineVisitStatusTest() + { + var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); + + var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); + Assert.Equal(LineVisitStatus.NotCoverable, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 15); + Assert.Equal(LineVisitStatus.Covered, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 22); + Assert.Equal(LineVisitStatus.NotCovered, line.LineVisitStatus); + } + + /// <summary> + /// A test for NumberOfFiles + /// </summary> + [Fact] + public void NumberOfFilesTest() + { + Assert.Equal(15, this.parserResult.Assemblies.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count()); + } + + /// <summary> + /// A test for FilesOfClass + /// </summary> + [Fact] + public void FilesOfClassTest() + { + Assert.Single(this.parserResult.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").Files); + Assert.Equal(2, this.parserResult.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.PartialClass").Files.Count()); + } + + /// <summary> + /// A test for ClassesInAssembly + /// </summary> + [Fact] + public void ClassesInAssemblyTest() + { + Assert.Equal(18, this.parserResult.Assemblies.SelectMany(a => a.Classes).Count()); + } + + /// <summary> + /// A test for Assemblies + /// </summary> + [Fact] + public void AssembliesTest() + { + Assert.Single(this.parserResult.Assemblies); + } + + /// <summary> + /// A test for GetCoverageQuotaOfClass. + /// </summary> + [Fact] + public void GetCoverableLinesOfClassTest() + { + Assert.Equal(4, this.parserResult.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.AbstractClass").CoverableLines); + } + + /// <summary> + /// A test for GetCoverageQuotaOfClass. + /// </summary> + [Fact] + public void GetCoverageQuotaOfClassTest() + { + Assert.Equal(66.6m, this.parserResult.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.PartialClassWithAutoProperties").CoverageQuota); + } + + /// <summary> + /// A test for MethodMetrics + /// </summary> + [Fact] + public void MethodMetricsTest() + { + Assert.Empty(this.parserResult.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").Files.Single(f => f.Path == "C:\\temp\\TestClass.cs").MethodMetrics); + } + + /// <summary> + /// A test for CodeElements + /// </summary> + [Fact] + public void CodeElementsTest() + { + var codeElements = GetFile(this.parserResult.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs").CodeElements; + Assert.Equal(2, codeElements.Count()); + + codeElements = GetFile(this.parserResult.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs").CodeElements; + Assert.Equal(4, codeElements.Count()); + + codeElements = GetFile(this.parserResult.Assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs").CodeElements; + Assert.Equal(10, codeElements.Count()); + + codeElements = GetFile(this.parserResult.Assemblies, "Test.AsyncClass", "C:\\temp\\AsyncClass.cs").CodeElements; + Assert.Single(codeElements); + Assert.Equal("SendAsync()", codeElements.First().Name); + } + + private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "Test").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName); + + private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "Test").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName) + .AnalyzeFile(); + } +} diff --git a/src/ReportGenerator.Core.Test/Parser/DynamicCodeCoverageParserTest.cs b/src/ReportGenerator.Core.Test/Parser/DynamicCodeCoverageParserTest.cs new file mode 100644 index 00000000..e8694d73 --- /dev/null +++ b/src/ReportGenerator.Core.Test/Parser/DynamicCodeCoverageParserTest.cs @@ -0,0 +1,188 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Xml.Linq; +using Moq; +using Palmmedia.ReportGenerator.Core.Parser; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test.Parser +{ + /// <summary> + /// This is a test class for VisualStudioParser and is intended + /// to contain all DynamicCodeCoverageParser Unit Tests + /// </summary> + [Collection("FileManager")] + public class DynamicCodeCoverageParserTest + { + private static readonly string FilePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "DynamicCodeCoverage.xml"); + + private ParserResult parserResult; + + public DynamicCodeCoverageParserTest() + { + var filterMock = new Mock<IFilter>(); + filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny<string>())).Returns(true); + + var report = XDocument.Load(FilePath); + this.parserResult = new DynamicCodeCoverageParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report); + } + + /// <summary> + /// A test for NumberOfLineVisits + /// </summary> + [Fact] + public void NumberOfLineVisitsTest() + { + var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "TestClass", "C:\\temp\\TestClass.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 10).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 11).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 12).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 23).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "TestClass2", "C:\\temp\\TestClass2.cs"); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "PartialClass", "C:\\temp\\PartialClass.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "PartialClass", "C:\\temp\\PartialClass2.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + } + + /// <summary> + /// A test for LineVisitStatus + /// </summary> + [Fact] + public void LineVisitStatusTest() + { + var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "TestClass", "C:\\temp\\TestClass.cs"); + + var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); + Assert.Equal(LineVisitStatus.NotCoverable, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 15); + Assert.Equal(LineVisitStatus.Covered, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 17); + Assert.Equal(LineVisitStatus.PartiallyCovered, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 22); + Assert.Equal(LineVisitStatus.NotCovered, line.LineVisitStatus); + } + + /// <summary> + /// A test for NumberOfFiles + /// </summary> + [Fact] + public void NumberOfFilesTest() + { + Assert.Equal(11, this.parserResult.Assemblies.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count()); + } + + /// <summary> + /// A test for FilesOfClass + /// </summary> + [Fact] + public void FilesOfClassTest() + { + Assert.Single(this.parserResult.Assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "TestClass").Files); + Assert.Equal(2, this.parserResult.Assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "PartialClass").Files.Count()); + } + + /// <summary> + /// A test for ClassesInAssembly + /// </summary> + [Fact] + public void ClassesInAssemblyTest() + { + Assert.Equal(13, this.parserResult.Assemblies.SelectMany(a => a.Classes).Count()); + } + + /// <summary> + /// A test for GetCoverageQuotaOfClass. + /// </summary> + [Fact] + public void GetCoverableLinesOfClassTest() + { + Assert.Equal(4, this.parserResult.Assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "AbstractClass").CoverableLines); + } + + /// <summary> + /// A test for Assemblies + /// </summary> + [Fact] + public void AssembliesTest() + { + Assert.Single(this.parserResult.Assemblies); + } + + /// <summary> + /// A test for MethodMetrics + /// </summary> + [Fact] + public void MethodMetricsTest() + { + var metrics = this.parserResult.Assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "TestClass").Files.Single(f => f.Path == "C:\\temp\\TestClass.cs").MethodMetrics; + + Assert.Equal(2, metrics.Count()); + Assert.Equal("SampleFunction()", metrics.First().FullName); + Assert.Equal(2, metrics.First().Metrics.Count()); + + Assert.Equal("Blocks covered", metrics.First().Metrics.ElementAt(0).Name); + Assert.Equal(9, metrics.First().Metrics.ElementAt(0).Value); + Assert.Equal("Blocks not covered", metrics.First().Metrics.ElementAt(1).Name); + Assert.Equal(4, metrics.First().Metrics.ElementAt(1).Value); + + metrics = this.parserResult.Assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "AsyncClass").Files.Single(f => f.Path == "C:\\temp\\AsyncClass.cs").MethodMetrics; + + Assert.Single(metrics); + Assert.Equal("SendAsync()", metrics.First().FullName); + } + + /// <summary> + /// A test for CodeElements + /// </summary> + [Fact] + public void CodeElementsTest() + { + var codeElements = GetFile(this.parserResult.Assemblies, "TestClass", "C:\\temp\\TestClass.cs").CodeElements; + Assert.Equal(2, codeElements.Count()); + + codeElements = GetFile(this.parserResult.Assemblies, "PartialClass", "C:\\temp\\PartialClass.cs").CodeElements; + Assert.Equal(4, codeElements.Count()); + + codeElements = GetFile(this.parserResult.Assemblies, "TestClass2", "C:\\temp\\TestClass2.cs").CodeElements; + Assert.Equal(6, codeElements.Count()); + + codeElements = GetFile(this.parserResult.Assemblies, "AsyncClass", "C:\\temp\\AsyncClass.cs").CodeElements; + Assert.Single(codeElements); + Assert.Equal("SendAsync()", codeElements.First().Name); + } + + private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "test.exe").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName); + + private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "test.exe").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName) + .AnalyzeFile(); + } +} diff --git a/src/ReportGenerator.Core.Test/Parser/Filtering/DefaultFilterTest.cs b/src/ReportGenerator.Core.Test/Parser/Filtering/DefaultFilterTest.cs new file mode 100644 index 00000000..d38ddc15 --- /dev/null +++ b/src/ReportGenerator.Core.Test/Parser/Filtering/DefaultFilterTest.cs @@ -0,0 +1,88 @@ +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test.Parser.Filtering +{ + /// <summary> + /// This is a test class for DefaultFilter and is intended + /// to contain all DefaultFilter Unit Tests + /// </summary> + public class DefaultFilterTest + { + [Fact] + public void NoFilter_AnyElement_ElementIsAccepted() + { + IFilter filter = new DefaultFilter(new string[] { }); + + Assert.True(filter.IsElementIncludedInReport("Test"), "Element is expected to be included."); + } + + [Fact] + public void OnlyIncludes_MatchingElement_ElementIsAccepted() + { + IFilter filter = new DefaultFilter(new[] { "+Test" }); + + Assert.True(filter.IsElementIncludedInReport("Test"), "Element is expected to be included."); + } + + [Fact] + public void OnlyIncludes_NotMatchingElement_ElementIsNotAccepted() + { + IFilter filter = new DefaultFilter(new[] { "+Test" }); + + Assert.False(filter.IsElementIncludedInReport("Test123"), "Element is expected to be excluded."); + } + + [Fact] + public void OnlyIncludesWithWildcards_MatchingElement_ElementIsAccepted() + { + IFilter filter = new DefaultFilter(new[] { "+Test*" }); + + Assert.True(filter.IsElementIncludedInReport("Test"), "Element is expected to be included."); + Assert.True(filter.IsElementIncludedInReport("Test123"), "Element is expected to be included."); + } + + [Fact] + public void OnlyIncludesWithWildcards_NotMatchingElement_ElementIsNotAccepted() + { + IFilter filter = new DefaultFilter(new[] { "+Test*" }); + + Assert.False(filter.IsElementIncludedInReport("PrefixTest"), "Element is expected to be included."); + Assert.False(filter.IsElementIncludedInReport("PrefixTest123"), "Element is expected to be included."); + } + + [Fact] + public void IncludesAndExcludes_MatchingElement_ElementIsAccepted() + { + IFilter filter = new DefaultFilter(new[] { "+Test", "-SomeExclude" }); + + Assert.True(filter.IsElementIncludedInReport("Test"), "Element is expected to be included."); + } + + [Fact] + public void IncludesAndExcludes_NotMatchingElement_ElementIsNotAccepted() + { + IFilter filter = new DefaultFilter(new[] { "+Test", "-Test" }); + + Assert.False(filter.IsElementIncludedInReport("Test"), "Element is expected to be excluded."); + } + + [Fact] + public void IncludesAndExcludesWithWildcards_MatchingElement_ElementIsAccepted() + { + IFilter filter = new DefaultFilter(new[] { "+Test*", "-SomeExclude*" }); + + Assert.True(filter.IsElementIncludedInReport("Test"), "Element is expected to be included."); + Assert.True(filter.IsElementIncludedInReport("Test123"), "Element is expected to be included."); + } + + [Fact] + public void IncludesAndExcludesWithWildcards_NotMatchingElement_ElementIsNotAccepted() + { + IFilter filter = new DefaultFilter(new[] { "+Test*", "-Tes*" }); + + Assert.False(filter.IsElementIncludedInReport("Test"), "Element is expected to be included."); + Assert.False(filter.IsElementIncludedInReport("PrefixTest123"), "Element is expected to be included."); + } + } +} diff --git a/src/ReportGenerator.Core.Test/Parser/JaCoCoParserTest.cs b/src/ReportGenerator.Core.Test/Parser/JaCoCoParserTest.cs new file mode 100644 index 00000000..613fa1c8 --- /dev/null +++ b/src/ReportGenerator.Core.Test/Parser/JaCoCoParserTest.cs @@ -0,0 +1,163 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Xml.Linq; +using Moq; +using Palmmedia.ReportGenerator.Core.Parser; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Palmmedia.ReportGenerator.Core.Parser.Preprocessing; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test.Parser +{ + /// <summary> + /// This is a test class for JaCoCoParser and is intended + /// to contain all JaCoCoParser Unit Tests + /// </summary> + [Collection("FileManager")] + public class JaCoCoParserTest + { + private static readonly string FilePath1 = Path.Combine(FileManager.GetJavaReportDirectory(), "JaCoCo0.8.3.xml"); + + private ParserResult parserResult; + + public JaCoCoParserTest() + { + var filterMock = new Mock<IFilter>(); + filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny<string>())).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); + } + + /// <summary> + /// A test for SupportsBranchCoverage + /// </summary> + [Fact] + public void SupportsBranchCoverage() + { + Assert.True(this.parserResult.SupportsBranchCoverage); + } + + /// <summary> + /// A test for NumberOfLineVisits + /// </summary> + [Fact] + public void NumberOfLineVisitsTest() + { + var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "test/TestClass", "C:\\temp\\test\\TestClass.java"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 17).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 20).LineVisits); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 1).LineVisits); + } + + /// <summary> + /// A test for LineVisitStatus + /// </summary> + [Fact] + public void LineVisitStatusTest() + { + var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "test/TestClass", "C:\\temp\\test\\TestClass.java"); + + var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); + Assert.Equal(LineVisitStatus.NotCoverable, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 12); + Assert.Equal(LineVisitStatus.Covered, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 15); + Assert.Equal(LineVisitStatus.PartiallyCovered, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 20); + Assert.Equal(LineVisitStatus.NotCovered, line.LineVisitStatus); + } + + /// <summary> + /// A test for NumberOfFiles + /// </summary> + [Fact] + public void NumberOfFilesTest() + { + Assert.Equal(7, this.parserResult.Assemblies.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count()); + } + + /// <summary> + /// A test for FilesOfClass + /// </summary> + [Fact] + public void FilesOfClassTest() + { + Assert.Single(this.parserResult.Assemblies.Single(a => a.Name == "test").Classes.Single(c => c.Name == "test/TestClass").Files); + Assert.Single(this.parserResult.Assemblies.Single(a => a.Name == "test").Classes.Single(c => c.Name == "test/GenericClass").Files); + } + + /// <summary> + /// A test for ClassesInAssembly + /// </summary> + [Fact] + public void ClassesInAssemblyTest() + { + Assert.Equal(7, this.parserResult.Assemblies.SelectMany(a => a.Classes).Count()); + } + + /// <summary> + /// A test for Assemblies + /// </summary> + [Fact] + public void AssembliesTest() + { + Assert.Equal(2, this.parserResult.Assemblies.Count()); + } + + /// <summary> + /// A test for GetCoverageQuotaOfClass. + /// </summary> + [Fact] + public void GetCoverableLinesOfClassTest() + { + Assert.Equal(3, this.parserResult.Assemblies.Single(a => a.Name == "test").Classes.Single(c => c.Name == "test/AbstractClass").CoverableLines); + } + + /// <summary> + /// A test for MethodMetrics + /// </summary> + [Fact] + public void MethodMetricsTest() + { + var metrics = this.parserResult.Assemblies.Single(a => a.Name == "test").Classes.Single(c => c.Name == "test/TestClass").Files.Single(f => f.Path == "C:\\temp\\test\\TestClass.java").MethodMetrics; + + Assert.Equal(4, metrics.Count()); + Assert.Equal("<init>()V", metrics.ElementAt(2).FullName); + Assert.Equal(2, metrics.ElementAt(2).Metrics.Count()); + + Assert.Equal("Line coverage", metrics.ElementAt(2).Metrics.ElementAt(0).Name); + Assert.Equal(100.0M, metrics.ElementAt(2).Metrics.ElementAt(0).Value); + Assert.Equal("Branch coverage", metrics.ElementAt(2).Metrics.ElementAt(1).Name); + Assert.Null(metrics.ElementAt(2).Metrics.ElementAt(1).Value); + } + + /// <summary> + /// A test for CodeElements + /// </summary> + [Fact] + public void CodeElementsTest() + { + var codeElements = GetFile(this.parserResult.Assemblies, "test/TestClass", "C:\\temp\\test\\TestClass.java").CodeElements; + Assert.Equal(4, codeElements.Count()); + } + + private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "test").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName); + + private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "test").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName) + .AnalyzeFile(); + } +} diff --git a/src/ReportGenerator.Core.Test/Parser/MProfParserTest.cs b/src/ReportGenerator.Core.Test/Parser/MProfParserTest.cs new file mode 100644 index 00000000..6e3c9475 --- /dev/null +++ b/src/ReportGenerator.Core.Test/Parser/MProfParserTest.cs @@ -0,0 +1,151 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Xml.Linq; +using Moq; +using Palmmedia.ReportGenerator.Core.Parser; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test.Parser +{ + /// <summary> + /// This is a test class for MProfParser and is intended + /// to contain all MProfParser Unit Tests + /// </summary> + [Collection("FileManager")] + public class MProfParserTest + { + private static readonly string FilePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "mprof-report.xml"); + + private ParserResult parserResult; + + public MProfParserTest() + { + var filterMock = new Mock<IFilter>(); + filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny<string>())).Returns(true); + + var report = XDocument.Load(FilePath); + this.parserResult = new MProfParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report); + } + + /// <summary> + /// A test for NumberOfLineVisits + /// </summary> + [Fact] + public void NumberOfLineVisitsTest() + { + var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 18).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + } + + /// <summary> + /// A test for LineVisitStatus + /// </summary> + [Fact] + public void LineVisitStatusTest() + { + var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); + + var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); + Assert.Equal(LineVisitStatus.NotCoverable, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 9); + Assert.Equal(LineVisitStatus.Covered, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 23); + Assert.Equal(LineVisitStatus.NotCovered, line.LineVisitStatus); + } + + /// <summary> + /// A test for NumberOfFiles + /// </summary> + [Fact] + public void NumberOfFilesTest() + { + Assert.Equal(8, this.parserResult.Assemblies.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count()); + } + + /// <summary> + /// A test for FilesOfClass + /// </summary> + [Fact] + public void FilesOfClassTest() + { + Assert.Single(this.parserResult.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").Files); + Assert.Equal(2, this.parserResult.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.PartialClass").Files.Count()); + } + + /// <summary> + /// A test for ClassesInAssembly + /// </summary> + [Fact] + public void ClassesInAssemblyTest() + { + Assert.Equal(12, this.parserResult.Assemblies.SelectMany(a => a.Classes).Count()); + } + + /// <summary> + /// A test for Assemblies + /// </summary> + [Fact] + public void AssembliesTest() + { + Assert.Single(this.parserResult.Assemblies); + } + + /// <summary> + /// A test for MethodMetrics + /// </summary> + [Fact] + public void MethodMetricsTest() + { + Assert.Empty(this.parserResult.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").Files.Single(f => f.Path == "C:\\temp\\TestClass.cs").MethodMetrics); + } + + /// <summary> + /// A test for CodeElements + /// </summary> + [Fact] + public void CodeElementsTest() + { + var codeElements = GetFile(this.parserResult.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs").CodeElements; + Assert.Single(codeElements); + + codeElements = GetFile(this.parserResult.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs").CodeElements; + Assert.Equal(2, codeElements.Count()); + + codeElements = GetFile(this.parserResult.Assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs").CodeElements; + Assert.Equal(3, codeElements.Count()); + } + + private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "Test").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName); + + private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "Test").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName) + .AnalyzeFile(); + } +} diff --git a/src/ReportGenerator.Core.Test/Parser/NCoverParserTest.cs b/src/ReportGenerator.Core.Test/Parser/NCoverParserTest.cs new file mode 100644 index 00000000..955f4539 --- /dev/null +++ b/src/ReportGenerator.Core.Test/Parser/NCoverParserTest.cs @@ -0,0 +1,151 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Xml.Linq; +using Moq; +using Palmmedia.ReportGenerator.Core.Parser; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test.Parser +{ + /// <summary> + /// This is a test class for NCoverParser and is intended + /// to contain all NCoverParser Unit Tests + /// </summary> + [Collection("FileManager")] + public class NCoverParserTest + { + private static readonly string FilePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "NCover1.5.8.xml"); + + private ParserResult parserResult; + + public NCoverParserTest() + { + var filterMock = new Mock<IFilter>(); + filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny<string>())).Returns(true); + + var report = XDocument.Load(FilePath); + this.parserResult = new NCoverParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report); + } + + /// <summary> + /// A test for NumberOfLineVisits + /// </summary> + [Fact] + public void NumberOfLineVisitsTest() + { + var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 18).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits); + Assert.Equal(4, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + } + + /// <summary> + /// A test for LineVisitStatus + /// </summary> + [Fact] + public void LineVisitStatusTest() + { + var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); + + var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); + Assert.Equal(LineVisitStatus.NotCoverable, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 10); + Assert.Equal(LineVisitStatus.Covered, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 18); + Assert.Equal(LineVisitStatus.NotCovered, line.LineVisitStatus); + } + + /// <summary> + /// A test for NumberOfFiles + /// </summary> + [Fact] + public void NumberOfFilesTest() + { + Assert.Equal(5, this.parserResult.Assemblies.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count()); + } + + /// <summary> + /// A test for FilesOfClass + /// </summary> + [Fact] + public void FilesOfClassTest() + { + Assert.Single(this.parserResult.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").Files); + Assert.Equal(2, this.parserResult.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.PartialClass").Files.Count()); + } + + /// <summary> + /// A test for ClassesInAssembly + /// </summary> + [Fact] + public void ClassesInAssemblyTest() + { + Assert.Equal(4, this.parserResult.Assemblies.SelectMany(a => a.Classes).Count()); + } + + /// <summary> + /// A test for Assemblies + /// </summary> + [Fact] + public void AssembliesTest() + { + Assert.Single(this.parserResult.Assemblies); + } + + /// <summary> + /// A test for MethodMetrics + /// </summary> + [Fact] + public void MethodMetricsTest() + { + Assert.Empty(this.parserResult.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").Files.Single(f => f.Path == "C:\\temp\\TestClass.cs").MethodMetrics); + } + + /// <summary> + /// A test for CodeElements + /// </summary> + [Fact] + public void CodeElementsTest() + { + var codeElements = GetFile(this.parserResult.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs").CodeElements; + Assert.Equal(2, codeElements.Count()); + + codeElements = GetFile(this.parserResult.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs").CodeElements; + Assert.Equal(4, codeElements.Count()); + + codeElements = GetFile(this.parserResult.Assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs").CodeElements; + Assert.Equal(5, codeElements.Count()); + } + + private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "Test").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName); + + private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "Test").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName) + .AnalyzeFile(); + } +} diff --git a/src/ReportGenerator.Core.Test/Parser/OpenCoverParserTest.cs b/src/ReportGenerator.Core.Test/Parser/OpenCoverParserTest.cs new file mode 100644 index 00000000..4d56d736 --- /dev/null +++ b/src/ReportGenerator.Core.Test/Parser/OpenCoverParserTest.cs @@ -0,0 +1,315 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Xml.Linq; +using Moq; +using Palmmedia.ReportGenerator.Core.Parser; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Palmmedia.ReportGenerator.Core.Parser.Preprocessing; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test.Parser +{ + /// <summary> + /// This is a test class for OpenCoverParser and is intended + /// to contain all OpenCoverParser Unit Tests + /// </summary> + [Collection("FileManager")] + public class OpenCoverParserTest + { + private static readonly string FilePath1 = Path.Combine(FileManager.GetCSharpReportDirectory(), "OpenCover.xml"); + + private static readonly string FilePath2 = Path.Combine(FileManager.GetCSharpReportDirectory(), "OpenCoverWithTrackedMethods.xml"); + + private ParserResult parserResultWithoutPreprocessing; + + private ParserResult parserResultWithPreprocessing; + + private ParserResult parserResultWithTrackedMethods; + + public OpenCoverParserTest() + { + var filterMock = new Mock<IFilter>(); + filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny<string>())).Returns(true); + + this.parserResultWithoutPreprocessing = new OpenCoverParser(filterMock.Object, filterMock.Object, filterMock.Object).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); + + report = XDocument.Load(FilePath2); + new OpenCoverReportPreprocessor().Execute(report); + this.parserResultWithTrackedMethods = new OpenCoverParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report); + } + + /// <summary> + /// A test for SupportsBranchCoverage + /// </summary> + [Fact] + public void SupportsBranchCoverage() + { + Assert.True(this.parserResultWithoutPreprocessing.SupportsBranchCoverage); + Assert.True(this.parserResultWithPreprocessing.SupportsBranchCoverage); + Assert.True(this.parserResultWithTrackedMethods.SupportsBranchCoverage); + } + + /// <summary> + /// A test for NumberOfLineVisits + /// </summary> + [Fact] + public void NumberOfLineVisitsTest_WithoutPreprocessing() + { + var fileAnalysis = GetFileAnalysis(this.parserResultWithoutPreprocessing.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 10).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 11).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 12).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 23).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResultWithoutPreprocessing.Assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); + Assert.Equal(3, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits); + Assert.Equal(4, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits); + Assert.False(fileAnalysis.Lines.Single(l => l.LineNumber == 44).CoveredBranches.HasValue, "No covered branches"); + Assert.False(fileAnalysis.Lines.Single(l => l.LineNumber == 44).TotalBranches.HasValue, "No total branches"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 54).CoveredBranches.Value); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 54).TotalBranches.Value); + + fileAnalysis = GetFileAnalysis(this.parserResultWithoutPreprocessing.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResultWithoutPreprocessing.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResultWithoutPreprocessing.Assemblies, "Test.ClassWithExcludes", "C:\\temp\\ClassWithExcludes.cs"); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + } + + /// <summary> + /// A test for NumberOfLineVisits + /// </summary> + [Fact] + public void NumberOfLineVisitsTest_WithPreprocessing() + { + var fileAnalysis = GetFileAnalysis(this.parserResultWithPreprocessing.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 10).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 11).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 12).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 23).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResultWithPreprocessing.Assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); + Assert.Equal(3, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits); + Assert.Equal(4, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits); + Assert.False(fileAnalysis.Lines.Single(l => l.LineNumber == 44).CoveredBranches.HasValue); + Assert.False(fileAnalysis.Lines.Single(l => l.LineNumber == 44).TotalBranches.HasValue); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 54).CoveredBranches.Value); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 54).TotalBranches.Value); + + fileAnalysis = GetFileAnalysis(this.parserResultWithPreprocessing.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResultWithPreprocessing.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResultWithPreprocessing.Assemblies, "Test.ClassWithExcludes", "C:\\temp\\ClassWithExcludes.cs"); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + } + + /// <summary> + /// A test for NumberOfLineVisits + /// </summary> + [Fact] + public void NumberOfLineVisitsTest_WithTrackedMethods() + { + var fileAnalysis = GetFileAnalysis(this.parserResultWithTrackedMethods.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); + + var line = fileAnalysis.Lines.Single(l => l.LineNumber == 9); + + Assert.Equal(2, line.LineVisits); + + Assert.Equal(2, line.LineCoverageByTestMethod.Count); + Assert.Equal(1, line.LineCoverageByTestMethod.First().Value.LineVisits); + Assert.Equal(1, line.LineCoverageByTestMethod.ElementAt(1).Value.LineVisits); + } + + /// <summary> + /// A test for LineVisitStatus + /// </summary> + [Fact] + public void LineVisitStatusTest_WithTrackedMethods() + { + var fileAnalysis = GetFileAnalysis(this.parserResultWithTrackedMethods.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); + + var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); + + Assert.Equal(LineVisitStatus.NotCoverable, line.LineVisitStatus); + + Assert.Equal(2, line.LineCoverageByTestMethod.Count); + Assert.Equal(LineVisitStatus.NotCoverable, line.LineCoverageByTestMethod.First().Value.LineVisitStatus); + Assert.Equal(LineVisitStatus.NotCoverable, line.LineCoverageByTestMethod.ElementAt(1).Value.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 15); + + Assert.Equal(LineVisitStatus.Covered, line.LineVisitStatus); + + Assert.Equal(2, line.LineCoverageByTestMethod.Count); + Assert.Equal(LineVisitStatus.Covered, line.LineCoverageByTestMethod.First().Value.LineVisitStatus); + Assert.Equal(LineVisitStatus.Covered, line.LineCoverageByTestMethod.ElementAt(1).Value.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 17); + + Assert.Equal(LineVisitStatus.PartiallyCovered, line.LineVisitStatus); + + Assert.Equal(2, line.LineCoverageByTestMethod.Count); + Assert.Equal(LineVisitStatus.PartiallyCovered, line.LineCoverageByTestMethod.First().Value.LineVisitStatus); + Assert.Equal(LineVisitStatus.PartiallyCovered, line.LineCoverageByTestMethod.ElementAt(1).Value.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 22); + + Assert.Equal(LineVisitStatus.NotCovered, line.LineVisitStatus); + + Assert.Equal(2, line.LineCoverageByTestMethod.Count); + Assert.Equal(LineVisitStatus.NotCovered, line.LineCoverageByTestMethod.First().Value.LineVisitStatus); + Assert.Equal(LineVisitStatus.NotCovered, line.LineCoverageByTestMethod.ElementAt(1).Value.LineVisitStatus); + } + + /// <summary> + /// A test for NumberOfFiles + /// </summary> + [Fact] + public void NumberOfFilesTest() + { + Assert.Equal(15, this.parserResultWithoutPreprocessing.Assemblies.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count()); + } + + /// <summary> + /// A test for FilesOfClass + /// </summary> + [Fact] + public void FilesOfClassTest() + { + Assert.Single(this.parserResultWithoutPreprocessing.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").Files); + Assert.Equal(2, this.parserResultWithoutPreprocessing.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.PartialClass").Files.Count()); + } + + /// <summary> + /// A test for ClassesInAssembly + /// </summary> + [Fact] + public void ClassesInAssemblyTest() + { + Assert.Equal(17, this.parserResultWithoutPreprocessing.Assemblies.SelectMany(a => a.Classes).Count()); + } + + /// <summary> + /// A test for Assemblies + /// </summary> + [Fact] + public void AssembliesTest() + { + Assert.Single(this.parserResultWithoutPreprocessing.Assemblies); + } + + /// <summary> + /// A test for GetCoverageQuotaOfClass. + /// </summary> + [Fact] + public void GetCoverableLinesOfClassTest() + { + Assert.Equal(4, this.parserResultWithoutPreprocessing.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.AbstractClass").CoverableLines); + } + + /// <summary> + /// A test for GetCoverageQuotaOfClass. + /// </summary> + [Fact] + public void GetCoverageQuotaOfClassTest() + { + Assert.Equal(66.6m, this.parserResultWithoutPreprocessing.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.PartialClassWithAutoProperties").CoverageQuota); + } + + /// <summary> + /// A test for MethodMetrics + /// </summary> + [Fact] + public void MethodMetricsTest() + { + var metrics = this.parserResultWithoutPreprocessing.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").Files.Single(f => f.Path == "C:\\temp\\TestClass.cs").MethodMetrics; + + Assert.Equal(2, metrics.Count()); + Assert.Equal("System.Void Test.TestClass::SampleFunction()", metrics.First().FullName); + Assert.Equal(5, metrics.First().Metrics.Count()); + + Assert.Equal("Cyclomatic complexity", metrics.First().Metrics.ElementAt(0).Name); + Assert.Equal(3, metrics.First().Metrics.ElementAt(0).Value); + Assert.Equal("NPath complexity", metrics.First().Metrics.ElementAt(1).Name); + Assert.Equal(2, metrics.First().Metrics.ElementAt(1).Value); + Assert.Equal("Sequence coverage", metrics.First().Metrics.ElementAt(2).Name); + Assert.Equal(75M, metrics.First().Metrics.ElementAt(2).Value); + Assert.Equal("Branch coverage", metrics.First().Metrics.ElementAt(3).Name); + Assert.Equal(66.67M, metrics.First().Metrics.ElementAt(3).Value); + Assert.Equal("Crap Score", metrics.First().Metrics.ElementAt(4).Name); + Assert.Equal(3.14M, metrics.First().Metrics.ElementAt(4).Value); + + metrics = this.parserResultWithoutPreprocessing.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.AsyncClass").Files.Single(f => f.Path == "C:\\temp\\AsyncClass.cs").MethodMetrics; + + Assert.Single(metrics); + Assert.Equal("SendAsync()", metrics.First().FullName); + } + + /// <summary> + /// A test for CodeElements + /// </summary> + [Fact] + public void CodeElementsTest() + { + var codeElements = GetFile(this.parserResultWithPreprocessing.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs").CodeElements; + Assert.Equal(2, codeElements.Count()); + + codeElements = GetFile(this.parserResultWithPreprocessing.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs").CodeElements; + Assert.Equal(4, codeElements.Count()); + + codeElements = GetFile(this.parserResultWithPreprocessing.Assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs").CodeElements; + Assert.Equal(10, codeElements.Count()); + + codeElements = GetFile(this.parserResultWithPreprocessing.Assemblies, "Test.AsyncClass", "C:\\temp\\AsyncClass.cs").CodeElements; + Assert.Single(codeElements); + Assert.Equal("SendAsync()", codeElements.First().Name); + } + + private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "Test").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName); + + private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "Test").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName) + .AnalyzeFile(); + } +} diff --git a/src/ReportGenerator.Core.Test/Parser/ParserResultTest.cs b/src/ReportGenerator.Core.Test/Parser/ParserResultTest.cs new file mode 100644 index 00000000..77f5b858 --- /dev/null +++ b/src/ReportGenerator.Core.Test/Parser/ParserResultTest.cs @@ -0,0 +1,288 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Xml.Linq; +using Moq; +using Palmmedia.ReportGenerator.Core.Parser; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Palmmedia.ReportGenerator.Core.Parser.Preprocessing; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test.Parser +{ + /// <summary> + /// This is a test class for MultiReportParser and is intended + /// to contain all ParserResultTest Unit Tests + /// </summary> + [Collection("FileManager")] + public class ParserResultTest + { + private static readonly string FilePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "OpenCover.xml"); + + private ParserResult parserResultWithoutPreprocessing; + + private ParserResult parserResultWithPreprocessing; + + public ParserResultTest() + { + var filterMock = new Mock<IFilter>(); + filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny<string>())).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))); + + var report = XDocument.Load(FilePath); + new OpenCoverReportPreprocessor().Execute(report); + this.parserResultWithPreprocessing = new OpenCoverParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report); + + report = XDocument.Load(FilePath); + new OpenCoverReportPreprocessor().Execute(report); + this.parserResultWithPreprocessing.Merge(new OpenCoverParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report)); + } + + /// <summary> + /// A test for SupportsBranchCoverage + /// </summary> + [Fact] + public void SupportsBranchCoverage() + { + var parserResult = new ParserResult(); + Assert.True(parserResult.SupportsBranchCoverage); + + parserResult = new ParserResult(new List<Assembly>(), false, "Test"); + Assert.False(parserResult.SupportsBranchCoverage); + + parserResult.Merge(new ParserResult()); + Assert.True(parserResult.SupportsBranchCoverage); + } + + /// <summary> + /// A test for SourceDirectories + /// </summary> + [Fact] + public void SourceDirectories() + { + var parserResult1 = new ParserResult(); + Assert.Equal(0, parserResult1.SourceDirectories.Count); + + parserResult1.AddSourceDirectory("C:\\temp1"); + parserResult1.AddSourceDirectory("C:\\temp2"); + Assert.Equal(2, parserResult1.SourceDirectories.Count); + + var parserResult2 = new ParserResult(); + parserResult2.AddSourceDirectory("C:\\temp2"); + parserResult2.AddSourceDirectory("C:\\temp3"); + Assert.Equal(2, parserResult1.SourceDirectories.Count); + + parserResult1.Merge(parserResult2); + Assert.Equal(3, parserResult1.SourceDirectories.Count); + } + + /// <summary> + /// A test for NumberOfLineVisits + /// </summary> + [Fact] + public void NumberOfLineVisitsTest_WithoutPreprocessing() + { + var fileAnalysis = GetFileAnalysis(this.parserResultWithoutPreprocessing.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 10).LineVisits); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 11).LineVisits); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 12).LineVisits); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 23).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResultWithoutPreprocessing.Assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); + Assert.Equal(6, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + Assert.Equal(4, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits); + Assert.Equal(8, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits); + Assert.False(fileAnalysis.Lines.Single(l => l.LineNumber == 44).CoveredBranches.HasValue, "No covered branches"); + Assert.False(fileAnalysis.Lines.Single(l => l.LineNumber == 44).TotalBranches.HasValue, "No total branches"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 54).CoveredBranches.Value); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 54).TotalBranches.Value); + + fileAnalysis = GetFileAnalysis(this.parserResultWithoutPreprocessing.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResultWithoutPreprocessing.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResultWithoutPreprocessing.Assemblies, "Test.ClassWithExcludes", "C:\\temp\\ClassWithExcludes.cs"); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + } + + /// <summary> + /// A test for NumberOfLineVisits + /// </summary> + [Fact] + public void NumberOfLineVisitsTest_WithPreprocessing() + { + var fileAnalysis = GetFileAnalysis(this.parserResultWithPreprocessing.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 10).LineVisits); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 11).LineVisits); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 12).LineVisits); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 23).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResultWithPreprocessing.Assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); + Assert.Equal(6, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + Assert.Equal(4, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits); + Assert.Equal(8, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits); + Assert.False(fileAnalysis.Lines.Single(l => l.LineNumber == 44).CoveredBranches.HasValue); + Assert.False(fileAnalysis.Lines.Single(l => l.LineNumber == 44).TotalBranches.HasValue); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 54).CoveredBranches.Value); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 54).TotalBranches.Value); + + fileAnalysis = GetFileAnalysis(this.parserResultWithPreprocessing.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResultWithPreprocessing.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResultWithPreprocessing.Assemblies, "Test.ClassWithExcludes", "C:\\temp\\ClassWithExcludes.cs"); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + } + + /// <summary> + /// A test for NumberOfFiles + /// </summary> + [Fact] + public void NumberOfFilesTest() + { + Assert.Equal(15, this.parserResultWithoutPreprocessing.Assemblies.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count()); + } + + /// <summary> + /// A test for FilesOfClass + /// </summary> + [Fact] + public void FilesOfClassTest() + { + Assert.Single(this.parserResultWithoutPreprocessing.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").Files); + Assert.Equal(2, this.parserResultWithoutPreprocessing.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.PartialClass").Files.Count()); + } + + /// <summary> + /// A test for ClassesInAssembly + /// </summary> + [Fact] + public void ClassesInAssemblyTest() + { + Assert.Equal(17, this.parserResultWithoutPreprocessing.Assemblies.SelectMany(a => a.Classes).Count()); + } + + /// <summary> + /// A test for Assemblies + /// </summary> + [Fact] + public void AssembliesTest() + { + Assert.Single(this.parserResultWithoutPreprocessing.Assemblies); + } + + /// <summary> + /// A test for MethodMetrics + /// </summary> + [Fact] + public void MethodMetricsTest() + { + var metrics = this.parserResultWithoutPreprocessing.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.TestClass").Files.Single(f => f.Path == "C:\\temp\\TestClass.cs").MethodMetrics; + + Assert.Equal(2, metrics.Count()); + Assert.Equal("System.Void Test.TestClass::SampleFunction()", metrics.First().FullName); + Assert.Equal(5, metrics.First().Metrics.Count()); + + Assert.Equal("Cyclomatic complexity", metrics.First().Metrics.ElementAt(0).Name); + Assert.Equal(3, metrics.First().Metrics.ElementAt(0).Value); + Assert.Equal("NPath complexity", metrics.First().Metrics.ElementAt(1).Name); + Assert.Equal(2, metrics.First().Metrics.ElementAt(1).Value); + Assert.Equal("Sequence coverage", metrics.First().Metrics.ElementAt(2).Name); + Assert.Equal(75M, metrics.First().Metrics.ElementAt(2).Value); + Assert.Equal("Branch coverage", metrics.First().Metrics.ElementAt(3).Name); + Assert.Equal(66.67M, metrics.First().Metrics.ElementAt(3).Value); + Assert.Equal("Crap Score", metrics.First().Metrics.ElementAt(4).Name); + Assert.Equal(3.14M, metrics.First().Metrics.ElementAt(4).Value); + + metrics = this.parserResultWithoutPreprocessing.Assemblies.Single(a => a.Name == "Test").Classes.Single(c => c.Name == "Test.AsyncClass").Files.Single(f => f.Path == "C:\\temp\\AsyncClass.cs").MethodMetrics; + + Assert.Single(metrics); + Assert.Equal("SendAsync()", metrics.First().FullName); + } + + /// <summary> + /// A test for MethodMetrics + /// </summary> + [Fact] + public void OpenCoverMethodMetricsTest() + { + var filterMock = new Mock<IFilter>(); + filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny<string>())).Returns(true); + + string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiOpenCover.xml"); + var parserResult = new CoverageReportParser(1, new string[0], filterMock.Object, filterMock.Object, filterMock.Object).ParseFiles(new string[] { filePath }); + + var metrics = parserResult.Assemblies + .Single(a => a.Name == "Test").Classes + .Single(c => c.Name == "Test.TestClass").Files + .Single(f => f.Path == "C:\\temp\\TestClass.cs") + .MethodMetrics; + + Assert.Equal(2, metrics.Count()); + Assert.Equal("System.Void Test.TestClass::SampleFunction()", metrics.First().FullName); + Assert.Equal(3, metrics.First().Metrics.Count()); + + Assert.Equal("Cyclomatic complexity", metrics.First().Metrics.ElementAt(0).Name); + Assert.Equal(111, metrics.First().Metrics.ElementAt(0).Value); + Assert.Equal("Sequence coverage", metrics.First().Metrics.ElementAt(1).Name); + Assert.Equal(222, metrics.First().Metrics.ElementAt(1).Value); + Assert.Equal("Branch coverage", metrics.First().Metrics.ElementAt(2).Name); + Assert.Equal(333, metrics.First().Metrics.ElementAt(2).Value); + } + + /// <summary> + /// A test for branches + /// </summary> + [Fact] + public void OpenCoverBranchesTest() + { + var filterMock = new Mock<IFilter>(); + filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny<string>())).Returns(true); + + string filePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "MultiOpenCover.xml"); + var parserResult = new CoverageReportParser(1, new string[0], filterMock.Object, filterMock.Object, filterMock.Object).ParseFiles(new string[] { filePath }); + + var fileAnalysis = GetFileAnalysis(parserResult.Assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); + + Assert.False(fileAnalysis.Lines.Single(l => l.LineNumber == 44).CoveredBranches.HasValue, "No covered branches"); + Assert.False(fileAnalysis.Lines.Single(l => l.LineNumber == 44).TotalBranches.HasValue, "No total branches"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 45).CoveredBranches.Value); + Assert.Equal(2, fileAnalysis.Lines.Single(l => l.LineNumber == 45).TotalBranches.Value); + } + + private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "Test").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName) + .AnalyzeFile(); + } +} diff --git a/src/ReportGenerator.Console.Test/Parser/Preprocessing/CoberturaReportPreprocessorTest.cs b/src/ReportGenerator.Core.Test/Parser/Preprocessing/CoberturaReportPreprocessorTest.cs similarity index 69% rename from src/ReportGenerator.Console.Test/Parser/Preprocessing/CoberturaReportPreprocessorTest.cs rename to src/ReportGenerator.Core.Test/Parser/Preprocessing/CoberturaReportPreprocessorTest.cs index a01ec49f..74f1498d 100644 --- a/src/ReportGenerator.Console.Test/Parser/Preprocessing/CoberturaReportPreprocessorTest.cs +++ b/src/ReportGenerator.Core.Test/Parser/Preprocessing/CoberturaReportPreprocessorTest.cs @@ -1,16 +1,16 @@ using System.IO; using System.Linq; using System.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser.Preprocessing; +using Palmmedia.ReportGenerator.Core.Parser.Preprocessing; +using Xunit; -namespace Palmmedia.ReportGeneratorTest.Parser.Preprocessing +namespace Palmmedia.ReportGenerator.Core.Test.Parser.Preprocessing { /// <summary> /// This is a test class for CoberturaReportPreprocessor and is intended /// to contain all CoberturaReportPreprocessor Unit Tests /// </summary> - [TestClass] + [Collection("FileManager")] public class CoberturaReportPreprocessorTest { private static readonly string FilePath = Path.Combine(FileManager.GetJavaReportDirectory(), "Cobertura2.1.1.xml"); @@ -18,12 +18,12 @@ public class CoberturaReportPreprocessorTest /// <summary> /// A test for Execute /// </summary> - [TestMethod] + [Fact] public void Execute_FullFilePathApplied() { XDocument report = XDocument.Load(FilePath); - new CoberturaReportPreprocessor(report).Execute(); + new CoberturaReportPreprocessor().Execute(report); var filesPaths = report.Root .Elements("packages") @@ -33,8 +33,8 @@ public void Execute_FullFilePathApplied() .Select(c => c.Attribute("filename").Value) .ToArray(); - Assert.IsTrue(filesPaths.Length > 0); - Assert.IsTrue(filesPaths.All(f => f.StartsWith("C:\\temp\\"))); + Assert.True(filesPaths.Length > 0); + Assert.True(filesPaths.All(f => f.StartsWith("C:\\temp\\"))); } } } diff --git a/src/ReportGenerator.Console.Test/Parser/Preprocessing/DotCoverReportPreprocessorTest.cs b/src/ReportGenerator.Core.Test/Parser/Preprocessing/DotCoverReportPreprocessorTest.cs similarity index 67% rename from src/ReportGenerator.Console.Test/Parser/Preprocessing/DotCoverReportPreprocessorTest.cs rename to src/ReportGenerator.Core.Test/Parser/Preprocessing/DotCoverReportPreprocessorTest.cs index d3b21f44..b945e1af 100644 --- a/src/ReportGenerator.Console.Test/Parser/Preprocessing/DotCoverReportPreprocessorTest.cs +++ b/src/ReportGenerator.Core.Test/Parser/Preprocessing/DotCoverReportPreprocessorTest.cs @@ -2,17 +2,16 @@ using System.IO; using System.Linq; using System.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser.Preprocessing; -using Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch; +using Palmmedia.ReportGenerator.Core.Parser.Preprocessing; +using Xunit; -namespace Palmmedia.ReportGeneratorTest.Parser.Preprocessing +namespace Palmmedia.ReportGenerator.Core.Test.Parser.Preprocessing { /// <summary> /// This is a test class for DotCoverReportPreprocessor and is intended /// to contain all DotCoverReportPreprocessor Unit Tests /// </summary> - [TestClass] + [Collection("FileManager")] public class DotCoverReportPreprocessorTest { private static readonly string FSharpFilePath = Path.Combine(FileManager.GetFSharpReportDirectory(), "dotCover.xml"); @@ -20,7 +19,7 @@ public class DotCoverReportPreprocessorTest /// <summary> /// A test for Execute /// </summary> - [TestMethod] + [Fact] public void Execute_MoveStartupCodeElementsToParentType() { XDocument report = XDocument.Load(FSharpFilePath); @@ -34,10 +33,9 @@ public void Execute_MoveStartupCodeElementsToParentType() .Elements("Type") .ToArray(); - Assert.AreEqual(14, startupCodeClasses.Length, "Wrong number of auto generated classes."); + Assert.Equal(14, startupCodeClasses.Length); - var classSearcherFactory = new ClassSearcherFactory(); - new DotCoverReportPreprocessor(report).Execute(); + new DotCoverReportPreprocessor().Execute(report); var updatedStartupCodeClasses = report.Root .Elements("Assembly") @@ -48,16 +46,16 @@ public void Execute_MoveStartupCodeElementsToParentType() .Elements("Type") .ToArray(); - Assert.AreEqual(0, updatedStartupCodeClasses.Length, "Wrong number of auto generated classes."); + Assert.Empty(updatedStartupCodeClasses); for (int i = 3; i < 7; i++) { - Assert.IsTrue(startupCodeClasses[i].Parent.Attribute("Name").Value.StartsWith("MouseBehavior")); + Assert.StartsWith("MouseBehavior", startupCodeClasses[i].Parent.Attribute("Name").Value); } for (int i = 8; i < 13; i++) { - Assert.IsTrue(startupCodeClasses[i].Parent.Attribute("Name").Value.StartsWith("TestMouseBehavior")); + Assert.StartsWith("TestMouseBehavior", startupCodeClasses[i].Parent.Attribute("Name").Value); } } } diff --git a/src/ReportGenerator.Console.Test/Parser/Preprocessing/DynamicCodeCoverageReportPreprocessorTest.cs b/src/ReportGenerator.Core.Test/Parser/Preprocessing/DynamicCodeCoverageReportPreprocessorTest.cs similarity index 66% rename from src/ReportGenerator.Console.Test/Parser/Preprocessing/DynamicCodeCoverageReportPreprocessorTest.cs rename to src/ReportGenerator.Core.Test/Parser/Preprocessing/DynamicCodeCoverageReportPreprocessorTest.cs index 0a2b991c..061a032f 100644 --- a/src/ReportGenerator.Console.Test/Parser/Preprocessing/DynamicCodeCoverageReportPreprocessorTest.cs +++ b/src/ReportGenerator.Core.Test/Parser/Preprocessing/DynamicCodeCoverageReportPreprocessorTest.cs @@ -1,16 +1,16 @@ using System.IO; using System.Linq; using System.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser.Preprocessing; +using Palmmedia.ReportGenerator.Core.Parser.Preprocessing; +using Xunit; -namespace Palmmedia.ReportGeneratorTest.Parser.Preprocessing +namespace Palmmedia.ReportGenerator.Core.Test.Parser.Preprocessing { /// <summary> /// This is a test class for DynamicCodeCoverageReportPreprocessor and is intended /// to contain all DynamicCodeCoverageReportPreprocessor Unit Tests /// </summary> - [TestClass] + [Collection("FileManager")] public class DynamicCodeCoverageReportPreprocessorTest { private static readonly string FSharpFilePath = Path.Combine(FileManager.GetFSharpReportDirectory(), "DynamicCodeCoverage.xml"); @@ -18,7 +18,7 @@ public class DynamicCodeCoverageReportPreprocessorTest /// <summary> /// A test for Execute /// </summary> - [TestMethod] + [Fact] public void Execute_ClassNameAddedToStartupFunctionElements() { XDocument report = XDocument.Load(FSharpFilePath); @@ -31,9 +31,9 @@ public void Execute_ClassNameAddedToStartupFunctionElements() .Where(c => c.Attribute("type_name").Value.StartsWith("$")) .ToArray(); - Assert.AreEqual(15, startupCodeFunctions.Length, "Wrong number of auto generated functions."); + Assert.Equal(15, startupCodeFunctions.Length); - new DynamicCodeCoverageReportPreprocessor(report).Execute(); + new DynamicCodeCoverageReportPreprocessor().Execute(report); var updatedStartupCodeFunctions = report.Root .Elements("modules") @@ -43,16 +43,16 @@ public void Execute_ClassNameAddedToStartupFunctionElements() .Where(c => c.Attribute("type_name").Value.StartsWith("$")) .ToArray(); - Assert.AreEqual(1, updatedStartupCodeFunctions.Length, "Wrong number of auto generated functions."); + Assert.Single(updatedStartupCodeFunctions); for (int i = 1; i < 7; i++) { - Assert.IsTrue(startupCodeFunctions[i].Attribute("type_name").Value.StartsWith("MouseBehavior.")); + Assert.StartsWith("MouseBehavior.", startupCodeFunctions[i].Attribute("type_name").Value); } for (int i = 8; i < 15; i++) { - Assert.IsTrue(startupCodeFunctions[i].Attribute("type_name").Value.StartsWith("TestMouseBehavior.")); + Assert.StartsWith("TestMouseBehavior.", startupCodeFunctions[i].Attribute("type_name").Value); } } } diff --git a/src/ReportGenerator.Core.Test/Parser/Preprocessing/JaCoCoReportPreprocessorTest.cs b/src/ReportGenerator.Core.Test/Parser/Preprocessing/JaCoCoReportPreprocessorTest.cs new file mode 100644 index 00000000..64bb38f5 --- /dev/null +++ b/src/ReportGenerator.Core.Test/Parser/Preprocessing/JaCoCoReportPreprocessorTest.cs @@ -0,0 +1,44 @@ +using System.IO; +using System.Linq; +using System.Xml.Linq; +using Palmmedia.ReportGenerator.Core.Parser.Preprocessing; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test.Parser.Preprocessing +{ + /// <summary> + /// This is a test class for JaCoCoReportPreprocessor and is intended + /// to contain all JaCoCoReportPreprocessor Unit Tests + /// </summary> + [Collection("FileManager")] + public class JaCoCoReportPreprocessorTest + { + private static readonly string FilePath = Path.Combine(FileManager.GetJavaReportDirectory(), "JaCoCo0.8.3.xml"); + + /// <summary> + /// A test for Execute + /// </summary> + [Fact] + public void Execute_FullFilePathApplied() + { + XDocument report = XDocument.Load(FilePath); + + new JaCoCoReportPreprocessor(new[] { "C:\\temp\\" }).Execute(report); + + var sourcefilenameAttributesOfClasses = report.Root.Element("package").Elements("class") + .Select(e => e.Attribute("sourcefilename").Value) + .ToArray(); + + Assert.True(sourcefilenameAttributesOfClasses.Length > 0); + Assert.True(sourcefilenameAttributesOfClasses.All(f => f.StartsWith("C:\\temp\\"))); + + var nameAttributesOfSourceFiles = report.Root.Element("package").Elements("sourcefile") + .Select(e => e.Attribute("name").Value) + .ToArray(); + + Assert.True(nameAttributesOfSourceFiles.Length > 0); + Assert.True(nameAttributesOfSourceFiles.All(f => f.StartsWith("C:\\temp\\"))); + + } + } +} diff --git a/src/ReportGenerator.Console.Test/Parser/Preprocessing/OpenCoverReportPreprocessorTest.cs b/src/ReportGenerator.Core.Test/Parser/Preprocessing/OpenCoverReportPreprocessorTest.cs similarity index 61% rename from src/ReportGenerator.Console.Test/Parser/Preprocessing/OpenCoverReportPreprocessorTest.cs rename to src/ReportGenerator.Core.Test/Parser/Preprocessing/OpenCoverReportPreprocessorTest.cs index dd364f2e..cfbb31a9 100644 --- a/src/ReportGenerator.Console.Test/Parser/Preprocessing/OpenCoverReportPreprocessorTest.cs +++ b/src/ReportGenerator.Core.Test/Parser/Preprocessing/OpenCoverReportPreprocessorTest.cs @@ -1,17 +1,16 @@ using System.IO; using System.Linq; using System.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser.Preprocessing; -using Palmmedia.ReportGenerator.Parser.Preprocessing.FileSearch; +using Palmmedia.ReportGenerator.Core.Parser.Preprocessing; +using Xunit; -namespace Palmmedia.ReportGeneratorTest.Parser.Preprocessing +namespace Palmmedia.ReportGenerator.Core.Test.Parser.Preprocessing { /// <summary> /// This is a test class for OpenCoverReportPreprocessor and is intended /// to contain all OpenCoverReportPreprocessor Unit Tests /// </summary> - [TestClass] + [Collection("FileManager")] public class OpenCoverReportPreprocessorTest { private static readonly string CSharpFilePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "OpenCover.xml"); @@ -21,14 +20,14 @@ public class OpenCoverReportPreprocessorTest /// <summary> /// A test for Execute /// </summary> - [TestMethod] + [Fact] public void Execute_SequencePointsOfAutoPropertiesAdded() { XDocument report = XDocument.Load(CSharpFilePath); - - new OpenCoverReportPreprocessor(report).Execute(); - Assert.AreEqual(15, report.Descendants("File").Count(), "Wrong number of total files."); + new OpenCoverReportPreprocessor().Execute(report); + + Assert.Equal(15, report.Descendants("File").Count()); var gettersAndSetters = report.Descendants("Class") .Single(c => c.Element("FullName") != null && c.Element("FullName").Value == "Test.TestClass2") @@ -38,19 +37,19 @@ public void Execute_SequencePointsOfAutoPropertiesAdded() foreach (var getterOrSetter in gettersAndSetters) { - Assert.IsTrue(getterOrSetter.Element("FileRef") != null); - Assert.IsTrue(getterOrSetter.Element("SequencePoints") != null); + Assert.True(getterOrSetter.Element("FileRef") != null); + Assert.True(getterOrSetter.Element("SequencePoints") != null); var sequencePoints = getterOrSetter.Element("SequencePoints").Elements("SequencePoint"); - Assert.AreEqual(1, sequencePoints.Count(), "Wrong number of sequence points."); - Assert.AreEqual(getterOrSetter.Element("MethodPoint").Attribute("vc").Value, sequencePoints.First().Attribute("vc").Value, "Getter or setter should have been visited."); + Assert.Single(sequencePoints); + Assert.Equal(getterOrSetter.Element("MethodPoint").Attribute("vc").Value, sequencePoints.First().Attribute("vc").Value); } } /// <summary> /// A test for Execute /// </summary> - [TestMethod] + [Fact] public void Execute_ClassNameAddedToStartupCodeElements() { XDocument report = XDocument.Load(FSharpFilePath); @@ -63,9 +62,9 @@ public void Execute_ClassNameAddedToStartupCodeElements() .Where(c => c.Element("FullName").Value.StartsWith("<StartupCode$")) .ToArray(); - Assert.AreEqual(17, startupCodeClasses.Length, "Wrong number of auto generated classes."); - - new OpenCoverReportPreprocessor(report).Execute(); + Assert.Equal(17, startupCodeClasses.Length); + + new OpenCoverReportPreprocessor().Execute(report); var updatedStartupCodeClasses = report.Root .Elements("Modules") @@ -75,16 +74,16 @@ public void Execute_ClassNameAddedToStartupCodeElements() .Where(c => c.Element("FullName").Value.StartsWith("<StartupCode$")) .ToArray(); - Assert.AreEqual(3, updatedStartupCodeClasses.Length, "Wrong number of auto generated classes."); + Assert.Equal(3, updatedStartupCodeClasses.Length); for (int i = 2; i < 9; i++) { - Assert.IsTrue(startupCodeClasses[i].Element("FullName").Value.StartsWith("ViewModels.MouseBehavior/")); + Assert.StartsWith("ViewModels.MouseBehavior/", startupCodeClasses[i].Element("FullName").Value); } for (int i = 9; i < 16; i++) { - Assert.IsTrue(startupCodeClasses[i].Element("FullName").Value.StartsWith("ViewModels.TestMouseBehavior/")); + Assert.StartsWith("ViewModels.TestMouseBehavior/", startupCodeClasses[i].Element("FullName").Value); } } } diff --git a/src/ReportGenerator.Console.Test/Parser/Preprocessing/VisualStudioReportPreprocessorTest.cs b/src/ReportGenerator.Core.Test/Parser/Preprocessing/VisualStudioReportPreprocessorTest.cs similarity index 58% rename from src/ReportGenerator.Console.Test/Parser/Preprocessing/VisualStudioReportPreprocessorTest.cs rename to src/ReportGenerator.Core.Test/Parser/Preprocessing/VisualStudioReportPreprocessorTest.cs index b3ec0fa5..a8ef094d 100644 --- a/src/ReportGenerator.Console.Test/Parser/Preprocessing/VisualStudioReportPreprocessorTest.cs +++ b/src/ReportGenerator.Core.Test/Parser/Preprocessing/VisualStudioReportPreprocessorTest.cs @@ -1,16 +1,16 @@ using System.IO; using System.Linq; using System.Xml.Linq; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Palmmedia.ReportGenerator.Parser.Preprocessing; +using Palmmedia.ReportGenerator.Core.Parser.Preprocessing; +using Xunit; -namespace Palmmedia.ReportGeneratorTest.Parser.Preprocessing +namespace Palmmedia.ReportGenerator.Core.Test.Parser.Preprocessing { /// <summary> /// This is a test class for VisualStudioReportPreprocessor and is intended /// to contain all VisualStudioReportPreprocessor Unit Tests /// </summary> - [TestClass] + [Collection("FileManager")] public class VisualStudioReportPreprocessorTest { private static readonly string FSharpFilePath = Path.Combine(FileManager.GetFSharpReportDirectory(), "VisualStudio2010.coveragexml"); @@ -18,7 +18,7 @@ public class VisualStudioReportPreprocessorTest /// <summary> /// A test for Execute /// </summary> - [TestMethod] + [Fact] public void Execute_ClassNameAddedToStartupCodeElements() { XDocument report = XDocument.Load(FSharpFilePath); @@ -30,9 +30,9 @@ public void Execute_ClassNameAddedToStartupCodeElements() .Elements("Class") .ToArray(); - Assert.AreEqual(15, startupCodeClasses.Length, "Wrong number of auto generated classes."); + Assert.Equal(15, startupCodeClasses.Length); - new VisualStudioReportPreprocessor(report).Execute(); + new VisualStudioReportPreprocessor().Execute(report); var updatedStartupCodeClasses = report.Root .Elements("Module") @@ -41,20 +41,20 @@ public void Execute_ClassNameAddedToStartupCodeElements() .Elements("Class") .ToArray(); - Assert.AreEqual(0, updatedStartupCodeClasses.Length, "Wrong number of auto generated classes."); + Assert.Empty(updatedStartupCodeClasses); - Assert.IsTrue(startupCodeClasses[0].Element("ClassName").Value.Equals("$Module1")); + Assert.Equal("$Module1", startupCodeClasses[0].Element("ClassName").Value); foreach (int index in new[] { 5, 6, 8, 9, 10, 11, 13 }) { - Assert.IsTrue(startupCodeClasses[index].Element("ClassName").Value.Equals("MouseBehavior")); - Assert.IsTrue(startupCodeClasses[index].Parent.Element("NamespaceName").Value.Equals("ViewModels")); + Assert.Equal("MouseBehavior", startupCodeClasses[index].Element("ClassName").Value); + Assert.Equal("ViewModels", startupCodeClasses[index].Parent.Element("NamespaceName").Value); } foreach (int index in new[] { 1, 2, 3, 4, 7, 12, 14 }) { - Assert.IsTrue(startupCodeClasses[index].Element("ClassName").Value.Equals("TestMouseBehavior")); - Assert.IsTrue(startupCodeClasses[index].Parent.Element("NamespaceName").Value.Equals("ViewModels")); + Assert.Equal("TestMouseBehavior", startupCodeClasses[index].Element("ClassName").Value); + Assert.Equal("ViewModels", startupCodeClasses[index].Parent.Element("NamespaceName").Value); } } } diff --git a/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2010.cs b/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2010.cs new file mode 100644 index 00000000..088d6271 --- /dev/null +++ b/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2010.cs @@ -0,0 +1,167 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Xml.Linq; +using Moq; +using Palmmedia.ReportGenerator.Core.Parser; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test.Parser +{ + /// <summary> + /// This is a test class for VisualStudioParser and is intended + /// to contain all VisualStudioParser Unit Tests for Visual Studio 2010 + /// </summary> + [Collection("FileManager")] + public class VisualStudioParserTest_2010 + { + private static readonly string FilePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "VisualStudio2010.coveragexml"); + + private ParserResult parserResult; + + public VisualStudioParserTest_2010() + { + var filterMock = new Mock<IFilter>(); + filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny<string>())).Returns(true); + + var report = XDocument.Load(FilePath); + this.parserResult = new VisualStudioParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report); + } + + /// <summary> + /// A test for NumberOfLineVisits + /// </summary> + [Fact] + public void NumberOfLineVisitsTest() + { + var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 10).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 11).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 12).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 23).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + } + + /// <summary> + /// A test for LineVisitStatus + /// </summary> + [Fact] + public void LineVisitStatusTest() + { + var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); + + var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); + Assert.Equal(LineVisitStatus.NotCoverable, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 15); + Assert.Equal(LineVisitStatus.Covered, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 22); + Assert.Equal(LineVisitStatus.NotCovered, line.LineVisitStatus); + } + + /// <summary> + /// A test for NumberOfFiles + /// </summary> + [Fact] + public void NumberOfFilesTest() + { + Assert.Equal(7, this.parserResult.Assemblies.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count()); + } + + /// <summary> + /// A test for FilesOfClass + /// </summary> + [Fact] + public void FilesOfClassTest() + { + Assert.Single(this.parserResult.Assemblies.Single(a => a.Name == "Test.exe").Classes.Single(c => c.Name == "Test.TestClass").Files); + Assert.Equal(2, this.parserResult.Assemblies.Single(a => a.Name == "Test.exe").Classes.Single(c => c.Name == "Test.PartialClass").Files.Count()); + } + + /// <summary> + /// A test for ClassesInAssembly + /// </summary> + [Fact] + public void ClassesInAssemblyTest() + { + Assert.Equal(7, this.parserResult.Assemblies.SelectMany(a => a.Classes).Count()); + } + + /// <summary> + /// A test for Assemblies + /// </summary> + [Fact] + public void AssembliesTest() + { + Assert.Single(this.parserResult.Assemblies); + } + + /// <summary> + /// A test for MethodMetrics + /// </summary> + [Fact] + public void MethodMetricsTest() + { + var metrics = this.parserResult.Assemblies.Single(a => a.Name == "Test.exe").Classes.Single(c => c.Name == "Test.TestClass").Files.Single(f => f.Path == "C:\\temp\\TestClass.cs").MethodMetrics; + + Assert.Equal(2, metrics.Count()); + Assert.Equal("SampleFunction()", metrics.First().FullName); + Assert.Equal(2, metrics.First().Metrics.Count()); + + Assert.Equal("Blocks covered", metrics.First().Metrics.ElementAt(0).Name); + Assert.Equal(9, metrics.First().Metrics.ElementAt(0).Value); + Assert.Equal("Blocks not covered", metrics.First().Metrics.ElementAt(1).Name); + Assert.Equal(4, metrics.First().Metrics.ElementAt(1).Value); + } + + /// <summary> + /// A test for CodeElements + /// </summary> + [Fact] + public void CodeElementsTest() + { + var codeElements = GetFile(this.parserResult.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs").CodeElements; + Assert.Equal(2, codeElements.Count()); + + codeElements = GetFile(this.parserResult.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs").CodeElements; + Assert.Equal(4, codeElements.Count()); + + codeElements = GetFile(this.parserResult.Assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs").CodeElements; + Assert.Equal(6, codeElements.Count()); + } + + private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "Test.exe").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName); + + private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "Test.exe").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName) + .AnalyzeFile(); + } +} diff --git a/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2012.cs b/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2012.cs new file mode 100644 index 00000000..b319c3b3 --- /dev/null +++ b/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2012.cs @@ -0,0 +1,163 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Xml.Linq; +using Moq; +using Palmmedia.ReportGenerator.Core.Parser; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test.Parser +{ + /// <summary> + /// This is a test class for VisualStudioParser and is intended + /// to contain all VisualStudioParser Unit Tests for Visual Studio 2012 + /// </summary> + [Collection("FileManager")] + public class VisualStudioParserTest_2012 + { + private static readonly string FilePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "VisualStudio2012.coveragexml"); + + private ParserResult parserResult; + + public VisualStudioParserTest_2012() + { + var filterMock = new Mock<IFilter>(); + filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny<string>())).Returns(true); + + var report = XDocument.Load(FilePath); + this.parserResult = new VisualStudioParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report); + } + + /// <summary> + /// A test for NumberOfLineVisits + /// </summary> + [Fact] + public void NumberOfLineVisitsTest() + { + var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 18).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 26).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + } + + /// <summary> + /// A test for LineVisitStatus + /// </summary> + [Fact] + public void LineVisitStatusTest() + { + var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); + + var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); + Assert.Equal(LineVisitStatus.NotCoverable, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 15); + Assert.Equal(LineVisitStatus.Covered, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 18); + Assert.Equal(LineVisitStatus.NotCovered, line.LineVisitStatus); + } + + /// <summary> + /// A test for NumberOfFiles + /// </summary> + [Fact] + public void NumberOfFilesTest() + { + Assert.Equal(7, this.parserResult.Assemblies.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count()); + } + + /// <summary> + /// A test for FilesOfClass + /// </summary> + [Fact] + public void FilesOfClassTest() + { + Assert.Single(this.parserResult.Assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "Test.TestClass").Files); + Assert.Equal(2, this.parserResult.Assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "Test.PartialClass").Files.Count()); + } + + /// <summary> + /// A test for ClassesInAssembly + /// </summary> + [Fact] + public void ClassesInAssemblyTest() + { + Assert.Equal(7, this.parserResult.Assemblies.SelectMany(a => a.Classes).Count()); + } + + /// <summary> + /// A test for Assemblies + /// </summary> + [Fact] + public void AssembliesTest() + { + Assert.Single(this.parserResult.Assemblies); + } + + /// <summary> + /// A test for MethodMetrics + /// </summary> + [Fact] + public void MethodMetricsTest() + { + var metrics = this.parserResult.Assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "Test.TestClass").Files.Single(f => f.Path == "C:\\temp\\TestClass.cs").MethodMetrics; + + Assert.Equal(2, metrics.Count()); + Assert.Equal("SampleFunction()", metrics.First().FullName); + Assert.Equal(2, metrics.First().Metrics.Count()); + + Assert.Equal("Blocks covered", metrics.First().Metrics.ElementAt(0).Name); + Assert.Equal(8, metrics.First().Metrics.ElementAt(0).Value); + Assert.Equal("Blocks not covered", metrics.First().Metrics.ElementAt(1).Name); + Assert.Equal(4, metrics.First().Metrics.ElementAt(1).Value); + } + + /// <summary> + /// A test for CodeElements + /// </summary> + [Fact] + public void CodeElementsTest() + { + var codeElements = GetFile(this.parserResult.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs").CodeElements; + Assert.Equal(2, codeElements.Count()); + + codeElements = GetFile(this.parserResult.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs").CodeElements; + Assert.Equal(4, codeElements.Count()); + + codeElements = GetFile(this.parserResult.Assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs").CodeElements; + Assert.Equal(6, codeElements.Count()); + } + + private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "test.exe").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName); + + private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "test.exe").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName) + .AnalyzeFile(); + } +} diff --git a/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2013.cs b/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2013.cs new file mode 100644 index 00000000..104246ae --- /dev/null +++ b/src/ReportGenerator.Core.Test/Parser/VisualStudioParserTest_2013.cs @@ -0,0 +1,185 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Xml.Linq; +using Moq; +using Palmmedia.ReportGenerator.Core.Parser; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test.Parser +{ + /// <summary> + /// This is a test class for VisualStudioParser and is intended + /// to contain all VisualStudioParser Unit Tests for Visual Studio 2013 + /// </summary> + [Collection("FileManager")] + public class VisualStudioParserTest_2013 + { + private static readonly string FilePath = Path.Combine(FileManager.GetCSharpReportDirectory(), "VisualStudio2013.coveragexml"); + + private ParserResult parserResult; + + public VisualStudioParserTest_2013() + { + var filterMock = new Mock<IFilter>(); + filterMock.Setup(f => f.IsElementIncludedInReport(It.IsAny<string>())).Returns(true); + + var report = XDocument.Load(FilePath); + this.parserResult = new VisualStudioParser(filterMock.Object, filterMock.Object, filterMock.Object).Parse(report); + } + + /// <summary> + /// A test for NumberOfLineVisits + /// </summary> + [Fact] + public void NumberOfLineVisitsTest() + { + var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 10).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 11).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 12).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 23).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs"); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 13).LineVisits); + Assert.Equal(-1, fileAnalysis.Lines.Single(l => l.LineNumber == 15).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 19).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 25).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 31).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 37).LineVisits); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 54).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 81).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + + fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass2.cs"); + Assert.Equal(1, fileAnalysis.Lines.Single(l => l.LineNumber == 9).LineVisits); + Assert.Equal(0, fileAnalysis.Lines.Single(l => l.LineNumber == 14).LineVisits); + } + + /// <summary> + /// A test for LineVisitStatus + /// </summary> + [Fact] + public void LineVisitStatusTest() + { + var fileAnalysis = GetFileAnalysis(this.parserResult.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs"); + + var line = fileAnalysis.Lines.Single(l => l.LineNumber == 1); + Assert.Equal(LineVisitStatus.NotCoverable, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 15); + Assert.Equal(LineVisitStatus.Covered, line.LineVisitStatus); + + line = fileAnalysis.Lines.Single(l => l.LineNumber == 22); + Assert.Equal(LineVisitStatus.NotCovered, line.LineVisitStatus); + } + + /// <summary> + /// A test for NumberOfFiles + /// </summary> + [Fact] + public void NumberOfFilesTest() + { + Assert.Equal(11, this.parserResult.Assemblies.SelectMany(a => a.Classes).SelectMany(a => a.Files).Distinct().Count()); + } + + /// <summary> + /// A test for FilesOfClass + /// </summary> + [Fact] + public void FilesOfClassTest() + { + Assert.Single(this.parserResult.Assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "Test.TestClass").Files); + Assert.Equal(2, this.parserResult.Assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "Test.PartialClass").Files.Count()); + } + + /// <summary> + /// A test for ClassesInAssembly + /// </summary> + [Fact] + public void ClassesInAssemblyTest() + { + Assert.Equal(13, this.parserResult.Assemblies.SelectMany(a => a.Classes).Count()); + } + + /// <summary> + /// A test for GetCoverageQuotaOfClass. + /// </summary> + [Fact] + public void GetCoverableLinesOfClassTest() + { + Assert.Equal(4, this.parserResult.Assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "Test.AbstractClass").CoverableLines); + } + + /// <summary> + /// A test for Assemblies + /// </summary> + [Fact] + public void AssembliesTest() + { + Assert.Single(this.parserResult.Assemblies); + } + + /// <summary> + /// A test for MethodMetrics + /// </summary> + [Fact] + public void MethodMetricsTest() + { + var metrics = this.parserResult.Assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "Test.TestClass").Files.Single(f => f.Path == "C:\\temp\\TestClass.cs").MethodMetrics; + + Assert.Equal(2, metrics.Count()); + Assert.Equal("SampleFunction()", metrics.First().FullName); + Assert.Equal(2, metrics.First().Metrics.Count()); + + Assert.Equal("Blocks covered", metrics.First().Metrics.ElementAt(0).Name); + Assert.Equal(9, metrics.First().Metrics.ElementAt(0).Value); + Assert.Equal("Blocks not covered", metrics.First().Metrics.ElementAt(1).Name); + Assert.Equal(4, metrics.First().Metrics.ElementAt(1).Value); + + metrics = this.parserResult.Assemblies.Single(a => a.Name == "test.exe").Classes.Single(c => c.Name == "Test.AsyncClass").Files.Single(f => f.Path == "C:\\temp\\AsyncClass.cs").MethodMetrics; + + Assert.Single(metrics); + Assert.Equal("SendAsync()", metrics.First().FullName); + } + + /// <summary> + /// A test for CodeElements + /// </summary> + [Fact] + public void CodeElementsTest() + { + var codeElements = GetFile(this.parserResult.Assemblies, "Test.TestClass", "C:\\temp\\TestClass.cs").CodeElements; + Assert.Equal(2, codeElements.Count()); + + codeElements = GetFile(this.parserResult.Assemblies, "Test.PartialClass", "C:\\temp\\PartialClass.cs").CodeElements; + Assert.Equal(4, codeElements.Count()); + + codeElements = GetFile(this.parserResult.Assemblies, "Test.TestClass2", "C:\\temp\\TestClass2.cs").CodeElements; + Assert.Equal(6, codeElements.Count()); + + codeElements = GetFile(this.parserResult.Assemblies, "Test.AsyncClass", "C:\\temp\\AsyncClass.cs").CodeElements; + Assert.Single(codeElements); + Assert.Equal("SendAsync()", codeElements.First().Name); + } + + private static CodeFile GetFile(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "test.exe").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName); + + private static FileAnalysis GetFileAnalysis(IEnumerable<Assembly> assemblies, string className, string fileName) => assemblies + .Single(a => a.Name == "test.exe").Classes + .Single(c => c.Name == className).Files + .Single(f => f.Path == fileName) + .AnalyzeFile(); + } +} diff --git a/src/ReportGenerator.Core.Test/ReportConfigurationBuilderTest.cs b/src/ReportGenerator.Core.Test/ReportConfigurationBuilderTest.cs new file mode 100644 index 00000000..e64cae08 --- /dev/null +++ b/src/ReportGenerator.Core.Test/ReportConfigurationBuilderTest.cs @@ -0,0 +1,74 @@ +using System.IO; +using System.Linq; +using Palmmedia.ReportGenerator.Core.Logging; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test +{ + /// <summary> + /// This is a test class for ReportConfigurationBuilder and is intended + /// to contain all ReportConfigurationBuilder Unit Tests + /// </summary> + [Collection("FileManager")] + public class ReportConfigurationBuilderTest + { + private static readonly string ReportPath = Path.Combine(FileManager.GetCSharpReportDirectory(), "OpenCover.xml"); + + private ReportConfigurationBuilder reportConfigurationBuilder; + + public ReportConfigurationBuilderTest() + { + this.reportConfigurationBuilder = new ReportConfigurationBuilder(); + } + + [Fact] + public void InitWithNamedArguments_OldFilters_AllPropertiesApplied() + { + string[] namedArguments = new string[] + { + "-reports:" + ReportPath, + "-targetdir:C:\\temp", + "-reporttype:Latex", + "-filters:+Test;-Test", + "-verbosity:" + VerbosityLevel.Info.ToString() + }; + + var configuration = this.reportConfigurationBuilder.Create(namedArguments); + + Assert.True(configuration.ReportFiles.Contains(ReportPath), "ReportPath does not exist in ReportFiles."); + Assert.True(configuration.ReportTypes.Contains("Latex"), "Wrong report type applied."); + Assert.True(configuration.AssemblyFilters.Contains("+Test"), "AssemblyFilters does not exist in ReportFiles."); + Assert.True(configuration.AssemblyFilters.Contains("-Test"), "AssemblyFilters does not exist in ReportFiles."); + Assert.NotNull(configuration.ReportFiles); + Assert.NotNull(configuration.AssemblyFilters); + Assert.NotNull(configuration.ClassFilters); + } + + [Fact] + public void InitWithNamedArguments_NewFilters_AllPropertiesApplied() + { + string[] namedArguments = new string[] + { + "-reports:" + ReportPath, + "-targetdir:C:\\temp", + "-reporttype:Latex", + "-assemblyfilters:+Test;-Test", + "-classfilters:+Test2;-Test2", + "-verbosity:" + VerbosityLevel.Info.ToString() + }; + + var configuration = this.reportConfigurationBuilder.Create(namedArguments); + + Assert.True(configuration.ReportFiles.Contains(ReportPath), "ReportPath does not exist in ReportFiles."); + Assert.Equal("C:\\temp", configuration.TargetDirectory); + Assert.True(configuration.ReportTypes.Contains("Latex"), "Wrong report type applied."); + Assert.True(configuration.AssemblyFilters.Contains("+Test"), "AssemblyFilters does not exist in ReportFiles."); + Assert.True(configuration.ClassFilters.Contains("+Test2"), "ClassFilters does not exist in ReportFiles."); + Assert.True(configuration.AssemblyFilters.Contains("-Test"), "AssemblyFilters does not exist in ReportFiles."); + Assert.True(configuration.ClassFilters.Contains("-Test2"), "ClassFilters does not exist in ReportFiles."); + Assert.NotNull(configuration.ReportFiles); + Assert.NotNull(configuration.AssemblyFilters); + Assert.NotNull(configuration.ClassFilters); + } + } +} diff --git a/src/ReportGenerator.Core.Test/ReportConfigurationTest.cs b/src/ReportGenerator.Core.Test/ReportConfigurationTest.cs new file mode 100644 index 00000000..cac230a4 --- /dev/null +++ b/src/ReportGenerator.Core.Test/ReportConfigurationTest.cs @@ -0,0 +1,119 @@ +using System.IO; +using Palmmedia.ReportGenerator.Core.Logging; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test +{ + /// <summary> + /// This is a test class for ReportConfiguration and is intended + /// to contain all ReportConfiguration Unit Tests + /// </summary> + [Collection("FileManager")] + public class ReportConfigurationTest + { + private static readonly string ReportPath = Path.Combine(FileManager.GetCSharpReportDirectory(), "OpenCover.xml"); + + [Fact] + public void InitByConstructor_AllDefaultValuesApplied() + { + var configuration = new ReportConfiguration( + new[] { ReportPath }, + "C:\\temp", + new string[] { }, + "C:\\temp\\historic", + new string[] { }, + new string[] { }, + new string[] { }, + new string[] { }, + new string[] { }, + null, + null); + + Assert.Contains(ReportPath, configuration.ReportFiles); + Assert.Equal("C:\\temp", configuration.TargetDirectory); + Assert.Equal("C:\\temp\\historic", configuration.HistoryDirectory); + Assert.Contains("Html", configuration.ReportTypes); + Assert.Empty(configuration.AssemblyFilters); + Assert.Empty(configuration.ClassFilters); + Assert.Equal(VerbosityLevel.Verbose, configuration.VerbosityLevel); + Assert.NotNull(configuration.ReportFiles); + Assert.NotNull(configuration.AssemblyFilters); + Assert.NotNull(configuration.ClassFilters); + + Assert.True(configuration.VerbosityLevelValid); + Assert.Equal(0, configuration.InvalidReportFilePatterns.Count); + Assert.Equal(0, configuration.SourceDirectories.Count); + } + + [Fact] + public void InitByConstructor_AllPropertiesApplied() + { + var configuration = new ReportConfiguration( + new[] { ReportPath }, + "C:\\temp", + new string[] { "C:\\source" }, + null, + new[] { "Latex", "Xml", "Html" }, + new string[] { "ReportGenerator.Core.Test.dll" }, + new[] { "+Test", "-Test" }, + new[] { "+Test2", "-Test2" }, + new[] { "+Test3", "-Test3" }, + VerbosityLevel.Info.ToString(), + "CustomTag"); + + Assert.Contains(ReportPath, configuration.ReportFiles); + Assert.Equal("C:\\temp", configuration.TargetDirectory); + Assert.Contains("C:\\source", configuration.SourceDirectories); + Assert.Contains("Latex", configuration.ReportTypes); + Assert.Contains("Xml", configuration.ReportTypes); + Assert.Contains("Html", configuration.ReportTypes); + Assert.Contains("ReportGenerator.Core.Test.dll", configuration.Plugins); + Assert.Contains("+Test", configuration.AssemblyFilters); + Assert.Contains("-Test", configuration.AssemblyFilters); + Assert.Contains("+Test2", configuration.ClassFilters); + Assert.Contains("-Test2", configuration.ClassFilters); + Assert.Contains("+Test3", configuration.FileFilters); + Assert.Contains("-Test3", configuration.FileFilters); + Assert.Equal(VerbosityLevel.Info, configuration.VerbosityLevel); + Assert.NotNull(configuration.ReportFiles); + Assert.NotNull(configuration.AssemblyFilters); + Assert.NotNull(configuration.ClassFilters); + Assert.Equal("CustomTag", configuration.Tag); + + Assert.True(configuration.VerbosityLevelValid); + Assert.Equal(0, configuration.InvalidReportFilePatterns.Count); + } + + [Fact] + public void InitByConstructor_InvalidValues() + { + var configuration = new ReportConfiguration( + new[] { ReportPath, "\t" }, + "C:\\temp", + new string[] { }, + "C:\\temp\\historic", + new string[] { }, + new string[] { "notexistingplugin.dll" }, + new string[] { }, + new string[] { }, + new string[] { }, + "Invalid", + null); + + Assert.Contains(ReportPath, configuration.ReportFiles); + Assert.Equal("C:\\temp", configuration.TargetDirectory); + Assert.Equal("C:\\temp\\historic", configuration.HistoryDirectory); + Assert.Contains("Html", configuration.ReportTypes); + Assert.Contains("notexistingplugin.dll", configuration.Plugins); + Assert.Empty(configuration.AssemblyFilters); + Assert.Empty(configuration.ClassFilters); + Assert.Equal(VerbosityLevel.Verbose, configuration.VerbosityLevel); + Assert.NotNull(configuration.ReportFiles); + Assert.NotNull(configuration.AssemblyFilters); + Assert.NotNull(configuration.ClassFilters); + + Assert.False(configuration.VerbosityLevelValid); + Assert.Equal(1, configuration.InvalidReportFilePatterns.Count); + } + } +} \ No newline at end of file diff --git a/src/ReportGenerator.Core.Test/ReportConfigurationValidatorTest.cs b/src/ReportGenerator.Core.Test/ReportConfigurationValidatorTest.cs new file mode 100644 index 00000000..b3268b5f --- /dev/null +++ b/src/ReportGenerator.Core.Test/ReportConfigurationValidatorTest.cs @@ -0,0 +1,233 @@ +using System.IO; +using Moq; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Reporting; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test +{ + [Collection("FileManager")] + public class ReportConfigurationValidatorTest + { + private static readonly string ReportPath = Path.Combine(FileManager.GetCSharpReportDirectory(), "OpenCover.xml"); + + private Mock<IReportBuilderFactory> reportBuilderFactoryMock = new Mock<IReportBuilderFactory>(); + + public ReportConfigurationValidatorTest() + { + this.reportBuilderFactoryMock + .Setup(r => r.GetAvailableReportTypes()) + .Returns(new[] { "Latex", "Xml", "Html", "Something" }); + } + + [Fact] + public void Validate_AllPropertiesApplied_ValidationPasses() + { + var configuration = new ReportConfiguration( + new[] { ReportPath }, + "C:\\temp", + new string[] { }, + null, + new[] { "Latex", "Xml", "Html" }, + new string[] { }, + new[] { "+Test", "-Test" }, + new[] { "+Test2", "-Test2" }, + new[] { "+Test3", "-Test3" }, + VerbosityLevel.Info.ToString(), + null); + + var sut = new ReportConfigurationValidator(this.reportBuilderFactoryMock.Object); + + Assert.True(sut.Validate(configuration)); + } + + [Fact] + public void Validate_NoReport_ValidationFails() + { + var configuration = new ReportConfiguration( + new string[] { }, + "C:\\temp", + new string[] { }, + null, + new[] { "Latex" }, + new string[] { }, + new[] { "+Test", "-Test" }, + new[] { "+Test2", "-Test2" }, + new string[] { }, + VerbosityLevel.Info.ToString(), + null); + + var sut = new ReportConfigurationValidator(this.reportBuilderFactoryMock.Object); + + Assert.False(sut.Validate(configuration)); + } + + [Fact] + public void Validate_NonExistingReport_ValidationFails() + { + var configuration = new ReportConfiguration( + new[] { "123.xml" }, + "C:\\temp", + new string[] { }, + null, + new[] { "Latex" }, + new string[] { }, + new[] { "+Test", "-Test" }, + new[] { "+Test2", "-Test2" }, + new string[] { }, + VerbosityLevel.Info.ToString(), + null); + + var sut = new ReportConfigurationValidator(this.reportBuilderFactoryMock.Object); + + Assert.False(sut.Validate(configuration)); + } + + [Fact] + public void Validate_NoTargetDirectory_ValidationFails() + { + var configuration = new ReportConfiguration( + new[] { ReportPath }, + string.Empty, + new string[] { }, + null, + new[] { "Latex" }, + new string[] { }, + new[] { "+Test", "-Test" }, + new[] { "+Test2", "-Test2" }, + new string[] { }, + VerbosityLevel.Info.ToString(), + null); + + var sut = new ReportConfigurationValidator(this.reportBuilderFactoryMock.Object); + + Assert.False(sut.Validate(configuration)); + } + + [Fact] + public void Validate_InvalidTargetDirectory_ValidationFails() + { + var configuration = new ReportConfiguration( + new[] { ReportPath }, + "C:\\temp:?$", + new string[] { }, + null, + new[] { "Latex" }, + new string[] { }, + new[] { "+Test", "-Test" }, + new[] { "+Test2", "-Test2" }, + new string[] { }, + VerbosityLevel.Info.ToString(), + null); + + var sut = new ReportConfigurationValidator(this.reportBuilderFactoryMock.Object); + + Assert.False(sut.Validate(configuration)); + } + + [Fact] + public void Validate_InvalidSourceDirectory_ValidationFails() + { + var configuration = new ReportConfiguration( + new[] { ReportPath }, + @"C:\\temp", + new string[] { "C:\\doesnotexist" }, + null, + new[] { "Latex" }, + new string[] { "notexistingplugin.dll" }, + new[] { "+Test", "-Test" }, + new[] { "+Test2", "-Test2" }, + new string[] { }, + VerbosityLevel.Info.ToString(), + null); + + var sut = new ReportConfigurationValidator(this.reportBuilderFactoryMock.Object); + + Assert.False(sut.Validate(configuration)); + } + + [Fact] + public void Validate_InvalidHistoryDirectory_ValidationFails() + { + var configuration = new ReportConfiguration( + new[] { ReportPath }, + "C:\\temp", + new string[] { }, + "C:\\temp:?$", + new[] { "Latex" }, + new string[] { }, + new[] { "+Test", "-Test" }, + new[] { "+Test2", "-Test2" }, + new string[] { }, + VerbosityLevel.Info.ToString(), + null); + + var sut = new ReportConfigurationValidator(this.reportBuilderFactoryMock.Object); + + Assert.False(sut.Validate(configuration)); + } + + [Fact] + public void Validate_InvalidReportType_ValidationFails() + { + var configuration = new ReportConfiguration( + new[] { ReportPath }, + "C:\\temp", + new string[] { }, + null, + new[] { "DoesNotExist" }, + new string[] { }, + new[] { "+Test", "-Test" }, + new[] { "+Test2", "-Test2" }, + new string[] { }, + VerbosityLevel.Info.ToString(), + null); + + var sut = new ReportConfigurationValidator(this.reportBuilderFactoryMock.Object); + + Assert.False(sut.Validate(configuration)); + } + + [Fact] + public void Validate_InvalidFilter_ValidationFails() + { + var configuration = new ReportConfiguration( + new[] { ReportPath }, + @"C:\\temp", + new string[] { }, + null, + new[] { "Latex" }, + new string[] { }, + new[] { "Test" }, + new[] { "Test2" }, + new[] { "Test3" }, + VerbosityLevel.Info.ToString(), + null); + + var sut = new ReportConfigurationValidator(this.reportBuilderFactoryMock.Object); + + Assert.False(sut.Validate(configuration)); + } + + [Fact] + public void Validate_InvalidPlugin_ValidationFails() + { + var configuration = new ReportConfiguration( + new[] { ReportPath }, + @"C:\\temp", + new string[] { }, + null, + new[] { "Latex" }, + new string[] { "notexistingplugin.dll" }, + new[] { "+Test", "-Test" }, + new[] { "+Test2", "-Test2" }, + new string[] { }, + VerbosityLevel.Info.ToString(), + null); + + var sut = new ReportConfigurationValidator(this.reportBuilderFactoryMock.Object); + + Assert.False(sut.Validate(configuration)); + } + } +} \ No newline at end of file diff --git a/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj b/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj new file mode 100644 index 00000000..78626e96 --- /dev/null +++ b/src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj @@ -0,0 +1,41 @@ +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <TargetFramework>netcoreapp2.0</TargetFramework> + <IsPackable>false</IsPackable> + <RootNamespace>Palmmedia.ReportGenerator.Core.Test</RootNamespace> + <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> + <AssemblyVersion>4.0.0.0</AssemblyVersion> + <FileVersion>4.0.0.0</FileVersion> + </PropertyGroup> + + <PropertyGroup><!-- Required to capture code coverage with OpenCover --> + <DebugType>full</DebugType> + <DebugSymbols>True</DebugSymbols> + </PropertyGroup> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> + <OutputPath>..\target\bin\Debug\</OutputPath> + </PropertyGroup> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> + <OutputPath>..\target\bin\Release\</OutputPath> + </PropertyGroup> + + <ItemGroup> + <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" /> + <PackageReference Include="Moq" Version="4.10.0" /> + <PackageReference Include="xunit" Version="2.4.0" /> + <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0"> + <PrivateAssets>all</PrivateAssets> + <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> + </PackageReference> + <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" /> + </ItemGroup> + + <ItemGroup> + <ProjectReference Include="..\ReportGenerator.Core\ReportGenerator.Core.csproj" /> + <ProjectReference Include="..\ReportGenerator.DotnetCorePluginLoader\ReportGenerator.DotnetCorePluginLoader.csproj" /> + </ItemGroup> + +</Project> diff --git a/src/ReportGenerator.Core.Test/Reporting/ReportBuilderFactoryTest.cs b/src/ReportGenerator.Core.Test/Reporting/ReportBuilderFactoryTest.cs new file mode 100644 index 00000000..0c452d79 --- /dev/null +++ b/src/ReportGenerator.Core.Test/Reporting/ReportBuilderFactoryTest.cs @@ -0,0 +1,113 @@ +using System.Collections.Generic; +using System.Linq; +using Palmmedia.ReportGenerator.Core; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Plugin; +using Palmmedia.ReportGenerator.Core.Reporting; +using Xunit; + +namespace Palmmedia.ReportGenerator.Core.Test.Reporting +{ + public class ReportBuilderFactoryTest + { + [Fact] + public void GetAvailableReportTypes_AllReportTypesReturned() + { + var plugins = new List<string>() + { + typeof(ReportBuilderFactoryTest).Assembly.Location + }; + + var factory = new ReportBuilderFactory(new ReflectionPluginLoader(plugins)); + Assert.True(factory.GetAvailableReportTypes().Count() > 12, "Not all default report builders available."); + } + + [Fact] + public void GetReportBuilders_DefaultReportBuilderReturned() + { + var plugins = new List<string>() + { + typeof(ReportBuilderFactoryTest).Assembly.Location + }; + + var factory = new ReportBuilderFactory(new ReflectionPluginLoader(plugins)); + + var reportContext = new ReportContext(new ReportConfiguration() { TargetDirectory = "C:\\temp", ReportTypes = new[] { "Html" } }); + var reportBuilders = factory.GetReportBuilders(reportContext); + Assert.Single(reportBuilders); + + reportContext = new ReportContext(new ReportConfiguration() { TargetDirectory = "C:\\temp", ReportTypes = new[] { "Latex" } }); + reportBuilders = factory.GetReportBuilders(reportContext); + Assert.Single(reportBuilders); + Assert.Equal(typeof(AdditionalLatexReportBuilder).FullName, reportBuilders.First().GetType().FullName); + } + + public class AdditionalLatexReportBuilder : IReportBuilder + { + /// <summary> + /// Gets the type of the report. + /// </summary> + /// <value> + /// The type of the report. + /// </value> + public string ReportType => "Latex"; + + /// <summary> + /// Gets or sets the report context. + /// </summary> + /// <value> + /// The report context. + /// </value> + public IReportContext ReportContext { get; set; } + + /// <summary> + /// Creates a class report. + /// </summary> + /// <param name="class">The class.</param> + /// <param name="fileAnalyses">The file analyses that correspond to the class.</param> + public void CreateClassReport(Class @class, IEnumerable<FileAnalysis> fileAnalyses) + { + } + + /// <summary> + /// Creates the summary report. + /// </summary> + /// <param name="summaryResult">The summary result.</param> + public void CreateSummaryReport(SummaryResult summaryResult) + { + } + } + + private class ReportConfiguration : IReportConfiguration + { + public string TargetDirectory { get; set; } + + public string HistoryDirectory { get; set; } + + public IReadOnlyCollection<string> ReportFiles { get; set; } + + public IReadOnlyCollection<string> InvalidReportFilePatterns { get; set; } + + public IReadOnlyCollection<string> ReportTypes { get; set; } + + public IReadOnlyCollection<string> Plugins { get; set; } + + public IReadOnlyCollection<string> SourceDirectories { get; set; } + + public IReadOnlyCollection<string> AssemblyFilters { get; set; } + + public IReadOnlyCollection<string> ClassFilters { get; set; } + + public IReadOnlyCollection<string> FileFilters { get; set; } + + public VerbosityLevel VerbosityLevel { get; set; } + + public IReadOnlyCollection<HistoricCoverage> OverallHistoricCoverages { get; set; } + + public string Tag { get; set; } + + public bool VerbosityLevelValid { get; set; } + } + } +} diff --git a/src/ReportGenerator.Console.Test/Settings.StyleCop b/src/ReportGenerator.Core.Test/Settings.StyleCop similarity index 100% rename from src/ReportGenerator.Console.Test/Settings.StyleCop rename to src/ReportGenerator.Core.Test/Settings.StyleCop diff --git a/src/ReportGenerator.Core/CodeAnalysis/IRiskHotspotsAnalyzer.cs b/src/ReportGenerator.Core/CodeAnalysis/IRiskHotspotsAnalyzer.cs new file mode 100644 index 00000000..5e838c90 --- /dev/null +++ b/src/ReportGenerator.Core/CodeAnalysis/IRiskHotspotsAnalyzer.cs @@ -0,0 +1,18 @@ +using System.Collections.Generic; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; + +namespace Palmmedia.ReportGenerator.Core.CodeAnalysis +{ + /// <summary> + /// Interface for risk hotspot analyzer. + /// </summary> + public interface IRiskHotspotsAnalyzer + { + /// <summary> + /// Performs a risk hotspot analysis on the given assemblies. + /// </summary> + /// <param name="assemblies">The assemlies to analyze.</param> + /// <returns>The risk hotspot analysis result.</returns> + RiskHotspotAnalysisResult PerformRiskHotspotAnalysis(IEnumerable<Assembly> assemblies); + } +} diff --git a/src/ReportGenerator.Reporting/CodeAnalysis/MetricStatus.cs b/src/ReportGenerator.Core/CodeAnalysis/MetricStatus.cs similarity index 88% rename from src/ReportGenerator.Reporting/CodeAnalysis/MetricStatus.cs rename to src/ReportGenerator.Core/CodeAnalysis/MetricStatus.cs index 45de9513..c8478279 100644 --- a/src/ReportGenerator.Reporting/CodeAnalysis/MetricStatus.cs +++ b/src/ReportGenerator.Core/CodeAnalysis/MetricStatus.cs @@ -1,6 +1,6 @@ -using Palmmedia.ReportGenerator.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; -namespace Palmmedia.ReportGenerator.Reporting.CodeAnalysis +namespace Palmmedia.ReportGenerator.Core.CodeAnalysis { /// <summary> /// Represents the status of a metric. diff --git a/src/ReportGenerator.Reporting/CodeAnalysis/RiskHotspot.cs b/src/ReportGenerator.Core/CodeAnalysis/RiskHotspot.cs similarity index 72% rename from src/ReportGenerator.Reporting/CodeAnalysis/RiskHotspot.cs rename to src/ReportGenerator.Core/CodeAnalysis/RiskHotspot.cs index b3d2ad08..a438a5a9 100644 --- a/src/ReportGenerator.Reporting/CodeAnalysis/RiskHotspot.cs +++ b/src/ReportGenerator.Core/CodeAnalysis/RiskHotspot.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Palmmedia.ReportGenerator.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; -namespace Palmmedia.ReportGenerator.Reporting.CodeAnalysis +namespace Palmmedia.ReportGenerator.Core.CodeAnalysis { /// <summary> /// Represents a risk hotspot. @@ -15,12 +15,14 @@ public class RiskHotspot /// <param name="class">The class.</param> /// <param name="methodMetric">The method metric.</param> /// <param name="statusMetrics">The metric with status.</param> - public RiskHotspot(Assembly assembly, Class @class, MethodMetric methodMetric, IEnumerable<MetricStatus> statusMetrics) + /// <param name="fileIndex">The index of the corresponding file within the classes files.</param> + public RiskHotspot(Assembly assembly, Class @class, MethodMetric methodMetric, IEnumerable<MetricStatus> statusMetrics, int fileIndex) { this.Assembly = assembly; this.Class = @class; this.MethodMetric = methodMetric; this.StatusMetrics = statusMetrics; + this.FileIndex = fileIndex; } /// <summary> @@ -42,5 +44,10 @@ public RiskHotspot(Assembly assembly, Class @class, MethodMetric methodMetric, I /// Gets the metric with status. /// </summary> public IEnumerable<MetricStatus> StatusMetrics { get; } + + /// <summary> + /// Gets the index of the corresponding file within the classes files. + /// </summary> + public int FileIndex { get; } } } diff --git a/src/ReportGenerator.Core/CodeAnalysis/RiskHotspotAnalysisResult.cs b/src/ReportGenerator.Core/CodeAnalysis/RiskHotspotAnalysisResult.cs new file mode 100644 index 00000000..2b59826f --- /dev/null +++ b/src/ReportGenerator.Core/CodeAnalysis/RiskHotspotAnalysisResult.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; + +namespace Palmmedia.ReportGenerator.Core.CodeAnalysis +{ + /// <summary> + /// The result of the risk hotspot analysis. + /// </summary> + public class RiskHotspotAnalysisResult + { + /// <summary> + /// Initializes a new instance of the <see cref="RiskHotspotAnalysisResult"/> class. + /// </summary> + /// <param name="riskHotspots">The risk hotspots.</param> + /// <param name="codeCodeQualityMetricsAvailable">Indicates whether any code quality metrics exists.</param> + public RiskHotspotAnalysisResult(IReadOnlyCollection<RiskHotspot> riskHotspots, bool codeCodeQualityMetricsAvailable) + { + this.RiskHotspots = riskHotspots ?? throw new ArgumentNullException(nameof(riskHotspots)); + this.CodeCodeQualityMetricsAvailable = codeCodeQualityMetricsAvailable; + } + + /// <summary> + /// Gets the risk hotspots. + /// </summary> + public IReadOnlyCollection<RiskHotspot> RiskHotspots { get; } + + /// <summary> + /// Gets a value indicating whether any code quality metrics exists. + /// </summary> + public bool CodeCodeQualityMetricsAvailable { get; } + } +} diff --git a/src/ReportGenerator.Core/CodeAnalysis/RiskHotspotsAnalysisThresholds.cs b/src/ReportGenerator.Core/CodeAnalysis/RiskHotspotsAnalysisThresholds.cs new file mode 100644 index 00000000..8c1efa3f --- /dev/null +++ b/src/ReportGenerator.Core/CodeAnalysis/RiskHotspotsAnalysisThresholds.cs @@ -0,0 +1,23 @@ +namespace Palmmedia.ReportGenerator.Core.CodeAnalysis +{ + /// <summary> + /// Thresholds of the various metrics. + /// </summary> + public class RiskHotspotsAnalysisThresholds + { + /// <summary> + /// Gets or sets the threshold for cylomatic complexity. + /// </summary> + public decimal MetricThresholdForCyclomaticComplexity { get; set; } = 15; + + /// <summary> + /// Gets or sets the threshold for crap score. + /// </summary> + public decimal MetricThresholdForCrapScore { get; set; } = 30; + + /// <summary> + /// Gets or sets the threshold for NPath complexity. + /// </summary> + public decimal MetricThresholdForNPathComplexity { get; set; } = 200; + } +} \ No newline at end of file diff --git a/src/ReportGenerator.Core/CodeAnalysis/RiskHotspotsAnalyzer.cs b/src/ReportGenerator.Core/CodeAnalysis/RiskHotspotsAnalyzer.cs new file mode 100644 index 00000000..7af72344 --- /dev/null +++ b/src/ReportGenerator.Core/CodeAnalysis/RiskHotspotsAnalyzer.cs @@ -0,0 +1,83 @@ +using System.Collections.Generic; +using System.Linq; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Properties; + +namespace Palmmedia.ReportGenerator.Core.CodeAnalysis +{ + /// <summary> + /// Analyses the method metrics for risk hotspots based on exceeded thresholds. + /// </summary> + internal class RiskHotspotsAnalyzer : IRiskHotspotsAnalyzer + { + /// <summary> + /// The thresholds of the various metrics. + /// </summary> + private readonly Dictionary<string, decimal> thresholdsByMetricName; + + /// <summary> + /// Initializes a new instance of the <see cref="RiskHotspotsAnalyzer"/> class. + /// </summary> + /// <param name="riskHotspotsAnalysisThresholds">The metric thresholds.</param> + public RiskHotspotsAnalyzer(RiskHotspotsAnalysisThresholds riskHotspotsAnalysisThresholds) + { + this.thresholdsByMetricName = new Dictionary<string, decimal>() + { + { ReportResources.CyclomaticComplexity, riskHotspotsAnalysisThresholds.MetricThresholdForCyclomaticComplexity }, + { ReportResources.NPathComplexity, riskHotspotsAnalysisThresholds.MetricThresholdForNPathComplexity }, + { ReportResources.CrapScore, riskHotspotsAnalysisThresholds.MetricThresholdForCrapScore } + }; + } + + /// <summary> + /// Performs a risk hotspot analysis on the given assemblies. + /// </summary> + /// <param name="assemblies">The assemlies to analyze.</param> + /// <returns>The risk hotspot analysis result.</returns> + public RiskHotspotAnalysisResult PerformRiskHotspotAnalysis(IEnumerable<Assembly> assemblies) + { + var riskHotspots = new List<RiskHotspot>(); + decimal threshold = -1; + + bool codeCodeQualityMetricsAvailable = false; + + foreach (var assembly in assemblies) + { + foreach (var clazz in assembly.Classes) + { + int fileIndex = 0; + + foreach (var file in clazz.Files) + { + foreach (var methodMetric in file.MethodMetrics) + { + var codeCodeQualityMetrics = methodMetric.Metrics + .Where(m => m.MetricType == MetricType.CodeQuality); + + codeCodeQualityMetricsAvailable |= codeCodeQualityMetrics.Any(); + + var statusMetrics = codeCodeQualityMetrics + .Select(m => new MetricStatus(m, this.thresholdsByMetricName.TryGetValue(m.Name, out threshold) && m.Value > threshold)) + .ToArray(); + + if (statusMetrics.Any(m => m.Exceeded)) + { + riskHotspots.Add(new RiskHotspot(assembly, clazz, methodMetric, statusMetrics, fileIndex)); + } + } + + fileIndex++; + } + } + } + + var result = new RiskHotspotAnalysisResult( + riskHotspots + .OrderByDescending(r => r.StatusMetrics.Where(m => m.Exceeded).Max(m => m.Metric.Value)) + .ToList(), + codeCodeQualityMetricsAvailable); + + return result; + } + } +} \ No newline at end of file diff --git a/src/ReportGenerator.Core/Common/ExceptionExtensions.cs b/src/ReportGenerator.Core/Common/ExceptionExtensions.cs new file mode 100644 index 00000000..85944087 --- /dev/null +++ b/src/ReportGenerator.Core/Common/ExceptionExtensions.cs @@ -0,0 +1,61 @@ +using System; +using System.Reflection; +using System.Text; +using Palmmedia.ReportGenerator.Core.Properties; + +namespace Palmmedia.ReportGenerator.Core.Common +{ + /// <summary> + /// Exception extensions. + /// </summary> + internal static class ExceptionExtensions + { + /// <summary> + /// Gets a full error message especially for <see cref="AggregateException"/>. + /// </summary> + /// <param name="exception">The exception</param> + /// <returns>The error message.</returns> + public static string GetExceptionMessageForDisplay(this Exception exception) + { + if (exception == null) + { + throw new ArgumentNullException(nameof(exception)); + } + + string message = exception.Message; + + if (exception is AggregateException aggregate) + { + var flat = aggregate.Flatten(); + + if (flat.InnerExceptions.Count == 1) + { + // recalling as we potentially can have a targetinvocationexception + message = GetExceptionMessageForDisplay(flat.InnerException); + } + else if (flat.InnerExceptions.Count > 0) + { + var bldr = new StringBuilder(); + + bldr.AppendLine(Resources.MultipleErrors); + + foreach (var innerEx in flat.InnerExceptions) + { + bldr.AppendLine(GetExceptionMessageForDisplay(innerEx)); + } + + message = bldr.ToString(); + } + } + else + { + if (exception is TargetInvocationException targetInvocationEx && targetInvocationEx.InnerException != null) + { + message = GetExceptionMessageForDisplay(targetInvocationEx.InnerException); + } + } + + return message; + } + } +} diff --git a/src/ReportGenerator.Core/Common/Glob.cs b/src/ReportGenerator.Core/Common/Glob.cs new file mode 100644 index 00000000..442cf3d7 --- /dev/null +++ b/src/ReportGenerator.Core/Common/Glob.cs @@ -0,0 +1,445 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Text.RegularExpressions; + +namespace Palmmedia.ReportGenerator.Core.Common +{ + /// <summary> + /// Finds files and directories by matching their path names against a pattern. + /// Implementation based on https://github.com/mganss/Glob.cs + /// </summary> + internal class Glob + { + private static readonly char[] GlobCharacters = "*?[]{}".ToCharArray(); + + private static Dictionary<string, RegexOrString> regexOrStringCache = new Dictionary<string, RegexOrString>(); + + private static HashSet<char> regexSpecialChars = new HashSet<char>(new[] { '[', '\\', '^', '$', '.', '|', '?', '*', '+', '(', ')' }); + + /// <summary> + /// Initializes a new instance of the <see cref="Glob"/> class. + /// </summary> + public Glob() + { + } + + /// <summary> + /// Initializes a new instance of the <see cref="Glob"/> class. + /// </summary> + /// <param name="pattern">The pattern to be matched. See <see cref="Pattern"/> for syntax.</param> + public Glob(string pattern) + { + this.Pattern = pattern; + } + + /// <summary> + /// Gets or sets a value indicating the pattern to match file and directory names against. + /// The pattern can contain the following special characters: + /// <list type="table"> + /// <item> + /// <term>?</term> + /// <description>Matches any single character in a file or directory name.</description> + /// </item> + /// <item> + /// <term>*</term> + /// <description>Matches zero or more characters in a file or directory name.</description> + /// </item> + /// <item> + /// <term>**</term> + /// <description>Matches zero or more recursve directories.</description> + /// </item> + /// <item> + /// <term>[...]</term> + /// <description>Matches a set of characters in a name. Syntax is equivalent to character groups in <see cref="System.Text.RegularExpressions.Regex"/>.</description> + /// </item> + /// <item> + /// <term>{group1,group2,...}</term> + /// <description>Matches any of the pattern groups. Groups can contain groups and patterns.</description> + /// </item> + /// </list> + /// </summary> + public string Pattern { get; set; } + + /// <summary> + /// Gets or sets a value indicating whether case should be ignored in file and directory names. Default is true. + /// </summary> + public bool IgnoreCase { get; set; } = true; + + /// <summary> + /// Returns a <see cref="System.String" /> that represents this instance. + /// </summary> + /// <returns> + /// A <see cref="System.String" /> that represents this instance. + /// </returns> + public override string ToString() + { + return this.Pattern; + } + + /// <summary> + /// Returns a hash code for this instance. + /// </summary> + /// <returns> + /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. + /// </returns> + public override int GetHashCode() + { + return this.Pattern.GetHashCode(); + } + + /// <summary> + /// Determines whether the specified <see cref="System.Object" />, is equal to this instance. + /// </summary> + /// <param name="obj">The <see cref="System.Object" /> to compare with this instance.</param> + /// <returns> + /// <c>true</c> if the specified <see cref="System.Object" /> is equal to this instance; otherwise, <c>false</c>. + /// </returns> + public override bool Equals(object obj) + { + // Check for null and compare run-time types. + if (obj == null || GetType() != obj.GetType()) + { + return false; + } + + var g = (Glob)obj; + return this.Pattern == g.Pattern; + } + + /// <summary> + /// Performs a pattern match. + /// </summary> + /// <returns>The matched path names</returns> + public IEnumerable<string> ExpandNames() + { + return this.Expand(this.Pattern, false).Select(f => f.FullName); + } + + /// <summary> + /// Performs a pattern match. + /// </summary> + /// <returns>The matched <see cref="FileSystemInfo"/> objects</returns> + public IEnumerable<FileSystemInfo> Expand() + { + return this.Expand(this.Pattern, false); + } + + private RegexOrString CreateRegexOrString(string pattern) + { + if (!regexOrStringCache.TryGetValue(pattern, out RegexOrString regexOrString)) + { + regexOrString = new RegexOrString(GlobToRegex(pattern), pattern, this.IgnoreCase, compileRegex: true); + regexOrStringCache[pattern] = regexOrString; + } + + return regexOrString; + } + + private IEnumerable<FileSystemInfo> Expand(string path, bool dirOnly) + { + if (string.IsNullOrEmpty(path)) + { + yield break; + } + + // stop looking if there are no more glob characters in the path. + // but only if ignoring case because FileSystemInfo.Exists always ignores case. + if (this.IgnoreCase && path.IndexOfAny(GlobCharacters) < 0) + { + FileSystemInfo fsi = null; + bool exists = false; + + fsi = dirOnly ? (FileSystemInfo)new DirectoryInfo(path) : new FileInfo(path); + exists = fsi.Exists; + + if (exists) + { + yield return fsi; + } + + yield break; + } + + string parent = Path.GetDirectoryName(path); + + if (parent == null) + { + DirectoryInfo dir = new DirectoryInfo(path); + + if (dir != null) + { + yield return dir; + } + + yield break; + } + + if (parent == string.Empty) + { + parent = Directory.GetCurrentDirectory(); + } + + var child = Path.GetFileName(path); + + // handle groups that contain folders + // child will contain unmatched closing brace + if (child.Count(c => c == '}') > child.Count(c => c == '{')) + { + foreach (var group in Ungroup(path)) + { + foreach (var item in this.Expand(group, dirOnly)) + { + yield return item; + } + } + + yield break; + } + + if (child == "**") + { + foreach (DirectoryInfo dir in this.Expand(parent, true).DistinctBy(d => d.FullName).Cast<DirectoryInfo>()) + { + yield return dir; + + foreach (var subDir in GetDirectories(dir)) + { + yield return subDir; + } + } + + yield break; + } + + var childRegexes = Ungroup(child).Select(s => this.CreateRegexOrString(s)).ToList(); + + foreach (DirectoryInfo parentDir in this.Expand(parent, true).DistinctBy(d => d.FullName).Cast<DirectoryInfo>()) + { + IEnumerable<FileSystemInfo> fileSystemEntries = dirOnly ? parentDir.EnumerateDirectories() : parentDir.EnumerateFileSystemInfos(); + + foreach (var fileSystemEntry in fileSystemEntries) + { + if (childRegexes.Any(r => r.IsMatch(fileSystemEntry.Name))) + { + yield return fileSystemEntry; + } + } + + if (childRegexes.Any(r => r.Pattern == @"^\.\.$")) + { + yield return parentDir.Parent ?? parentDir; + } + + if (childRegexes.Any(r => r.Pattern == @"^\.$")) + { + yield return parentDir; + } + } + } + + private static string GlobToRegex(string glob) + { + var regex = new StringBuilder(); + var characterClass = false; + + regex.Append("^"); + + foreach (var c in glob) + { + if (characterClass) + { + if (c == ']') + { + characterClass = false; + } + + regex.Append(c); + continue; + } + + switch (c) + { + case '*': + regex.Append(".*"); + break; + case '?': + regex.Append("."); + break; + case '[': + characterClass = true; + regex.Append(c); + break; + default: + if (regexSpecialChars.Contains(c)) + { + regex.Append('\\'); + } + + regex.Append(c); + break; + } + } + + regex.Append("$"); + + return regex.ToString(); + } + + private static IEnumerable<string> Ungroup(string path) + { + if (!path.Contains('{')) + { + yield return path; + yield break; + } + + var level = 0; + var option = new StringBuilder(); + var prefix = string.Empty; + var postfix = string.Empty; + var options = new List<string>(); + + for (int i = 0; i < path.Length; i++) + { + var c = path[i]; + + switch (c) + { + case '{': + level++; + if (level == 1) + { + prefix = option.ToString(); + option.Clear(); + } + else option.Append(c); + break; + case ',': + if (level == 1) + { + options.Add(option.ToString()); + option.Clear(); + } + else option.Append(c); + break; + case '}': + level--; + if (level == 0) + { + options.Add(option.ToString()); + break; + } + else option.Append(c); + break; + default: + option.Append(c); + break; + } + + if (level == 0 && c == '}' && (i + 1) < path.Length) + { + postfix = path.Substring(i + 1); + break; + } + } + + // invalid grouping + if (level > 0) + { + yield return path; + yield break; + } + + var postGroups = Ungroup(postfix); + + foreach (var opt in options.SelectMany(o => Ungroup(o))) + { + foreach (var postGroup in postGroups) + { + var s = prefix + opt + postGroup; + yield return s; + } + } + } + + private static IEnumerable<DirectoryInfo> GetDirectories(DirectoryInfo root) + { + IEnumerable<DirectoryInfo> subDirs = null; + + try + { + subDirs = root.EnumerateDirectories(); + } + catch (Exception) + { + yield break; + } + + foreach (DirectoryInfo dirInfo in subDirs) + { + yield return dirInfo; + + foreach (var recursiveDir in GetDirectories(dirInfo)) + { + yield return recursiveDir; + } + } + } + + private class RegexOrString + { + public RegexOrString(string pattern, string rawString, bool ignoreCase, bool compileRegex) + { + this.IgnoreCase = ignoreCase; + + try + { + this.Regex = new Regex( + pattern, + RegexOptions.CultureInvariant | (ignoreCase ? RegexOptions.IgnoreCase : 0) | (compileRegex ? RegexOptions.Compiled : 0)); + this.Pattern = pattern; + } + catch + { + this.Pattern = rawString; + } + } + + public Regex Regex { get; set; } + + public string Pattern { get; set; } + + public bool IgnoreCase { get; set; } + + public bool IsMatch(string input) + { + if (this.Regex != null) + { + return this.Regex.IsMatch(input); + } + + return this.Pattern.Equals(input, this.IgnoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal); + } + } + } + + internal static class Extensions + { + internal static IEnumerable<TSource> DistinctBy<TSource, TKey>( + this IEnumerable<TSource> source, + Func<TSource, TKey> keySelector) + { + var knownKeys = new HashSet<TKey>(); + foreach (TSource element in source) + { + if (knownKeys.Add(keySelector(element))) + { + yield return element; + } + } + } + } +} diff --git a/src/ReportGenerator.Core/Common/GlobbingFileSearch.cs b/src/ReportGenerator.Core/Common/GlobbingFileSearch.cs new file mode 100644 index 00000000..a6821384 --- /dev/null +++ b/src/ReportGenerator.Core/Common/GlobbingFileSearch.cs @@ -0,0 +1,20 @@ +using System.Collections.Generic; + +namespace Palmmedia.ReportGenerator.Core.Common +{ + /// <summary> + /// Searches files based on file pattern with support for globbing. + /// </summary> + internal static class GlobbingFileSearch + { + /// <summary> + /// Gets the files matching the given file pattern.. + /// </summary> + /// <param name="pattern">The file pattern.</param> + /// <returns>The files.</returns> + internal static IEnumerable<string> GetFiles(string pattern) + { + return new Glob(pattern).ExpandNames(); + } + } +} diff --git a/src/ReportGenerator.Console/Common/LinqExtensions.cs b/src/ReportGenerator.Core/Common/LinqExtensions.cs similarity index 97% rename from src/ReportGenerator.Console/Common/LinqExtensions.cs rename to src/ReportGenerator.Core/Common/LinqExtensions.cs index 8dda69d6..9be5d964 100644 --- a/src/ReportGenerator.Console/Common/LinqExtensions.cs +++ b/src/ReportGenerator.Core/Common/LinqExtensions.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Xml.Linq; -namespace Palmmedia.ReportGenerator.Common +namespace Palmmedia.ReportGenerator.Core.Common { /// <summary> /// Linq extensions. diff --git a/src/ReportGenerator.Console/Common/FileSearch.cs b/src/ReportGenerator.Core/Common/WildCardFileSearch.cs similarity index 98% rename from src/ReportGenerator.Console/Common/FileSearch.cs rename to src/ReportGenerator.Core/Common/WildCardFileSearch.cs index 84bc2280..5582b86f 100644 --- a/src/ReportGenerator.Console/Common/FileSearch.cs +++ b/src/ReportGenerator.Core/Common/WildCardFileSearch.cs @@ -3,12 +3,12 @@ using System.IO; using System.Linq; -namespace Palmmedia.ReportGenerator.Common +namespace Palmmedia.ReportGenerator.Core.Common { /// <summary> /// Searches files based on file pattern with support for wildcards. /// </summary> - internal static class FileSearch + internal static class WildCardFileSearch { /// <summary> /// Gets the files matching the given file pattern.. diff --git a/src/ReportGenerator.Core/Generator.cs b/src/ReportGenerator.Core/Generator.cs new file mode 100644 index 00000000..6c0a6f17 --- /dev/null +++ b/src/ReportGenerator.Core/Generator.cs @@ -0,0 +1,142 @@ +using System; +using System.IO; +using Microsoft.Extensions.Configuration; +using Palmmedia.ReportGenerator.Core.CodeAnalysis; +using Palmmedia.ReportGenerator.Core.Common; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Parser; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Palmmedia.ReportGenerator.Core.Plugin; +using Palmmedia.ReportGenerator.Core.Properties; +using Palmmedia.ReportGenerator.Core.Reporting; +using Palmmedia.ReportGenerator.Core.Reporting.History; + +namespace Palmmedia.ReportGenerator.Core +{ + /// <summary> + /// The report generator implementation. + /// </summary> + public class Generator : IReportGenerator + { + /// <summary> + /// The Logger. + /// </summary> + private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(Program)); + + /// <summary> + /// Executes the report generation. + /// </summary> + /// <param name="reportConfiguration">The report configuration.</param> + /// <returns><c>true</c> if report was generated successfully; otherwise <c>false</c>.</returns> + public bool GenerateReport(IReportConfiguration reportConfiguration) + { + if (reportConfiguration == null) + { + throw new ArgumentNullException(nameof(reportConfiguration)); + } + + try + { + var configuration = this.GetConfiguration(); + + var reportContext = new ReportContext(reportConfiguration); + var pluginLoader = new ReflectionPluginLoader(reportConfiguration.Plugins); + + IReportBuilderFactory reportBuilderFactory = new ReportBuilderFactory(pluginLoader); + + // Set log level before validation is performed + LoggerFactory.VerbosityLevel = reportContext.ReportConfiguration.VerbosityLevel; + + if (!new ReportConfigurationValidator(reportBuilderFactory).Validate(reportContext.ReportConfiguration)) + { +#if DEBUG + if (System.Diagnostics.Debugger.IsAttached) + { + Console.ReadKey(); + } +#endif + + return false; + } + + var stopWatch = new System.Diagnostics.Stopwatch(); + stopWatch.Start(); + DateTime executionTime = DateTime.Now; + + var settings = new Settings(); + configuration.GetSection("settings").Bind(settings); + + var parserResult = new CoverageReportParser( + settings.NumberOfReportsParsedInParallel, + reportConfiguration.SourceDirectories, + new DefaultFilter(reportContext.ReportConfiguration.AssemblyFilters), + new DefaultFilter(reportContext.ReportConfiguration.ClassFilters), + new DefaultFilter(reportContext.ReportConfiguration.FileFilters)) + .ParseFiles(reportContext.ReportConfiguration.ReportFiles); + + Logger.DebugFormat(Resources.ReportParsingTook, stopWatch.ElapsedMilliseconds / 1000d); + + var riskHotspotsAnalysisThresholds = new RiskHotspotsAnalysisThresholds(); + configuration.GetSection("riskHotspotsAnalysisThresholds").Bind(riskHotspotsAnalysisThresholds); + + reportContext.RiskHotspotAnalysisResult = new RiskHotspotsAnalyzer(riskHotspotsAnalysisThresholds) + .PerformRiskHotspotAnalysis(parserResult.Assemblies); + + var overallHistoricCoverages = new System.Collections.Generic.List<Parser.Analysis.HistoricCoverage>(); + var historyStorage = new HistoryStorageFactory(pluginLoader).GetHistoryStorage(reportContext.ReportConfiguration); + + if (historyStorage != null) + { + new HistoryParser(historyStorage, settings.MaximumNumberOfHistoricCoverageFiles) + .ApplyHistoricCoverage(parserResult.Assemblies, overallHistoricCoverages); + + reportContext.OverallHistoricCoverages = overallHistoricCoverages; + } + + new Reporting.ReportGenerator( + parserResult, + reportBuilderFactory.GetReportBuilders(reportContext)) + .CreateReport(reportContext.ReportConfiguration.HistoryDirectory != null, overallHistoricCoverages, executionTime, reportContext.ReportConfiguration.Tag); + + if (historyStorage != null) + { + new HistoryReportGenerator(historyStorage) + .CreateReport(parserResult.Assemblies, executionTime, reportContext.ReportConfiguration.Tag); + } + + stopWatch.Stop(); + Logger.InfoFormat(Resources.ReportGenerationTook, stopWatch.ElapsedMilliseconds / 1000d); + + return true; + } + catch (Exception ex) + { + Logger.Error(ex.GetExceptionMessageForDisplay()); + Logger.Error(ex.StackTrace); + +#if DEBUG + if (System.Diagnostics.Debugger.IsAttached) + { + Console.ReadKey(); + } +#endif + + return false; + } + } + + /// <summary> + /// Get the <see cref="IConfigurationRoot"/>. + /// </summary> + /// <returns>The configuration.</returns> + private IConfigurationRoot GetConfiguration() + { + var builder = new ConfigurationBuilder() + .SetBasePath(new FileInfo(this.GetType().Assembly.Location).DirectoryName) + .AddJsonFile("appsettings.json") + .AddCommandLine(Environment.GetCommandLineArgs()); + + return builder.Build(); + } + } +} diff --git a/src/ReportGenerator.Core/Help.cs b/src/ReportGenerator.Core/Help.cs new file mode 100644 index 00000000..be88f0e9 --- /dev/null +++ b/src/ReportGenerator.Core/Help.cs @@ -0,0 +1,98 @@ +using System; +using System.Globalization; +using System.Linq; +using System.Reflection; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Reporting; + +namespace Palmmedia.ReportGenerator.Core +{ + /// <summary> + /// Prints help on the command line. + /// </summary> + internal class Help + { + /// <summary> + /// The report builder factory. + /// </summary> + private readonly IReportBuilderFactory reportBuilderFactory; + + /// <summary> + /// Initializes a new instance of the <see cref="Help"/> class. + /// </summary> + /// <param name="reportBuilderFactory">The report builder factory.</param> + internal Help(IReportBuilderFactory reportBuilderFactory) + { + this.reportBuilderFactory = reportBuilderFactory ?? throw new ArgumentNullException(nameof(reportBuilderFactory)); + } + + /// <summary> + /// Shows the help of the program. + /// </summary> + internal void ShowHelp() + { + var availableReportTypes = this.reportBuilderFactory.GetAvailableReportTypes(); + + Console.WriteLine(); + Console.WriteLine("ReportGenerator " + typeof(ReportConfigurationBuilder).Assembly.GetName().Version); + + AssemblyCopyrightAttribute assemblyCopyrightAttribute = typeof(ReportConfigurationBuilder).Assembly + .GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false) + .Cast<AssemblyCopyrightAttribute>() + .FirstOrDefault(); + + if (assemblyCopyrightAttribute != null) + { + Console.WriteLine(assemblyCopyrightAttribute.Copyright); + } + + Console.WriteLine(); + Console.WriteLine(Properties.Help.Parameters); + Console.WriteLine(" " + Properties.Help.Parameters1); + Console.WriteLine(" " + Properties.Help.Parameters2); + Console.WriteLine(string.Format(CultureInfo.InvariantCulture, " " + Properties.Help.Parameters3, string.Join("|", availableReportTypes.Take(3).Union(new[] { "..." })))); + Console.WriteLine(" " + Properties.Help.Parameters12); + Console.WriteLine(" " + Properties.Help.Parameters5); + Console.WriteLine(" " + Properties.Help.Parameters11); + Console.WriteLine(" " + Properties.Help.Parameters6); + Console.WriteLine(" " + Properties.Help.Parameters7); + Console.WriteLine(" " + Properties.Help.Parameters8); + Console.WriteLine(string.Format(CultureInfo.InvariantCulture, " " + Properties.Help.Parameters9, string.Join("|", Enum.GetNames(typeof(VerbosityLevel))))); + Console.WriteLine(" " + Properties.Help.Parameters10); + + Console.WriteLine(); + Console.WriteLine(Properties.Help.Explanations); + Console.WriteLine(" " + Properties.Help.Explanations1); + Console.WriteLine(" " + Properties.Help.Explanations2); + Console.WriteLine(" " + Properties.Help.Explanations3); + Console.WriteLine(string.Format(CultureInfo.InvariantCulture, " " + Properties.Help.ReportTypeValues, string.Join(", ", availableReportTypes))); + Console.WriteLine(" " + Properties.Help.Explanations15); + Console.WriteLine(" " + Properties.Help.Explanations5); + Console.WriteLine(" " + Properties.Help.Explanations6); + Console.WriteLine(" " + Properties.Help.Explanations7); + Console.WriteLine(" " + Properties.Help.Explanations14); + Console.WriteLine(" " + Properties.Help.Explanations8); + Console.WriteLine(" " + Properties.Help.Explanations9); + Console.WriteLine(" " + Properties.Help.Explanations10); + Console.WriteLine(" " + Properties.Help.Explanations11); + Console.WriteLine(" " + Properties.Help.Explanations12); + Console.WriteLine(string.Format(CultureInfo.InvariantCulture, " " + Properties.Help.VerbosityValues, string.Join(", ", Enum.GetNames(typeof(VerbosityLevel))))); + Console.WriteLine(" " + Properties.Help.Explanations13); + + Console.WriteLine(); + Console.WriteLine(Properties.Help.DefaultValues); + Console.WriteLine(" -reporttypes:Html"); + Console.WriteLine(" -assemblyfilters:+*"); + Console.WriteLine(" -classfilters:+*"); + Console.WriteLine(" -filefilters:+*"); + Console.WriteLine(" -verbosity:" + VerbosityLevel.Verbose); + + Console.WriteLine(); + Console.WriteLine(Properties.Help.Examples); + Console.WriteLine(" \"-reports:coverage.xml\" \"-targetdir:C:\\report\""); + Console.WriteLine(" \"-reports:target\\*\\*.xml\" \"-targetdir:C:\\report\" -reporttypes:Latex;HtmlSummary -tag:v1.4.5"); + Console.WriteLine(" \"-reports:coverage1.xml;coverage2.xml\" \"-targetdir:report\" \"-sourcedirs:C:\\MyProject\" -plugins:CustomReports.dll"); + Console.WriteLine(" \"-reports:coverage.xml\" \"-targetdir:C:\\report\" \"-assemblyfilters:+Included;-Excluded.*\""); + } + } +} \ No newline at end of file diff --git a/src/ReportGenerator.Console/IReportGenerator.cs b/src/ReportGenerator.Core/IReportGenerator.cs similarity index 71% rename from src/ReportGenerator.Console/IReportGenerator.cs rename to src/ReportGenerator.Core/IReportGenerator.cs index 292e803e..4735da2d 100644 --- a/src/ReportGenerator.Console/IReportGenerator.cs +++ b/src/ReportGenerator.Core/IReportGenerator.cs @@ -1,4 +1,6 @@ -namespace Palmmedia.ReportGenerator +using Palmmedia.ReportGenerator.Core.Reporting; + +namespace Palmmedia.ReportGenerator.Core { /// <summary> /// Provides report generation capabilities. @@ -10,6 +12,6 @@ public interface IReportGenerator /// </summary> /// <param name="reportConfiguration">The report configuration.</param> /// <returns>True if the report generation succeeded, otherwise false.</returns> - bool GenerateReport(ReportConfiguration reportConfiguration); + bool GenerateReport(IReportConfiguration reportConfiguration); } } diff --git a/src/ReportGenerator.Console/Logging/ConsoleLogger.cs b/src/ReportGenerator.Core/Logging/ConsoleLogger.cs similarity index 65% rename from src/ReportGenerator.Console/Logging/ConsoleLogger.cs rename to src/ReportGenerator.Core/Logging/ConsoleLogger.cs index 654e39f5..77546a60 100644 --- a/src/ReportGenerator.Console/Logging/ConsoleLogger.cs +++ b/src/ReportGenerator.Core/Logging/ConsoleLogger.cs @@ -1,12 +1,17 @@ using System; -namespace Palmmedia.ReportGenerator.Logging +namespace Palmmedia.ReportGenerator.Core.Logging { /// <summary> /// <see cref="ILogger"/> that writes to the console. /// </summary> internal class ConsoleLogger : ILogger { + /// <summary> + /// Lock object. + /// </summary> + private readonly object lockObject = new object(); + /// <summary> /// Gets or sets the verbosity level. /// </summary> @@ -20,7 +25,10 @@ public void Debug(string message) { if (this.VerbosityLevel < VerbosityLevel.Info) { - Console.WriteLine(message); + lock (this.lockObject) + { + Console.WriteLine(message); + } } } @@ -33,7 +41,10 @@ public void DebugFormat(string format, params object[] args) { if (this.VerbosityLevel < VerbosityLevel.Info) { - Console.WriteLine(format, args); + lock (this.lockObject) + { + Console.WriteLine(format, args); + } } } @@ -45,7 +56,10 @@ public void Info(string message) { if (this.VerbosityLevel < VerbosityLevel.Warning) { - Console.WriteLine(message); + lock (this.lockObject) + { + Console.WriteLine(message); + } } } @@ -58,7 +72,10 @@ public void InfoFormat(string format, params object[] args) { if (this.VerbosityLevel < VerbosityLevel.Warning) { - Console.WriteLine(format, args); + lock (this.lockObject) + { + Console.WriteLine(format, args); + } } } @@ -70,9 +87,12 @@ public void Warn(string message) { if (this.VerbosityLevel < VerbosityLevel.Error) { - Console.ForegroundColor = ConsoleColor.Magenta; - Console.WriteLine(message); - Console.ResetColor(); + lock (this.lockObject) + { + Console.ForegroundColor = ConsoleColor.Magenta; + Console.WriteLine(message); + Console.ResetColor(); + } } } @@ -85,9 +105,12 @@ public void WarnFormat(string format, params object[] args) { if (this.VerbosityLevel < VerbosityLevel.Error) { - Console.ForegroundColor = ConsoleColor.Magenta; - Console.WriteLine(format, args); - Console.ResetColor(); + lock (this.lockObject) + { + Console.ForegroundColor = ConsoleColor.Magenta; + Console.WriteLine(format, args); + Console.ResetColor(); + } } } @@ -99,9 +122,12 @@ public void Error(string message) { if (this.VerbosityLevel < VerbosityLevel.Off) { - Console.ForegroundColor = ConsoleColor.Red; - Console.WriteLine(message); - Console.ResetColor(); + lock (this.lockObject) + { + Console.ForegroundColor = ConsoleColor.Red; + Console.WriteLine(message); + Console.ResetColor(); + } } } @@ -114,9 +140,12 @@ public void ErrorFormat(string format, params object[] args) { if (this.VerbosityLevel < VerbosityLevel.Off) { - Console.ForegroundColor = ConsoleColor.Red; - Console.WriteLine(format, args); - Console.ResetColor(); + lock (this.lockObject) + { + Console.ForegroundColor = ConsoleColor.Red; + Console.WriteLine(format, args); + Console.ResetColor(); + } } } } diff --git a/src/ReportGenerator.Console/Logging/ConsoleLoggerFactory.cs b/src/ReportGenerator.Core/Logging/ConsoleLoggerFactory.cs similarity index 95% rename from src/ReportGenerator.Console/Logging/ConsoleLoggerFactory.cs rename to src/ReportGenerator.Core/Logging/ConsoleLoggerFactory.cs index b97eef04..950d3f03 100644 --- a/src/ReportGenerator.Console/Logging/ConsoleLoggerFactory.cs +++ b/src/ReportGenerator.Core/Logging/ConsoleLoggerFactory.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Text; -namespace Palmmedia.ReportGenerator.Logging +namespace Palmmedia.ReportGenerator.Core.Logging { /// <summary> /// A logger factory creating console loggers. diff --git a/src/ReportGenerator.Console/Logging/ILogger.cs b/src/ReportGenerator.Core/Logging/ILogger.cs similarity index 97% rename from src/ReportGenerator.Console/Logging/ILogger.cs rename to src/ReportGenerator.Core/Logging/ILogger.cs index 1aa30fa4..d857395c 100644 --- a/src/ReportGenerator.Console/Logging/ILogger.cs +++ b/src/ReportGenerator.Core/Logging/ILogger.cs @@ -1,4 +1,4 @@ -namespace Palmmedia.ReportGenerator.Logging +namespace Palmmedia.ReportGenerator.Core.Logging { /// <summary> /// Interface for loggers. diff --git a/src/ReportGenerator.Console/Logging/ILoggerFactory.cs b/src/ReportGenerator.Core/Logging/ILoggerFactory.cs similarity index 92% rename from src/ReportGenerator.Console/Logging/ILoggerFactory.cs rename to src/ReportGenerator.Core/Logging/ILoggerFactory.cs index 9c8faefc..80ec5282 100644 --- a/src/ReportGenerator.Console/Logging/ILoggerFactory.cs +++ b/src/ReportGenerator.Core/Logging/ILoggerFactory.cs @@ -1,6 +1,6 @@ using System; -namespace Palmmedia.ReportGenerator.Logging +namespace Palmmedia.ReportGenerator.Core.Logging { /// <summary> /// Provides <see cref="ILogger"/> objects creation capabilities. diff --git a/src/ReportGenerator.Console/Logging/LoggerFactory.cs b/src/ReportGenerator.Core/Logging/LoggerFactory.cs similarity index 97% rename from src/ReportGenerator.Console/Logging/LoggerFactory.cs rename to src/ReportGenerator.Core/Logging/LoggerFactory.cs index 654102c5..08cf7ccb 100644 --- a/src/ReportGenerator.Console/Logging/LoggerFactory.cs +++ b/src/ReportGenerator.Core/Logging/LoggerFactory.cs @@ -1,6 +1,6 @@ using System; -namespace Palmmedia.ReportGenerator.Logging +namespace Palmmedia.ReportGenerator.Core.Logging { /// <summary> /// Factory for loggers. diff --git a/src/ReportGenerator.Console/Logging/VerbosityLevel.cs b/src/ReportGenerator.Core/Logging/VerbosityLevel.cs similarity index 92% rename from src/ReportGenerator.Console/Logging/VerbosityLevel.cs rename to src/ReportGenerator.Core/Logging/VerbosityLevel.cs index 63e9a2f1..a18760d2 100644 --- a/src/ReportGenerator.Console/Logging/VerbosityLevel.cs +++ b/src/ReportGenerator.Core/Logging/VerbosityLevel.cs @@ -1,4 +1,4 @@ -namespace Palmmedia.ReportGenerator.Logging +namespace Palmmedia.ReportGenerator.Core.Logging { /// <summary> /// Enumeration for the logging verbosity. diff --git a/src/ReportGenerator.Core/MSBuild/ReportGenerator.cs b/src/ReportGenerator.Core/MSBuild/ReportGenerator.cs new file mode 100644 index 00000000..f20036f8 --- /dev/null +++ b/src/ReportGenerator.Core/MSBuild/ReportGenerator.cs @@ -0,0 +1,144 @@ +using System.Linq; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; + +namespace Palmmedia.ReportGenerator.Core.MSBuild +{ + /// <summary> + /// MSBuild Task for generating reports. + /// </summary> + /// <example> + /// <?xml version="1.0" encoding="utf-8"?><br/> + /// <Project DefaultTargets="Coverage" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"><br/> + /// <UsingTask TaskName="ReportGenerator" AssemblyFile="ReportGenerator.exe" /><br/> + /// <ItemGroup><br/> + /// <CoverageFiles Include="partcover.xml" /><br/> + /// </ItemGroup><br/> + /// <Target Name="Coverage"><br/> + /// <ReportGenerator ReportFiles="@(CoverageFiles)" TargetDirectory="report" ReportTypes="Html" /><br/> + /// </Target><br/> + /// </Project> + /// </example> + public class ReportGenerator : Task, ITask + { + /// <summary> + /// Gets or sets the report files. + /// </summary> + [Required] + public ITaskItem[] ReportFiles { get; set; } + + /// <summary> + /// Gets or sets the directory the report will be created in. This must be a directory, not a file. If the directory does not exist, it is created automatically. + /// </summary> + [Required] + public string TargetDirectory { get; set; } + + /// <summary> + /// Gets or sets the directory the historic data will be created in. This must be a directory, not a file. If the directory does not exist, it is created automatically. + /// </summary> + public string HistoryDirectory { get; set; } + + /// <summary> + /// Gets or sets the types of the report. + /// </summary> + /// <value>The types of the report.</value> + public ITaskItem[] ReportTypes { get; set; } + + /// <summary> + /// Gets or sets the source directories. Optional directories which contain the corresponding source code. The source files are used if coverage report contains classes without path information. + /// </summary> + /// <value> + /// The source directories. + /// </value> + public ITaskItem[] SourceDirectories { get; set; } + + /// <summary> + /// Gets or sets the plugins. + /// </summary> + /// <value> + /// The plugins. + /// </value> + public ITaskItem[] Plugins { get; set; } + + /// <summary> + /// Gets or sets the assembly filters (old property). + /// </summary> + /// <value> + /// The assembly filters. + /// </value> + public ITaskItem[] Filters { get; set; } + + /// <summary> + /// Gets or sets the assembly filters (new property). + /// </summary> + /// <value> + /// The assembly filters. + /// </value> + public ITaskItem[] AssemblyFilters { get; set; } + + /// <summary> + /// Gets or sets the class filters. + /// </summary> + /// <value> + /// The class filters. + /// </value> + public ITaskItem[] ClassFilters { get; set; } + + /// <summary> + /// Gets or sets the file filters. + /// </summary> + /// <value> + /// The file filters. + /// </value> + public ITaskItem[] FileFilters { get; set; } + + /// <summary> + /// Gets or sets the verbosity level. + /// </summary> + /// <value> + /// The verbosity level. + /// </value> + public string VerbosityLevel { get; set; } + + /// <summary> + /// Gets or sets the custom tag (e.g. build number). + /// </summary> + /// <value> + /// The custom tag. + /// </value> + public string Tag { get; set; } + + /// <summary> + /// When overridden in a derived class, executes the task. + /// </summary> + /// <returns> + /// true if the task successfully executed; otherwise, false. + /// </returns> + public override bool Execute() + { + string[] reportTypes = new string[] { }; + + if (this.ReportTypes != null && this.ReportTypes.Length > 0) + { + reportTypes = this.ReportTypes.Select(r => r.ItemSpec).ToArray(); + } + + ITaskItem[] assemblyFilters = this.AssemblyFilters ?? this.Filters; + + var configuration = new ReportConfiguration( + this.ReportFiles == null ? Enumerable.Empty<string>() : this.ReportFiles.Select(r => r.ItemSpec), + this.TargetDirectory, + this.SourceDirectories == null ? Enumerable.Empty<string>() : this.SourceDirectories.Select(r => r.ItemSpec), + this.HistoryDirectory, + reportTypes, + this.Plugins == null ? Enumerable.Empty<string>() : this.Plugins.Select(r => r.ItemSpec), + assemblyFilters == null ? Enumerable.Empty<string>() : assemblyFilters.Select(r => r.ItemSpec), + this.ClassFilters == null ? Enumerable.Empty<string>() : this.ClassFilters.Select(r => r.ItemSpec), + this.FileFilters == null ? Enumerable.Empty<string>() : this.FileFilters.Select(r => r.ItemSpec), + this.VerbosityLevel, + this.Tag); + + return new Generator().GenerateReport(configuration); + } + } +} diff --git a/src/ReportGenerator.Console/Parser/Analysis/Assembly.cs b/src/ReportGenerator.Core/Parser/Analysis/Assembly.cs similarity index 91% rename from src/ReportGenerator.Console/Parser/Analysis/Assembly.cs rename to src/ReportGenerator.Core/Parser/Analysis/Assembly.cs index cbee0f56..7bceb8b2 100644 --- a/src/ReportGenerator.Console/Parser/Analysis/Assembly.cs +++ b/src/ReportGenerator.Core/Parser/Analysis/Assembly.cs @@ -1,19 +1,23 @@ using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -namespace Palmmedia.ReportGenerator.Parser.Analysis +namespace Palmmedia.ReportGenerator.Core.Parser.Analysis { /// <summary> /// Represents one assembly. /// </summary> public class Assembly { + /// <summary> + /// Lock object for accessing 'classes'. + /// </summary> + private readonly object classesLock = new object(); + /// <summary> /// List of classes in assembly. /// </summary> - private readonly ConcurrentBag<Class> classes = new ConcurrentBag<Class>(); + private readonly List<Class> classes = new List<Class>(); /// <summary> /// Initializes a new instance of the <see cref="Assembly"/> class. @@ -21,12 +25,7 @@ public class Assembly /// <param name="name">The name of the assembly.</param> internal Assembly(string name) { - if (name == null) - { - throw new ArgumentNullException(nameof(name)); - } - - this.Name = name; + this.Name = name ?? throw new ArgumentNullException(nameof(name)); } /// <summary> @@ -132,7 +131,10 @@ public override bool Equals(object obj) /// <param name="class">The class to add.</param> internal void AddClass(Class @class) { - this.classes.Add(@class); + lock (this.classesLock) + { + this.classes.Add(@class); + } } /// <summary> @@ -157,6 +159,7 @@ internal void Merge(Assembly assembly) else { this.AddClass(@class); + @class.Assembly = this; } } } diff --git a/src/ReportGenerator.Console/Parser/Analysis/Branch.cs b/src/ReportGenerator.Core/Parser/Analysis/Branch.cs similarity index 96% rename from src/ReportGenerator.Console/Parser/Analysis/Branch.cs rename to src/ReportGenerator.Core/Parser/Analysis/Branch.cs index db8fe4a3..a19bba47 100644 --- a/src/ReportGenerator.Console/Parser/Analysis/Branch.cs +++ b/src/ReportGenerator.Core/Parser/Analysis/Branch.cs @@ -1,4 +1,4 @@ -namespace Palmmedia.ReportGenerator.Parser.Analysis +namespace Palmmedia.ReportGenerator.Core.Parser.Analysis { /// <summary> /// Represents a branch. diff --git a/src/ReportGenerator.Console/Parser/Analysis/Class.cs b/src/ReportGenerator.Core/Parser/Analysis/Class.cs similarity index 79% rename from src/ReportGenerator.Console/Parser/Analysis/Class.cs rename to src/ReportGenerator.Core/Parser/Analysis/Class.cs index 67fdd6ac..ade0470f 100644 --- a/src/ReportGenerator.Console/Parser/Analysis/Class.cs +++ b/src/ReportGenerator.Core/Parser/Analysis/Class.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace Palmmedia.ReportGenerator.Parser.Analysis +namespace Palmmedia.ReportGenerator.Core.Parser.Analysis { /// <summary> /// Represents a class. @@ -14,11 +14,6 @@ public class Class /// </summary> private readonly List<CodeFile> files = new List<CodeFile>(); - /// <summary> - /// The method metrics of the class. - /// </summary> - private readonly List<MethodMetric> methodMetrics = new List<MethodMetric>(); - /// <summary> /// List of historic coverage information. /// </summary> @@ -36,18 +31,8 @@ public class Class /// <param name="assembly">The assembly.</param> internal Class(string name, Assembly assembly) { - if (name == null) - { - throw new ArgumentNullException(nameof(name)); - } - - if (assembly == null) - { - throw new ArgumentNullException(nameof(assembly)); - } - - this.Name = name; - this.Assembly = assembly; + this.Name = name ?? throw new ArgumentNullException(nameof(name)); + this.Assembly = assembly ?? throw new ArgumentNullException(nameof(assembly)); } /// <summary> @@ -59,7 +44,7 @@ internal Class(string name, Assembly assembly) /// Gets the assembly. /// </summary> /// <value>The assembly.</value> - public Assembly Assembly { get; } + public Assembly Assembly { get; internal set; } /// <summary> /// Gets the files. @@ -67,12 +52,6 @@ internal Class(string name, Assembly assembly) /// <value>The files.</value> public IEnumerable<CodeFile> Files => this.files.OrderBy(f => f.Path); - /// <summary> - /// Gets the method metrics. - /// </summary> - /// <value>The method metrics.</value> - public IEnumerable<MethodMetric> MethodMetrics => this.methodMetrics; - /// <summary> /// Gets the historic coverage information. /// </summary> @@ -186,24 +165,6 @@ internal void AddFile(CodeFile codeFile) this.files.Add(codeFile); } - /// <summary> - /// Removes the given file. - /// </summary> - /// <param name="codeFile">The code file.</param> - internal void RemoveFile(CodeFile codeFile) - { - this.files.Remove(codeFile); - } - - /// <summary> - /// Adds the given method metric. - /// </summary> - /// <param name="methodMetric">The method metric.</param> - internal void AddMethodMetric(MethodMetric methodMetric) - { - this.methodMetrics.Add(methodMetric); - } - /// <summary> /// Adds the given historic coverage. /// </summary> @@ -233,19 +194,6 @@ internal void Merge(Class @class) this.CoverageQuota = @class.coverageQuota.Value; } - foreach (var methodMetric in @class.methodMetrics) - { - var existingMethodMetric = this.methodMetrics.FirstOrDefault(m => m.Name == methodMetric.Name); - if (existingMethodMetric != null) - { - existingMethodMetric.Merge(methodMetric); - } - else - { - this.AddMethodMetric(methodMetric); - } - } - foreach (var file in @class.files) { var existingFile = this.files.FirstOrDefault(f => f.Equals(file)); diff --git a/src/ReportGenerator.Console/Parser/Analysis/CodeElement.cs b/src/ReportGenerator.Core/Parser/Analysis/CodeElement.cs similarity index 73% rename from src/ReportGenerator.Console/Parser/Analysis/CodeElement.cs rename to src/ReportGenerator.Core/Parser/Analysis/CodeElement.cs index 1297bb35..3dd11482 100644 --- a/src/ReportGenerator.Console/Parser/Analysis/CodeElement.cs +++ b/src/ReportGenerator.Core/Parser/Analysis/CodeElement.cs @@ -1,6 +1,6 @@ using System; -namespace Palmmedia.ReportGenerator.Parser.Analysis +namespace Palmmedia.ReportGenerator.Core.Parser.Analysis { /// <summary> /// Represents an element (e.g. a method or property) in a code file. @@ -12,17 +12,14 @@ public class CodeElement /// </summary> /// <param name="name">The name.</param> /// <param name="type">The <see cref="Analysis.CodeElementType"/>.</param> - /// <param name="line">The line number.</param> - internal CodeElement(string name, CodeElementType type, int line) + /// <param name="firstLine">The number of the first line.</param> + /// <param name="lastLine">The number of the last line.</param> + internal CodeElement(string name, CodeElementType type, int firstLine, int lastLine) { - if (name == null) - { - throw new ArgumentNullException(nameof(name)); - } - - this.Name = name; + this.Name = name ?? throw new ArgumentNullException(nameof(name)); this.CodeElementType = type; - this.Line = line; + this.FirstLine = firstLine; + this.LastLine = lastLine; } /// <summary> @@ -42,12 +39,20 @@ internal CodeElement(string name, CodeElementType type, int line) public CodeElementType CodeElementType { get; } /// <summary> - /// Gets the line number. + /// Gets the number of the first line. + /// </summary> + /// <value> + /// The number of the first line. + /// </value> + public int FirstLine { get; } + + /// <summary> + /// Gets the number of the last line. /// </summary> /// <value> - /// The line number. + /// The number of the last line. /// </value> - public int Line { get; } + public int LastLine { get; } /// <summary> /// Determines whether the specified <see cref="System.Object"/> is equal to this instance. @@ -65,7 +70,7 @@ public override bool Equals(object obj) else { var codeElement = (CodeElement)obj; - return this.Name.Equals(codeElement.Name) && this.Line == codeElement.Line; + return this.Name.Equals(codeElement.Name) && this.FirstLine == codeElement.FirstLine; } } @@ -75,6 +80,6 @@ public override bool Equals(object obj) /// <returns> /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. /// </returns> - public override int GetHashCode() => this.Name.GetHashCode() + this.Line.GetHashCode(); + public override int GetHashCode() => this.Name.GetHashCode() + this.FirstLine.GetHashCode(); } } diff --git a/src/ReportGenerator.Console/Parser/Analysis/CodeElementType.cs b/src/ReportGenerator.Core/Parser/Analysis/CodeElementType.cs similarity index 84% rename from src/ReportGenerator.Console/Parser/Analysis/CodeElementType.cs rename to src/ReportGenerator.Core/Parser/Analysis/CodeElementType.cs index 22c0de84..0503e798 100644 --- a/src/ReportGenerator.Console/Parser/Analysis/CodeElementType.cs +++ b/src/ReportGenerator.Core/Parser/Analysis/CodeElementType.cs @@ -1,4 +1,4 @@ -namespace Palmmedia.ReportGenerator.Parser.Analysis +namespace Palmmedia.ReportGenerator.Core.Parser.Analysis { /// <summary> /// Type of <see cref="CodeElement"/>. diff --git a/src/ReportGenerator.Console/Parser/Analysis/CodeFile.cs b/src/ReportGenerator.Core/Parser/Analysis/CodeFile.cs similarity index 91% rename from src/ReportGenerator.Console/Parser/Analysis/CodeFile.cs rename to src/ReportGenerator.Core/Parser/Analysis/CodeFile.cs index a12780bc..d8e7f9b5 100644 --- a/src/ReportGenerator.Console/Parser/Analysis/CodeFile.cs +++ b/src/ReportGenerator.Core/Parser/Analysis/CodeFile.cs @@ -3,10 +3,10 @@ using System.Globalization; using System.IO; using System.Linq; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Properties; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Properties; -namespace Palmmedia.ReportGenerator.Parser.Analysis +namespace Palmmedia.ReportGenerator.Core.Parser.Analysis { /// <summary> /// Represents a source code file. @@ -23,6 +23,11 @@ public class CodeFile /// </summary> private readonly IDictionary<TestMethod, CoverageByTrackedMethod> lineCoveragesByTestMethod = new Dictionary<TestMethod, CoverageByTrackedMethod>(); + /// <summary> + /// The method metrics of the class. + /// </summary> + private readonly List<MethodMetric> methodMetrics = new List<MethodMetric>(); + /// <summary> /// The code elements.. /// </summary> @@ -66,11 +71,6 @@ internal CodeFile(string path, int[] lineCoverage, LineVisitStatus[] lineVisitSt /// <param name="branches">The branches.</param> internal CodeFile(string path, int[] lineCoverage, LineVisitStatus[] lineVisitStatus, IDictionary<int, ICollection<Branch>> branches) { - if (path == null) - { - throw new ArgumentNullException(nameof(path)); - } - if (lineCoverage == null) { throw new ArgumentNullException(nameof(lineCoverage)); @@ -86,7 +86,7 @@ internal CodeFile(string path, int[] lineCoverage, LineVisitStatus[] lineVisitSt throw new ArgumentException("Length of 'lineCoverage' and 'lineVisitStatus' must match", nameof(lineVisitStatus)); } - this.Path = path; + this.Path = path ?? throw new ArgumentNullException(nameof(path)); this.lineCoverage = lineCoverage; this.lineVisitStatus = lineVisitStatus; this.branches = branches; @@ -106,6 +106,12 @@ internal CodeFile(string path, int[] lineCoverage, LineVisitStatus[] lineVisitSt /// </value> public IEnumerable<TestMethod> TestMethods => this.lineCoveragesByTestMethod.Keys; + /// <summary> + /// Gets the method metrics. + /// </summary> + /// <value>The method metrics.</value> + public IEnumerable<MethodMetric> MethodMetrics => this.methodMetrics; + /// <summary> /// Gets the code elements. /// </summary> @@ -225,10 +231,19 @@ internal void AddCoverageByTestMethod(TestMethod testMethod, CoverageByTrackedMe } else { - this.lineCoveragesByTestMethod[testMethod] = MergeCoverageByTrackedMetho(existingTrackedMethodCoverage, trackedMethodCoverage); + this.lineCoveragesByTestMethod[testMethod] = MergeCoverageByTrackedMethod(existingTrackedMethodCoverage, trackedMethodCoverage); } } + /// <summary> + /// Adds the given method metric. + /// </summary> + /// <param name="methodMetric">The method metric.</param> + internal void AddMethodMetric(MethodMetric methodMetric) + { + this.methodMetrics.Add(methodMetric); + } + /// <summary> /// Adds the code element. /// </summary> @@ -392,7 +407,20 @@ internal void Merge(CodeFile file) } else { - this.lineCoveragesByTestMethod[lineCoverageByTestMethod.Key] = MergeCoverageByTrackedMetho(existingTrackedMethodCoverage, lineCoverageByTestMethod.Value); + this.lineCoveragesByTestMethod[lineCoverageByTestMethod.Key] = MergeCoverageByTrackedMethod(existingTrackedMethodCoverage, lineCoverageByTestMethod.Value); + } + } + + foreach (var methodMetric in file.methodMetrics) + { + var existingMethodMetric = this.methodMetrics.FirstOrDefault(m => m.Equals(methodMetric)); + if (existingMethodMetric != null) + { + existingMethodMetric.Merge(methodMetric); + } + else + { + this.AddMethodMetric(methodMetric); } } @@ -441,7 +469,7 @@ internal void Merge(CodeFile file) /// <param name="existingTrackedMethodCoverage">The existing tracked method coverage.</param> /// <param name="lineCoverageByTestMethod">The new line coverage by test method.</param> /// <returns>The merged tracked method coverage.</returns> - private static CoverageByTrackedMethod MergeCoverageByTrackedMetho(CoverageByTrackedMethod existingTrackedMethodCoverage, CoverageByTrackedMethod lineCoverageByTestMethod) + private static CoverageByTrackedMethod MergeCoverageByTrackedMethod(CoverageByTrackedMethod existingTrackedMethodCoverage, CoverageByTrackedMethod lineCoverageByTestMethod) { // Resize coverage array if neccessary if (lineCoverageByTestMethod.Coverage.LongLength > existingTrackedMethodCoverage.Coverage.LongLength) diff --git a/src/ReportGenerator.Console/Parser/Analysis/CoverageByTrackedMethod.cs b/src/ReportGenerator.Core/Parser/Analysis/CoverageByTrackedMethod.cs similarity index 90% rename from src/ReportGenerator.Console/Parser/Analysis/CoverageByTrackedMethod.cs rename to src/ReportGenerator.Core/Parser/Analysis/CoverageByTrackedMethod.cs index d2638058..3c157677 100644 --- a/src/ReportGenerator.Console/Parser/Analysis/CoverageByTrackedMethod.cs +++ b/src/ReportGenerator.Core/Parser/Analysis/CoverageByTrackedMethod.cs @@ -1,4 +1,4 @@ -namespace Palmmedia.ReportGenerator.Parser.Analysis +namespace Palmmedia.ReportGenerator.Core.Parser.Analysis { /// <summary> /// Coverage information for a test method. diff --git a/src/ReportGenerator.Console/Parser/Analysis/CoverageType.cs b/src/ReportGenerator.Core/Parser/Analysis/CoverageType.cs similarity index 86% rename from src/ReportGenerator.Console/Parser/Analysis/CoverageType.cs rename to src/ReportGenerator.Core/Parser/Analysis/CoverageType.cs index b7c24330..f340c582 100644 --- a/src/ReportGenerator.Console/Parser/Analysis/CoverageType.cs +++ b/src/ReportGenerator.Core/Parser/Analysis/CoverageType.cs @@ -1,4 +1,4 @@ -namespace Palmmedia.ReportGenerator.Parser.Analysis +namespace Palmmedia.ReportGenerator.Core.Parser.Analysis { /// <summary> /// Indicates the method how coverage of a class was measured. diff --git a/src/ReportGenerator.Console/Parser/Analysis/FileAnalysis.cs b/src/ReportGenerator.Core/Parser/Analysis/FileAnalysis.cs similarity index 97% rename from src/ReportGenerator.Console/Parser/Analysis/FileAnalysis.cs rename to src/ReportGenerator.Core/Parser/Analysis/FileAnalysis.cs index 846d76c3..c7397f21 100644 --- a/src/ReportGenerator.Console/Parser/Analysis/FileAnalysis.cs +++ b/src/ReportGenerator.Core/Parser/Analysis/FileAnalysis.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Palmmedia.ReportGenerator.Parser.Analysis +namespace Palmmedia.ReportGenerator.Core.Parser.Analysis { /// <summary> /// Coverage information of a source file. diff --git a/src/ReportGenerator.Console/Parser/Analysis/HistoricCoverage.cs b/src/ReportGenerator.Core/Parser/Analysis/HistoricCoverage.cs similarity index 98% rename from src/ReportGenerator.Console/Parser/Analysis/HistoricCoverage.cs rename to src/ReportGenerator.Core/Parser/Analysis/HistoricCoverage.cs index 72aab460..4d89e7fe 100644 --- a/src/ReportGenerator.Console/Parser/Analysis/HistoricCoverage.cs +++ b/src/ReportGenerator.Core/Parser/Analysis/HistoricCoverage.cs @@ -1,6 +1,6 @@ using System; -namespace Palmmedia.ReportGenerator.Parser.Analysis +namespace Palmmedia.ReportGenerator.Core.Parser.Analysis { /// <summary> /// Coverage information of a <see cref="Class"/> of a specific date. diff --git a/src/ReportGenerator.Console/Parser/Analysis/LineAnalysis.cs b/src/ReportGenerator.Core/Parser/Analysis/LineAnalysis.cs similarity index 98% rename from src/ReportGenerator.Console/Parser/Analysis/LineAnalysis.cs rename to src/ReportGenerator.Core/Parser/Analysis/LineAnalysis.cs index 3b9bb115..df24de64 100644 --- a/src/ReportGenerator.Console/Parser/Analysis/LineAnalysis.cs +++ b/src/ReportGenerator.Core/Parser/Analysis/LineAnalysis.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Palmmedia.ReportGenerator.Parser.Analysis +namespace Palmmedia.ReportGenerator.Core.Parser.Analysis { /// <summary> /// Full coverage information of a line in a source file. diff --git a/src/ReportGenerator.Console/Parser/Analysis/LineVisitStatus.cs b/src/ReportGenerator.Core/Parser/Analysis/LineVisitStatus.cs similarity index 90% rename from src/ReportGenerator.Console/Parser/Analysis/LineVisitStatus.cs rename to src/ReportGenerator.Core/Parser/Analysis/LineVisitStatus.cs index 8943abd6..981b8d5e 100644 --- a/src/ReportGenerator.Console/Parser/Analysis/LineVisitStatus.cs +++ b/src/ReportGenerator.Core/Parser/Analysis/LineVisitStatus.cs @@ -1,4 +1,4 @@ -namespace Palmmedia.ReportGenerator.Parser.Analysis +namespace Palmmedia.ReportGenerator.Core.Parser.Analysis { /// <summary> /// Indicates the coverage status of a line in a source file. diff --git a/src/ReportGenerator.Console/Parser/Analysis/MethodMetric.cs b/src/ReportGenerator.Core/Parser/Analysis/MethodMetric.cs similarity index 68% rename from src/ReportGenerator.Console/Parser/Analysis/MethodMetric.cs rename to src/ReportGenerator.Core/Parser/Analysis/MethodMetric.cs index 2ad898e5..b4d71247 100644 --- a/src/ReportGenerator.Console/Parser/Analysis/MethodMetric.cs +++ b/src/ReportGenerator.Core/Parser/Analysis/MethodMetric.cs @@ -1,21 +1,14 @@ using System; using System.Collections.Generic; -using System.Globalization; using System.Linq; -using System.Text.RegularExpressions; -namespace Palmmedia.ReportGenerator.Parser.Analysis +namespace Palmmedia.ReportGenerator.Core.Parser.Analysis { /// <summary> /// Represents the metrics of a method. /// </summary> public class MethodMetric { - /// <summary> - /// Regex to analyze/split a method name. - /// </summary> - private const string MethodRegex = @"^.*::(?<MethodName>.+)\((?<Arguments>.*)\)$"; - /// <summary> /// List of metrics. /// </summary> @@ -24,25 +17,13 @@ public class MethodMetric /// <summary> /// Initializes a new instance of the <see cref="MethodMetric"/> class. /// </summary> - /// <param name="name">The name.</param> - public MethodMetric(string name) - { - if (name == null) - { - throw new ArgumentNullException(nameof(name)); - } - - this.Name = name; - } - - /// <summary> - /// Initializes a new instance of the <see cref="MethodMetric"/> class. - /// </summary> - /// <param name="name">The name.</param> + /// <param name="fullName">The full method name.</param> + /// <param name="shortName">The short method name.</param> /// <param name="metrics">The metrics.</param> - public MethodMetric(string name, IEnumerable<Metric> metrics) + public MethodMetric(string fullName, string shortName, IEnumerable<Metric> metrics) { - this.Name = name; + this.FullName = fullName; + this.ShortName = shortName; this.AddMetrics(metrics); } @@ -51,19 +32,23 @@ public MethodMetric(string name, IEnumerable<Metric> metrics) /// </summary> public IEnumerable<Metric> Metrics => this.metrics; + /// <summary> + /// Gets the full name of the method. + /// </summary> + public string FullName { get; } + /// <summary> /// Gets the name of the method. /// </summary> - public string Name { get; } + public string ShortName { get; } /// <summary> - /// Gets the short name of the method (method arguments are omitted). + /// Gets the line number. /// </summary> - /// <value>The short name of the method.</value> - public string ShortName => Regex.Replace( - this.Name, - MethodRegex, - m => string.Format(CultureInfo.InvariantCulture, "{0}({1})", m.Groups["MethodName"].Value, m.Groups["Arguments"].Value.Length > 0 ? "..." : string.Empty)); + /// <value> + /// The line number. + /// </value> + public int? Line { get; internal set; } /// <summary> /// Determines whether the specified <see cref="System.Object"/> is equal to this instance. @@ -81,7 +66,7 @@ public override bool Equals(object obj) else { var methodMetric = (MethodMetric)obj; - return methodMetric.Name.Equals(this.Name); + return methodMetric.FullName.Equals(this.FullName) && methodMetric.Line == this.Line; } } @@ -91,7 +76,7 @@ public override bool Equals(object obj) /// <returns> /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. /// </returns> - public override int GetHashCode() => this.Name.GetHashCode(); + public override int GetHashCode() => this.FullName.GetHashCode() + this.Line.GetHashCode(); /// <summary> /// Adds the given metric. @@ -127,7 +112,17 @@ internal void Merge(MethodMetric methodMetric) var existingMetric = this.metrics.FirstOrDefault(m => m.Name == metric.Name); if (existingMetric != null) { - existingMetric.Value = Math.Max(existingMetric.Value, metric.Value); + if (existingMetric.Value.HasValue) + { + if (metric.Value.HasValue) + { + existingMetric.Value = Math.Max(existingMetric.Value.Value, metric.Value.Value); + } + } + else + { + existingMetric.Value = metric.Value; + } } else { diff --git a/src/ReportGenerator.Console/Parser/Analysis/Metric.cs b/src/ReportGenerator.Core/Parser/Analysis/Metric.cs similarity index 80% rename from src/ReportGenerator.Console/Parser/Analysis/Metric.cs rename to src/ReportGenerator.Core/Parser/Analysis/Metric.cs index c09a378a..223ea584 100644 --- a/src/ReportGenerator.Console/Parser/Analysis/Metric.cs +++ b/src/ReportGenerator.Core/Parser/Analysis/Metric.cs @@ -1,6 +1,6 @@ using System; -namespace Palmmedia.ReportGenerator.Parser.Analysis +namespace Palmmedia.ReportGenerator.Core.Parser.Analysis { /// <summary> /// Represents a metric, which is a key/value pair. @@ -14,14 +14,9 @@ public class Metric /// <param name="explanationUrl">The explanation url.</param> /// <param name="metricType">The type of the metric.</param> /// <param name="value">The value.</param> - public Metric(string name, Uri explanationUrl, MetricType metricType, decimal value) + public Metric(string name, Uri explanationUrl, MetricType metricType, decimal? value) { - if (name == null) - { - throw new ArgumentNullException(nameof(name)); - } - - this.Name = name; + this.Name = name ?? throw new ArgumentNullException(nameof(name)); this.ExplanationUrl = explanationUrl; this.MetricType = metricType; this.Value = value; @@ -45,6 +40,6 @@ public Metric(string name, Uri explanationUrl, MetricType metricType, decimal va /// <summary> /// Gets the value. /// </summary> - public decimal Value { get; internal set; } + public decimal? Value { get; internal set; } } } diff --git a/src/ReportGenerator.Console/Parser/Analysis/MetricType.cs b/src/ReportGenerator.Core/Parser/Analysis/MetricType.cs similarity index 89% rename from src/ReportGenerator.Console/Parser/Analysis/MetricType.cs rename to src/ReportGenerator.Core/Parser/Analysis/MetricType.cs index ebdcff3a..2612344a 100644 --- a/src/ReportGenerator.Console/Parser/Analysis/MetricType.cs +++ b/src/ReportGenerator.Core/Parser/Analysis/MetricType.cs @@ -1,4 +1,4 @@ -namespace Palmmedia.ReportGenerator.Parser.Analysis +namespace Palmmedia.ReportGenerator.Core.Parser.Analysis { /// <summary> /// Type of a <see cref="Metric"/>. diff --git a/src/ReportGenerator.Console/Parser/Analysis/ShortLineAnalysis.cs b/src/ReportGenerator.Core/Parser/Analysis/ShortLineAnalysis.cs similarity index 93% rename from src/ReportGenerator.Console/Parser/Analysis/ShortLineAnalysis.cs rename to src/ReportGenerator.Core/Parser/Analysis/ShortLineAnalysis.cs index 28f4a725..54976859 100644 --- a/src/ReportGenerator.Console/Parser/Analysis/ShortLineAnalysis.cs +++ b/src/ReportGenerator.Core/Parser/Analysis/ShortLineAnalysis.cs @@ -1,4 +1,4 @@ -namespace Palmmedia.ReportGenerator.Parser.Analysis +namespace Palmmedia.ReportGenerator.Core.Parser.Analysis { /// <summary> /// Coverage information of a line in a source file. diff --git a/src/ReportGenerator.Console/Parser/Analysis/SummaryResult.cs b/src/ReportGenerator.Core/Parser/Analysis/SummaryResult.cs similarity index 79% rename from src/ReportGenerator.Console/Parser/Analysis/SummaryResult.cs rename to src/ReportGenerator.Core/Parser/Analysis/SummaryResult.cs index 58eb87bb..1652be54 100644 --- a/src/ReportGenerator.Console/Parser/Analysis/SummaryResult.cs +++ b/src/ReportGenerator.Core/Parser/Analysis/SummaryResult.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace Palmmedia.ReportGenerator.Parser.Analysis +namespace Palmmedia.ReportGenerator.Core.Parser.Analysis { /// <summary> /// Overall result of all assemblies. @@ -15,21 +15,13 @@ public class SummaryResult /// <param name="assemblies">The assemblies.</param> /// <param name="usedParser">The used parser.</param> /// <param name="supportsBranchCoverage">if set to <c>true</c> the used parser supports branch coverage.</param> - internal SummaryResult(IEnumerable<Assembly> assemblies, string usedParser, bool supportsBranchCoverage) + /// <param name="sourceDirectories">The source directories.</param> + internal SummaryResult(IReadOnlyCollection<Assembly> assemblies, string usedParser, bool supportsBranchCoverage, IReadOnlyCollection<string> sourceDirectories) { - if (assemblies == null) - { - throw new ArgumentNullException(nameof(assemblies)); - } - - if (usedParser == null) - { - throw new ArgumentNullException(nameof(usedParser)); - } - - this.Assemblies = assemblies; - this.UsedParser = usedParser; + this.Assemblies = assemblies ?? throw new ArgumentNullException(nameof(assemblies)); + this.UsedParser = usedParser ?? throw new ArgumentNullException(nameof(usedParser)); this.SupportsBranchCoverage = supportsBranchCoverage; + this.SourceDirectories = sourceDirectories ?? throw new ArgumentNullException(nameof(sourceDirectories)); } /// <summary> @@ -38,7 +30,7 @@ internal SummaryResult(IEnumerable<Assembly> assemblies, string usedParser, bool /// <value> /// The assemblies. /// </value> - public IEnumerable<Assembly> Assemblies { get; } + public IReadOnlyCollection<Assembly> Assemblies { get; } /// <summary> /// Gets the used parser. @@ -56,6 +48,14 @@ internal SummaryResult(IEnumerable<Assembly> assemblies, string usedParser, bool /// </value> public bool SupportsBranchCoverage { get; } + /// <summary> + /// Gets the source directories. + /// </summary> + /// <value> + /// The source directories. + /// </value> + public IReadOnlyCollection<string> SourceDirectories { get; } + /// <summary> /// Gets the number of covered lines. /// </summary> @@ -99,7 +99,7 @@ public int? TotalLines } /// <summary> - /// Gets the coverage quota of the class. + /// Gets the coverage quota. /// </summary> /// <value>The coverage quota.</value> public decimal? CoverageQuota => (this.CoverableLines == 0) ? (decimal?)null : (decimal)Math.Truncate(1000 * (double)this.CoveredLines / (double)this.CoverableLines) / 10; @@ -121,7 +121,7 @@ public int? TotalLines public int? TotalBranches => this.Assemblies.Sum(f => f.TotalBranches); /// <summary> - /// Gets the branch coverage quota of the class. + /// Gets the branch coverage quota. /// </summary> /// <value>The branch coverage quota.</value> public decimal? BranchCoverageQuota => (this.TotalBranches == 0) ? (decimal?)null : (decimal)Math.Truncate(1000 * (double)this.CoveredBranches / (double)this.TotalBranches) / 10; diff --git a/src/ReportGenerator.Console/Parser/Analysis/TestMethod.cs b/src/ReportGenerator.Core/Parser/Analysis/TestMethod.cs similarity index 85% rename from src/ReportGenerator.Console/Parser/Analysis/TestMethod.cs rename to src/ReportGenerator.Core/Parser/Analysis/TestMethod.cs index c084d92d..79ed82d5 100644 --- a/src/ReportGenerator.Console/Parser/Analysis/TestMethod.cs +++ b/src/ReportGenerator.Core/Parser/Analysis/TestMethod.cs @@ -1,7 +1,7 @@ using System; using System.Threading; -namespace Palmmedia.ReportGenerator.Parser.Analysis +namespace Palmmedia.ReportGenerator.Core.Parser.Analysis { /// <summary> /// Name of a test method. @@ -20,18 +20,8 @@ public class TestMethod /// <param name="shortName">The short name.</param> internal TestMethod(string name, string shortName) { - if (name == null) - { - throw new ArgumentNullException(nameof(name)); - } - - if (shortName == null) - { - throw new ArgumentNullException(nameof(shortName)); - } - - this.Name = name; - this.ShortName = shortName; + this.Name = name ?? throw new ArgumentNullException(nameof(name)); + this.ShortName = shortName ?? throw new ArgumentNullException(nameof(shortName)); this.Id = Interlocked.Increment(ref counter); } diff --git a/src/ReportGenerator.Core/Parser/CoberturaParser.cs b/src/ReportGenerator.Core/Parser/CoberturaParser.cs new file mode 100644 index 00000000..92249f93 --- /dev/null +++ b/src/ReportGenerator.Core/Parser/CoberturaParser.cs @@ -0,0 +1,446 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using System.Xml.Linq; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Palmmedia.ReportGenerator.Core.Properties; + +namespace Palmmedia.ReportGenerator.Core.Parser +{ + /// <summary> + /// Parser for XML reports generated by Cobertura. + /// </summary> + internal class CoberturaParser : ParserBase + { + /// <summary> + /// The Logger. + /// </summary> + private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(CoberturaParser)); + + /// <summary> + /// Regex to analyze if a method name belongs to a lamda expression. + /// </summary> + private static Regex lambdaMethodNameRegex = new Regex("<.+>.+__", RegexOptions.Compiled); + + /// <summary> + /// Regex to analyze if a method name is generated by compiler. + /// </summary> + private static Regex compilerGeneratedMethodNameRegex = new Regex(@"(?<ClassName>.+)/<(?<CompilerGeneratedName>.+)>.+__.+MoveNext\(\)$", RegexOptions.Compiled); + + /// <summary> + /// Regex to analyze the branch coverage of a line element. + /// </summary> + private static Regex branchCoverageRegex = new Regex("\\((?<NumberOfCoveredBranches>\\d+)/(?<NumberOfTotalBranches>\\d+)\\)$", RegexOptions.Compiled); + + /// <summary> + /// Regex to extract short method name. + /// </summary> + private static Regex methodRegex = new Regex(@"^(?<MethodName>.+)\((?<Arguments>.*)\).*$", RegexOptions.Compiled); + + /// <summary> + /// Initializes a new instance of the <see cref="CoberturaParser" /> class. + /// </summary> + /// <param name="assemblyFilter">The assembly filter.</param> + /// <param name="classFilter">The class filter.</param> + /// <param name="fileFilter">The file filter.</param> + internal CoberturaParser(IFilter assemblyFilter, IFilter classFilter, IFilter fileFilter) + : base(assemblyFilter, classFilter, fileFilter) + { + } + + /// <summary> + /// Parses the given XML report. + /// </summary> + /// <param name="report">The XML report</param> + /// <returns>The parser result.</returns> + public override ParserResult Parse(XContainer report) + { + if (report == null) + { + throw new ArgumentNullException(nameof(report)); + } + + var assemblies = new List<Assembly>(); + + var modules = report.Descendants("package") + .ToArray(); + + var assemblyNames = modules + .Select(m => m.Attribute("name").Value) + .Distinct() + .Where(a => this.AssemblyFilter.IsElementIncludedInReport(a)) + .OrderBy(a => a) + .ToArray(); + + foreach (var assemblyName in assemblyNames) + { + assemblies.Add(this.ProcessAssembly(modules, assemblyName)); + } + + var result = new ParserResult(assemblies.OrderBy(a => a.Name).ToList(), true, this.ToString()); + + foreach (var sourceElement in report.Elements("sources").Elements("source")) + { + result.AddSourceDirectory(sourceElement.Value); + } + + return result; + } + + /// <summary> + /// Processes the given assembly. + /// </summary> + /// <param name="modules">The modules.</param> + /// <param name="assemblyName">Name of the assembly.</param> + /// <returns>The <see cref="Assembly"/>.</returns> + private Assembly ProcessAssembly(XElement[] modules, string assemblyName) + { + Logger.DebugFormat(" " + Resources.CurrentAssembly, assemblyName); + + var classNames = modules + .Where(m => m.Attribute("name").Value.Equals(assemblyName)) + .Elements("classes") + .Elements("class") + .Select(c => c.Attribute("name").Value) + .Where(c => !c.Contains("$") && !c.Contains("/<")) + .Distinct() + .Where(c => this.ClassFilter.IsElementIncludedInReport(c)) + .OrderBy(name => name) + .ToArray(); + + var assembly = new Assembly(assemblyName); + + Parallel.ForEach(classNames, className => this.ProcessClass(modules, assembly, className)); + + return assembly; + } + + /// <summary> + /// Processes the given class. + /// </summary> + /// <param name="modules">The modules.</param> + /// <param name="assembly">The assembly.</param> + /// <param name="className">Name of the class.</param> + private void ProcessClass(XElement[] modules, Assembly assembly, string className) + { + var files = modules + .Where(m => m.Attribute("name").Value.Equals(assembly.Name)) + .Elements("classes") + .Elements("class") + .Where(c => c.Attribute("name").Value.Equals(className) + || c.Attribute("name").Value.StartsWith(className + "$", StringComparison.Ordinal) + || c.Attribute("name").Value.StartsWith(className + "/<", StringComparison.Ordinal)) + .Select(c => c.Attribute("filename").Value) + .Distinct() + .ToArray(); + + var filteredFiles = files + .Where(f => this.FileFilter.IsElementIncludedInReport(f)) + .ToArray(); + + // If all files are removed by filters, then the whole class is omitted + if (files.Length == 0 || filteredFiles.Length > 0) + { + var @class = new Class(className, assembly); + + foreach (var file in filteredFiles) + { + @class.AddFile(ProcessFile(modules, @class, file)); + } + + assembly.AddClass(@class); + } + } + + /// <summary> + /// Processes the file. + /// </summary> + /// <param name="modules">The modules.</param> + /// <param name="class">The class.</param> + /// <param name="filePath">The file path.</param> + /// <returns>The <see cref="CodeFile"/>.</returns> + private static CodeFile ProcessFile(XElement[] modules, Class @class, string filePath) + { + var classes = modules + .Where(m => m.Attribute("name").Value.Equals(@class.Assembly.Name)) + .Elements("classes") + .Elements("class") + .Where(c => c.Attribute("name").Value.Equals(@class.Name) + || c.Attribute("name").Value.StartsWith(@class.Name + "$", StringComparison.Ordinal) + || c.Attribute("name").Value.StartsWith(@class.Name + "/<", StringComparison.Ordinal)) + .ToArray(); + + var lines = classes.Elements("lines") + .Elements("line") + .ToArray(); + + var linesOfFile = lines + .Select(line => new + { + LineNumber = int.Parse(line.Attribute("number").Value, CultureInfo.InvariantCulture), + Visits = int.Parse(line.Attribute("hits").Value, CultureInfo.InvariantCulture) + }) + .OrderBy(seqpnt => seqpnt.LineNumber) + .ToArray(); + + var branches = GetBranches(lines); + + int[] coverage = new int[] { }; + LineVisitStatus[] lineVisitStatus = new LineVisitStatus[] { }; + + if (linesOfFile.Length > 0) + { + coverage = new int[linesOfFile[linesOfFile.LongLength - 1].LineNumber + 1]; + lineVisitStatus = new LineVisitStatus[linesOfFile[linesOfFile.LongLength - 1].LineNumber + 1]; + + for (int i = 0; i < coverage.Length; i++) + { + coverage[i] = -1; + } + + foreach (var line in linesOfFile) + { + coverage[line.LineNumber] = line.Visits; + + bool partiallyCovered = false; + + ICollection<Branch> branchesOfLine = null; + if (branches.TryGetValue(line.LineNumber, out branchesOfLine)) + { + partiallyCovered = branchesOfLine.Any(b => b.BranchVisits == 0); + } + + LineVisitStatus statusOfLine = line.Visits > 0 ? (partiallyCovered ? LineVisitStatus.PartiallyCovered : LineVisitStatus.Covered) : LineVisitStatus.NotCovered; + lineVisitStatus[line.LineNumber] = statusOfLine; + } + } + + var methodsOfFile = classes + .Elements("methods") + .Elements("method") + .ToArray(); + + var codeFile = new CodeFile(filePath, coverage, lineVisitStatus, branches); + + SetMethodMetrics(codeFile, methodsOfFile); + SetCodeElements(codeFile, methodsOfFile); + + return codeFile; + } + + /// <summary> + /// Extracts the metrics from the given <see cref="XElement">XElements</see>. + /// </summary> + /// <param name="codeFile">The code file.</param> + /// <param name="methodsOfFile">The methods of the file.</param> + private static void SetMethodMetrics(CodeFile codeFile, IEnumerable<XElement> methodsOfFile) + { + foreach (var method in methodsOfFile) + { + string fullName = method.Attribute("name").Value + method.Attribute("signature").Value; + fullName = ExtractMethodName(fullName, method.Parent.Parent.Attribute("name").Value); + + if (lambdaMethodNameRegex.IsMatch(fullName)) + { + continue; + } + + string shortName = methodRegex.Replace(fullName, m => string.Format(CultureInfo.InvariantCulture, "{0}({1})", m.Groups["MethodName"].Value, m.Groups["Arguments"].Value.Length > 0 ? "..." : string.Empty)); + + var metrics = new List<Metric>(); + + var lineRate = method.Attribute("line-rate"); + + if (lineRate != null) + { + decimal? value = null; + + if (!"NaN".Equals(lineRate.Value, StringComparison.OrdinalIgnoreCase)) + { + value = Math.Round(100 * decimal.Parse(lineRate.Value, CultureInfo.InvariantCulture), 2, MidpointRounding.AwayFromZero); + } + + metrics.Add(new Metric( + ReportResources.Coverage, + ParserBase.CodeCoverageUri, + MetricType.CoveragePercentual, + value)); + } + + var branchRate = method.Attribute("branch-rate"); + + if (branchRate != null) + { + decimal? value = null; + + if (!"NaN".Equals(branchRate.Value, StringComparison.OrdinalIgnoreCase)) + { + value = Math.Round(100 * decimal.Parse(branchRate.Value, CultureInfo.InvariantCulture), 2, MidpointRounding.AwayFromZero); + } + + metrics.Add(new Metric( + ReportResources.BranchCoverage, + ParserBase.CodeCoverageUri, + MetricType.CoveragePercentual, + value)); + } + + var cyclomaticComplexityAttribute = method.Attribute("complexity"); + + if (cyclomaticComplexityAttribute != null) + { + decimal? value = null; + + if (!"NaN".Equals(cyclomaticComplexityAttribute.Value, StringComparison.OrdinalIgnoreCase)) + { + value = Math.Round(decimal.Parse(cyclomaticComplexityAttribute.Value, CultureInfo.InvariantCulture), 2, MidpointRounding.AwayFromZero); + } + + metrics.Insert( + 0, + new Metric( + ReportResources.CyclomaticComplexity, + ParserBase.CyclomaticComplexityUri, + MetricType.CodeQuality, + value)); + } + + var methodMetric = new MethodMetric(fullName, shortName, metrics); + + var line = method + .Elements("lines") + .Elements("line") + .FirstOrDefault(); + + if (line != null) + { + methodMetric.Line = int.Parse(line.Attribute("number").Value, CultureInfo.InvariantCulture); + } + + /* If cobertura file is merged from different files, a class and therefore method can exist several times. + * The first result is used. */ + if (codeFile.MethodMetrics.Any(m => m.Equals(methodMetric))) + { + continue; + } + + codeFile.AddMethodMetric(methodMetric); + } + } + + /// <summary> + /// Extracts the methods/properties of the given <see cref="XElement">XElements</see>. + /// </summary> + /// <param name="codeFile">The code file.</param> + /// <param name="methodsOfFile">The methods of the file.</param> + private static void SetCodeElements(CodeFile codeFile, IEnumerable<XElement> methodsOfFile) + { + foreach (var method in methodsOfFile) + { + string methodName = method.Attribute("name").Value + method.Attribute("signature").Value; + methodName = ExtractMethodName(methodName, method.Parent.Parent.Attribute("name").Value); + + if (lambdaMethodNameRegex.IsMatch(methodName)) + { + continue; + } + + methodName = methodRegex.Replace(methodName, m => string.Format(CultureInfo.InvariantCulture, "{0}({1})", m.Groups["MethodName"].Value, m.Groups["Arguments"].Value)); + + var lines = method.Elements("lines") + .Elements("line") + .Select(line => int.Parse(line.Attribute("number").Value, CultureInfo.InvariantCulture)) + .ToArray(); + + if (lines.Length > 0) + { + codeFile.AddCodeElement(new CodeElement(methodName, CodeElementType.Method, lines.Min(), lines.Max())); + } + } + } + + /// <summary> + /// Gets the branches by line number. + /// </summary> + /// <param name="lines">The lines.</param> + /// <returns>The branches by line number.</returns> + private static Dictionary<int, ICollection<Branch>> GetBranches(IEnumerable<XElement> lines) + { + var result = new Dictionary<int, ICollection<Branch>>(); + + foreach (var line in lines) + { + if (!line.Attribute("branch").Value.Equals("true", StringComparison.OrdinalIgnoreCase)) + { + continue; + } + + var match = branchCoverageRegex.Match(line.Attribute("condition-coverage").Value); + + if (match.Success) + { + int lineNumber = int.Parse(line.Attribute("number").Value, CultureInfo.InvariantCulture); + + int numberOfCoveredBranches = int.Parse(match.Groups["NumberOfCoveredBranches"].Value, CultureInfo.InvariantCulture); + int numberOfTotalBranches = int.Parse(match.Groups["NumberOfTotalBranches"].Value, CultureInfo.InvariantCulture); + + var branches = new HashSet<Branch>(); + + for (int i = 0; i < numberOfTotalBranches; i++) + { + string identifier = string.Format( + CultureInfo.InvariantCulture, + "{0}_{1}", + lineNumber, + i); + + branches.Add(new Branch(i < numberOfCoveredBranches ? 1 : 0, identifier)); + } + + /* If cobertura file is merged from different files, a class and therefore each line can exist several times. + * The best result is used. */ + if (result.TryGetValue(lineNumber, out ICollection<Branch> existingBranches)) + { + if (numberOfCoveredBranches > existingBranches.Count(b => b.BranchVisits == 1)) + { + result[lineNumber] = branches; + } + } + else + { + result.Add(lineNumber, branches); + } + } + } + + return result; + } + + /// <summary> + /// Extracts the method name. For async methods the original name is returned. + /// </summary> + /// <param name="methodName">The full method name.</param> + /// <param name="className">The name of the class.</param> + /// <returns>The method name.</returns> + private static string ExtractMethodName(string methodName, string className) + { + // Quick check before expensive regex is called + if (methodName.EndsWith("MoveNext()")) + { + Match match = compilerGeneratedMethodNameRegex.Match(className + methodName); + + if (match.Success) + { + methodName = match.Groups["CompilerGeneratedName"].Value + "()"; + } + } + + return methodName; + } + } +} diff --git a/src/ReportGenerator.Core/Parser/CoverageReportParser.cs b/src/ReportGenerator.Core/Parser/CoverageReportParser.cs new file mode 100644 index 00000000..7fc13bbf --- /dev/null +++ b/src/ReportGenerator.Core/Parser/CoverageReportParser.cs @@ -0,0 +1,298 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using System.Xml.Linq; +using Palmmedia.ReportGenerator.Core.Common; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Palmmedia.ReportGenerator.Core.Parser.Preprocessing; +using Palmmedia.ReportGenerator.Core.Properties; + +namespace Palmmedia.ReportGenerator.Core.Parser +{ + /// <summary> + /// Initiates the corresponding parser to the given report file. + /// </summary> + internal class CoverageReportParser + { + /// <summary> + /// The Logger. + /// </summary> + private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(CoverageReportParser)); + + /// <summary> + /// Lock object to prevent parallel merges. + /// </summary> + private readonly object mergeLock = new object(); + + /// <summary> + /// The number reports that are parsed and processed in parallel. + /// </summary> + private readonly int numberOfReportsParsedInParallel; + + /// <summary> + /// The source directories. + /// </summary> + private readonly IEnumerable<string> sourceDirectories; + + /// <summary> + /// The assembly filter. + /// </summary> + private readonly IFilter assemblyFilter; + + /// <summary> + /// The class filter. + /// </summary> + private readonly IFilter classFilter; + + /// <summary> + /// The file filter. + /// </summary> + private readonly IFilter fileFilter; + + /// <summary> + /// Initializes a new instance of the <see cref="CoverageReportParser" /> class. + /// </summary> + /// <param name="numberOfReportsParsedInParallel">The number reports that are parsed and processed in parallel.</param> + /// <param name="sourceDirectories">The source directories.</param> + /// <param name="assemblyFilter">The assembly filter.</param> + /// <param name="classFilter">The class filter.</param> + /// <param name="fileFilter">The file filter.</param> + internal CoverageReportParser(int numberOfReportsParsedInParallel, IEnumerable<string> sourceDirectories, IFilter assemblyFilter, IFilter classFilter, IFilter fileFilter) + { + this.numberOfReportsParsedInParallel = Math.Max(1, numberOfReportsParsedInParallel); + this.sourceDirectories = sourceDirectories ?? throw new ArgumentNullException(nameof(sourceDirectories)); + this.assemblyFilter = assemblyFilter ?? throw new ArgumentNullException(nameof(assemblyFilter)); + this.classFilter = classFilter ?? throw new ArgumentNullException(nameof(classFilter)); + this.fileFilter = fileFilter ?? throw new ArgumentNullException(nameof(fileFilter)); + } + + /// <summary> + /// Tries to initiate the correct parsers for the given reports. + /// </summary> + /// <param name="reportFiles">The report files to parse.</param> + /// <returns> + /// The IParser instance. + /// </returns> + internal ParserResult ParseFiles(IReadOnlyCollection<string> reportFiles) + { + if (reportFiles == null) + { + throw new ArgumentNullException(nameof(reportFiles)); + } + + var result = new ParserResult(); + + int counter = 0; + + try + { + Parallel.ForEach( + reportFiles, + new ParallelOptions() { MaxDegreeOfParallelism = this.numberOfReportsParsedInParallel }, + reportFile => + { + int number = Interlocked.Increment(ref counter); + Logger.InfoFormat(Resources.LoadingReport, reportFile, number, reportFiles.Count); + + try + { + var report = XDocument.Load(reportFile); + + foreach (var parserResult in this.ParseFile(report)) + { + lock (mergeLock) + { + result.Merge(parserResult); + } + } + } + catch (Exception ex) when (!(ex is UnsupportedParserException)) + { + Logger.ErrorFormat(" " + Resources.ErrorDuringReadingReport, reportFile, GetHumanReadableFileSize(reportFile), ex.GetExceptionMessageForDisplay()); + } + }); + } + catch (AggregateException ae) + { + foreach (var e in ae.Flatten().InnerExceptions) + { + if (e is UnsupportedParserException) + { + throw e; + } + } + + throw; + } + + return result; + } + + /// <summary> + /// Tries to initiate the correct parsers for the given report. The result is merged into the given result. + /// The report may contain several reports. For every report an extra parser is initiated. + /// </summary> + /// <param name="report">The report file to parse.</param> + /// <returns>The parser result.</returns> + private IEnumerable<ParserResult> ParseFile(XContainer report) + { + if (report.Descendants("PartCoverReport").Any()) + { + throw new UnsupportedParserException(Resources.ErrorPartCover); + } + + var elements = report.Descendants("CoverageSession").ToArray(); + + if (elements.Length > 0) + { + foreach (var item in elements) + { + Logger.Debug(" " + Resources.PreprocessingReport); + new OpenCoverReportPreprocessor().Execute(item); + Logger.DebugFormat(" " + Resources.InitiatingParser, "OpenCover"); + + yield return new OpenCoverParser(this.assemblyFilter, this.classFilter, this.fileFilter).Parse(item); + } + + yield break; + } + + elements = report.Descendants("Root").Where(e => e.Attribute("ReportType") != null && e.Attribute("ReportType").Value == "DetailedXml").ToArray(); + + if (elements.Length > 0) + { + foreach (var item in elements) + { + Logger.Debug(" " + Resources.PreprocessingReport); + new DotCoverReportPreprocessor().Execute(item); + Logger.DebugFormat(" " + Resources.InitiatingParser, "dotCover"); + + yield return new DotCoverParser(this.assemblyFilter, this.classFilter, this.fileFilter).Parse(item); + } + + yield break; + } + + elements = report.Descendants("report").Where(e => e.Attribute("name") != null).ToArray(); + + if (elements.Length > 0) + { + foreach (var item in elements) + { + Logger.Debug(" " + Resources.PreprocessingReport); + new JaCoCoReportPreprocessor(this.sourceDirectories).Execute(item); + Logger.DebugFormat(" " + Resources.InitiatingParser, "JaCoCo"); + + var result = new JaCoCoParser(this.assemblyFilter, this.classFilter, this.fileFilter).Parse(item); + + foreach (var sourceDirectory in this.sourceDirectories) + { + result.AddSourceDirectory(sourceDirectory); + } + + yield return result; + } + + yield break; + } + + elements = report.Descendants("coverage").ToArray(); + + if (elements.Length > 0) + { + foreach (var item in elements) + { + if (item.Attribute("profilerVersion") != null) + { + Logger.DebugFormat(" " + Resources.InitiatingParser, "NCover"); + + yield return new NCoverParser(this.assemblyFilter, this.classFilter, this.fileFilter).Parse(item); + } + else if (item.Attributes().Count() > 1) + { + Logger.Debug(" " + Resources.PreprocessingReport); + new CoberturaReportPreprocessor().Execute(item); + Logger.DebugFormat(" " + Resources.InitiatingParser, "Cobertura"); + + yield return new CoberturaParser(this.assemblyFilter, this.classFilter, this.fileFilter).Parse(item); + } + else + { + Logger.DebugFormat(" " + Resources.InitiatingParser, "mprof"); + + yield return new MProfParser(this.assemblyFilter, this.classFilter, this.fileFilter).Parse(item); + } + } + + yield break; + } + + elements = report.Descendants("CoverageDSPriv").ToArray(); + + if (elements.Length > 0) + { + foreach (var item in elements) + { + Logger.DebugFormat(" " + Resources.InitiatingParser, "Visual Studio"); + new VisualStudioReportPreprocessor().Execute(item); + + yield return new VisualStudioParser(this.assemblyFilter, this.classFilter, this.fileFilter).Parse(item); + } + + yield break; + } + + elements = report.Descendants("results").ToArray(); + + if (elements.Length > 0) + { + foreach (var item in elements) + { + if (item.Element("modules") != null) + { + Logger.DebugFormat(" " + Resources.InitiatingParser, "Dynamic Code Coverage"); + new DynamicCodeCoverageReportPreprocessor().Execute(item); + + yield return new DynamicCodeCoverageParser(this.assemblyFilter, this.classFilter, this.fileFilter).Parse(item); + } + } + + yield break; + } + } + + /// <summary> + /// Get the file size in human readable format. + /// If size information is not available (e.g. IOException), '-' is returned. + /// </summary> + /// <param name="fileName">The name of the file.</param> + /// <returns>The file size.</returns> + private static String GetHumanReadableFileSize(string fileName) + { + try + { + long byteCount = new FileInfo(fileName).Length; + + string[] suffixes = { "B", "KB", "MB", "GB", "TB", "PB", "EB" }; + + if (byteCount == 0) + { + return "0" + suffixes[0]; + } + + long bytes = Math.Abs(byteCount); + int place = Convert.ToInt32(Math.Floor(Math.Log(bytes, 1024))); + double num = Math.Round(bytes / Math.Pow(1024, place), 1); + return (Math.Sign(byteCount) * num).ToString() + suffixes[place]; + } + catch (Exception) + { + return "-"; + } + } + } +} diff --git a/src/ReportGenerator.Console/Parser/DotCoverParser.cs b/src/ReportGenerator.Core/Parser/DotCoverParser.cs similarity index 60% rename from src/ReportGenerator.Console/Parser/DotCoverParser.cs rename to src/ReportGenerator.Core/Parser/DotCoverParser.cs index a428d357..3d68ae5d 100644 --- a/src/ReportGenerator.Console/Parser/DotCoverParser.cs +++ b/src/ReportGenerator.Core/Parser/DotCoverParser.cs @@ -5,11 +5,12 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Xml.Linq; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Palmmedia.ReportGenerator.Core.Properties; -namespace Palmmedia.ReportGenerator.Parser +namespace Palmmedia.ReportGenerator.Core.Parser { /// <summary> /// Parser for XML reports generated by dotCover. @@ -17,133 +18,93 @@ namespace Palmmedia.ReportGenerator.Parser internal class DotCoverParser : ParserBase { /// <summary> - /// Regex to analyze if a method name belongs to a lamda expression. + /// The Logger. /// </summary> - private const string LambdaMethodRegex = @"<.+>.+__.+\(.*\)"; + private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(DotCoverParser)); /// <summary> - /// The Logger. + /// Regex to analyze if a method name belongs to a lamda expression. /// </summary> - private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(DotCoverParser)); + private static Regex lambdaMethodNameRegex = new Regex(@"<.+>.+__.+\(.*\)", RegexOptions.Compiled); /// <summary> - /// The module elements of the report. + /// Regex to analyze if a method name is generated by compiler. /// </summary> - private XElement[] modules; + private static Regex compilerGeneratedMethodNameRegex = new Regex(@"<(?<CompilerGeneratedName>.+)>.+__.+MoveNext\(\):.+$", RegexOptions.Compiled); /// <summary> - /// The file elements of the report. + /// Initializes a new instance of the <see cref="DotCoverParser" /> class. /// </summary> - private XElement[] files; + /// <param name="assemblyFilter">The assembly filter.</param> + /// <param name="classFilter">The class filter.</param> + /// <param name="fileFilter">The file filter.</param> + internal DotCoverParser(IFilter assemblyFilter, IFilter classFilter, IFilter fileFilter) + : base(assemblyFilter, classFilter, fileFilter) + { + } /// <summary> - /// Initializes a new instance of the <see cref="DotCoverParser"/> class. + /// Parses the given XML report. /// </summary> - /// <param name="report">The report file as XContainer.</param> - internal DotCoverParser(XContainer report) + /// <param name="report">The XML report</param> + /// <returns>The parser result.</returns> + public override ParserResult Parse(XContainer report) { if (report == null) { throw new ArgumentNullException(nameof(report)); } - this.modules = report.Descendants("Assembly") + var assemblies = new List<Assembly>(); + + var modules = report.Descendants("Assembly") .ToArray(); - this.files = report.Descendants("File").ToArray(); + var files = report.Descendants("File").ToArray(); - var assemblyNames = this.modules + var assemblyNames = modules .Select(m => m.Attribute("Name").Value) .Distinct() + .Where(a => this.AssemblyFilter.IsElementIncludedInReport(a)) .OrderBy(a => a) .ToArray(); - Parallel.ForEach(assemblyNames, assemblyName => this.AddAssembly(this.ProcessAssembly(assemblyName))); - - this.modules = null; - this.files = null; - } - - /// <summary> - /// Extracts the methods/properties of the given <see cref="XElement">XElements</see>. - /// </summary> - /// <param name="codeFile">The code file.</param> - /// <param name="fileId">The id of the file.</param> - /// <param name="methods">The methods.</param> - private static void SetCodeElements(CodeFile codeFile, string fileId, IEnumerable<XElement> methods) - { - foreach (var method in methods) - { - string methodName = ExtractMethodName(method.Parent.Attribute("Name").Value, method.Attribute("Name").Value); - - if (Regex.IsMatch(methodName, LambdaMethodRegex)) - { - continue; - } - - CodeElementType type = CodeElementType.Method; - - if (methodName.StartsWith("get_", StringComparison.OrdinalIgnoreCase) - || methodName.StartsWith("set_", StringComparison.OrdinalIgnoreCase)) - { - type = CodeElementType.Property; - methodName = methodName.Substring(4); - } - - var statement = method - .Elements("Statement") - .FirstOrDefault(); - - if (statement != null && statement.Attribute("FileIndex").Value == fileId) - { - int line = int.Parse(statement.Attribute("Line").Value, CultureInfo.InvariantCulture); - codeFile.AddCodeElement(new CodeElement(methodName, type, line)); - } - } - } - - /// <summary> - /// Extracts the method name. For async methods the original name is returned. - /// </summary> - /// <param name="typeName">The name of the class.</param> - /// <param name="methodName">The full method name.</param> - /// <returns>The method name.</returns> - private static string ExtractMethodName(string typeName, string methodName) - { - Match match = Regex.Match(typeName + methodName, @"<(?<CompilerGeneratedName>.+)>.+__.+MoveNext\(\):.+$"); - - if (match.Success) + foreach (var assemblyName in assemblyNames) { - return match.Groups["CompilerGeneratedName"].Value + "()"; + assemblies.Add(this.ProcessAssembly(modules, files, assemblyName)); } - return methodName.Substring(0, methodName.LastIndexOf(':')); + var result = new ParserResult(assemblies.OrderBy(a => a.Name).ToList(), false, this.ToString()); + return result; } /// <summary> /// Processes the given assembly. /// </summary> + /// <param name="modules">The modules.</param> + /// <param name="files">The files.</param> /// <param name="assemblyName">Name of the assembly.</param> /// <returns>The <see cref="Assembly"/>.</returns> - private Assembly ProcessAssembly(string assemblyName) + private Assembly ProcessAssembly(XElement[] modules, XElement[] files, string assemblyName) { Logger.DebugFormat(" " + Resources.CurrentAssembly, assemblyName); - var assemblyElement = this.modules + var assemblyElement = modules .Where(m => m.Attribute("Name").Value.Equals(assemblyName)); var classNames = assemblyElement .Elements("Namespace") .Elements("Type") .Concat(assemblyElement.Elements("Type")) - .Where(c => !Regex.IsMatch(c.Attribute("Name").Value, "<.*>.+__")) + .Where(c => !Regex.IsMatch(c.Attribute("Name").Value, "<.*>.+__", RegexOptions.Compiled)) .Select(c => c.Parent.Attribute("Name").Value + "." + c.Attribute("Name").Value) .Distinct() + .Where(c => this.ClassFilter.IsElementIncludedInReport(c)) .OrderBy(name => name) .ToArray(); var assembly = new Assembly(assemblyName); - Parallel.ForEach(classNames, className => assembly.AddClass(this.ProcessClass(assembly, className))); + Parallel.ForEach(classNames, className => this.ProcessClass(modules, files, assembly, className)); return assembly; } @@ -151,15 +112,16 @@ private Assembly ProcessAssembly(string assemblyName) /// <summary> /// Processes the given class. /// </summary> + /// <param name="modules">The modules.</param> + /// <param name="files">The files.</param> /// <param name="assembly">The assembly.</param> /// <param name="className">Name of the class.</param> - /// <returns>The <see cref="Class"/>.</returns> - private Class ProcessClass(Assembly assembly, string className) + private void ProcessClass(XElement[] modules, XElement[] files, Assembly assembly, string className) { - var assemblyElement = this.modules + var assemblyElement = modules .Where(m => m.Attribute("Name").Value.Equals(assembly.Name)); - var filesIdsOfClass = assemblyElement + var fileIdsOfClass = assemblyElement .Elements("Namespace") .Elements("Type") .Concat(assemblyElement.Elements("Type")) @@ -169,25 +131,41 @@ private Class ProcessClass(Assembly assembly, string className) .Distinct() .ToArray(); - var @class = new Class(className, assembly); + var filteredFilesOfClass = fileIdsOfClass + .Select(fileId => + new + { + FileId = fileId, + FilePath = files.First(f => f.Attribute("Index").Value == fileId).Attribute("Name").Value + }) + .Where(f => this.FileFilter.IsElementIncludedInReport(f.FilePath)) + .ToArray(); - foreach (var fileId in filesIdsOfClass) + // If all files are removed by filters, then the whole class is omitted + if (fileIdsOfClass.Length == 0 || filteredFilesOfClass.Length > 0) { - @class.AddFile(this.ProcessFile(fileId, @class)); - } + var @class = new Class(className, assembly); + + foreach (var file in filteredFilesOfClass) + { + @class.AddFile(ProcessFile(modules, file.FileId, @class, file.FilePath)); + } - return @class; + assembly.AddClass(@class); + } } /// <summary> /// Processes the file. /// </summary> - /// <param name="fileId">The id of the file.</param> + /// <param name="modules">The modules.</param> + /// <param name="fileId">The file id.</param> /// <param name="class">The class.</param> + /// <param name="filePath">The file path.</param> /// <returns>The <see cref="CodeFile"/>.</returns> - private CodeFile ProcessFile(string fileId, Class @class) + private static CodeFile ProcessFile(XElement[] modules, string fileId, Class @class, string filePath) { - var assemblyElement = this.modules + var assemblyElement = modules .Where(m => m.Attribute("Name").Value.Equals(@class.Assembly.Name)); var methodsOfFile = assemblyElement @@ -234,12 +212,76 @@ private CodeFile ProcessFile(string fileId, Class @class) } } - string filePath = this.files.First(f => f.Attribute("Index").Value == fileId).Attribute("Name").Value; var codeFile = new CodeFile(filePath, coverage, lineVisitStatus); SetCodeElements(codeFile, fileId, methodsOfFile); return codeFile; } + + /// <summary> + /// Extracts the methods/properties of the given <see cref="XElement">XElements</see>. + /// </summary> + /// <param name="codeFile">The code file.</param> + /// <param name="fileId">The id of the file.</param> + /// <param name="methods">The methods.</param> + private static void SetCodeElements(CodeFile codeFile, string fileId, IEnumerable<XElement> methods) + { + foreach (var method in methods) + { + string methodName = ExtractMethodName(method.Parent.Attribute("Name").Value, method.Attribute("Name").Value); + + if (lambdaMethodNameRegex.IsMatch(methodName)) + { + continue; + } + + CodeElementType type = CodeElementType.Method; + + if (methodName.StartsWith("get_", StringComparison.OrdinalIgnoreCase) + || methodName.StartsWith("set_", StringComparison.OrdinalIgnoreCase)) + { + type = CodeElementType.Property; + methodName = methodName.Substring(4); + } + + var seqpnts = method + .Elements("Statement") + .Where(c => c.Attribute("FileIndex").Value == fileId) + .Select(c => new + { + LineNumberStart = int.Parse(c.Attribute("Line").Value, CultureInfo.InvariantCulture), + LineNumberEnd = int.Parse(c.Attribute("EndLine").Value, CultureInfo.InvariantCulture) + }) + .ToArray(); + + if (seqpnts.Length > 0) + { + codeFile.AddCodeElement(new CodeElement(methodName, type, seqpnts.Min(s => s.LineNumberStart), seqpnts.Max(s => s.LineNumberEnd))); + } + } + } + + /// <summary> + /// Extracts the method name. For async methods the original name is returned. + /// </summary> + /// <param name="typeName">The name of the class.</param> + /// <param name="methodName">The full method name.</param> + /// <returns>The method name.</returns> + private static string ExtractMethodName(string typeName, string methodName) + { + // Quick check before expensive regex is called + if (methodName.Contains("MoveNext()")) + { + Match match = compilerGeneratedMethodNameRegex.Match(typeName + methodName); + + if (match.Success) + { + return match.Groups["CompilerGeneratedName"].Value + "()"; + } + } + + return methodName.Substring(0, methodName.LastIndexOf(':')); + } } } diff --git a/src/ReportGenerator.Console/Parser/DynamicCodeCoverageParser.cs b/src/ReportGenerator.Core/Parser/DynamicCodeCoverageParser.cs similarity index 62% rename from src/ReportGenerator.Console/Parser/DynamicCodeCoverageParser.cs rename to src/ReportGenerator.Core/Parser/DynamicCodeCoverageParser.cs index 4bfdf57a..fe876422 100644 --- a/src/ReportGenerator.Console/Parser/DynamicCodeCoverageParser.cs +++ b/src/ReportGenerator.Core/Parser/DynamicCodeCoverageParser.cs @@ -5,43 +5,74 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Xml.Linq; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Palmmedia.ReportGenerator.Core.Properties; -namespace Palmmedia.ReportGenerator.Parser +namespace Palmmedia.ReportGenerator.Core.Parser { /// <summary> /// Parser for XML reports generated by CodeCoverage.exe. /// </summary> internal class DynamicCodeCoverageParser : ParserBase { + /// <summary> + /// The Logger. + /// </summary> + private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(DynamicCodeCoverageParser)); + /// <summary> /// Regex to analyze if a method name belongs to a lamda expression. /// </summary> - private const string LambdaMethodRegex = "<.+>.+__"; + private static Regex lambdaMethodNameRegex = new Regex("<.+>.+__", RegexOptions.Compiled); /// <summary> - /// The Logger. + /// Regex to analyze if a method name is generated by compiler. /// </summary> - private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(DynamicCodeCoverageParser)); + private static Regex compilerGeneratedMethodNameRegex = new Regex(@"^.*<(?<CompilerGeneratedName>.+)>.+__.+$", RegexOptions.Compiled); /// <summary> - /// Initializes a new instance of the <see cref="DynamicCodeCoverageParser"/> class. + /// Regex to extract short method name. /// </summary> - /// <param name="report">The report file as XContainer.</param> - internal DynamicCodeCoverageParser(XContainer report) + private static Regex methodRegex = new Regex(@"^(?<MethodName>.+)\((?<Arguments>.*)\).*$", RegexOptions.Compiled); + + /// <summary> + /// Initializes a new instance of the <see cref="DynamicCodeCoverageParser" /> class. + /// </summary> + /// <param name="assemblyFilter">The assembly filter.</param> + /// <param name="classFilter">The class filter.</param> + /// <param name="fileFilter">The file filter.</param> + internal DynamicCodeCoverageParser(IFilter assemblyFilter, IFilter classFilter, IFilter fileFilter) : base(assemblyFilter, classFilter, fileFilter) + { + } + + /// <summary> + /// Parses the given XML report. + /// </summary> + /// <param name="report">The XML report</param> + /// <returns>The parser result.</returns> + public override ParserResult Parse(XContainer report) { if (report == null) { throw new ArgumentNullException(nameof(report)); } + var assemblies = new List<Assembly>(); + var modules = report.Descendants("module") - .OrderBy(m => m.Attribute("name").Value) - .ToArray(); + .Where(m => this.AssemblyFilter.IsElementIncludedInReport(m.Attribute("name").Value)) + .OrderBy(m => m.Attribute("name").Value) + .ToArray(); + + foreach (var module in modules) + { + assemblies.Add(this.ProcessAssembly(module)); + } - Parallel.ForEach(modules, assembly => this.AddAssembly(ProcessAssembly(assembly))); + var result = new ParserResult(assemblies.OrderBy(a => a.Name).ToList(), false, this.ToString()); + return result; } /// <summary> @@ -49,7 +80,7 @@ internal DynamicCodeCoverageParser(XContainer report) /// </summary> /// <param name="module">The module.</param> /// <returns>The <see cref="Assembly"/>.</returns> - private static Assembly ProcessAssembly(XElement module) + private Assembly ProcessAssembly(XElement module) { string assemblyName = module.Attribute("name").Value; @@ -67,12 +98,13 @@ private static Assembly ProcessAssembly(XElement module) return nestedClassSeparatorIndex > -1 ? t.Substring(0, nestedClassSeparatorIndex) : t; }) .Distinct() + .Where(c => this.ClassFilter.IsElementIncludedInReport(c)) .OrderBy(name => name) .ToArray(); var assembly = new Assembly(assemblyName); - Parallel.ForEach(classNames, className => assembly.AddClass(ProcessClass(module, assembly, className))); + Parallel.ForEach(classNames, className => this.ProcessClass(module, assembly, className)); return assembly; } @@ -83,8 +115,7 @@ private static Assembly ProcessAssembly(XElement module) /// <param name="module">The module.</param> /// <param name="assembly">The assembly.</param> /// <param name="className">Name of the class.</param> - /// <returns>The <see cref="Class"/>.</returns> - private static Class ProcessClass(XElement module, Assembly assembly, string className) + private void ProcessClass(XElement module, Assembly assembly, string className) { var fileIdsOfClass = module .Elements("functions") @@ -94,19 +125,36 @@ private static Class ProcessClass(XElement module, Assembly assembly, string cla .Elements("ranges") .Elements("range") .Select(r => r.Attribute("source_id").Value) - .Distinct(); + .Distinct() + .ToArray(); - var @class = new Class(className, assembly); + var files = module + .Elements("source_files") + .Elements("source_file") + .ToArray(); - var files = module.Elements("source_files").Elements("source_file"); + var filteredFilesOfClass = fileIdsOfClass + .Select(fileId => + new + { + FileId = fileId, + FilePath = files.First(f => f.Attribute("id").Value == fileId).Attribute("path").Value + }) + .Where(f => this.FileFilter.IsElementIncludedInReport(f.FilePath)) + .ToArray(); - foreach (var fileId in fileIdsOfClass) + // If all files are removed by filters, then the whole class is omitted + if (fileIdsOfClass.Length == 0 || filteredFilesOfClass.Length > 0) { - string file = files.First(f => f.Attribute("id").Value == fileId).Attribute("path").Value; - @class.AddFile(ProcessFile(module, fileId, @class, file)); - } + var @class = new Class(className, assembly); + + foreach (var file in filteredFilesOfClass) + { + @class.AddFile(ProcessFile(module, file.FileId, @class, file.FilePath)); + } - return @class; + assembly.AddClass(@class); + } } /// <summary> @@ -127,8 +175,6 @@ private static CodeFile ProcessFile(XElement module, string fileId, Class @class .Where(m => m.Elements("ranges").Elements("range").Any(r => r.Attribute("source_id").Value == fileId)) .ToArray(); - SetMethodMetrics(methods, @class); - var linesOfFile = methods .Elements("ranges") .Elements("range") @@ -172,6 +218,7 @@ private static CodeFile ProcessFile(XElement module, string fileId, Class @class var codeFile = new CodeFile(filePath, coverage, lineVisitStatus); + SetMethodMetrics(codeFile, methods); SetCodeElements(codeFile, methods); return codeFile; @@ -180,23 +227,24 @@ private static CodeFile ProcessFile(XElement module, string fileId, Class @class /// <summary> /// Extracts the metrics from the given <see cref="XElement">XElements</see>. /// </summary> - /// <param name="methods">The methods.</param> - /// <param name="class">The class.</param> - private static void SetMethodMetrics(IEnumerable<XElement> methods, Class @class) + /// <param name="codeFile">The code file.</param> + /// <param name="methodsOfFile">The methods of the file.</param> + private static void SetMethodMetrics(CodeFile codeFile, IEnumerable<XElement> methodsOfFile) { - foreach (var method in methods) + foreach (var method in methodsOfFile) { - string methodName = method.Attribute("name").Value; + string fullName = method.Attribute("name").Value; // Exclude properties and lambda expressions - if (methodName.StartsWith("get_", StringComparison.Ordinal) - || methodName.StartsWith("set_", StringComparison.Ordinal) - || Regex.IsMatch(methodName, LambdaMethodRegex)) + if (fullName.StartsWith("get_", StringComparison.Ordinal) + || fullName.StartsWith("set_", StringComparison.Ordinal) + || lambdaMethodNameRegex.IsMatch(fullName)) { continue; } - methodName = ExtractMethodName(methodName, method.Attribute("type_name").Value); + fullName = ExtractMethodName(fullName, method.Attribute("type_name").Value); + string shortName = methodRegex.Replace(fullName, m => string.Format(CultureInfo.InvariantCulture, "{0}({1})", m.Groups["MethodName"].Value, m.Groups["Arguments"].Value.Length > 0 ? "..." : string.Empty)); var metrics = new[] { @@ -212,7 +260,19 @@ private static void SetMethodMetrics(IEnumerable<XElement> methods, Class @class int.Parse(method.Attribute("blocks_not_covered").Value, CultureInfo.InvariantCulture)) }; - @class.AddMethodMetric(new MethodMetric(methodName, metrics)); + var methodMetric = new MethodMetric(fullName, shortName, metrics); + + var seqpnt = method + .Elements("ranges") + .Elements("range") + .FirstOrDefault(); + + if (seqpnt != null) + { + methodMetric.Line = int.Parse(seqpnt.Attribute("start_line").Value, CultureInfo.InvariantCulture); + } + + codeFile.AddMethodMetric(methodMetric); } } @@ -225,7 +285,7 @@ private static void SetCodeElements(CodeFile codeFile, IEnumerable<XElement> met { foreach (var method in methodsOfFile) { - if (Regex.IsMatch(method.Attribute("name").Value, LambdaMethodRegex)) + if (lambdaMethodNameRegex.IsMatch(method.Attribute("name").Value)) { continue; } @@ -241,15 +301,19 @@ private static void SetCodeElements(CodeFile codeFile, IEnumerable<XElement> met methodName = methodName.Substring(4); } - var seqpnt = method + var seqpnts = method .Elements("ranges") .Elements("range") - .FirstOrDefault(); + .Select(l => new + { + LineNumberStart = int.Parse(l.Attribute("start_line").Value, CultureInfo.InvariantCulture), + LineNumberEnd = int.Parse(l.Attribute("end_line").Value, CultureInfo.InvariantCulture) + }) + .ToArray(); - if (seqpnt != null) + if (seqpnts.Length > 0) { - int line = int.Parse(seqpnt.Attribute("start_line").Value, CultureInfo.InvariantCulture); - codeFile.AddCodeElement(new CodeElement(methodName, type, line)); + codeFile.AddCodeElement(new CodeElement(methodName, type, seqpnts.Min(s => s.LineNumberStart), seqpnts.Max(s => s.LineNumberEnd))); } } } @@ -262,7 +326,7 @@ private static void SetCodeElements(CodeFile codeFile, IEnumerable<XElement> met /// <returns>The method name.</returns> private static string ExtractMethodName(string methodName, string typeName) { - Match match = Regex.Match(typeName, @"^.*<(?<CompilerGeneratedName>.+)>.+__.+$"); + Match match = compilerGeneratedMethodNameRegex.Match(typeName); if (match.Success) { diff --git a/src/ReportGenerator.Console/Reporting/DefaultFilter.cs b/src/ReportGenerator.Core/Parser/Filtering/DefaultFilter.cs similarity index 76% rename from src/ReportGenerator.Console/Reporting/DefaultFilter.cs rename to src/ReportGenerator.Core/Parser/Filtering/DefaultFilter.cs index 8dbbb41d..860cb646 100644 --- a/src/ReportGenerator.Console/Reporting/DefaultFilter.cs +++ b/src/ReportGenerator.Core/Parser/Filtering/DefaultFilter.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; -using System.Globalization; using System.Linq; using System.Text.RegularExpressions; -namespace Palmmedia.ReportGenerator.Reporting +namespace Palmmedia.ReportGenerator.Core.Parser.Filtering { /// <summary> /// Default implementation of <see cref="IFilter"/>. @@ -17,12 +16,12 @@ internal class DefaultFilter : IFilter /// <summary> /// The include filters. /// </summary> - private readonly IEnumerable<string> includeFilters; + private readonly Regex[] includeFilters; /// <summary> /// The exclude filters. /// </summary> - private readonly IEnumerable<string> excludeFilters; + private readonly Regex[] excludeFilters; /// <summary> /// Initializes a new instance of the <see cref="DefaultFilter"/> class. @@ -37,15 +36,20 @@ internal DefaultFilter(IEnumerable<string> filters) this.excludeFilters = filters .Where(f => f.StartsWith("-", StringComparison.OrdinalIgnoreCase)) - .Select(f => CreateFilterRegex(f)); + .Select(f => CreateFilterRegex(f)) + .ToArray(); this.includeFilters = filters .Where(f => f.StartsWith("+", StringComparison.OrdinalIgnoreCase)) - .Select(f => CreateFilterRegex(f)); + .Select(f => CreateFilterRegex(f)) + .ToArray(); - if (!this.includeFilters.Any()) + if (this.includeFilters.Length == 0) { - this.includeFilters = Enumerable.Repeat(CreateFilterRegex("+*"), 1); + this.includeFilters = new[] + { + CreateFilterRegex("+*") + }; } } @@ -58,13 +62,13 @@ internal DefaultFilter(IEnumerable<string> filters) /// </returns> public bool IsElementIncludedInReport(string name) { - if (this.excludeFilters.Any(f => Regex.IsMatch(name, f))) + if (this.excludeFilters.Any(f => f.IsMatch(name))) { return false; } else { - return this.includeFilters.Any(f => Regex.IsMatch(name, f)); + return this.includeFilters.Any(f => f.IsMatch(name)); } } @@ -74,14 +78,14 @@ public bool IsElementIncludedInReport(string name) /// </summary> /// <param name="filter">The filter.</param> /// <returns>The regular expression.</returns> - private static string CreateFilterRegex(string filter) + private static Regex CreateFilterRegex(string filter) { filter = filter.Substring(1); filter = filter.Replace("*", "$$$*"); filter = Regex.Escape(filter); filter = filter.Replace(@"\$\$\$\*", ".*"); - return string.Format(CultureInfo.InvariantCulture, "^{0}$", filter); + return new Regex($"^{filter}$", RegexOptions.Compiled); } } -} +} \ No newline at end of file diff --git a/src/ReportGenerator.Console/Reporting/IFilter.cs b/src/ReportGenerator.Core/Parser/Filtering/IFilter.cs similarity index 91% rename from src/ReportGenerator.Console/Reporting/IFilter.cs rename to src/ReportGenerator.Core/Parser/Filtering/IFilter.cs index ae512a62..cbc3f870 100644 --- a/src/ReportGenerator.Console/Reporting/IFilter.cs +++ b/src/ReportGenerator.Core/Parser/Filtering/IFilter.cs @@ -1,4 +1,4 @@ -namespace Palmmedia.ReportGenerator.Reporting +namespace Palmmedia.ReportGenerator.Core.Parser.Filtering { /// <summary> /// Interface to filter assemblies and classes based on their name during report generation. diff --git a/src/ReportGenerator.Core/Parser/JaCoCoParser.cs b/src/ReportGenerator.Core/Parser/JaCoCoParser.cs new file mode 100644 index 00000000..003dc4be --- /dev/null +++ b/src/ReportGenerator.Core/Parser/JaCoCoParser.cs @@ -0,0 +1,371 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using System.Xml.Linq; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Palmmedia.ReportGenerator.Core.Properties; + +namespace Palmmedia.ReportGenerator.Core.Parser +{ + /// <summary> + /// Parser for XML reports generated by JaCoCo. + /// </summary> + internal class JaCoCoParser : ParserBase + { + /// <summary> + /// The Logger. + /// </summary> + private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(JaCoCoParser)); + + /// <summary> + /// Regex to extract short method name. + /// </summary> + private static Regex methodRegex = new Regex(@"^(?<MethodName>.+)\((?<Arguments>.*)\).*$", RegexOptions.Compiled); + + /// <summary> + /// Initializes a new instance of the <see cref="JaCoCoParser" /> class. + /// </summary> + /// <param name="assemblyFilter">The assembly filter.</param> + /// <param name="classFilter">The class filter.</param> + /// <param name="fileFilter">The file filter.</param> + internal JaCoCoParser(IFilter assemblyFilter, IFilter classFilter, IFilter fileFilter) + : base(assemblyFilter, classFilter, fileFilter) + { + } + + /// <summary> + /// Parses the given XML report. + /// </summary> + /// <param name="report">The XML report</param> + /// <returns>The parser result.</returns> + public override ParserResult Parse(XContainer report) + { + if (report == null) + { + throw new ArgumentNullException(nameof(report)); + } + + var assemblies = new List<Assembly>(); + + var modules = report.Descendants("package") + .ToArray(); + + var assemblyNames = modules + .Select(m => m.Attribute("name").Value) + .Distinct() + .Where(a => this.AssemblyFilter.IsElementIncludedInReport(a)) + .OrderBy(a => a) + .ToArray(); + + foreach (var assemblyName in assemblyNames) + { + assemblies.Add(this.ProcessAssembly(modules, assemblyName)); + } + + var result = new ParserResult(assemblies.OrderBy(a => a.Name).ToList(), true, this.ToString()); + return result; + } + + /// <summary> + /// Processes the given assembly. + /// </summary> + /// <param name="modules">The modules.</param> + /// <param name="assemblyName">Name of the assembly.</param> + /// <returns>The <see cref="Assembly"/>.</returns> + private Assembly ProcessAssembly(XElement[] modules, string assemblyName) + { + Logger.DebugFormat(" " + Resources.CurrentAssembly, assemblyName); + + var classNames = modules + .Where(m => m.Attribute("name").Value.Equals(assemblyName)) + .Elements("class") + .Select(c => c.Attribute("name").Value) + .Where(c => !c.Contains("$")) + .Distinct() + .Where(c => this.ClassFilter.IsElementIncludedInReport(c)) + .OrderBy(name => name) + .ToArray(); + + var assembly = new Assembly(assemblyName); + + Parallel.ForEach(classNames, className => this.ProcessClass(modules, assembly, className)); + + return assembly; + } + + /// <summary> + /// Processes the given class. + /// </summary> + /// <param name="modules">The modules.</param> + /// <param name="assembly">The assembly.</param> + /// <param name="className">Name of the class.</param> + private void ProcessClass(XElement[] modules, Assembly assembly, string className) + { + var classes = modules + .Where(m => m.Attribute("name").Value.Equals(assembly.Name)) + .Elements("class") + .Where(c => c.Attribute("name").Value.Equals(className) + || c.Attribute("name").Value.StartsWith(className + "$", StringComparison.Ordinal)) + .ToArray(); + + var files = classes + .Select(c => c.Attribute("sourcefilename")?.Value) + .Where(f => f != null) // This attribute is not present in older JaCoCo versions + .Distinct() + .ToArray(); + + var filteredFiles = files + .Where(f => this.FileFilter.IsElementIncludedInReport(f)) + .ToArray(); + + // If all files are removed by filters, then the whole class is omitted + if (files.Length == 0 || filteredFiles.Length > 0) + { + var @class = new Class(className, assembly); + + foreach (var file in filteredFiles) + { + var codeFile = ProcessFile(modules, @class, file); + + var methodsOfFile = classes + .Where(c => c.Attribute("sourcefilename").Value.Equals(file)) + .Elements("method") + .ToArray(); + + SetMethodMetrics(codeFile, methodsOfFile); + SetCodeElements(codeFile, methodsOfFile); + + @class.AddFile(codeFile); + } + + assembly.AddClass(@class); + } + } + + /// <summary> + /// Processes the file. + /// </summary> + /// <param name="modules">The modules.</param> + /// <param name="class">The class.</param> + /// <param name="filePath">The file path.</param> + /// <returns>The <see cref="CodeFile"/>.</returns> + private static CodeFile ProcessFile(XElement[] modules, Class @class, string filePath) + { + var linesOfFile = modules + .Where(m => m.Attribute("name").Value.Equals(@class.Assembly.Name)) + .Elements("sourcefile") + .Where(c => c.Attribute("name").Value.Equals(filePath)) + .Elements("line") + .Select(line => new JaCoCoLineCoverage() + { + LineNumber = int.Parse(line.Attribute("nr").Value, CultureInfo.InvariantCulture), + MissedInstructions = int.Parse(line.Attribute("mi")?.Value ?? "0", CultureInfo.InvariantCulture), + CoveredInstructions = int.Parse(line.Attribute("ci")?.Value ?? "0", CultureInfo.InvariantCulture), + MissedBranches = int.Parse(line.Attribute("mb")?.Value ?? "0", CultureInfo.InvariantCulture), + CoveredBranches = int.Parse(line.Attribute("cb")?.Value ?? "0", CultureInfo.InvariantCulture) + }) + .OrderBy(seqpnt => seqpnt.LineNumber) + .ToArray(); + + var branches = GetBranches(linesOfFile); + + int[] coverage = new int[] { }; + LineVisitStatus[] lineVisitStatus = new LineVisitStatus[] { }; + + if (linesOfFile.Length > 0) + { + coverage = new int[linesOfFile[linesOfFile.LongLength - 1].LineNumber + 1]; + lineVisitStatus = new LineVisitStatus[linesOfFile[linesOfFile.LongLength - 1].LineNumber + 1]; + + for (int i = 0; i < coverage.Length; i++) + { + coverage[i] = -1; + } + + foreach (var line in linesOfFile) + { + coverage[line.LineNumber] = line.CoveredInstructions > 0 ? 1 : 0; + + bool partiallyCovered = line.MissedInstructions > 0; + + LineVisitStatus statusOfLine = line.CoveredInstructions > 0 ? (partiallyCovered ? LineVisitStatus.PartiallyCovered : LineVisitStatus.Covered) : LineVisitStatus.NotCovered; + lineVisitStatus[line.LineNumber] = statusOfLine; + } + } + + return new CodeFile(filePath, coverage, lineVisitStatus, branches); + } + + /// <summary> + /// Extracts the metrics from the given <see cref="XElement">XElements</see>. + /// </summary> + /// <param name="codeFile">The code file.</param> + /// <param name="methodsOfFile">The methods of the file.</param> + private static void SetMethodMetrics(CodeFile codeFile, IEnumerable<XElement> methodsOfFile) + { + foreach (var method in methodsOfFile) + { + string fullName = method.Attribute("name").Value + method.Attribute("desc").Value; + + if (fullName.StartsWith("lambda$")) + { + continue; + } + + string shortName = methodRegex.Replace(fullName, m => string.Format(CultureInfo.InvariantCulture, "{0}({1})", m.Groups["MethodName"].Value, m.Groups["Arguments"].Value.Length > 0 ? "..." : string.Empty)); + + var metrics = new List<Metric>(); + + var lineRate = method.Elements("counter") + .Where(e => e.Attribute("type") != null && e.Attribute("type").Value == "LINE") + .FirstOrDefault(); + + if (lineRate != null) + { + decimal missed = decimal.Parse(lineRate.Attribute("missed").Value, CultureInfo.InvariantCulture); + decimal covered = decimal.Parse(lineRate.Attribute("covered").Value, CultureInfo.InvariantCulture); + decimal total = missed + covered; + + metrics.Add(new Metric( + ReportResources.Coverage, + ParserBase.CodeCoverageUri, + MetricType.CoveragePercentual, + total == 0 ? (decimal?)null : Math.Round((100 * covered) / total, 2, MidpointRounding.AwayFromZero))); + } + else + { + // If no line rate available, do not add branch coverage too + continue; + } + + var branchRate = method.Elements("counter") + .Where(e => e.Attribute("type") != null && e.Attribute("type").Value == "BRANCH") + .FirstOrDefault(); + + if (branchRate != null) + { + decimal missed = decimal.Parse(branchRate.Attribute("missed").Value, CultureInfo.InvariantCulture); + decimal covered = decimal.Parse(branchRate.Attribute("covered").Value, CultureInfo.InvariantCulture); + decimal total = missed + covered; + + metrics.Add(new Metric( + ReportResources.BranchCoverage, + ParserBase.CodeCoverageUri, + MetricType.CoveragePercentual, + total == 0 ? (decimal?)null : Math.Round((100 * covered) / total, 2, MidpointRounding.AwayFromZero))); + } + else + { + // If no branch coverage is available, add default to avoid empty columns + metrics.Add(new Metric( + ReportResources.BranchCoverage, + ParserBase.CodeCoverageUri, + MetricType.CoveragePercentual, + null)); + } + + var methodMetric = new MethodMetric(fullName, shortName, metrics); + methodMetric.Line = method.Attribute("line") != null ? int.Parse(method.Attribute("line").Value, CultureInfo.InvariantCulture) : default(int?); + + codeFile.AddMethodMetric(methodMetric); + } + } + + /// <summary> + /// Extracts the methods/properties of the given <see cref="XElement">XElements</see>. + /// </summary> + /// <param name="codeFile">The code file.</param> + /// <param name="methodsOfFile">The methods of the file.</param> + private static void SetCodeElements(CodeFile codeFile, IEnumerable<XElement> methodsOfFile) + { + foreach (var method in methodsOfFile) + { + string methodName = method.Attribute("name").Value + method.Attribute("desc").Value; + + if (methodName.StartsWith("lambda$")) + { + continue; + } + + methodName = methodRegex.Replace(methodName, m => string.Format(CultureInfo.InvariantCulture, "{0}({1})", m.Groups["MethodName"].Value, m.Groups["Arguments"].Value)); + + int lineNumber = int.Parse(method.Attribute("line")?.Value ?? "0", CultureInfo.InvariantCulture); + + codeFile.AddCodeElement(new CodeElement(methodName, CodeElementType.Method, lineNumber, lineNumber)); + } + } + + /// <summary> + /// Gets the branches by line number. + /// </summary> + /// <param name="lines">The lines.</param> + /// <returns>The branches by line number.</returns> + private static Dictionary<int, ICollection<Branch>> GetBranches(IEnumerable<JaCoCoLineCoverage> lines) + { + var result = new Dictionary<int, ICollection<Branch>>(); + + foreach (var line in lines) + { + if (line.MissedBranches == 0 && line.CoveredBranches == 0) + { + continue; + } + + int numberOfTotalBranches = line.MissedBranches + line.CoveredBranches; + + var branches = new HashSet<Branch>(); + + for (int i = 0; i < numberOfTotalBranches; i++) + { + string identifier = string.Format( + CultureInfo.InvariantCulture, + "{0}_{1}", + line.LineNumber, + i); + + branches.Add(new Branch(i < line.CoveredBranches ? 1 : 0, identifier)); + } + + result.Add(line.LineNumber, branches); + } + + return result; + } + + /// <summary> + /// Represents the coverage information of a line. + /// </summary> + private class JaCoCoLineCoverage + { + /// <summary> + /// Gets or sets the line number. + /// </summary> + public int LineNumber { get; set; } + + /// <summary> + /// Gets or sets the number of missed instructions. + /// </summary> + public int MissedInstructions { get; set; } + + /// <summary> + /// Gets or sets the number of covered instructions. + /// </summary> + public int CoveredInstructions { get; set; } + + /// <summary> + /// Gets or sets the number of missed branches. + /// </summary> + public int MissedBranches { get; set; } + + /// <summary> + /// Gets or sets the number of covered branches. + /// </summary> + public int CoveredBranches { get; set; } + } + } +} diff --git a/src/ReportGenerator.Console/Parser/MProfParser.cs b/src/ReportGenerator.Core/Parser/MProfParser.cs similarity index 63% rename from src/ReportGenerator.Console/Parser/MProfParser.cs rename to src/ReportGenerator.Core/Parser/MProfParser.cs index d5de45ec..e271164f 100644 --- a/src/ReportGenerator.Console/Parser/MProfParser.cs +++ b/src/ReportGenerator.Core/Parser/MProfParser.cs @@ -5,11 +5,12 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Xml.Linq; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Palmmedia.ReportGenerator.Core.Properties; -namespace Palmmedia.ReportGenerator.Parser +namespace Palmmedia.ReportGenerator.Core.Parser { /// <summary> /// Parser for XML reports generated by mprof (Mono). @@ -17,101 +18,79 @@ namespace Palmmedia.ReportGenerator.Parser internal class MProfParser : ParserBase { /// <summary> - /// Regex to analyze if a method name belongs to a lamda expression. + /// The Logger. /// </summary> - private const string LambdaMethodRegex = "<.*>.+__"; + private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(MProfParser)); /// <summary> - /// The Logger. + /// Regex to analyze if a method name belongs to a lamda expression. /// </summary> - private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(MProfParser)); + private static Regex lambdaMethodNameRegex = new Regex("<.*>.+__", RegexOptions.Compiled); /// <summary> - /// The methods of the processed report. + /// Initializes a new instance of the <see cref="MProfParser" /> class. /// </summary> - private XElement[] methods; + /// <param name="assemblyFilter">The assembly filter.</param> + /// <param name="classFilter">The class filter.</param> + /// <param name="fileFilter">The file filter.</param> + internal MProfParser(IFilter assemblyFilter, IFilter classFilter, IFilter fileFilter) : base(assemblyFilter, classFilter, fileFilter) + { + } /// <summary> - /// Initializes a new instance of the <see cref="MProfParser"/> class. + /// Parses the given XML report. /// </summary> - /// <param name="report">The report file as XContainer.</param> - internal MProfParser(XContainer report) + /// <param name="report">The XML report</param> + /// <returns>The parser result.</returns> + public override ParserResult Parse(XContainer report) { if (report == null) { throw new ArgumentNullException(nameof(report)); } - this.methods = report.Descendants("method").ToArray(); + var assemblies = new List<Assembly>(); + + var methods = report.Descendants("method").ToArray(); var assemblyNames = report.Descendants("assembly") .Select(a => a.Attribute("name").Value) .Distinct() + .Where(a => this.AssemblyFilter.IsElementIncludedInReport(a)) .OrderBy(a => a) .ToArray(); - Parallel.ForEach(assemblyNames, assemblyName => this.AddAssembly(this.ProcessAssembly(assemblyName))); - - this.methods = null; - } - - /// <summary> - /// Extracts the methods/properties of the given <see cref="XElement">XElements</see>. - /// </summary> - /// <param name="codeFile">The code file.</param> - /// <param name="methodsOfFile">The methods of the file.</param> - private static void SetCodeElements(CodeFile codeFile, IEnumerable<XElement> methodsOfFile) - { - foreach (var method in methodsOfFile) + foreach (var assemblyName in assemblyNames) { - string methodName = method.Attribute("name").Value; - - if (Regex.IsMatch(methodName, LambdaMethodRegex)) - { - continue; - } - - CodeElementType type = CodeElementType.Method; - - if (methodName.StartsWith("get_", StringComparison.OrdinalIgnoreCase) - || methodName.StartsWith("set_", StringComparison.OrdinalIgnoreCase)) - { - type = CodeElementType.Property; - methodName = methodName.Substring(4); - } - - var firstLine = method - .Elements("statement") - .FirstOrDefault(); - - if (firstLine != null) - { - int line = int.Parse(firstLine.Attribute("line").Value, CultureInfo.InvariantCulture); - codeFile.AddCodeElement(new CodeElement(methodName, type, line)); - } + assemblies.Add(this.ProcessAssembly(methods, assemblyName)); } + + var result = new ParserResult(assemblies.OrderBy(a => a.Name).ToList(), false, this.ToString()); + return result; } /// <summary> /// Processes the given assembly. /// </summary> + /// <param name="methods">The methods.</param> /// <param name="assemblyName">Name of the assembly.</param> /// <returns>The <see cref="Assembly"/>.</returns> - private Assembly ProcessAssembly(string assemblyName) + private Assembly ProcessAssembly(XElement[] methods, string assemblyName) { Logger.DebugFormat(" " + Resources.CurrentAssembly, assemblyName); - var classNames = this.methods + var classNames = methods .Where(m => m.Attribute("assembly").Value.Equals(assemblyName)) .Select(m => m.Attribute("class").Value) .Where(c => !c.Contains(".`1c__") && c != "`1") .Distinct() + .Where(c => this.ClassFilter.IsElementIncludedInReport(c)) .OrderBy(name => name) .ToArray(); var assembly = new Assembly(assemblyName); - Parallel.ForEach(classNames, className => assembly.AddClass(this.ProcessClass(assembly, className))); + Parallel.ForEach(classNames, className => this.ProcessClass(methods, assembly, className)); return assembly; } @@ -119,45 +98,54 @@ private Assembly ProcessAssembly(string assemblyName) /// <summary> /// Processes the given class. /// </summary> + /// <param name="methods">The methods.</param> /// <param name="assembly">The assembly.</param> /// <param name="className">Name of the class.</param> - /// <returns>The <see cref="Class"/>.</returns> - private Class ProcessClass(Assembly assembly, string className) + private void ProcessClass(XElement[] methods, Assembly assembly, string className) { - var @class = new Class(className, assembly); - - var filesOfClass = this.methods + var filesOfClass = methods .Where(m => m.Attribute("assembly").Value.Equals(assembly.Name)) - .Where(m => m.Attribute("class").Value.Equals(@class.Name, StringComparison.Ordinal)) + .Where(m => m.Attribute("class").Value.Equals(className, StringComparison.Ordinal)) .Where(m => m.Attribute("filename").Value.Length > 0) .Select(m => m.Attribute("filename").Value) .Distinct() .ToArray(); - foreach (var file in filesOfClass) + var filteredFilesOfClass = filesOfClass + .Where(f => this.FileFilter.IsElementIncludedInReport(f)) + .ToArray(); + + // If all files are removed by filters, then the whole class is omitted + if (filesOfClass.Length == 0 || filteredFilesOfClass.Length > 0) { - @class.AddFile(this.ProcessFile(@class, file)); - } + var @class = new Class(className, assembly); - return @class; + foreach (var file in filteredFilesOfClass) + { + @class.AddFile(ProcessFile(methods, @class, file)); + } + + assembly.AddClass(@class); + } } /// <summary> /// Processes the file. /// </summary> + /// <param name="methods">The methods.</param> /// <param name="class">The class.</param> /// <param name="filePath">The file path.</param> /// <returns>The <see cref="CodeFile"/>.</returns> - private CodeFile ProcessFile(Class @class, string filePath) + private static CodeFile ProcessFile(XElement[] methods, Class @class, string filePath) { - var methods = this.methods + var methodsOfFile = methods .Where(m => m.Attribute("assembly").Value.Equals(@class.Assembly.Name)) .Where(m => m.Attribute("class").Value.Equals(@class.Name, StringComparison.Ordinal)) .Where(m => m.Attribute("filename").Value.Equals(filePath)) .Distinct() .ToArray(); - var linesOfFile = methods + var linesOfFile = methodsOfFile .Elements("statement") .Select(l => new { @@ -190,9 +178,46 @@ private CodeFile ProcessFile(Class @class, string filePath) var codeFile = new CodeFile(filePath, coverage, lineVisitStatus); - SetCodeElements(codeFile, methods); + SetCodeElements(codeFile, methodsOfFile); return codeFile; } + + /// <summary> + /// Extracts the methods/properties of the given <see cref="XElement">XElements</see>. + /// </summary> + /// <param name="codeFile">The code file.</param> + /// <param name="methodsOfFile">The methods of the file.</param> + private static void SetCodeElements(CodeFile codeFile, IEnumerable<XElement> methodsOfFile) + { + foreach (var method in methodsOfFile) + { + string methodName = method.Attribute("name").Value; + + if (lambdaMethodNameRegex.IsMatch(methodName)) + { + continue; + } + + CodeElementType type = CodeElementType.Method; + + if (methodName.StartsWith("get_", StringComparison.OrdinalIgnoreCase) + || methodName.StartsWith("set_", StringComparison.OrdinalIgnoreCase)) + { + type = CodeElementType.Property; + methodName = methodName.Substring(4); + } + + var lineNumbers = method + .Elements("statement") + .Select(l => int.Parse(l.Attribute("line").Value, CultureInfo.InvariantCulture)) + .ToArray(); + + if (lineNumbers.Length > 0) + { + codeFile.AddCodeElement(new CodeElement(methodName, type, lineNumbers.Min(), lineNumbers.Max())); + } + } + } } } diff --git a/src/ReportGenerator.Console/Parser/NCoverParser.cs b/src/ReportGenerator.Core/Parser/NCoverParser.cs similarity index 63% rename from src/ReportGenerator.Console/Parser/NCoverParser.cs rename to src/ReportGenerator.Core/Parser/NCoverParser.cs index 9ffe4f80..370e5b47 100644 --- a/src/ReportGenerator.Console/Parser/NCoverParser.cs +++ b/src/ReportGenerator.Core/Parser/NCoverParser.cs @@ -5,11 +5,12 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Xml.Linq; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Palmmedia.ReportGenerator.Core.Properties; -namespace Palmmedia.ReportGenerator.Parser +namespace Palmmedia.ReportGenerator.Core.Parser { /// <summary> /// Parser for XML reports generated by NCover. @@ -17,103 +18,81 @@ namespace Palmmedia.ReportGenerator.Parser internal class NCoverParser : ParserBase { /// <summary> - /// Regex to analyze if a method name belongs to a lamda expression. + /// The Logger. /// </summary> - private const string LambdaMethodRegex = "<.+>.+__.+"; + private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(NCoverParser)); /// <summary> - /// The Logger. + /// Regex to analyze if a method name belongs to a lamda expression. /// </summary> - private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(NCoverParser)); + private static Regex lambdaMethodNameRegex = new Regex("<.+>.+__.+", RegexOptions.Compiled); /// <summary> - /// The module elements of the report. + /// Initializes a new instance of the <see cref="NCoverParser" /> class. /// </summary> - private XElement[] modules; + /// <param name="assemblyFilter">The assembly filter.</param> + /// <param name="classFilter">The class filter.</param> + /// <param name="fileFilter">The file filter.</param> + internal NCoverParser(IFilter assemblyFilter, IFilter classFilter, IFilter fileFilter) : base(assemblyFilter, classFilter, fileFilter) + { + } /// <summary> - /// Initializes a new instance of the <see cref="NCoverParser"/> class. + /// Parses the given XML report. /// </summary> - /// <param name="report">The report file as XContainer.</param> - internal NCoverParser(XContainer report) + /// <param name="report">The XML report</param> + /// <returns>The parser result.</returns> + public override ParserResult Parse(XContainer report) { if (report == null) { throw new ArgumentNullException(nameof(report)); } - this.modules = report.Descendants("module").ToArray(); + var assemblies = new List<Assembly>(); - var assemblyNames = this.modules + var modules = report.Descendants("module").ToArray(); + + var assemblyNames = modules .Select(module => module.Attribute("assembly").Value) .Distinct() + .Where(a => this.AssemblyFilter.IsElementIncludedInReport(a)) .OrderBy(a => a) .ToArray(); - Parallel.ForEach(assemblyNames, assemblyName => this.AddAssembly(this.ProcessAssembly(assemblyName))); - - this.modules = null; - } - - /// <summary> - /// Extracts the methods/properties of the given <see cref="XElement">XElements</see>. - /// </summary> - /// <param name="codeFile">The code file.</param> - /// <param name="methodsOfClass">The methods of the class.</param> - private static void SetCodeElements(CodeFile codeFile, IEnumerable<XElement> methodsOfClass) - { - foreach (var method in methodsOfClass) + foreach (var assemblyName in assemblyNames) { - string methodName = method.Attribute("name").Value; - - if (Regex.IsMatch(methodName, LambdaMethodRegex)) - { - continue; - } - - CodeElementType type = CodeElementType.Method; - - if (methodName.StartsWith("get_", StringComparison.OrdinalIgnoreCase) - || methodName.StartsWith("set_", StringComparison.OrdinalIgnoreCase)) - { - type = CodeElementType.Property; - methodName = methodName.Substring(4); - } - - var seqpnt = method - .Elements("seqpnt") - .FirstOrDefault(); - - if (seqpnt != null && seqpnt.Attribute("document").Value.Equals(codeFile.Path)) - { - int line = int.Parse(seqpnt.Attribute("line").Value, CultureInfo.InvariantCulture); - codeFile.AddCodeElement(new CodeElement(methodName, type, line)); - } + assemblies.Add(this.ProcessAssembly(modules, assemblyName)); } + + var result = new ParserResult(assemblies.OrderBy(a => a.Name).ToList(), false, this.ToString()); + return result; } /// <summary> /// Processes the given assembly. /// </summary> + /// <param name="modules">The modules.</param> /// <param name="assemblyName">Name of the assembly.</param> /// <returns>The <see cref="Assembly"/>.</returns> - private Assembly ProcessAssembly(string assemblyName) + private Assembly ProcessAssembly(XElement[] modules, string assemblyName) { Logger.DebugFormat(" " + Resources.CurrentAssembly, assemblyName); - var classNames = this.modules + var classNames = modules .Where(module => module.Attribute("assembly").Value.Equals(assemblyName)) .Elements("method") .Where(m => m.Attribute("excluded").Value == "false") .Select(method => method.Attribute("class").Value) .Where(value => !value.Contains("__") && !value.Contains("+")) .Distinct() + .Where(c => this.ClassFilter.IsElementIncludedInReport(c)) .OrderBy(name => name) .ToArray(); var assembly = new Assembly(assemblyName); - Parallel.ForEach(classNames, className => assembly.AddClass(this.ProcessClass(assembly, className))); + Parallel.ForEach(classNames, className => this.ProcessClass(modules, assembly, className)); return assembly; } @@ -121,12 +100,12 @@ private Assembly ProcessAssembly(string assemblyName) /// <summary> /// Processes the given class. /// </summary> + /// <param name="modules">The modules.</param> /// <param name="assembly">The assembly.</param> /// <param name="className">Name of the class.</param> - /// <returns>The <see cref="Class"/>.</returns> - private Class ProcessClass(Assembly assembly, string className) + private void ProcessClass(XElement[] modules, Assembly assembly, string className) { - var filesOfClass = this.modules + var filesOfClass = modules .Where(module => module.Attribute("assembly").Value.Equals(assembly.Name)).Elements("method") .Where(method => method.Attribute("class").Value.Equals(className)) .Where(m => m.Attribute("excluded").Value == "false") @@ -135,25 +114,34 @@ private Class ProcessClass(Assembly assembly, string className) .Distinct() .ToArray(); - var @class = new Class(className, assembly); + var filteredFilesOfClass = filesOfClass + .Where(f => this.FileFilter.IsElementIncludedInReport(f)) + .ToArray(); - foreach (var file in filesOfClass) + // If all files are removed by filters, then the whole class is omitted + if (filesOfClass.Length == 0 || filteredFilesOfClass.Length > 0) { - @class.AddFile(this.ProcessFile(@class, file)); - } + var @class = new Class(className, assembly); + + foreach (var file in filteredFilesOfClass) + { + @class.AddFile(ProcessFile(modules, @class, file)); + } - return @class; + assembly.AddClass(@class); + } } /// <summary> /// Processes the file. /// </summary> + /// <param name="modules">The modules.</param> /// <param name="class">The class.</param> /// <param name="filePath">The file path.</param> /// <returns>The <see cref="CodeFile"/>.</returns> - private CodeFile ProcessFile(Class @class, string filePath) + private static CodeFile ProcessFile(XElement[] modules, Class @class, string filePath) { - var methodsOfClass = this.modules + var methodsOfClass = modules .Where(type => type.Attribute("assembly").Value.Equals(@class.Assembly.Name)) .Elements("method") .Where(m => m.Attribute("excluded").Value == "false") @@ -188,7 +176,7 @@ private CodeFile ProcessFile(Class @class, string filePath) { for (int lineNumber = seqpnt.LineNumberStart; lineNumber <= seqpnt.LineNumberEnd; lineNumber++) { - coverage[seqpnt.LineNumberStart] = coverage[seqpnt.LineNumberStart] == -1 ? seqpnt.Visits : coverage[seqpnt.LineNumberStart] + seqpnt.Visits; + coverage[lineNumber] = coverage[lineNumber] == -1 ? seqpnt.Visits : coverage[lineNumber] + seqpnt.Visits; lineVisitStatus[lineNumber] = lineVisitStatus[lineNumber] == LineVisitStatus.Covered || seqpnt.Visits > 0 ? LineVisitStatus.Covered : LineVisitStatus.NotCovered; } } @@ -200,5 +188,47 @@ private CodeFile ProcessFile(Class @class, string filePath) return codeFile; } + + /// <summary> + /// Extracts the methods/properties of the given <see cref="XElement">XElements</see>. + /// </summary> + /// <param name="codeFile">The code file.</param> + /// <param name="methodsOfClass">The methods of the class.</param> + private static void SetCodeElements(CodeFile codeFile, IEnumerable<XElement> methodsOfClass) + { + foreach (var method in methodsOfClass) + { + string methodName = method.Attribute("name").Value; + + if (lambdaMethodNameRegex.IsMatch(methodName)) + { + continue; + } + + CodeElementType type = CodeElementType.Method; + + if (methodName.StartsWith("get_", StringComparison.OrdinalIgnoreCase) + || methodName.StartsWith("set_", StringComparison.OrdinalIgnoreCase)) + { + type = CodeElementType.Property; + methodName = methodName.Substring(4); + } + + var seqpnts = method + .Elements("seqpnt") + .Where(seqpnt => seqpnt.Attribute("document").Value.Equals(codeFile.Path) && seqpnt.Attribute("line").Value != "16707566") + .Select(seqpnt => new + { + LineNumberStart = int.Parse(seqpnt.Attribute("line").Value, CultureInfo.InvariantCulture), + LineNumberEnd = int.Parse(seqpnt.Attribute("endline").Value, CultureInfo.InvariantCulture) + }) + .ToArray(); + + if (seqpnts.Length > 0) + { + codeFile.AddCodeElement(new CodeElement(methodName, type, seqpnts.Min(s => s.LineNumberStart), seqpnts.Max(s => s.LineNumberEnd))); + } + } + } } } diff --git a/src/ReportGenerator.Console/Parser/OpenCoverParser.cs b/src/ReportGenerator.Core/Parser/OpenCoverParser.cs similarity index 74% rename from src/ReportGenerator.Console/Parser/OpenCoverParser.cs rename to src/ReportGenerator.Core/Parser/OpenCoverParser.cs index 697dafdb..c602d7a7 100644 --- a/src/ReportGenerator.Console/Parser/OpenCoverParser.cs +++ b/src/ReportGenerator.Core/Parser/OpenCoverParser.cs @@ -5,12 +5,13 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Xml.Linq; -using Palmmedia.ReportGenerator.Common; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; +using Palmmedia.ReportGenerator.Core.Common; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Palmmedia.ReportGenerator.Core.Properties; -namespace Palmmedia.ReportGenerator.Parser +namespace Palmmedia.ReportGenerator.Core.Parser { /// <summary> /// Parser for XML reports generated by OpenCover. @@ -18,297 +19,112 @@ namespace Palmmedia.ReportGenerator.Parser internal class OpenCoverParser : ParserBase { /// <summary> - /// Regex to analyze if a method name belongs to a lamda expression. + /// The Logger. /// </summary> - private const string LambdaMethodRegex = "::<.+>.+__"; + private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(OpenCoverParser)); /// <summary> - /// The Logger. + /// Regex to analyze if a method name belongs to a lamda expression. /// </summary> - private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(OpenCoverParser)); + private static Regex lambdaMethodNameRegex = new Regex("::<.+>.+__", RegexOptions.Compiled); /// <summary> - /// The module elements of the report. + /// Regex to analyze if a method name is generated by compiler. /// </summary> - private XElement[] modules; + private static Regex compilerGeneratedMethodNameRegex = new Regex(@"<(?<CompilerGeneratedName>.+)>.+__.+::MoveNext\(\)$", RegexOptions.Compiled); /// <summary> - /// The file elements of the report. + /// Regex to extract short method name. /// </summary> - private XElement[] files; + private static Regex methodRegex = new Regex(@"^.*::(?<MethodName>.+)\((?<Arguments>.*)\)$", RegexOptions.Compiled); /// <summary> - /// The tracked methods by id. + /// Initializes a new instance of the <see cref="OpenCoverParser" /> class. /// </summary> - private IDictionary<string, string> trackedMethods; + /// <param name="assemblyFilter">The assembly filter.</param> + /// <param name="classFilter">The class filter.</param> + /// <param name="fileFilter">The file filter.</param> + internal OpenCoverParser(IFilter assemblyFilter, IFilter classFilter, IFilter fileFilter) + : base(assemblyFilter, classFilter, fileFilter) + { + } /// <summary> - /// Initializes a new instance of the <see cref="OpenCoverParser"/> class. + /// Parses the given XML report. /// </summary> - /// <param name="report">The report file as XContainer.</param> - internal OpenCoverParser(XContainer report) + /// <param name="report">The XML report</param> + /// <returns>The parser result.</returns> + public override ParserResult Parse(XContainer report) { if (report == null) { throw new ArgumentNullException(nameof(report)); } - this.modules = report.Descendants("Module") + var assemblies = new List<Assembly>(); + + var modules = report.Descendants("Module") .Where(m => m.Attribute("skippedDueTo") == null) .ToArray(); - this.files = report.Descendants("File").ToArray(); - this.trackedMethods = report.Descendants("TrackedMethod") + var files = report.Descendants("File").ToArray(); + var trackedMethods = report.Descendants("TrackedMethod") .ToDictionary(t => t.Attribute("uid").Value, t => t.Attribute("name").Value); - var assemblyNames = this.modules + var assemblyNames = modules .Select(m => m.Element("ModuleName").Value) .Distinct() + .Where(a => this.AssemblyFilter.IsElementIncludedInReport(a)) .OrderBy(a => a) .ToArray(); - Parallel.ForEach(assemblyNames, assemblyName => this.AddAssembly(this.ProcessAssembly(assemblyName))); - - this.modules = null; - this.files = null; - this.trackedMethods = null; - } - - /// <summary> - /// Gets a value indicating whether the used parser supports branch coverage. - /// </summary> - /// <value> - /// <c>true</c> if used parser supports branch coverage; otherwise, <c>false</c>. - /// </value> - public override bool SupportsBranchCoverage => true; - - /// <summary> - /// Extracts the metrics from the given <see cref="XElement">XElements</see>. - /// </summary> - /// <param name="methods">The methods.</param> - /// <param name="class">The class.</param> - private static void SetMethodMetrics(IEnumerable<XElement> methods, Class @class) - { - foreach (var methodGroup in methods.GroupBy(m => m.Element("Name").Value)) - { - var method = methodGroup.First(); - - // Exclude properties and lambda expressions - if (method.Attribute("skippedDueTo") != null - || method.HasAttributeWithValue("isGetter", "true") - || method.HasAttributeWithValue("isSetter", "true") - || Regex.IsMatch(methodGroup.Key, LambdaMethodRegex)) - { - continue; - } - - var metrics = new List<Metric>() - { - new Metric( - ReportResources.CyclomaticComplexity, - ParserBase.CyclomaticComplexityUri, - MetricType.CodeQuality, - methodGroup.Max(m => int.Parse(m.Attribute("cyclomaticComplexity").Value, CultureInfo.InvariantCulture))), - new Metric( - ReportResources.SequenceCoverage, - ParserBase.CodeCoverageUri, - MetricType.CoveragePercentual, - methodGroup.Max(m => decimal.Parse(m.Attribute("sequenceCoverage").Value, CultureInfo.InvariantCulture))), - new Metric( - ReportResources.BranchCoverage, - ParserBase.CodeCoverageUri, - MetricType.CoveragePercentual, - methodGroup.Max(m => decimal.Parse(m.Attribute("branchCoverage").Value, CultureInfo.InvariantCulture))) - }; - - var npathComplexityAttributes = methodGroup.Select(m => m.Attribute("nPathComplexity")).Where(a => a != null).ToArray(); - - if (npathComplexityAttributes.Length > 0) - { - metrics.Insert( - 1, - new Metric( - ReportResources.NPathComplexity, - ParserBase.NPathComplexityUri, - MetricType.CodeQuality, - npathComplexityAttributes.Max(a => int.Parse(a.Value, CultureInfo.InvariantCulture)))); - } - - var crapScoreAttributes = methodGroup.Select(m => m.Attribute("crapScore")).Where(a => a != null).ToArray(); - if (crapScoreAttributes.Length > 0) - { - metrics.Add(new Metric( - ReportResources.CrapScore, - ParserBase.CrapScoreUri, - MetricType.CodeQuality, - crapScoreAttributes.Max(a => decimal.Parse(a.Value, CultureInfo.InvariantCulture)))); - } - - @class.AddMethodMetric(new MethodMetric(ExtractMethodName(methodGroup.Key), metrics)); - } - } - - /// <summary> - /// Gets the branches by line number. - /// </summary> - /// <param name="methods">The methods.</param> - /// <param name="fileIds">The file ids of the class.</param> - /// <returns>The branches by line number.</returns> - private static Dictionary<int, ICollection<Branch>> GetBranches(XElement[] methods, HashSet<string> fileIds) - { - var result = new Dictionary<int, ICollection<Branch>>(); - - var branchPoints = methods - .Elements("BranchPoints") - .Elements("BranchPoint") - .ToArray(); - - // OpenCover supports this since version 4.5.3207 - if (branchPoints.Length == 0 || branchPoints[0].Attribute("sl") == null) + foreach (var assemblyName in assemblyNames) { - return result; - } - - foreach (var branchPoint in branchPoints) - { - if (branchPoint.Attribute("fileid") != null - && !fileIds.Contains(branchPoint.Attribute("fileid").Value)) - { - // If fileid is available, verify that branch belongs to same file (available since version OpenCover.4.5.3418) - continue; - } - - int lineNumber = int.Parse(branchPoint.Attribute("sl").Value, CultureInfo.InvariantCulture); - - string identifier = string.Format( - CultureInfo.InvariantCulture, - "{0}_{1}_{2}_{3}", - lineNumber, - branchPoint.Attribute("path").Value, - branchPoint.Attribute("offset").Value, - branchPoint.Attribute("offsetend").Value); - - var branch = new Branch( - int.Parse(branchPoint.Attribute("vc").Value, CultureInfo.InvariantCulture), - identifier); - - ICollection<Branch> branches = null; - if (result.TryGetValue(lineNumber, out branches)) - { - HashSet<Branch> branchesHashset = (HashSet<Branch>)branches; - if (branchesHashset.Contains(branch)) - { - // Not perfect for performance, but Hashset has no GetElement method - branchesHashset.First(b => b.Equals(branch)).BranchVisits += branch.BranchVisits; - } - else - { - branches.Add(branch); - } - } - else - { - branches = new HashSet<Branch>(); - branches.Add(branch); - - result.Add(lineNumber, branches); - } + assemblies.Add(this.ProcessAssembly(modules, files, trackedMethods, assemblyName)); } + var result = new ParserResult(assemblies.OrderBy(a => a.Name).ToList(), true, this.ToString()); return result; } - /// <summary> - /// Extracts the methods/properties of the given <see cref="XElement">XElements</see>. - /// </summary> - /// <param name="codeFile">The code file.</param> - /// <param name="methodsOfFile">The methods of the file.</param> - private static void SetCodeElements(CodeFile codeFile, IEnumerable<XElement> methodsOfFile) - { - foreach (var method in methodsOfFile) - { - if (method.Attribute("skippedDueTo") != null - || Regex.IsMatch(method.Element("Name").Value, LambdaMethodRegex)) - { - continue; - } - - string methodName = ExtractMethodName(method.Element("Name").Value); - methodName = methodName.Substring(methodName.LastIndexOf(':') + 1); - - CodeElementType type = CodeElementType.Method; - - if (method.HasAttributeWithValue("isGetter", "true") - || method.HasAttributeWithValue("isSetter", "true")) - { - type = CodeElementType.Property; - methodName = methodName.Substring(4); - } - - var seqpnt = method - .Elements("SequencePoints") - .Elements("SequencePoint") - .FirstOrDefault(); - - if (seqpnt != null) - { - int line = int.Parse(seqpnt.Attribute("sl").Value, CultureInfo.InvariantCulture); - codeFile.AddCodeElement(new CodeElement(methodName, type, line)); - } - } - } - - /// <summary> - /// Extracts the method name. For async methods the original name is returned. - /// </summary> - /// <param name="methodName">The full method name.</param> - /// <returns>The method name.</returns> - private static string ExtractMethodName(string methodName) - { - Match match = Regex.Match(methodName, @"<(?<CompilerGeneratedName>.+)>.+__.+::MoveNext\(\)$"); - - if (match.Success) - { - methodName = match.Groups["CompilerGeneratedName"].Value + "()"; - } - - return methodName; - } - /// <summary> /// Processes the given assembly. /// </summary> + /// <param name="modules">The modules.</param> + /// <param name="files">The files.</param> + /// <param name="trackedMethods">The tracked methods.</param> /// <param name="assemblyName">Name of the assembly.</param> /// <returns>The <see cref="Assembly"/>.</returns> - private Assembly ProcessAssembly(string assemblyName) + private Assembly ProcessAssembly(XElement[] modules, XElement[] files, IDictionary<string, string> trackedMethods, string assemblyName) { Logger.DebugFormat(" " + Resources.CurrentAssembly, assemblyName); - var fileIdsByFilename = this.modules + var fileIdsByFilename = modules .Where(m => m.Element("ModuleName").Value.Equals(assemblyName)) .Elements("Files") .Elements("File") .GroupBy(f => f.Attribute("fullPath").Value, f => f.Attribute("uid").Value) .ToDictionary(g => g.Key, g => g.ToHashSet()); - var classNames = this.modules + var classNames = modules .Where(m => m.Element("ModuleName").Value.Equals(assemblyName)) .Elements("Classes") .Elements("Class") - .Where(c => !c.Element("FullName").Value.Contains("<") - && c.Attribute("skippedDueTo") == null) + .Where(c => c.Attribute("skippedDueTo") == null) .Select(c => { string fullname = c.Element("FullName").Value; int nestedClassSeparatorIndex = fullname.IndexOf('/'); return nestedClassSeparatorIndex > -1 ? fullname.Substring(0, nestedClassSeparatorIndex) : fullname; }) + .Where(name => !name.Contains("<")) .Distinct() + .Where(c => this.ClassFilter.IsElementIncludedInReport(c)) .OrderBy(name => name) .ToArray(); var assembly = new Assembly(assemblyName); - Parallel.ForEach(classNames, className => assembly.AddClass(this.ProcessClass(fileIdsByFilename, assembly, className))); + Parallel.ForEach(classNames, className => this.ProcessClass(modules, files, trackedMethods, fileIdsByFilename, assembly, className)); return assembly; } @@ -316,20 +132,24 @@ private Assembly ProcessAssembly(string assemblyName) /// <summary> /// Processes the given class. /// </summary> + /// <param name="modules">The modules.</param> + /// <param name="files">The files.</param> + /// <param name="trackedMethods">The tracked methods.</param> /// <param name="fileIdsByFilename">Dictionary containing the file ids by filename.</param> /// <param name="assembly">The assembly.</param> /// <param name="className">Name of the class.</param> - /// <returns>The <see cref="Class"/>.</returns> - private Class ProcessClass(Dictionary<string, HashSet<string>> fileIdsByFilename, Assembly assembly, string className) + private void ProcessClass(XElement[] modules, XElement[] files, IDictionary<string, string> trackedMethods, Dictionary<string, HashSet<string>> fileIdsByFilename, Assembly assembly, string className) { - var methods = this.modules + var methods = modules .Where(m => m.Element("ModuleName").Value.Equals(assembly.Name)) .Elements("Classes") .Elements("Class") .Where(c => c.Element("FullName").Value.Equals(className) || c.Element("FullName").Value.StartsWith(className + "/", StringComparison.Ordinal)) .Elements("Methods") - .Elements("Method"); + .Elements("Method") + .Where(m => m.Attribute("skippedDueTo") == null) + .ToArray(); var fileIdsOfClassInSequencePoints = methods .Elements("SequencePoints") @@ -350,49 +170,42 @@ private Class ProcessClass(Dictionary<string, HashSet<string>> fileIdsByFilename .Distinct() .ToHashSet(); - var filesOfClass = this.files + var filesOfClass = files .Where(file => fileIdsOfClass.Contains(file.Attribute("uid").Value)) .Select(file => file.Attribute("fullPath").Value) .Distinct() .ToArray(); - var @class = new Class(className, assembly); + var filteredFilesOfClass = filesOfClass + .Where(f => this.FileFilter.IsElementIncludedInReport(f)) + .ToArray(); - foreach (var file in filesOfClass) + // If all files are removed by filters, then the whole class is omitted + if (filesOfClass.Length == 0 || filteredFilesOfClass.Length > 0) { - @class.AddFile(this.ProcessFile(fileIdsByFilename[file], @class, file)); - } + var @class = new Class(className, assembly); + + foreach (var file in filteredFilesOfClass) + { + @class.AddFile(ProcessFile(trackedMethods, fileIdsByFilename[file], file, methods)); + } - @class.CoverageQuota = this.GetCoverageQuotaOfClass(assembly, className); + @class.CoverageQuota = GetCoverageQuotaOfClass(methods); - return @class; + assembly.AddClass(@class); + } } /// <summary> /// Processes the file. /// </summary> + /// <param name="trackedMethods">The tracked methods.</param> /// <param name="fileIds">The file ids of the class.</param> - /// <param name="class">The class.</param> /// <param name="filePath">The file path.</param> + /// <param name="methods">The methods.</param> /// <returns>The <see cref="CodeFile"/>.</returns> - private CodeFile ProcessFile(HashSet<string> fileIds, Class @class, string filePath) + private static CodeFile ProcessFile(IDictionary<string, string> trackedMethods, HashSet<string> fileIds, string filePath, XElement[] methods) { - var methods = this.modules - .Where(m => m.Element("ModuleName").Value.Equals(@class.Assembly.Name)) - .Elements("Classes") - .Elements("Class") - .Where(c => c.Element("FullName").Value.Equals(@class.Name) - || c.Element("FullName").Value.StartsWith(@class.Name + "/", StringComparison.Ordinal)) - .Elements("Methods") - .Elements("Method") - .ToArray(); - - var methodsOfFile = methods - .Where(m => m.Element("FileRef") != null && fileIds.Contains(m.Element("FileRef").Attribute("uid").Value)) - .ToArray(); - - SetMethodMetrics(methodsOfFile, @class); - var seqpntsOfFile = methods .Elements("SequencePoints") .Elements("SequencePoint") @@ -499,7 +312,7 @@ private CodeFile ProcessFile(HashSet<string> fileIds, Class @class, string fileP string name = null; // Sometimes no corresponding MethodRef element exists - if (this.trackedMethods.TryGetValue(trackedMethodCoverage.Key, out name)) + if (trackedMethods.TryGetValue(trackedMethodCoverage.Key, out name)) { string shortName = name.Substring(name.Substring(0, name.IndexOf(':') + 1).LastIndexOf('.') + 1); TestMethod testMethod = new TestMethod(name, shortName); @@ -507,28 +320,241 @@ private CodeFile ProcessFile(HashSet<string> fileIds, Class @class, string fileP } } + var methodsOfFile = methods + .Where(m => m.Element("FileRef") != null && fileIds.Contains(m.Element("FileRef").Attribute("uid").Value)) + .ToArray(); + + SetMethodMetrics(codeFile, methodsOfFile); SetCodeElements(codeFile, methodsOfFile); return codeFile; } + /// <summary> + /// Extracts the metrics from the given <see cref="XElement">XElements</see>. + /// </summary> + /// <param name="codeFile">The code file.</param> + /// <param name="methodsOfFile">The methods of the file.</param> + private static void SetMethodMetrics(CodeFile codeFile, IEnumerable<XElement> methodsOfFile) + { + foreach (var methodGroup in methodsOfFile.GroupBy(m => m.Element("Name").Value)) + { + var method = methodGroup.First(); + + // Exclude properties and lambda expressions + if (method.Attribute("skippedDueTo") != null + || method.HasAttributeWithValue("isGetter", "true") + || method.HasAttributeWithValue("isSetter", "true") + || lambdaMethodNameRegex.IsMatch(methodGroup.Key)) + { + continue; + } + + var metrics = new List<Metric>() + { + new Metric( + ReportResources.CyclomaticComplexity, + ParserBase.CyclomaticComplexityUri, + MetricType.CodeQuality, + methodGroup.Max(m => int.Parse(m.Attribute("cyclomaticComplexity").Value, CultureInfo.InvariantCulture))), + new Metric( + ReportResources.SequenceCoverage, + ParserBase.CodeCoverageUri, + MetricType.CoveragePercentual, + methodGroup.Max(m => decimal.Parse(m.Attribute("sequenceCoverage").Value, CultureInfo.InvariantCulture))), + new Metric( + ReportResources.BranchCoverage, + ParserBase.CodeCoverageUri, + MetricType.CoveragePercentual, + methodGroup.Max(m => decimal.Parse(m.Attribute("branchCoverage").Value, CultureInfo.InvariantCulture))) + }; + + var npathComplexityAttributes = methodGroup.Select(m => m.Attribute("nPathComplexity")).Where(a => a != null).ToArray(); + + if (npathComplexityAttributes.Length > 0) + { + metrics.Insert( + 1, + new Metric( + ReportResources.NPathComplexity, + ParserBase.NPathComplexityUri, + MetricType.CodeQuality, + npathComplexityAttributes.Max(a => int.Parse(a.Value, CultureInfo.InvariantCulture)))); + } + + var crapScoreAttributes = methodGroup.Select(m => m.Attribute("crapScore")).Where(a => a != null).ToArray(); + if (crapScoreAttributes.Length > 0) + { + metrics.Add(new Metric( + ReportResources.CrapScore, + ParserBase.CrapScoreUri, + MetricType.CodeQuality, + crapScoreAttributes.Max(a => decimal.Parse(a.Value, CultureInfo.InvariantCulture)))); + } + + string fullName = ExtractMethodName(methodGroup.Key); + string shortName = methodRegex.Replace(fullName, m => string.Format(CultureInfo.InvariantCulture, "{0}({1})", m.Groups["MethodName"].Value, m.Groups["Arguments"].Value.Length > 0 ? "..." : string.Empty)); + + var methodMetric = new MethodMetric(fullName, shortName, metrics); + + var seqpnt = method + .Elements("SequencePoints") + .Elements("SequencePoint") + .FirstOrDefault(); + + if (seqpnt != null) + { + methodMetric.Line = int.Parse(seqpnt.Attribute("sl").Value, CultureInfo.InvariantCulture); + } + + codeFile.AddMethodMetric(methodMetric); + } + } + + /// <summary> + /// Gets the branches by line number. + /// </summary> + /// <param name="methods">The methods.</param> + /// <param name="fileIds">The file ids of the class.</param> + /// <returns>The branches by line number.</returns> + private static Dictionary<int, ICollection<Branch>> GetBranches(XElement[] methods, HashSet<string> fileIds) + { + var result = new Dictionary<int, ICollection<Branch>>(); + + var branchPoints = methods + .Elements("BranchPoints") + .Elements("BranchPoint") + .ToArray(); + + // OpenCover supports this since version 4.5.3207 + if (branchPoints.Length == 0 || branchPoints[0].Attribute("sl") == null) + { + return result; + } + + foreach (var branchPoint in branchPoints) + { + if (branchPoint.Attribute("fileid") != null + && !fileIds.Contains(branchPoint.Attribute("fileid").Value)) + { + // If fileid is available, verify that branch belongs to same file (available since version OpenCover.4.5.3418) + continue; + } + + int lineNumber = int.Parse(branchPoint.Attribute("sl").Value, CultureInfo.InvariantCulture); + + string identifier = string.Format( + CultureInfo.InvariantCulture, + "{0}_{1}_{2}_{3}", + lineNumber, + branchPoint.Attribute("path").Value, + branchPoint.Attribute("offset").Value, + branchPoint.Attribute("offsetend").Value); + + var branch = new Branch( + int.Parse(branchPoint.Attribute("vc").Value, CultureInfo.InvariantCulture), + identifier); + + ICollection<Branch> branches = null; + if (result.TryGetValue(lineNumber, out branches)) + { + HashSet<Branch> branchesHashset = (HashSet<Branch>)branches; + if (branchesHashset.Contains(branch)) + { + // Not perfect for performance, but Hashset has no GetElement method + branchesHashset.First(b => b.Equals(branch)).BranchVisits += branch.BranchVisits; + } + else + { + branches.Add(branch); + } + } + else + { + branches = new HashSet<Branch>(); + branches.Add(branch); + + result.Add(lineNumber, branches); + } + } + + return result; + } + + /// <summary> + /// Extracts the methods/properties of the given <see cref="XElement">XElements</see>. + /// </summary> + /// <param name="codeFile">The code file.</param> + /// <param name="methodsOfFile">The methods of the file.</param> + private static void SetCodeElements(CodeFile codeFile, IEnumerable<XElement> methodsOfFile) + { + foreach (var method in methodsOfFile) + { + if (method.Attribute("skippedDueTo") != null + || lambdaMethodNameRegex.IsMatch(method.Element("Name").Value)) + { + continue; + } + + string methodName = ExtractMethodName(method.Element("Name").Value); + methodName = methodName.Substring(methodName.LastIndexOf(':') + 1); + + CodeElementType type = CodeElementType.Method; + + if (method.HasAttributeWithValue("isGetter", "true") + || method.HasAttributeWithValue("isSetter", "true")) + { + type = CodeElementType.Property; + methodName = methodName.Substring(4); + } + + var seqpnts = method + .Elements("SequencePoints") + .Elements("SequencePoint") + .Select(seqpnt => new + { + LineNumberStart = int.Parse(seqpnt.Attribute("sl").Value, CultureInfo.InvariantCulture), + LineNumberEnd = seqpnt.Attribute("el") != null ? int.Parse(seqpnt.Attribute("el").Value, CultureInfo.InvariantCulture) : int.Parse(seqpnt.Attribute("sl").Value, CultureInfo.InvariantCulture) + }) + .ToArray(); + + if (seqpnts.Length > 0) + { + codeFile.AddCodeElement(new CodeElement(methodName, type, seqpnts.Min(s => s.LineNumberStart), seqpnts.Max(s => s.LineNumberEnd))); + } + } + } + + /// <summary> + /// Extracts the method name. For async methods the original name is returned. + /// </summary> + /// <param name="methodName">The full method name.</param> + /// <returns>The method name.</returns> + private static string ExtractMethodName(string methodName) + { + // Quick check before expensive regex is called + if (methodName.EndsWith("::MoveNext()")) + { + Match match = compilerGeneratedMethodNameRegex.Match(methodName); + + if (match.Success) + { + methodName = match.Groups["CompilerGeneratedName"].Value + "()"; + } + } + + return methodName; + } + /// <summary> /// Gets the coverage quota of a class. /// This method is used to get coverage quota if line coverage is not available. /// </summary> - /// <param name="assembly">The assembly.</param> - /// <param name="className">Name of the class.</param> + /// <param name="methods">The methods.</param> /// <returns>The coverage quota.</returns> - private decimal? GetCoverageQuotaOfClass(Assembly assembly, string className) + private static decimal? GetCoverageQuotaOfClass(XElement[] methods) { - var methodGroups = this.modules - .Where(m => m.Element("ModuleName").Value.Equals(assembly.Name)) - .Elements("Classes") - .Elements("Class") - .Where(c => c.Element("FullName").Value.Equals(className) - || c.Element("FullName").Value.StartsWith(className + "/", StringComparison.Ordinal)) - .Elements("Methods") - .Elements("Method") + var methodGroups = methods .Where(m => m.Attribute("skippedDueTo") == null && m.Element("FileRef") == null && !m.Element("Name").Value.EndsWith(".ctor()", StringComparison.OrdinalIgnoreCase)) .GroupBy(m => m.Element("Name").Value) .ToArray(); diff --git a/src/ReportGenerator.Console/Parser/ParserBase.cs b/src/ReportGenerator.Core/Parser/ParserBase.cs similarity index 50% rename from src/ReportGenerator.Console/Parser/ParserBase.cs rename to src/ReportGenerator.Core/Parser/ParserBase.cs index 56624b9f..229cf0f0 100644 --- a/src/ReportGenerator.Console/Parser/ParserBase.cs +++ b/src/ReportGenerator.Core/Parser/ParserBase.cs @@ -1,15 +1,13 @@ using System; -using System.Collections.Concurrent; -using System.Collections.Generic; -using System.Linq; -using Palmmedia.ReportGenerator.Parser.Analysis; +using System.Xml.Linq; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; -namespace Palmmedia.ReportGenerator.Parser +namespace Palmmedia.ReportGenerator.Core.Parser { /// <summary> - /// Base class for the <see cref="IParser"/> implementations. + /// Base class for the parser implementations. /// </summary> - internal abstract class ParserBase : IParser + internal abstract class ParserBase { /// <summary> /// The cyclomatic complexity URI. @@ -32,23 +30,39 @@ internal abstract class ParserBase : IParser protected static readonly Uri CrapScoreUri = new Uri("https://googletesting.blogspot.de/2011/02/this-code-is-crap.html"); /// <summary> - /// The assemblies found in the report. + /// Initializes a new instance of the <see cref="ParserBase" /> class. /// </summary> - private ConcurrentBag<Assembly> assemblies = new ConcurrentBag<Assembly>(); + /// <param name="assemblyFilter">The assembly filter.</param> + /// <param name="classFilter">The class filter.</param> + /// <param name="fileFilter">The file filter.</param> + protected ParserBase(IFilter assemblyFilter, IFilter classFilter, IFilter fileFilter) + { + this.AssemblyFilter = assemblyFilter ?? throw new ArgumentNullException(nameof(assemblyFilter)); + this.ClassFilter = classFilter ?? throw new ArgumentNullException(nameof(classFilter)); + this.FileFilter = fileFilter ?? throw new ArgumentNullException(nameof(fileFilter)); + } /// <summary> - /// Gets the assemblies that have been found in the report. + /// Gets the assembly filter. /// </summary> - /// <value>The assemblies.</value> - public IEnumerable<Assembly> Assemblies => this.assemblies.OrderBy(a => a.Name); + protected IFilter AssemblyFilter { get; } /// <summary> - /// Gets a value indicating whether the used parser supports branch coverage. + /// Gets the class filter. /// </summary> - /// <value> - /// <c>true</c> if used parser supports branch coverage; otherwise, <c>false</c>. - /// </value> - public virtual bool SupportsBranchCoverage => false; + protected IFilter ClassFilter { get; } + + /// <summary> + /// Gets the file filter. + /// </summary> + protected IFilter FileFilter { get; } + + /// <summary> + /// Parses the given XML report. + /// </summary> + /// <param name="report">The XML report</param> + /// <returns>The parser result.</returns> + public abstract ParserResult Parse(XContainer report); /// <summary> /// Returns a <see cref="System.String"/> that represents this instance. @@ -57,14 +71,5 @@ internal abstract class ParserBase : IParser /// A <see cref="System.String"/> that represents this instance. /// </returns> public override string ToString() => this.GetType().Name; - - /// <summary> - /// Adds the given assembly. - /// </summary> - /// <param name="assembly">The assembly.</param> - protected internal void AddAssembly(Assembly assembly) - { - this.assemblies.Add(assembly); - } } } diff --git a/src/ReportGenerator.Core/Parser/ParserResult.cs b/src/ReportGenerator.Core/Parser/ParserResult.cs new file mode 100644 index 00000000..13838b47 --- /dev/null +++ b/src/ReportGenerator.Core/Parser/ParserResult.cs @@ -0,0 +1,152 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; + +namespace Palmmedia.ReportGenerator.Core.Parser +{ + /// <summary> + /// The result on a <see cref="ParserBase"/>. + /// </summary> + internal class ParserResult + { + /// <summary> + /// The name of the parser or the merged parsers. + /// </summary> + private readonly List<string> parserNames; + + /// <summary> + /// The covered assemblies. + /// </summary> + private readonly List<Assembly> assemblies; + + /// <summary> + /// The source directories. + /// </summary> + private readonly HashSet<string> sourceDirectories = new HashSet<string>(); + + /// <summary> + /// Initializes a new instance of the <see cref="ParserResult"/> class. + /// </summary> + public ParserResult() + { + this.assemblies = new List<Assembly>(); + this.SupportsBranchCoverage = true; + this.parserNames = new List<string>(); + } + + /// <summary> + /// Initializes a new instance of the <see cref="ParserResult"/> class. + /// </summary> + /// <param name="assemblies">The assemblies.</param> + /// <param name="supportsBranchCoverage">Indicates whether the used parser supports branch coverage.</param> + /// <param name="parserName">The name of the parser.</param> + public ParserResult(List<Assembly> assemblies, bool supportsBranchCoverage, string parserName) + { + if (parserName == null) + { + throw new ArgumentNullException(nameof(parserName)); + } + + this.assemblies = assemblies ?? throw new ArgumentNullException(nameof(assemblies)); + this.SupportsBranchCoverage = supportsBranchCoverage; + this.parserNames = new List<string>() + { + parserName + }; + } + + /// <summary> + /// Gets the assemblies that have been found in the report. + /// </summary> + /// <value>The assemblies.</value> + public IReadOnlyCollection<Assembly> Assemblies => this.assemblies; + + /// <summary> + /// Gets the source directories. + /// </summary> + /// <value>The source directories.</value> + public IReadOnlyCollection<string> SourceDirectories => this.sourceDirectories; + + /// <summary> + /// Gets a value indicating whether the used parser supports branch coverage. + /// </summary> + /// <value> + /// <c>true</c> if used parser supports branch coverage; otherwise, <c>false</c>. + /// </value> + public bool SupportsBranchCoverage { get; private set; } + + /// <summary> + /// Gets the names of the parsers. + /// </summary> + public string ParserName + { + get + { + if (this.parserNames.Count == 0) + { + return string.Empty; + } + else if (this.parserNames.Count == 1) + { + return this.parserNames[0]; + } + else + { + StringBuilder sb = new StringBuilder("MultiReportParser ("); + + var groupedParsers = this.parserNames.GroupBy(p => p).OrderBy(pg => pg.Key); + + sb.Append(string.Join( + ", ", + groupedParsers.Select(pg => string.Format(CultureInfo.InvariantCulture, "{0}x {1}", pg.Count(), pg.Key)))); + + sb.Append(")"); + return sb.ToString(); + } + } + } + + /// <summary> + /// Adds the given source directory. + /// </summary> + /// <param name="directory">The directory to add.</param> + public void AddSourceDirectory(string directory) + { + this.sourceDirectories.Add(directory); + } + + /// <summary> + /// Merges the given parser result with the current instance. + /// </summary> + /// <param name="parserResult">The parser result to merge.</param> + internal void Merge(ParserResult parserResult) + { + foreach (var assembly in parserResult.Assemblies) + { + var existingAssembly = this.assemblies.FirstOrDefault(a => a.Name == assembly.Name); + + if (existingAssembly != null) + { + existingAssembly.Merge(assembly); + } + else + { + this.assemblies.Add(assembly); + } + } + + foreach (var directory in parserResult.sourceDirectories) + { + this.sourceDirectories.Add(directory); + } + + this.assemblies.Sort((x, y) => x.Name.CompareTo(y.Name)); + + this.SupportsBranchCoverage |= parserResult.SupportsBranchCoverage; + this.parserNames.AddRange(parserResult.parserNames); + } + } +} \ No newline at end of file diff --git a/src/ReportGenerator.Console/Parser/Preprocessing/CoberturaReportPreprocessor.cs b/src/ReportGenerator.Core/Parser/Preprocessing/CoberturaReportPreprocessor.cs similarity index 65% rename from src/ReportGenerator.Console/Parser/Preprocessing/CoberturaReportPreprocessor.cs rename to src/ReportGenerator.Core/Parser/Preprocessing/CoberturaReportPreprocessor.cs index fcf36c94..2866397c 100644 --- a/src/ReportGenerator.Console/Parser/Preprocessing/CoberturaReportPreprocessor.cs +++ b/src/ReportGenerator.Core/Parser/Preprocessing/CoberturaReportPreprocessor.cs @@ -2,33 +2,20 @@ using System.Linq; using System.Xml.Linq; -namespace Palmmedia.ReportGenerator.Parser.Preprocessing +namespace Palmmedia.ReportGenerator.Core.Parser.Preprocessing { /// <summary> /// Preprocessor for Cobertura reports. /// </summary> internal class CoberturaReportPreprocessor { - /// <summary> - /// The report file as XContainer. - /// </summary> - private readonly XContainer report; - - /// <summary> - /// Initializes a new instance of the <see cref="CoberturaReportPreprocessor"/> class. - /// </summary> - /// <param name="report">The report.</param> - internal CoberturaReportPreprocessor(XContainer report) - { - this.report = report; - } - /// <summary> /// Executes the preprocessing of the report. /// </summary> - internal void Execute() + /// <param name="report">The report.</param> + internal void Execute(XContainer report) { - var sources = this.report.Descendants("sources") + var sources = report.Descendants("sources") .Elements("source") .Select(s => s.Value) .ToArray(); @@ -38,16 +25,7 @@ internal void Execute() return; } - // Issue 115: https://stackoverflow.com/questions/19909008/path-combine-does-not-add-directory-separator-after-drive-letter - for (int i = 0; i < sources.Length; i++) - { - if (sources[i].Length == 2 && sources[i][1] == ':') - { - sources[i] = sources[i] + System.IO.Path.DirectorySeparatorChar; - } - } - - var classes = this.report.Descendants("package") + var classes = report.Descendants("package") .Elements("classes") .Elements("class") .ToArray(); diff --git a/src/ReportGenerator.Console/Parser/Preprocessing/DotCoverReportPreprocessor.cs b/src/ReportGenerator.Core/Parser/Preprocessing/DotCoverReportPreprocessor.cs similarity index 88% rename from src/ReportGenerator.Console/Parser/Preprocessing/DotCoverReportPreprocessor.cs rename to src/ReportGenerator.Core/Parser/Preprocessing/DotCoverReportPreprocessor.cs index 41517e35..a87642ee 100644 --- a/src/ReportGenerator.Console/Parser/Preprocessing/DotCoverReportPreprocessor.cs +++ b/src/ReportGenerator.Core/Parser/Preprocessing/DotCoverReportPreprocessor.cs @@ -3,33 +3,20 @@ using System.Linq; using System.Xml.Linq; -namespace Palmmedia.ReportGenerator.Parser.Preprocessing +namespace Palmmedia.ReportGenerator.Core.Parser.Preprocessing { /// <summary> /// Preprocessor for OpenCover reports. /// </summary> internal class DotCoverReportPreprocessor { - /// <summary> - /// The report file as XContainer. - /// </summary> - private readonly XContainer report; - - /// <summary> - /// Initializes a new instance of the <see cref="DotCoverReportPreprocessor"/> class. - /// </summary> - /// <param name="report">The report.</param> - internal DotCoverReportPreprocessor(XContainer report) - { - this.report = report; - } - /// <summary> /// Executes the preprocessing of the report. /// </summary> - internal void Execute() + /// <param name="report">The report.</param> + internal void Execute(XContainer report) { - foreach (var module in this.report.Descendants("Assembly").ToArray()) + foreach (var module in report.Descendants("Assembly").ToArray()) { MoveStartupCodeElementsToParentType(module); } diff --git a/src/ReportGenerator.Console/Parser/Preprocessing/DynamicCodeCoverageReportPreprocessor.cs b/src/ReportGenerator.Core/Parser/Preprocessing/DynamicCodeCoverageReportPreprocessor.cs similarity index 87% rename from src/ReportGenerator.Console/Parser/Preprocessing/DynamicCodeCoverageReportPreprocessor.cs rename to src/ReportGenerator.Core/Parser/Preprocessing/DynamicCodeCoverageReportPreprocessor.cs index eab373cb..e1ecd50d 100644 --- a/src/ReportGenerator.Console/Parser/Preprocessing/DynamicCodeCoverageReportPreprocessor.cs +++ b/src/ReportGenerator.Core/Parser/Preprocessing/DynamicCodeCoverageReportPreprocessor.cs @@ -2,33 +2,20 @@ using System.Linq; using System.Xml.Linq; -namespace Palmmedia.ReportGenerator.Parser.Preprocessing +namespace Palmmedia.ReportGenerator.Core.Parser.Preprocessing { /// <summary> /// Preprocessor for reports generated by CodeCoverage.exe. /// </summary> internal class DynamicCodeCoverageReportPreprocessor { - /// <summary> - /// The report file as XContainer. - /// </summary> - private readonly XContainer report; - - /// <summary> - /// Initializes a new instance of the <see cref="DynamicCodeCoverageReportPreprocessor"/> class. - /// </summary> - /// <param name="report">The report.</param> - internal DynamicCodeCoverageReportPreprocessor(XContainer report) - { - this.report = report; - } - /// <summary> /// Executes the preprocessing of the report. /// </summary> - internal void Execute() + /// <param name="report">The report.</param> + internal void Execute(XContainer report) { - foreach (var module in this.report.Descendants("module").ToArray()) + foreach (var module in report.Descendants("module").ToArray()) { ApplyClassNameToStartupCodeElements(module); } @@ -111,7 +98,7 @@ private static void ApplyClassNameToStartupCodeElements(XElement module) * 2) Class comes after current class * 3) Closer class has already been found */ if (lineNumbersOfClass.Length != 1 - || lineNumbersOfClass[0] > lineNumbers[0] + || lineNumbersOfClass[0] > lineNumbers[0] || closestLineNumber > lineNumbersOfClass[0]) { continue; diff --git a/src/ReportGenerator.Core/Parser/Preprocessing/JaCoCoReportPreprocessor.cs b/src/ReportGenerator.Core/Parser/Preprocessing/JaCoCoReportPreprocessor.cs new file mode 100644 index 00000000..f04b8308 --- /dev/null +++ b/src/ReportGenerator.Core/Parser/Preprocessing/JaCoCoReportPreprocessor.cs @@ -0,0 +1,113 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Xml.Linq; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Properties; + +namespace Palmmedia.ReportGenerator.Core.Parser.Preprocessing +{ + /// <summary> + /// Preprocessor for JaCoCo reports. + /// </summary> + internal class JaCoCoReportPreprocessor + { + /// <summary> + /// The Logger. + /// </summary> + private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(JaCoCoReportPreprocessor)); + + /// <summary> + /// The source directories. + /// </summary> + private readonly IReadOnlyList<string> sourceDirectories; + + /// <summary> + /// Initializes a new instance of the <see cref="JaCoCoReportPreprocessor"/> class. + /// </summary> + /// <param name="sourceDirectories">The source directories.</param> + internal JaCoCoReportPreprocessor(IEnumerable<string> sourceDirectories) + { + if (sourceDirectories == null) + { + throw new ArgumentNullException(nameof(sourceDirectories)); + } + + this.sourceDirectories = sourceDirectories.ToList(); + } + + /// <summary> + /// Executes the preprocessing of the report. + /// </summary> + /// <param name="report">The report.</param> + internal void Execute(XContainer report) + { + if (this.sourceDirectories.Count == 0) + { + Logger.Warn(" " + Resources.NoSouceDirectories); + } + + var modules = report.Descendants("package") + .ToArray(); + + foreach (var module in modules) + { + string moduleName = module.Attribute("name").Value; + + var sourcefilenameAttributesOfClasses = module.Elements("class") + .Select(e => e.Attribute("sourcefilename")) + .Where(e => e != null) // This attribute is not present in older JaCoCo versions + .ToArray(); + + var nameAttributesOfSourceFiles = module.Elements("sourcefile") + .Select(e => e.Attribute("name")) + .ToArray(); + + foreach (var attribute in sourcefilenameAttributesOfClasses) + { + attribute.Value = this.GetFullFilePath(moduleName, attribute.Value); + } + + foreach (var attribute in nameAttributesOfSourceFiles) + { + attribute.Value = this.GetFullFilePath(moduleName, attribute.Value); + } + } + } + + /// <summary> + /// Gets the full path of the file. + /// </summary> + /// <param name="moduleName">The name of the module/package.</param> + /// <param name="fileName">The file.</param> + /// <returns>The full path of the file.</returns> + private string GetFullFilePath(string moduleName, string fileName) + { + fileName = fileName + .Replace('\\', Path.DirectorySeparatorChar) + .Replace('/', Path.DirectorySeparatorChar); + + if (!Path.IsPathRooted(fileName)) + { + var path = this.sourceDirectories + .SelectMany(sourceDirectory => new[] { + Path.Combine(sourceDirectory, fileName), + Path.Combine(sourceDirectory, moduleName, fileName) + }) + .Select(p => p + .Replace('\\', Path.DirectorySeparatorChar) + .Replace('/', Path.DirectorySeparatorChar) + ) + .FirstOrDefault(p => File.Exists(p)); + + if (!string.IsNullOrEmpty(path)) + { + return path; + } + } + + return fileName; + } + } +} diff --git a/src/ReportGenerator.Console/Parser/Preprocessing/OpenCoverReportPreprocessor.cs b/src/ReportGenerator.Core/Parser/Preprocessing/OpenCoverReportPreprocessor.cs similarity index 89% rename from src/ReportGenerator.Console/Parser/Preprocessing/OpenCoverReportPreprocessor.cs rename to src/ReportGenerator.Core/Parser/Preprocessing/OpenCoverReportPreprocessor.cs index e3282025..f8b6f27e 100644 --- a/src/ReportGenerator.Console/Parser/Preprocessing/OpenCoverReportPreprocessor.cs +++ b/src/ReportGenerator.Core/Parser/Preprocessing/OpenCoverReportPreprocessor.cs @@ -3,33 +3,20 @@ using System.Linq; using System.Xml.Linq; -namespace Palmmedia.ReportGenerator.Parser.Preprocessing +namespace Palmmedia.ReportGenerator.Core.Parser.Preprocessing { /// <summary> /// Preprocessor for OpenCover reports. /// </summary> internal class OpenCoverReportPreprocessor { - /// <summary> - /// The report file. - /// </summary> - private readonly XContainer report; - - /// <summary> - /// Initializes a new instance of the <see cref="OpenCoverReportPreprocessor"/> class. - /// </summary> - /// <param name="report">The report.</param> - internal OpenCoverReportPreprocessor(XContainer report) - { - this.report = report; - } - /// <summary> /// Executes the preprocessing of the report. /// </summary> - internal void Execute() + /// <param name="report">The report.</param> + internal void Execute(XContainer report) { - foreach (var module in this.report.Descendants("Module").ToArray()) + foreach (var module in report.Descendants("Module").ToArray()) { ApplyClassNameToStartupCodeElements(module); } diff --git a/src/ReportGenerator.Console/Parser/Preprocessing/VisualStudioReportPreprocessor.cs b/src/ReportGenerator.Core/Parser/Preprocessing/VisualStudioReportPreprocessor.cs similarity index 88% rename from src/ReportGenerator.Console/Parser/Preprocessing/VisualStudioReportPreprocessor.cs rename to src/ReportGenerator.Core/Parser/Preprocessing/VisualStudioReportPreprocessor.cs index 2e6e59b0..daf1752b 100644 --- a/src/ReportGenerator.Console/Parser/Preprocessing/VisualStudioReportPreprocessor.cs +++ b/src/ReportGenerator.Core/Parser/Preprocessing/VisualStudioReportPreprocessor.cs @@ -2,33 +2,20 @@ using System.Linq; using System.Xml.Linq; -namespace Palmmedia.ReportGenerator.Parser.Preprocessing +namespace Palmmedia.ReportGenerator.Core.Parser.Preprocessing { /// <summary> /// Preprocessor for Visual Studio reports. /// </summary> internal class VisualStudioReportPreprocessor { - /// <summary> - /// The report file as XContainer. - /// </summary> - private readonly XContainer report; - - /// <summary> - /// Initializes a new instance of the <see cref="VisualStudioReportPreprocessor"/> class. - /// </summary> - /// <param name="report">The report.</param> - internal VisualStudioReportPreprocessor(XContainer report) - { - this.report = report; - } - /// <summary> /// Executes the preprocessing of the report. /// </summary> - internal void Execute() + /// <param name="report">The report.</param> + internal void Execute(XContainer report) { - foreach (var module in this.report.Descendants("Module").ToArray()) + foreach (var module in report.Descendants("Module").ToArray()) { ApplyClassNameToStartupCodeElements(module); } diff --git a/src/ReportGenerator.Core/Parser/UnsupportedParserException.cs b/src/ReportGenerator.Core/Parser/UnsupportedParserException.cs new file mode 100644 index 00000000..2bce6929 --- /dev/null +++ b/src/ReportGenerator.Core/Parser/UnsupportedParserException.cs @@ -0,0 +1,35 @@ +using System; + +namespace Palmmedia.ReportGenerator.Core.Parser +{ + /// <summary> + /// Exception indicating that a parser/xml format is not or no longer supported. + /// </summary> + [Serializable] + internal class UnsupportedParserException : Exception + { + /// <summary> + /// Initializes a new instance of the <see cref="UnsupportedParserException"/> class. + /// </summary> + public UnsupportedParserException() + { + } + + /// <summary> + /// Initializes a new instance of the <see cref="UnsupportedParserException"/> class. + /// </summary> + /// <param name="message">The message.</param> + public UnsupportedParserException(string message) : base(message) + { + } + + /// <summary> + /// Initializes a new instance of the <see cref="UnsupportedParserException"/> class. + /// </summary> + /// <param name="message">The message.</param> + /// <param name="inner">The inner exception.</param> + public UnsupportedParserException(string message, Exception inner) : base(message, inner) + { + } + } +} diff --git a/src/ReportGenerator.Console/Parser/VisualStudioParser.cs b/src/ReportGenerator.Core/Parser/VisualStudioParser.cs similarity index 59% rename from src/ReportGenerator.Console/Parser/VisualStudioParser.cs rename to src/ReportGenerator.Core/Parser/VisualStudioParser.cs index c810fd25..619cc189 100644 --- a/src/ReportGenerator.Console/Parser/VisualStudioParser.cs +++ b/src/ReportGenerator.Core/Parser/VisualStudioParser.cs @@ -5,168 +5,93 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Xml.Linq; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Filtering; +using Palmmedia.ReportGenerator.Core.Properties; -namespace Palmmedia.ReportGenerator.Parser +namespace Palmmedia.ReportGenerator.Core.Parser { /// <summary> /// Parser for XML reports generated by Visual Studio. /// </summary> internal class VisualStudioParser : ParserBase { - /// <summary> - /// Regex to analyze if a method name belongs to a lamda expression. - /// </summary> - private const string LambdaMethodRegex = "<.+>.+__"; - /// <summary> /// The Logger. /// </summary> private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(VisualStudioParser)); /// <summary> - /// The module elements of the report. + /// Regex to analyze if a method name belongs to a lamda expression. /// </summary> - private XElement[] modules; + private static Regex lambdaMethodNameRegex = new Regex("<.+>.+__", RegexOptions.Compiled); /// <summary> - /// The file elements of the report. + /// Regex to analyze if a method name is generated by compiler. /// </summary> - private XElement[] files; + private static Regex compilerGeneratedMethodNameRegex = new Regex(@"^.*<(?<CompilerGeneratedName>.+)>.+__.+!MoveNext\(\)!.+$", RegexOptions.Compiled); /// <summary> - /// Initializes a new instance of the <see cref="VisualStudioParser"/> class. + /// Regex to extract short method name. /// </summary> - /// <param name="report">The report file as XContainer.</param> - internal VisualStudioParser(XContainer report) - { - if (report == null) - { - throw new ArgumentNullException(nameof(report)); - } - - this.modules = report.Descendants("Module").ToArray(); - this.files = report.Descendants("SourceFileNames").ToArray(); - - var assemblyNames = this.modules - .Select(m => m.Element("ModuleName").Value) - .Distinct() - .OrderBy(a => a) - .ToArray(); - - Parallel.ForEach(assemblyNames, assemblyName => this.AddAssembly(this.ProcessAssembly(assemblyName))); - - this.modules = null; - this.files = null; - } + private static Regex methodRegex = new Regex(@"^(?<MethodName>.+)\((?<Arguments>.*)\).*$", RegexOptions.Compiled); /// <summary> - /// Extracts the metrics from the given <see cref="XElement">XElements</see>. + /// Initializes a new instance of the <see cref="VisualStudioParser" /> class. /// </summary> - /// <param name="methods">The methods.</param> - /// <param name="class">The class.</param> - private static void SetMethodMetrics(IEnumerable<XElement> methods, Class @class) + /// <param name="assemblyFilter">The assembly filter.</param> + /// <param name="classFilter">The class filter.</param> + /// <param name="fileFilter">The file filter.</param> + internal VisualStudioParser(IFilter assemblyFilter, IFilter classFilter, IFilter fileFilter) : base(assemblyFilter, classFilter, fileFilter) { - foreach (var method in methods) - { - string methodName = method.Element("MethodName").Value; - - // Exclude properties and lambda expressions - if (methodName.StartsWith("get_", StringComparison.Ordinal) - || methodName.StartsWith("set_", StringComparison.Ordinal) - || Regex.IsMatch(methodName, LambdaMethodRegex)) - { - continue; - } - - methodName = ExtractMethodName(methodName, method.Element("MethodKeyName").Value); - - var metrics = new[] - { - new Metric( - ReportResources.BlocksCovered, - ParserBase.CodeCoverageUri, - MetricType.CoverageAbsolute, - int.Parse(method.Element("BlocksCovered").Value, CultureInfo.InvariantCulture)), - new Metric( - ReportResources.BlocksNotCovered, - ParserBase.CodeCoverageUri, - MetricType.CoverageAbsolute, - int.Parse(method.Element("BlocksNotCovered").Value, CultureInfo.InvariantCulture)) - }; - - @class.AddMethodMetric(new MethodMetric(methodName, metrics)); - } } /// <summary> - /// Extracts the methods/properties of the given <see cref="XElement">XElements</see>. + /// Parses the given XML report. /// </summary> - /// <param name="codeFile">The code file.</param> - /// <param name="methodsOfFile">The methods of the file.</param> - private static void SetCodeElements(CodeFile codeFile, IEnumerable<XElement> methodsOfFile) + /// <param name="report">The XML report</param> + /// <returns>The parser result.</returns> + public override ParserResult Parse(XContainer report) { - foreach (var method in methodsOfFile) + if (report == null) { - if (Regex.IsMatch(method.Element("MethodName").Value, LambdaMethodRegex)) - { - continue; - } - - string methodName = ExtractMethodName(method.Element("MethodName").Value, method.Element("MethodKeyName").Value); - - CodeElementType type = CodeElementType.Method; + throw new ArgumentNullException(nameof(report)); + } - if (methodName.StartsWith("get_", StringComparison.OrdinalIgnoreCase) - || methodName.StartsWith("set_", StringComparison.OrdinalIgnoreCase)) - { - type = CodeElementType.Property; - methodName = methodName.Substring(4); - } + var assemblies = new List<Assembly>(); - var seqpnt = method - .Elements("Lines") - .Elements("LnStart") - .FirstOrDefault(); + var modules = report.Descendants("Module").ToArray(); + var files = report.Descendants("SourceFileNames").ToArray(); - if (seqpnt != null) - { - int line = int.Parse(seqpnt.Value, CultureInfo.InvariantCulture); - codeFile.AddCodeElement(new CodeElement(methodName, type, line)); - } - } - } - - /// <summary> - /// Extracts the method name. For async methods the original name is returned. - /// </summary> - /// <param name="methodName">The full method name.</param> - /// <param name="methodKeyName">The method key name.</param> - /// <returns>The method name.</returns> - private static string ExtractMethodName(string methodName, string methodKeyName) - { - Match match = Regex.Match(methodKeyName, @"^.*<(?<CompilerGeneratedName>.+)>.+__.+!MoveNext\(\)!.+$"); + var assemblyNames = modules + .Select(m => m.Element("ModuleName").Value) + .Distinct() + .Where(a => this.AssemblyFilter.IsElementIncludedInReport(a)) + .OrderBy(a => a) + .ToArray(); - if (match.Success) + foreach (var assemblyName in assemblyNames) { - methodName = match.Groups["CompilerGeneratedName"].Value + "()"; + assemblies.Add(this.ProcessAssembly(modules, files, assemblyName)); } - return methodName; + var result = new ParserResult(assemblies.OrderBy(a => a.Name).ToList(), false, this.ToString()); + return result; } /// <summary> /// Processes the given assembly. /// </summary> + /// <param name="modules">The modules.</param> + /// <param name="files">The files.</param> /// <param name="assemblyName">Name of the assembly.</param> /// <returns>The <see cref="Assembly"/>.</returns> - private Assembly ProcessAssembly(string assemblyName) + private Assembly ProcessAssembly(XElement[] modules, XElement[] files, string assemblyName) { Logger.DebugFormat(" " + Resources.CurrentAssembly, assemblyName); - var classNames = this.modules + var classNames = modules .Where(m => m.Element("ModuleName").Value.Equals(assemblyName)) .Elements("NamespaceTable") .Elements("Class") @@ -181,12 +106,13 @@ private Assembly ProcessAssembly(string assemblyName) return c.Parent.Parent.Element("NamespaceName").Value + "." + fullname; }) .Distinct() + .Where(c => this.ClassFilter.IsElementIncludedInReport(c)) .OrderBy(name => name) .ToArray(); var assembly = new Assembly(assemblyName); - Parallel.ForEach(classNames, className => assembly.AddClass(this.ProcessClass(assembly, className))); + Parallel.ForEach(classNames, className => this.ProcessClass(modules, files, assembly, className)); return assembly; } @@ -194,12 +120,13 @@ private Assembly ProcessAssembly(string assemblyName) /// <summary> /// Processes the given class. /// </summary> + /// <param name="modules">The modules.</param> + /// <param name="files">The files.</param> /// <param name="assembly">The assembly.</param> /// <param name="className">Name of the class.</param> - /// <returns>The <see cref="Class"/>.</returns> - private Class ProcessClass(Assembly assembly, string className) + private void ProcessClass(XElement[] modules, XElement[] files, Assembly assembly, string className) { - var fileIdsOfClass = this.modules + var fileIdsOfClass = modules .Where(m => m.Element("ModuleName").Value.Equals(assembly.Name)) .Elements("NamespaceTable") .Elements("Class") @@ -209,29 +136,44 @@ private Class ProcessClass(Assembly assembly, string className) .Elements("Lines") .Elements("SourceFileID") .Select(m => m.Value) - .Distinct(); + .Distinct() + .ToArray(); - var @class = new Class(className, assembly); + var filteredFilesOfClass = fileIdsOfClass + .Select(fileId => + new + { + FileId = fileId, + FilePath = files.First(f => f.Element("SourceFileID").Value == fileId).Element("SourceFileName").Value + }) + .Where(f => this.FileFilter.IsElementIncludedInReport(f.FilePath)) + .ToArray(); - foreach (var fileId in fileIdsOfClass) + // If all files are removed by filters, then the whole class is omitted + if (fileIdsOfClass.Length == 0 || filteredFilesOfClass.Length > 0) { - string file = this.files.First(f => f.Element("SourceFileID").Value == fileId).Element("SourceFileName").Value; - @class.AddFile(this.ProcessFile(fileId, @class, file)); - } + var @class = new Class(className, assembly); - return @class; + foreach (var file in filteredFilesOfClass) + { + @class.AddFile(ProcessFile(modules, file.FileId, @class, file.FilePath)); + } + + assembly.AddClass(@class); + } } /// <summary> /// Processes the file. /// </summary> + /// <param name="modules">The modules.</param> /// <param name="fileId">The file id.</param> /// <param name="class">The class.</param> /// <param name="filePath">The file path.</param> /// <returns>The <see cref="CodeFile"/>.</returns> - private CodeFile ProcessFile(string fileId, Class @class, string filePath) + private static CodeFile ProcessFile(XElement[] modules, string fileId, Class @class, string filePath) { - var methods = this.modules + var methods = modules .Where(m => m.Element("ModuleName").Value.Equals(@class.Assembly.Name)) .Elements("NamespaceTable") .Elements("Class") @@ -241,8 +183,6 @@ private CodeFile ProcessFile(string fileId, Class @class, string filePath) .Where(m => m.Elements("Lines").Elements("SourceFileID").Any(s => s.Value == fileId)) .ToArray(); - SetMethodMetrics(methods, @class); - var linesOfFile = methods .Elements("Lines") .Select(l => new @@ -280,9 +220,125 @@ private CodeFile ProcessFile(string fileId, Class @class, string filePath) var codeFile = new CodeFile(filePath, coverage, lineVisitStatus); + SetMethodMetrics(codeFile, methods); SetCodeElements(codeFile, methods); return codeFile; } + + /// <summary> + /// Extracts the metrics from the given <see cref="XElement">XElements</see>. + /// </summary> + /// <param name="codeFile">The code file.</param> + /// <param name="methodsOfFile">The methods of the file.</param> + private static void SetMethodMetrics(CodeFile codeFile, IEnumerable<XElement> methodsOfFile) + { + foreach (var method in methodsOfFile) + { + string fullName = method.Element("MethodName").Value; + + // Exclude properties and lambda expressions + if (fullName.StartsWith("get_", StringComparison.Ordinal) + || fullName.StartsWith("set_", StringComparison.Ordinal) + || lambdaMethodNameRegex.IsMatch(fullName)) + { + continue; + } + + fullName = ExtractMethodName(fullName, method.Element("MethodKeyName").Value); + string shortName = methodRegex.Replace(fullName, m => string.Format(CultureInfo.InvariantCulture, "{0}({1})", m.Groups["MethodName"].Value, m.Groups["Arguments"].Value.Length > 0 ? "..." : string.Empty)); + + var metrics = new[] + { + new Metric( + ReportResources.BlocksCovered, + ParserBase.CodeCoverageUri, + MetricType.CoverageAbsolute, + int.Parse(method.Element("BlocksCovered").Value, CultureInfo.InvariantCulture)), + new Metric( + ReportResources.BlocksNotCovered, + ParserBase.CodeCoverageUri, + MetricType.CoverageAbsolute, + int.Parse(method.Element("BlocksNotCovered").Value, CultureInfo.InvariantCulture)) + }; + + var methodMetric = new MethodMetric(fullName, shortName, metrics); + + var seqpnt = method + .Elements("Lines") + .Elements("LnStart") + .FirstOrDefault(); + + if (seqpnt != null) + { + methodMetric.Line = int.Parse(seqpnt.Value, CultureInfo.InvariantCulture); + } + + codeFile.AddMethodMetric(methodMetric); + } + } + + /// <summary> + /// Extracts the methods/properties of the given <see cref="XElement">XElements</see>. + /// </summary> + /// <param name="codeFile">The code file.</param> + /// <param name="methodsOfFile">The methods of the file.</param> + private static void SetCodeElements(CodeFile codeFile, IEnumerable<XElement> methodsOfFile) + { + foreach (var method in methodsOfFile) + { + if (lambdaMethodNameRegex.IsMatch(method.Element("MethodName").Value)) + { + continue; + } + + string methodName = ExtractMethodName(method.Element("MethodName").Value, method.Element("MethodKeyName").Value); + + CodeElementType type = CodeElementType.Method; + + if (methodName.StartsWith("get_", StringComparison.OrdinalIgnoreCase) + || methodName.StartsWith("set_", StringComparison.OrdinalIgnoreCase)) + { + type = CodeElementType.Property; + methodName = methodName.Substring(4); + } + + var seqpnts = method + .Elements("Lines") + .Select(l => new + { + LineNumberStart = int.Parse(l.Element("LnStart").Value, CultureInfo.InvariantCulture), + LineNumberEnd = int.Parse(l.Element("LnEnd").Value, CultureInfo.InvariantCulture) + }) + .ToArray(); + + if (seqpnts.Length > 0) + { + codeFile.AddCodeElement(new CodeElement(methodName, type, seqpnts.Min(s => s.LineNumberStart), seqpnts.Max(s => s.LineNumberEnd))); + } + } + } + + /// <summary> + /// Extracts the method name. For async methods the original name is returned. + /// </summary> + /// <param name="methodName">The full method name.</param> + /// <param name="methodKeyName">The method key name.</param> + /// <returns>The method name.</returns> + private static string ExtractMethodName(string methodName, string methodKeyName) + { + // Quick check before expensive regex is called + if (methodKeyName.Contains("MoveNext()")) + { + Match match = compilerGeneratedMethodNameRegex.Match(methodKeyName); + + if (match.Success) + { + methodName = match.Groups["CompilerGeneratedName"].Value + "()"; + } + } + + return methodName; + } } } diff --git a/src/ReportGenerator.Core/Plugin/DefaultAssemblyLoader.cs b/src/ReportGenerator.Core/Plugin/DefaultAssemblyLoader.cs new file mode 100644 index 00000000..d73b2fbc --- /dev/null +++ b/src/ReportGenerator.Core/Plugin/DefaultAssemblyLoader.cs @@ -0,0 +1,20 @@ +using System.Reflection; + +namespace Palmmedia.ReportGenerator.Core.Plugin +{ + /// <summary> + /// The default assembly loader. + /// </summary> + internal class DefaultAssemblyLoader : IAssemblyLoader + { + /// <summary> + /// Loads the assembly with the given name. + /// </summary> + /// <param name="name">The name of the assembly.</param> + /// <returns>The assembly.</returns> + public Assembly Load(string name) + { + return Assembly.LoadFrom(name); + } + } +} diff --git a/src/ReportGenerator.Console/Reporting/FileUnblocker.cs b/src/ReportGenerator.Core/Plugin/FileUnblocker.cs similarity index 95% rename from src/ReportGenerator.Console/Reporting/FileUnblocker.cs rename to src/ReportGenerator.Core/Plugin/FileUnblocker.cs index ccde1cc0..b8145bd1 100644 --- a/src/ReportGenerator.Console/Reporting/FileUnblocker.cs +++ b/src/ReportGenerator.Core/Plugin/FileUnblocker.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -namespace Palmmedia.ReportGenerator.Reporting +namespace Palmmedia.ReportGenerator.Core.Plugin { /// <summary> /// Helper class for unblocking files. diff --git a/src/ReportGenerator.Core/Plugin/IAssemblyLoader.cs b/src/ReportGenerator.Core/Plugin/IAssemblyLoader.cs new file mode 100644 index 00000000..286fa637 --- /dev/null +++ b/src/ReportGenerator.Core/Plugin/IAssemblyLoader.cs @@ -0,0 +1,17 @@ +using System.Reflection; + +namespace Palmmedia.ReportGenerator.Core.Plugin +{ + /// <summary> + /// Interface for assembly loaders. + /// </summary> + public interface IAssemblyLoader + { + /// <summary> + /// Loads the assembly with the given name. + /// </summary> + /// <param name="name">The name of the assembly.</param> + /// <returns>The assembly.</returns> + Assembly Load(string name); + } +} diff --git a/src/ReportGenerator.Core/Plugin/IPluginLoader.cs b/src/ReportGenerator.Core/Plugin/IPluginLoader.cs new file mode 100644 index 00000000..cbdbda83 --- /dev/null +++ b/src/ReportGenerator.Core/Plugin/IPluginLoader.cs @@ -0,0 +1,17 @@ +using System.Collections.Generic; + +namespace Palmmedia.ReportGenerator.Core.Plugin +{ + /// <summary> + /// Interface for loading plugins at runtime. + /// </summary> + internal interface IPluginLoader + { + /// <summary> + /// Determines all available plugins from a certain type. + /// </summary> + /// <typeparam name="T">The plugin type.</typeparam> + /// <returns>All available plugins.</returns> + IReadOnlyCollection<T> LoadInstancesOfType<T>(); + } +} diff --git a/src/ReportGenerator.Core/Plugin/ReflectionPluginLoader.cs b/src/ReportGenerator.Core/Plugin/ReflectionPluginLoader.cs new file mode 100644 index 00000000..07057b58 --- /dev/null +++ b/src/ReportGenerator.Core/Plugin/ReflectionPluginLoader.cs @@ -0,0 +1,127 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Runtime.Versioning; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Properties; + +namespace Palmmedia.ReportGenerator.Core.Plugin +{ + /// <summary> + /// Load plugins at runtime by scanning all DLLs via reflection. + /// </summary> + internal class ReflectionPluginLoader : IPluginLoader + { + /// <summary> + /// The Logger. + /// </summary> + private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(ReflectionPluginLoader)); + + /// <summary> + /// The plugins. + /// </summary> + private readonly IReadOnlyCollection<string> plugins; + + /// <summary> + /// The <see cref="IAssemblyLoader"/>. + /// </summary> + private readonly IAssemblyLoader assemblyLoader; + + /// <summary> + /// Initializes a new instance of the <see cref="ReflectionPluginLoader" /> class. + /// </summary> + /// <param name="plugins">The plugins.</param> + public ReflectionPluginLoader(IReadOnlyCollection<string> plugins) + { + this.plugins = plugins ?? throw new ArgumentNullException(nameof(plugins)); + this.assemblyLoader = this.CreateAssemblyLoader(); + } + + /// <summary> + /// Determines all available plugins from a certain type. + /// </summary> + /// <typeparam name="T">The plugin type.</typeparam> + /// <returns>All available plugins.</returns> + public IReadOnlyCollection<T> LoadInstancesOfType<T>() + { + var result = new List<T>(); + + var internalPluginTypes = typeof(ReflectionPluginLoader).Assembly.GetExportedTypes() + .Where(t => typeof(T).IsAssignableFrom(t) && t.IsClass && !t.IsAbstract); + + foreach (var pluginType in internalPluginTypes) + { + try + { + result.Add((T)Activator.CreateInstance(pluginType)); + } + catch (Exception) + { + Logger.Error(string.Format(Resources.FailedToInstantiatePlugin, pluginType.Name)); + } + } + + if (this.plugins.Count == 0) + { + return result; + } + + foreach (var plugin in this.plugins) + { + try + { + // Unblock files, this prevents FileLoadException (e.g. if file was extracted from a ZIP archive) + FileUnblocker.Unblock(plugin); + + var assembly = this.assemblyLoader.Load(plugin); + + var pluginTypes = assembly.GetExportedTypes() + .Where(t => typeof(T).IsAssignableFrom(t) && t.IsClass && !t.IsAbstract); + + foreach (var pluginType in pluginTypes) + { + try + { + result.Add((T)Activator.CreateInstance(pluginType)); + } + catch (Exception) + { + Logger.Error(string.Format(Resources.FailedToInstantiatePlugin, pluginType.Name)); + } + } + } + catch (Exception) + { + Logger.Error(string.Format(Resources.FailedToLoadPlugins, plugin)); + } + } + + return result; + } + + /// <summary> + /// Initializes the <see cref="IAssemblyLoader"/> based on the runtime (.NET full framework vs. .NET Core) + /// </summary> + /// <returns>The <see cref="IAssemblyLoader"/>.</returns> + private IAssemblyLoader CreateAssemblyLoader() + { + string framework = Assembly.GetEntryAssembly()?.GetCustomAttribute<TargetFrameworkAttribute>()?.FrameworkName; + + if (framework != null && framework.StartsWith(".NETCoreApp")) + { + var directory = new FileInfo(typeof(ReflectionPluginLoader).Assembly.Location).Directory.FullName; + string path = Path.Combine(directory, "ReportGenerator.DotnetCorePluginLoader.dll"); + + var dotnetCorePluginLoaderAssembly = Assembly.LoadFrom(path); + var assemblyLoaderType = dotnetCorePluginLoaderAssembly.GetExportedTypes() + .Where(t => typeof(IAssemblyLoader).IsAssignableFrom(t) && t.IsClass && !t.IsAbstract) + .Single(); + return (IAssemblyLoader)Activator.CreateInstance(assemblyLoaderType); + } + + return new DefaultAssemblyLoader(); + } + } +} diff --git a/src/ReportGenerator.Core/Program.cs b/src/ReportGenerator.Core/Program.cs new file mode 100644 index 00000000..413b625e --- /dev/null +++ b/src/ReportGenerator.Core/Program.cs @@ -0,0 +1,36 @@ +using System; +using System.Linq; +using Palmmedia.ReportGenerator.Core.Plugin; +using Palmmedia.ReportGenerator.Core.Reporting; + +namespace Palmmedia.ReportGenerator.Core +{ + /// <summary> + /// Command line access to the ReportBuilder. + /// </summary> + public class Program + { + /// <summary> + /// The main method. + /// </summary> + /// <param name="args">The command line arguments.</param> + /// <returns>Return code indicating success/failure.</returns> + public static int Main(string[] args) + { + args = args.Select(a => a.EndsWith("\"", StringComparison.OrdinalIgnoreCase) ? a.TrimEnd('\"') + "\\" : a).ToArray(); + + var reportConfigurationBuilder = new ReportConfigurationBuilder(); + ReportConfiguration configuration = reportConfigurationBuilder.Create(args); + + if (args.Length < 2) + { + var help = new Help(new ReportBuilderFactory(new ReflectionPluginLoader(configuration.Plugins))); + help.ShowHelp(); + + return 1; + } + + return new Generator().GenerateReport(configuration) ? 0 : 1; + } + } +} diff --git a/src/ReportGenerator.Core/ProgramIcon.ico b/src/ReportGenerator.Core/ProgramIcon.ico new file mode 100644 index 00000000..1d455f70 Binary files /dev/null and b/src/ReportGenerator.Core/ProgramIcon.ico differ diff --git a/src/ReportGenerator.Core/Properties/AssemblyInfo.cs b/src/ReportGenerator.Core/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..9ba27d48 --- /dev/null +++ b/src/ReportGenerator.Core/Properties/AssemblyInfo.cs @@ -0,0 +1,2 @@ +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("ReportGenerator.Core.Test")] +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicProxyGenAssembly2")] \ No newline at end of file diff --git a/src/ReportGenerator.Console/Properties/Help.Designer.cs b/src/ReportGenerator.Core/Properties/Help.Designer.cs similarity index 87% rename from src/ReportGenerator.Console/Properties/Help.Designer.cs rename to src/ReportGenerator.Core/Properties/Help.Designer.cs index c6bf31b2..d57aee14 100644 --- a/src/ReportGenerator.Console/Properties/Help.Designer.cs +++ b/src/ReportGenerator.Core/Properties/Help.Designer.cs @@ -8,7 +8,7 @@ // </auto-generated> //------------------------------------------------------------------------------ -namespace Palmmedia.ReportGenerator.Properties { +namespace Palmmedia.ReportGenerator.Core.Properties { using System; @@ -39,7 +39,7 @@ internal Help() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Palmmedia.ReportGenerator.Properties.Help", typeof(Help).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Palmmedia.ReportGenerator.Core.Properties.Help", typeof(Help).Assembly); resourceMan = temp; } return resourceMan; @@ -88,7 +88,7 @@ internal static string Explanations { } /// <summary> - /// Looks up a localized string similar to Reports: The coverage reports that should be parsed (separated by semicolon). Wildcards are allowed.. + /// Looks up a localized string similar to Reports: The coverage reports that should be parsed (separated by semicolon). Globbing is supported.. /// </summary> internal static string Explanations1 { get { @@ -97,7 +97,7 @@ internal static string Explanations1 { } /// <summary> - /// Looks up a localized string similar to File Filters: Optional list of files that should be included or excluded in the report.. + /// Looks up a localized string similar to File filters: Optional list of files that should be included or excluded in the report.. /// </summary> internal static string Explanations10 { get { @@ -124,7 +124,7 @@ internal static string Explanations12 { } /// <summary> - /// Looks up a localized string similar to Optional tag or build version.. + /// Looks up a localized string similar to Tag: Optional tag or build version.. /// </summary> internal static string Explanations13 { get { @@ -133,34 +133,43 @@ internal static string Explanations13 { } /// <summary> - /// Looks up a localized string similar to Target directory: The directory where the generated report should be saved.. + /// Looks up a localized string similar to Plugins: Optional plugin files for custom reports or custom history storage (separated by semicolon).. /// </summary> - internal static string Explanations2 { + internal static string Explanations14 { get { - return ResourceManager.GetString("Explanations2", resourceCulture); + return ResourceManager.GetString("Explanations14", resourceCulture); } } /// <summary> - /// Looks up a localized string similar to Reporttypes: The output formats and scope (separated by semicolon).. + /// Looks up a localized string similar to Source directories: Optional directories which contain the corresponding source code (separated by semicolon).. /// </summary> - internal static string Explanations3 { + internal static string Explanations15 { get { - return ResourceManager.GetString("Explanations3", resourceCulture); + return ResourceManager.GetString("Explanations15", resourceCulture); } } /// <summary> - /// Looks up a localized string similar to Source directories: Optional directories which contain the corresponding source code (separated by semicolon).. + /// Looks up a localized string similar to Target directory: The directory where the generated report should be saved.. /// </summary> - internal static string Explanations4 { + internal static string Explanations2 { get { - return ResourceManager.GetString("Explanations4", resourceCulture); + return ResourceManager.GetString("Explanations2", resourceCulture); } } /// <summary> - /// Looks up a localized string similar to The source files are used if coverage report contains classes without path information.. + /// Looks up a localized string similar to Report types: The output formats and scope (separated by semicolon).. + /// </summary> + internal static string Explanations3 { + get { + return ResourceManager.GetString("Explanations3", resourceCulture); + } + } + + /// <summary> + /// Looks up a localized string similar to The source directories are used if coverage report contains classes without path information.. /// </summary> internal static string Explanations5 { get { @@ -187,7 +196,7 @@ internal static string Explanations7 { } /// <summary> - /// Looks up a localized string similar to Assembly Filters: Optional list of assemblies that should be included or excluded in the report.. + /// Looks up a localized string similar to Assembly filters: Optional list of assemblies that should be included or excluded in the report.. /// </summary> internal static string Explanations8 { get { @@ -196,7 +205,7 @@ internal static string Explanations8 { } /// <summary> - /// Looks up a localized string similar to Class Filters: Optional list of classes that should be included or excluded in the report.. + /// Looks up a localized string similar to Class filters: Optional list of classes that should be included or excluded in the report.. /// </summary> internal static string Explanations9 { get { @@ -232,29 +241,38 @@ internal static string Parameters10 { } /// <summary> - /// Looks up a localized string similar to ["]-targetdir:<target directory>["]. + /// Looks up a localized string similar to [["]-plugins:<plugin>[;<plugin>][;<plugin>]["]]. /// </summary> - internal static string Parameters2 { + internal static string Parameters11 { get { - return ResourceManager.GetString("Parameters2", resourceCulture); + return ResourceManager.GetString("Parameters11", resourceCulture); } } /// <summary> - /// Looks up a localized string similar to [["]-reporttypes:<{0}>[;<{0}>]["]]". + /// Looks up a localized string similar to [["]-sourcedirs:<directory>[;<directory>][;<directory>]["]]. /// </summary> - internal static string Parameters3 { + internal static string Parameters12 { get { - return ResourceManager.GetString("Parameters3", resourceCulture); + return ResourceManager.GetString("Parameters12", resourceCulture); } } /// <summary> - /// Looks up a localized string similar to [["]-sourcedirs:<directory>[;<directory>][;<directory>]["]]. + /// Looks up a localized string similar to ["]-targetdir:<target directory>["]. /// </summary> - internal static string Parameters4 { + internal static string Parameters2 { get { - return ResourceManager.GetString("Parameters4", resourceCulture); + return ResourceManager.GetString("Parameters2", resourceCulture); + } + } + + /// <summary> + /// Looks up a localized string similar to [["]-reporttypes:<{0}>[;<{0}>]["]]". + /// </summary> + internal static string Parameters3 { + get { + return ResourceManager.GetString("Parameters3", resourceCulture); } } diff --git a/src/ReportGenerator.Console/Properties/Help.resx b/src/ReportGenerator.Core/Properties/Help.resx similarity index 91% rename from src/ReportGenerator.Console/Properties/Help.resx rename to src/ReportGenerator.Core/Properties/Help.resx index f8e49e75..759cd8f5 100644 --- a/src/ReportGenerator.Console/Properties/Help.resx +++ b/src/ReportGenerator.Core/Properties/Help.resx @@ -127,10 +127,10 @@ <value>Explanations:</value> </data> <data name="Explanations1" xml:space="preserve"> - <value>Reports: The coverage reports that should be parsed (separated by semicolon). Wildcards are allowed.</value> + <value>Reports: The coverage reports that should be parsed (separated by semicolon). Globbing is supported.</value> </data> <data name="Explanations10" xml:space="preserve"> - <value>File Filters: Optional list of files that should be included or excluded in the report.</value> + <value>File filters: Optional list of files that should be included or excluded in the report.</value> </data> <data name="Explanations11" xml:space="preserve"> <value> Exclusion filters take precedence over inclusion filters. Wildcards are allowed.</value> @@ -141,17 +141,20 @@ <data name="Explanations13" xml:space="preserve"> <value>Tag: Optional tag or build version.</value> </data> + <data name="Explanations14" xml:space="preserve"> + <value>Plugins: Optional plugin files for custom reports or custom history storage (separated by semicolon).</value> + </data> + <data name="Explanations15" xml:space="preserve"> + <value>Source directories: Optional directories which contain the corresponding source code (separated by semicolon).</value> + </data> <data name="Explanations2" xml:space="preserve"> <value>Target directory: The directory where the generated report should be saved.</value> </data> <data name="Explanations3" xml:space="preserve"> - <value>Reporttypes: The output formats and scope (separated by semicolon).</value> - </data> - <data name="Explanations4" xml:space="preserve"> - <value>Source directories: Optional directories which contain the corresponding source code (separated by semicolon).</value> + <value>Report types: The output formats and scope (separated by semicolon).</value> </data> <data name="Explanations5" xml:space="preserve"> - <value> The source files are used if coverage report contains classes without path information.</value> + <value> The source directories are used if coverage report contains classes without path information.</value> </data> <data name="Explanations6" xml:space="preserve"> <value>History directory: Optional directory for storing persistent coverage information.</value> @@ -160,10 +163,10 @@ <value> Can be used in future reports to show coverage evolution.</value> </data> <data name="Explanations8" xml:space="preserve"> - <value>Assembly Filters: Optional list of assemblies that should be included or excluded in the report.</value> + <value>Assembly filters: Optional list of assemblies that should be included or excluded in the report.</value> </data> <data name="Explanations9" xml:space="preserve"> - <value>Class Filters: Optional list of classes that should be included or excluded in the report.</value> + <value>Class filters: Optional list of classes that should be included or excluded in the report.</value> </data> <data name="Parameters" xml:space="preserve"> <value>Parameters:</value> @@ -174,15 +177,18 @@ <data name="Parameters10" xml:space="preserve"> <value>[["]-tag:<tag>["]]</value> </data> + <data name="Parameters11" xml:space="preserve"> + <value>[["]-plugins:<plugin>[;<plugin>][;<plugin>]["]]</value> + </data> + <data name="Parameters12" xml:space="preserve"> + <value>[["]-sourcedirs:<directory>[;<directory>][;<directory>]["]]</value> + </data> <data name="Parameters2" xml:space="preserve"> <value>["]-targetdir:<target directory>["]</value> </data> <data name="Parameters3" xml:space="preserve"> <value>[["]-reporttypes:<{0}>[;<{0}>]["]]"</value> </data> - <data name="Parameters4" xml:space="preserve"> - <value>[["]-sourcedirs:<directory>[;<directory>][;<directory>]["]]</value> - </data> <data name="Parameters5" xml:space="preserve"> <value>[["]-historydir:<history directory>["]]</value> </data> diff --git a/src/ReportGenerator.Console/Properties/ReportResources.Designer.cs b/src/ReportGenerator.Core/Properties/ReportResources.Designer.cs similarity index 93% rename from src/ReportGenerator.Console/Properties/ReportResources.Designer.cs rename to src/ReportGenerator.Core/Properties/ReportResources.Designer.cs index fddecae7..7988c81b 100644 --- a/src/ReportGenerator.Console/Properties/ReportResources.Designer.cs +++ b/src/ReportGenerator.Core/Properties/ReportResources.Designer.cs @@ -8,7 +8,7 @@ // </auto-generated> //------------------------------------------------------------------------------ -namespace Palmmedia.ReportGenerator.Properties { +namespace Palmmedia.ReportGenerator.Core.Properties { using System; @@ -39,7 +39,7 @@ internal ReportResources() { public static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Palmmedia.ReportGenerator.Properties.ReportResources", typeof(ReportResources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Palmmedia.ReportGenerator.Core.Properties.ReportResources", typeof(ReportResources).Assembly); resourceMan = temp; } return resourceMan; @@ -168,6 +168,15 @@ public static string ByNamespace { } } + /// <summary> + /// Looks up a localized string similar to Changes only. + /// </summary> + public static string ChangesOnly { + get { + return ResourceManager.GetString("ChangesOnly", resourceCulture); + } + } + /// <summary> /// Looks up a localized string similar to Class:. /// </summary> @@ -213,6 +222,15 @@ public static string CollapseAll { } } + /// <summary> + /// Looks up a localized string similar to Compare with:. + /// </summary> + public static string CompareHistory { + get { + return ResourceManager.GetString("CompareHistory", resourceCulture); + } + } + /// <summary> /// Looks up a localized string similar to Coverable. /// </summary> @@ -312,6 +330,15 @@ public static string CyclomaticComplexity { } } + /// <summary> + /// Looks up a localized string similar to Date. + /// </summary> + public static string Date { + get { + return ResourceManager.GetString("Date", resourceCulture); + } + } + /// <summary> /// Looks up a localized string similar to Expand all. /// </summary> @@ -465,6 +492,15 @@ public static string NoGrouping { } } + /// <summary> + /// Looks up a localized string similar to No risk hotspots found.. + /// </summary> + public static string NoRiskHotspots { + get { + return ResourceManager.GetString("NoRiskHotspots", resourceCulture); + } + } + /// <summary> /// Looks up a localized string similar to NPath complexity. /// </summary> diff --git a/src/ReportGenerator.Console/Properties/ReportResources.resx b/src/ReportGenerator.Core/Properties/ReportResources.resx similarity index 96% rename from src/ReportGenerator.Console/Properties/ReportResources.resx rename to src/ReportGenerator.Core/Properties/ReportResources.resx index 619aa879..1709dc15 100644 --- a/src/ReportGenerator.Console/Properties/ReportResources.resx +++ b/src/ReportGenerator.Core/Properties/ReportResources.resx @@ -294,4 +294,16 @@ <data name="Top" xml:space="preserve"> <value>Top:</value> </data> + <data name="NoRiskHotspots" xml:space="preserve"> + <value>No risk hotspots found.</value> + </data> + <data name="CompareHistory" xml:space="preserve"> + <value>Compare with:</value> + </data> + <data name="Date" xml:space="preserve"> + <value>Date</value> + </data> + <data name="ChangesOnly" xml:space="preserve"> + <value>Changes only</value> + </data> </root> \ No newline at end of file diff --git a/src/ReportGenerator.Console/Properties/Resources.Designer.cs b/src/ReportGenerator.Core/Properties/Resources.Designer.cs similarity index 86% rename from src/ReportGenerator.Console/Properties/Resources.Designer.cs rename to src/ReportGenerator.Core/Properties/Resources.Designer.cs index 5fb3bc44..4ae8dff2 100644 --- a/src/ReportGenerator.Console/Properties/Resources.Designer.cs +++ b/src/ReportGenerator.Core/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // </auto-generated> //------------------------------------------------------------------------------ -namespace Palmmedia.ReportGenerator.Properties { +namespace Palmmedia.ReportGenerator.Core.Properties { using System; @@ -19,7 +19,7 @@ namespace Palmmedia.ReportGenerator.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -39,7 +39,7 @@ internal Resources() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Palmmedia.ReportGenerator.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Palmmedia.ReportGenerator.Core.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -178,7 +178,7 @@ internal static string ErrorDuringReadingHistoricReports { } /// <summary> - /// Looks up a localized string similar to Error during reading report '{0}': {1}. + /// Looks up a localized string similar to Error during reading report '{0}' (Size: {1}): {2}. /// </summary> internal static string ErrorDuringReadingReport { get { @@ -213,6 +213,15 @@ internal static string ErrorDuringSavingHistoricReport { } } + /// <summary> + /// Looks up a localized string similar to PartCover is no longer supported. If you want to generate coverage reports based on PartCover, please use version 3.x of ReportGenerator.. + /// </summary> + internal static string ErrorPartCover { + get { + return ResourceManager.GetString("ErrorPartCover", resourceCulture); + } + } + /// <summary> /// Looks up a localized string similar to The report file pattern '{0}' is invalid.. /// </summary> @@ -222,6 +231,24 @@ internal static string FailedReportFilePattern { } } + /// <summary> + /// Looks up a localized string similar to Failed to instantiateplugin class '{0}'.. + /// </summary> + internal static string FailedToInstantiatePlugin { + get { + return ResourceManager.GetString("FailedToInstantiatePlugin", resourceCulture); + } + } + + /// <summary> + /// Looks up a localized string similar to Failed to load plugins from '{0}'.. + /// </summary> + internal static string FailedToLoadPlugins { + get { + return ResourceManager.GetString("FailedToLoadPlugins", resourceCulture); + } + } + /// <summary> /// Looks up a localized string similar to File '{0}' does not exist (any more).. /// </summary> @@ -296,7 +323,7 @@ internal static string InvalidFilter { } /// <summary> - /// Looks up a localized string similar to Loading report '{0}'. + /// Looks up a localized string similar to Loading report '{0}' {1}/{2}. /// </summary> internal static string LoadingReport { get { @@ -304,6 +331,15 @@ internal static string LoadingReport { } } + /// <summary> + /// Looks up a localized string similar to Multiple errors. + /// </summary> + internal static string MultipleErrors { + get { + return ResourceManager.GetString("MultipleErrors", resourceCulture); + } + } + /// <summary> /// Looks up a localized string similar to No assemblies have been covered.. /// </summary> @@ -322,6 +358,15 @@ internal static string NoReportFiles { } } + /// <summary> + /// Looks up a localized string similar to No source directories supplied for JaCoCo report. + /// </summary> + internal static string NoSouceDirectories { + get { + return ResourceManager.GetString("NoSouceDirectories", resourceCulture); + } + } + /// <summary> /// Looks up a localized string similar to No target directory specified.. /// </summary> @@ -331,6 +376,15 @@ internal static string NoTargetDirectory { } } + /// <summary> + /// Looks up a localized string similar to The plugin '{0}' does not exist.. + /// </summary> + internal static string NotExistingPlugin { + get { + return ResourceManager.GetString("NotExistingPlugin", resourceCulture); + } + } + /// <summary> /// Looks up a localized string similar to The report file '{0}' does not exist.. /// </summary> @@ -367,6 +421,15 @@ internal static string ReportGenerationTook { } } + /// <summary> + /// Looks up a localized string similar to Coverage report parsing took {0:f1} seconds. + /// </summary> + internal static string ReportParsingTook { + get { + return ResourceManager.GetString("ReportParsingTook", resourceCulture); + } + } + /// <summary> /// Looks up a localized string similar to Several custom history storages exist. Please ensure that only one custom storage exists.. /// </summary> diff --git a/src/ReportGenerator.Console/Properties/Resources.resx b/src/ReportGenerator.Core/Properties/Resources.resx similarity index 91% rename from src/ReportGenerator.Console/Properties/Resources.resx rename to src/ReportGenerator.Core/Properties/Resources.resx index f1517596..f94abde8 100644 --- a/src/ReportGenerator.Console/Properties/Resources.resx +++ b/src/ReportGenerator.Core/Properties/Resources.resx @@ -157,7 +157,7 @@ <value>Error during reading historic reports: {0}</value> </data> <data name="ErrorDuringReadingReport" xml:space="preserve"> - <value>Error during reading report '{0}': {1}</value> + <value>Error during reading report '{0}' (Size: {1}): {2}</value> </data> <data name="ErrorDuringRenderingClassReport" xml:space="preserve"> <value>Error during rendering report for class '{0}' (Report type: '{1}'): {2}</value> @@ -168,9 +168,18 @@ <data name="ErrorDuringSavingHistoricReport" xml:space="preserve"> <value>Error during saving historic report '{0}': {1}</value> </data> + <data name="ErrorPartCover" xml:space="preserve"> + <value>PartCover is no longer supported. If you want to generate coverage reports based on PartCover, please use version 3.x of ReportGenerator.</value> + </data> <data name="FailedReportFilePattern" xml:space="preserve"> <value>The report file pattern '{0}' is invalid.</value> </data> + <data name="FailedToInstantiatePlugin" xml:space="preserve"> + <value>Failed to instantiateplugin class '{0}'.</value> + </data> + <data name="FailedToLoadPlugins" xml:space="preserve"> + <value>Failed to load plugins from '{0}'.</value> + </data> <data name="FileDoesNotExist" xml:space="preserve"> <value>File '{0}' does not exist (any more).</value> </data> @@ -197,7 +206,10 @@ <value>The filter '{0}' is invalid. Filters must start with '+' or '-'.</value> </data> <data name="LoadingReport" xml:space="preserve"> - <value>Loading report '{0}'</value> + <value>Loading report '{0}' {1}/{2}</value> + </data> + <data name="MultipleErrors" xml:space="preserve"> + <value>Multiple errors</value> </data> <data name="NoAssembliesHaveBeenCovered" xml:space="preserve"> <value>No assemblies have been covered.</value> @@ -205,9 +217,15 @@ <data name="NoReportFiles" xml:space="preserve"> <value>No report files specified.</value> </data> + <data name="NoSouceDirectories" xml:space="preserve"> + <value>No source directories supplied for JaCoCo report</value> + </data> <data name="NoTargetDirectory" xml:space="preserve"> <value>No target directory specified.</value> </data> + <data name="NotExistingPlugin" xml:space="preserve"> + <value>The plugin '{0}' does not exist.</value> + </data> <data name="NotExistingReportFile" xml:space="preserve"> <value>The report file '{0}' does not exist.</value> </data> @@ -220,6 +238,9 @@ <data name="ReportGenerationTook" xml:space="preserve"> <value>Report generation took {0:f1} seconds</value> </data> + <data name="ReportParsingTook" xml:space="preserve"> + <value>Coverage report parsing took {0:f1} seconds</value> + </data> <data name="SeveralCustomHistoryStorages" xml:space="preserve"> <value>Several custom history storages exist. Please ensure that only one custom storage exists.</value> </data> diff --git a/src/ReportGenerator.Core/ReportConfiguration.cs b/src/ReportGenerator.Core/ReportConfiguration.cs new file mode 100644 index 00000000..d6447115 --- /dev/null +++ b/src/ReportGenerator.Core/ReportConfiguration.cs @@ -0,0 +1,203 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Palmmedia.ReportGenerator.Core.Common; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Reporting; + +namespace Palmmedia.ReportGenerator.Core +{ + /// <summary> + /// Provides all parameters that are required for report generation. + /// </summary> + public class ReportConfiguration : IReportConfiguration + { + /// <summary> + /// The report files. + /// </summary> + private List<string> reportFiles = new List<string>(); + + /// <summary> + /// The report file pattern that could not be parsed. + /// </summary> + private List<string> invalidReportFilePatterns = new List<string>(); + + /// <summary> + /// Initializes a new instance of the <see cref="ReportConfiguration" /> class. + /// </summary> + /// <param name="reportFilePatterns">The report file patterns.</param> + /// <param name="targetDirectory">The target directory.</param> + /// <param name="sourceDirectories">The source directories.</param> + /// <param name="historyDirectory">The history directory.</param> + /// <param name="reportTypes">The report types.</param> + /// <param name="plugins">The plugins.</param> + /// <param name="assemblyFilters">The assembly filters.</param> + /// <param name="classFilters">The class filters.</param> + /// <param name="fileFilters">The file filters.</param> + /// <param name="verbosityLevel">The verbosity level.</param> + /// <param name="tag">The custom tag (e.g. build number).</param> + public ReportConfiguration( + IEnumerable<string> reportFilePatterns, + string targetDirectory, + IEnumerable<string> sourceDirectories, + string historyDirectory, + IEnumerable<string> reportTypes, + IEnumerable<string> plugins, + IEnumerable<string> assemblyFilters, + IEnumerable<string> classFilters, + IEnumerable<string> fileFilters, + string verbosityLevel, + string tag) + { + if (reportFilePatterns == null) + { + throw new ArgumentNullException(nameof(reportFilePatterns)); + } + + if (sourceDirectories == null) + { + throw new ArgumentNullException(nameof(sourceDirectories)); + } + + if (reportTypes == null) + { + throw new ArgumentNullException(nameof(reportTypes)); + } + + if (plugins == null) + { + throw new ArgumentNullException(nameof(plugins)); + } + + if (assemblyFilters == null) + { + throw new ArgumentNullException(nameof(assemblyFilters)); + } + + if (classFilters == null) + { + throw new ArgumentNullException(nameof(classFilters)); + } + + if (fileFilters == null) + { + throw new ArgumentNullException(nameof(fileFilters)); + } + + foreach (var reportFilePattern in reportFilePatterns) + { + try + { + this.reportFiles.AddRange(GlobbingFileSearch.GetFiles(reportFilePattern)); + } + catch (Exception) + { + this.invalidReportFilePatterns.Add(reportFilePattern); + } + } + + this.TargetDirectory = targetDirectory ?? throw new ArgumentNullException(nameof(targetDirectory)); + this.HistoryDirectory = historyDirectory; + + this.SourceDirectories = sourceDirectories.ToList(); + + if (reportTypes.Any()) + { + this.ReportTypes = reportTypes.ToList(); + } + else + { + this.ReportTypes = new[] { "Html" }; + } + + this.Plugins = plugins.ToList(); + this.AssemblyFilters = assemblyFilters.ToList(); + this.ClassFilters = classFilters.ToList(); + this.FileFilters = fileFilters.ToList(); + + if (verbosityLevel != null) + { + VerbosityLevel parsedVerbosityLevel = VerbosityLevel.Verbose; + this.VerbosityLevelValid = Enum.TryParse<VerbosityLevel>(verbosityLevel, true, out parsedVerbosityLevel); + this.VerbosityLevel = parsedVerbosityLevel; + } + else + { + this.VerbosityLevelValid = true; + } + + this.Tag = tag; + } + + /// <summary> + /// Gets the report files. + /// </summary> + public IReadOnlyCollection<string> ReportFiles => this.reportFiles; + + /// <summary> + /// Gets the target directory. + /// </summary> + public string TargetDirectory { get; } + + /// <summary> + /// Gets the source directories. + /// </summary> + public IReadOnlyCollection<string> SourceDirectories { get; } + + /// <summary> + /// Gets the history directory. + /// </summary> + public string HistoryDirectory { get; } + + /// <summary> + /// Gets the type of the report. + /// </summary> + public IReadOnlyCollection<string> ReportTypes { get; } + + /// <summary> + /// Gets the plugins. + /// </summary> + public IReadOnlyCollection<string> Plugins { get; } + + /// <summary> + /// Gets the assembly filters. + /// </summary> + public IReadOnlyCollection<string> AssemblyFilters { get; } + + /// <summary> + /// Gets the class filters. + /// </summary> + public IReadOnlyCollection<string> ClassFilters { get; } + + /// <summary> + /// Gets the file filters. + /// </summary> + public IReadOnlyCollection<string> FileFilters { get; } + + /// <summary> + /// Gets the verbosity level. + /// </summary> + public VerbosityLevel VerbosityLevel { get; } + + /// <summary> + /// Gets the custom tag (e.g. build number). + /// </summary> + public string Tag { get; } + + /// <summary> + /// Gets the invalid file patters supplied by the user. + /// </summary> + public IReadOnlyCollection<string> InvalidReportFilePatterns + { + get + { + return this.invalidReportFilePatterns; + } + } + + /// <summary> + /// Gets a value indicating whether the verbosity level was successfully parsed during initialization. + /// </summary> + public bool VerbosityLevelValid { get; private set; } + } +} diff --git a/src/ReportGenerator.Core/ReportConfigurationBuilder.cs b/src/ReportGenerator.Core/ReportConfigurationBuilder.cs new file mode 100644 index 00000000..6113193c --- /dev/null +++ b/src/ReportGenerator.Core/ReportConfigurationBuilder.cs @@ -0,0 +1,128 @@ +using System; +using System.Collections.Generic; +using System.Text.RegularExpressions; + +namespace Palmmedia.ReportGenerator.Core +{ + /// <summary> + /// Builder for <see cref="ReportConfiguration"/>. + /// Creates instances of <see cref="ReportConfiguration"/> based on command line parameters. + /// </summary> + internal class ReportConfigurationBuilder + { + /// <summary> + /// Initializes a new instance of the <see cref="ReportConfiguration"/> class. + /// </summary> + /// <param name="args">The command line arguments.</param> + /// <returns>The report configuration.</returns> + internal ReportConfiguration Create(string[] args) + { + if (args == null) + { + throw new ArgumentNullException(nameof(args)); + } + + var namedArguments = new Dictionary<string, string>(); + + foreach (var arg in args) + { + var match = Regex.Match(arg, "-(?<key>\\w{2,}):(?<value>.+)"); + + if (match.Success) + { + namedArguments[match.Groups["key"].Value.ToUpperInvariant()] = match.Groups["value"].Value; + } + } + + var reportFilePatterns = new string[] { }; + string targetDirectory = string.Empty; + var sourceDirectories = new string[] { }; + string historyDirectory = null; + var reportTypes = new string[] { }; + var plugins = new string[] { }; + var assemblyFilters = new string[] { }; + var classFilters = new string[] { }; + var fileFilters = new string[] { }; + string verbosityLevel = null; + string tag = null; + + string value = null; + + if (namedArguments.TryGetValue("REPORTS", out value)) + { + reportFilePatterns = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); + } + + if (namedArguments.TryGetValue("TARGETDIR", out value)) + { + targetDirectory = value; + } + + if (namedArguments.TryGetValue("SOURCEDIRS", out value)) + { + sourceDirectories = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); + } + + if (namedArguments.TryGetValue("HISTORYDIR", out value)) + { + historyDirectory = value; + } + + if (namedArguments.TryGetValue("REPORTTYPES", out value)) + { + reportTypes = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); + } + else if (namedArguments.TryGetValue("REPORTTYPE", out value)) + { + reportTypes = new[] { value }; + } + + if (namedArguments.TryGetValue("PLUGINS", out value)) + { + plugins = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); + } + + if (namedArguments.TryGetValue("ASSEMBLYFILTERS", out value)) + { + assemblyFilters = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); + } + else if (namedArguments.TryGetValue("FILTERS", out value)) + { + assemblyFilters = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); + } + + if (namedArguments.TryGetValue("CLASSFILTERS", out value)) + { + classFilters = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); + } + + if (namedArguments.TryGetValue("FILEFILTERS", out value)) + { + fileFilters = value.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); + } + + if (namedArguments.TryGetValue("VERBOSITY", out value)) + { + verbosityLevel = value; + } + + if (namedArguments.TryGetValue("TAG", out value)) + { + tag = value; + } + + return new ReportConfiguration( + reportFilePatterns, + targetDirectory, + sourceDirectories, + historyDirectory, + reportTypes, + plugins, + assemblyFilters, + classFilters, + fileFilters, + verbosityLevel, + tag); + } + } +} \ No newline at end of file diff --git a/src/ReportGenerator.Core/ReportConfigurationValidator.cs b/src/ReportGenerator.Core/ReportConfigurationValidator.cs new file mode 100644 index 00000000..45737a2a --- /dev/null +++ b/src/ReportGenerator.Core/ReportConfigurationValidator.cs @@ -0,0 +1,153 @@ +using System; +using System.IO; +using System.Linq; +using Palmmedia.ReportGenerator.Core.Common; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Properties; +using Palmmedia.ReportGenerator.Core.Reporting; + +namespace Palmmedia.ReportGenerator.Core +{ + /// <summary> + /// Validates an <see cref="IReportConfiguration"/> to verify all user input is applicable and correct. + /// </summary> + internal class ReportConfigurationValidator + { + /// <summary> + /// The Logger. + /// </summary> + private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(ReportConfiguration)); + + /// <summary> + /// The report builder factory (required to determine if all requested formats are supported). + /// </summary> + private readonly IReportBuilderFactory reportBuilderFactory; + + /// <summary> + /// Initializes a new instance of the <see cref="ReportConfigurationValidator"/> class. + /// </summary> + /// <param name="reportBuilderFactory">The report builder factory.</param> + internal ReportConfigurationValidator(IReportBuilderFactory reportBuilderFactory) + { + this.reportBuilderFactory = reportBuilderFactory; + } + + /// <summary> + /// Validates all parameters. + /// </summary> + /// <param name="reportConfiguration">The report configuration.</param> + /// <returns> + /// <c>true</c> if all parameters are in a valid state; otherwise <c>false</c>. + /// </returns> + internal bool Validate(IReportConfiguration reportConfiguration) + { + bool result = true; + + if (reportConfiguration.InvalidReportFilePatterns.Count > 0) + { + foreach (var failedReportFilePattern in reportConfiguration.InvalidReportFilePatterns) + { + Logger.ErrorFormat(Resources.FailedReportFilePattern, failedReportFilePattern); + } + + result &= false; + } + + foreach (var file in reportConfiguration.Plugins) + { + if (!File.Exists(file)) + { + Logger.ErrorFormat(Resources.NotExistingPlugin, file); + result &= false; + } + } + + if (!reportConfiguration.ReportFiles.Any()) + { + Logger.Error(Resources.NoReportFiles); + result &= false; + } + else + { + foreach (var file in reportConfiguration.ReportFiles) + { + if (!File.Exists(file)) + { + Logger.ErrorFormat(Resources.NotExistingReportFile, file); + result &= false; + } + } + } + + if (string.IsNullOrEmpty(reportConfiguration.TargetDirectory)) + { + Logger.Error(Resources.NoTargetDirectory); + result &= false; + } + else if (!Directory.Exists(reportConfiguration.TargetDirectory)) + { + try + { + Directory.CreateDirectory(reportConfiguration.TargetDirectory); + } + catch (Exception ex) + { + Logger.ErrorFormat(Resources.TargetDirectoryCouldNotBeCreated, reportConfiguration.TargetDirectory, ex.GetExceptionMessageForDisplay()); + result &= false; + } + } + + if (!string.IsNullOrEmpty(reportConfiguration.HistoryDirectory) && !Directory.Exists(reportConfiguration.HistoryDirectory)) + { + try + { + Directory.CreateDirectory(reportConfiguration.HistoryDirectory); + } + catch (Exception ex) + { + Logger.ErrorFormat(Resources.HistoryDirectoryCouldNotBeCreated, reportConfiguration.HistoryDirectory, ex.GetExceptionMessageForDisplay()); + result &= false; + } + } + + foreach (var sourceDirectory in reportConfiguration.SourceDirectories) + { + if (!Directory.Exists(sourceDirectory)) + { + Logger.ErrorFormat(Resources.SourceDirectoryDoesNotExist, sourceDirectory); + result &= false; + } + } + + var availableReportTypes = this.reportBuilderFactory.GetAvailableReportTypes(); + + foreach (var reportType in reportConfiguration.ReportTypes) + { + if (!availableReportTypes.Contains(reportType, StringComparer.OrdinalIgnoreCase)) + { + Logger.ErrorFormat(Resources.UnknownReportType, reportType); + result &= false; + } + } + + foreach (var filter in reportConfiguration.AssemblyFilters) + { + if (string.IsNullOrEmpty(filter) + || (!filter.StartsWith("+", StringComparison.OrdinalIgnoreCase) + && !filter.StartsWith("-", StringComparison.OrdinalIgnoreCase))) + { + Logger.ErrorFormat(Resources.InvalidFilter, filter); + result &= false; + } + } + + if (!reportConfiguration.VerbosityLevelValid) + { + Logger.Error(Resources.UnknownVerbosityLevel); + result &= false; + } + + return result; + } + } +} diff --git a/src/ReportGenerator.Core/ReportContext.cs b/src/ReportGenerator.Core/ReportContext.cs new file mode 100644 index 00000000..aa0c48cf --- /dev/null +++ b/src/ReportGenerator.Core/ReportContext.cs @@ -0,0 +1,53 @@ +using System.Collections.Generic; +using Palmmedia.ReportGenerator.Core.CodeAnalysis; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Reporting; + +namespace Palmmedia.ReportGenerator.Core +{ + /// <summary> + /// The context containing configuration and runtime information of the current execution. + /// </summary> + internal class ReportContext : IReportContext + { + /// <summary> + /// The historic coverage elements. + /// </summary> + private IReadOnlyCollection<HistoricCoverage> overallHistoricCoverages = new List<HistoricCoverage>(); + + /// <summary> + /// Initializes a new instance of the <see cref="ReportContext"/> class. + /// </summary> + /// <param name="reportConfiguration">The configuration options.</param> + internal ReportContext(IReportConfiguration reportConfiguration) + { + this.ReportConfiguration = reportConfiguration; + } + + /// <summary> + /// Gets the configuration options. + /// </summary> + public IReportConfiguration ReportConfiguration { get; } + + /// <summary> + /// Gets or sets the risk hotspot analysis result. + /// </summary> + public RiskHotspotAnalysisResult RiskHotspotAnalysisResult { get; set; } + + /// <summary> + /// Gets or sets the historic coverage elements. + /// </summary> + public IReadOnlyCollection<HistoricCoverage> OverallHistoricCoverages + { + get + { + return this.overallHistoricCoverages; + } + + set + { + this.overallHistoricCoverages = value ?? this.overallHistoricCoverages; + } + } + } +} \ No newline at end of file diff --git a/src/ReportGenerator.Core/ReportGenerator.Core.csproj b/src/ReportGenerator.Core/ReportGenerator.Core.csproj new file mode 100644 index 00000000..73c8b4a3 --- /dev/null +++ b/src/ReportGenerator.Core/ReportGenerator.Core.csproj @@ -0,0 +1,103 @@ +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <TargetFramework>netstandard2.0</TargetFramework> + <RootNamespace>Palmmedia.ReportGenerator.Core</RootNamespace> + <OutputType>Exe</OutputType> + <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> + <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> + <AssemblyName>ReportGenerator.Core</AssemblyName> + <AssemblyVersion>4.0.0.0</AssemblyVersion> + <FileVersion>4.0.0.0</FileVersion> + </PropertyGroup> + + <PropertyGroup><!-- Required to capture code coverage with OpenCover --> + <DebugType>full</DebugType> + <DebugSymbols>True</DebugSymbols> + </PropertyGroup> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> + <OutputPath>..\target\bin\Debug\</OutputPath> + </PropertyGroup> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> + <OutputPath>..\target\bin\Release\</OutputPath> + </PropertyGroup> + + <ItemGroup> + <None Remove="Reporting\Builders\Rendering\resources\angular.min.js" /> + <None Remove="Reporting\Builders\Rendering\resources\chartist.min.css" /> + <None Remove="Reporting\Builders\Rendering\resources\chartist.min.js" /> + <None Remove="Reporting\Builders\Rendering\resources\coverageTableReactComponents.js" /> + <None Remove="Reporting\Builders\Rendering\resources\custom.css" /> + <None Remove="Reporting\Builders\Rendering\resources\customAngularApp.js" /> + <None Remove="Reporting\Builders\Rendering\resources\jquery-1.11.2.min.js" /> + <None Remove="Reporting\Builders\Rendering\resources\matchMedia.js" /> + <None Remove="Reporting\Builders\Rendering\resources\react.min.js" /> + <None Remove="Reporting\Builders\Rendering\resources\react.modified.min.js" /> + <None Remove="Reporting\Builders\Rendering\resources\riskHotspotTableReactComponents.js" /> + </ItemGroup> + + <ItemGroup> + <EmbeddedResource Include="Reporting\Builders\Rendering\resources\angular.min.js" /> + <EmbeddedResource Include="Reporting\Builders\Rendering\resources\chartist.min.css" /> + <EmbeddedResource Include="Reporting\Builders\Rendering\resources\chartist.min.js" /> + <EmbeddedResource Include="Reporting\Builders\Rendering\resources\coverageTableReactComponents.js" /> + <EmbeddedResource Include="Reporting\Builders\Rendering\resources\custom.css" /> + <EmbeddedResource Include="Reporting\Builders\Rendering\resources\customAngularApp.js" /> + <EmbeddedResource Include="Reporting\Builders\Rendering\resources\jquery-1.11.2.min.js" /> + <EmbeddedResource Include="Reporting\Builders\Rendering\resources\matchMedia.js" /> + <EmbeddedResource Include="Reporting\Builders\Rendering\resources\react.min.js" /> + <EmbeddedResource Include="Reporting\Builders\Rendering\resources\react.modified.min.js" /> + <EmbeddedResource Include="Reporting\Builders\Rendering\resources\riskHotspotTableReactComponents.js" /> + </ItemGroup> + + <ItemGroup> + <Compile Update="Properties\Help.Designer.cs"> + <DesignTime>True</DesignTime> + <AutoGen>True</AutoGen> + <DependentUpon>Help.resx</DependentUpon> + </Compile> + <Compile Update="Properties\ReportResources.Designer.cs"> + <DesignTime>True</DesignTime> + <AutoGen>True</AutoGen> + <DependentUpon>ReportResources.resx</DependentUpon> + </Compile> + <Compile Update="Properties\Resources.Designer.cs"> + <DesignTime>True</DesignTime> + <AutoGen>True</AutoGen> + <DependentUpon>Resources.resx</DependentUpon> + </Compile> + </ItemGroup> + + <ItemGroup> + <EmbeddedResource Update="Properties\Help.resx"> + <Generator>ResXFileCodeGenerator</Generator> + <LastGenOutput>Help.Designer.cs</LastGenOutput> + </EmbeddedResource> + <EmbeddedResource Update="Properties\ReportResources.resx"> + <Generator>PublicResXFileCodeGenerator</Generator> + <LastGenOutput>ReportResources.Designer.cs</LastGenOutput> + </EmbeddedResource> + <EmbeddedResource Update="Properties\Resources.resx"> + <Generator>ResXFileCodeGenerator</Generator> + <LastGenOutput>Resources.Designer.cs</LastGenOutput> + </EmbeddedResource> + </ItemGroup> + + <ItemGroup> + <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.8.166" /> + <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.1" /> + <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" /> + <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.1.1" /> + <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" /> + <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0004" /> + </ItemGroup> + + <ItemGroup> + <None Update="appsettings.json"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + </ItemGroup> + +</Project> diff --git a/src/ReportGenerator.Reporting/BadgeReportBuilder.cs b/src/ReportGenerator.Core/Reporting/Builders/BadgeReportBuilder.cs similarity index 91% rename from src/ReportGenerator.Reporting/BadgeReportBuilder.cs rename to src/ReportGenerator.Core/Reporting/Builders/BadgeReportBuilder.cs index 094a4282..5ee5c683 100644 --- a/src/ReportGenerator.Reporting/BadgeReportBuilder.cs +++ b/src/ReportGenerator.Core/Reporting/Builders/BadgeReportBuilder.cs @@ -1,19 +1,21 @@ using System; using System.Collections.Generic; -using System.ComponentModel.Composition; -using System.Drawing; -using System.Drawing.Imaging; using System.Globalization; using System.IO; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Properties; +using SixLabors.Fonts; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.Formats.Png; +using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; +using SixLabors.ImageSharp.Processing.Text; -namespace Palmmedia.ReportGenerator.Reporting +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders { /// <summary> /// Creates badges in SVG format. /// </summary> - [Export(typeof(IReportBuilder))] public class BadgeReportBuilder : IReportBuilder { /// <summary> @@ -152,7 +154,7 @@ @keyframes fadein {{ /// <value> /// The report configuration. /// </value> - public IReportConfiguration ReportConfiguration { get; set; } + public IReportContext ReportContext { get; set; } /// <summary> /// Creates a class report. @@ -177,31 +179,37 @@ public void CreateSummaryReport(SummaryResult summaryResult) if (summaryResult.CoverageQuota.HasValue) { File.WriteAllText( - Path.Combine(this.ReportConfiguration.TargetDirectory, "badge_linecoverage.svg"), + Path.Combine(this.ReportContext.ReportConfiguration.TargetDirectory, "badge_linecoverage.svg"), this.CreateSvgBadge(summaryResult, true, false)); - - File.WriteAllBytes( - Path.Combine(this.ReportConfiguration.TargetDirectory, "badge_linecoverage.png"), - this.CreatePngBadge(summaryResult, true)); } if (summaryResult.BranchCoverageQuota.HasValue) { File.WriteAllText( - Path.Combine(this.ReportConfiguration.TargetDirectory, "badge_branchcoverage.svg"), + Path.Combine(this.ReportContext.ReportConfiguration.TargetDirectory, "badge_branchcoverage.svg"), this.CreateSvgBadge(summaryResult, false, true)); - - File.WriteAllBytes( - Path.Combine(this.ReportConfiguration.TargetDirectory, "badge_branchcoverage.png"), - this.CreatePngBadge(summaryResult, false)); } if (summaryResult.CoverageQuota.HasValue && summaryResult.BranchCoverageQuota.HasValue) { File.WriteAllText( - Path.Combine(this.ReportConfiguration.TargetDirectory, "badge_combined.svg"), + Path.Combine(this.ReportContext.ReportConfiguration.TargetDirectory, "badge_combined.svg"), this.CreateSvgBadge(summaryResult, true, true)); } + + if (summaryResult.CoverageQuota.HasValue) + { + File.WriteAllBytes( + Path.Combine(this.ReportContext.ReportConfiguration.TargetDirectory, "badge_linecoverage.png"), + this.CreatePngBadge(summaryResult, true)); + } + + if (summaryResult.BranchCoverageQuota.HasValue) + { + File.WriteAllBytes( + Path.Combine(this.ReportContext.ReportConfiguration.TargetDirectory, "badge_branchcoverage.png"), + this.CreatePngBadge(summaryResult, false)); + } } /// <summary> @@ -221,7 +229,7 @@ private string CreateSvgBadge(SummaryResult summaryResult, bool includeLineCover ReportResources.CodeCoverage, includeLineCoverage ? string.Format(LineCoverageSymbol, lineCoverageClass) : string.Empty, includeBranchCoverage ? string.Format(BranchCoverageSymbol, branchCoverageClass) : string.Empty, - string.Format("{0} {1} {2}", ReportResources.GeneratedBy, typeof(IReportBuilder).Assembly.GetName().Name, typeof(IReportBuilder).Assembly.GetName().Version), + $"{ReportResources.GeneratedBy} ReportGenerator {typeof(IReportBuilder).Assembly.GetName().Version}", ReportResources.Coverage3, includeLineCoverage ? string.Format(CoverageText, lineCoverageClass, summaryResult.CoverageQuota.Value.ToString(CultureInfo.InvariantCulture)) : string.Empty, includeBranchCoverage ? string.Format(CoverageText, branchCoverageClass, summaryResult.BranchCoverageQuota.Value.ToString(CultureInfo.InvariantCulture)) : string.Empty, @@ -241,24 +249,15 @@ private byte[] CreatePngBadge(SummaryResult summaryResult, bool lineCoverage) string text = (lineCoverage ? summaryResult.CoverageQuota.Value : summaryResult.BranchCoverageQuota.Value).ToString(CultureInfo.InvariantCulture) + "%"; using (var ms = new MemoryStream(Convert.FromBase64String(template))) - using (Image image = Bitmap.FromStream(ms)) - using (Graphics g = Graphics.FromImage(image)) - using (Font font = new Font("Verdana", 8, FontStyle.Regular, GraphicsUnit.Point)) + using (var image = Image.Load<Rgba32>(ms)) using (MemoryStream output = new MemoryStream()) { - Rectangle rect = new Rectangle(112, 0, 155, 20); - - StringFormat stringFormat = new StringFormat() - { - Alignment = StringAlignment.Near, - LineAlignment = StringAlignment.Center - }; - - g.DrawString(text, font, Brushes.White, rect, stringFormat); + var font = SystemFonts.CreateFont("Arial", 12, FontStyle.Regular); + image.Mutate(ctx => ctx.DrawText(text, font, Rgba32.White, new SixLabors.Primitives.PointF(113, 5))); - image.Save(output, ImageFormat.Png); + image.Save(output, new PngEncoder()); return output.ToArray(); } } } -} +} \ No newline at end of file diff --git a/src/ReportGenerator.Core/Reporting/Builders/CoberturaReportBuilder.cs b/src/ReportGenerator.Core/Reporting/Builders/CoberturaReportBuilder.cs new file mode 100644 index 00000000..d39147bf --- /dev/null +++ b/src/ReportGenerator.Core/Reporting/Builders/CoberturaReportBuilder.cs @@ -0,0 +1,226 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Xml.Linq; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; + +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders +{ + /// <summary> + /// Creates xml report in Cobertura format + /// </summary> + public class CoberturaReportBuilder : IReportBuilder + { + /// <summary> + /// Package elements by assembly name. + /// </summary> + private readonly Dictionary<string, XElement> packageElementsByName = new Dictionary<string, XElement>(); + + /// <summary> + /// Gets the type of the report. + /// </summary> + /// <value> + /// The type of the report. + /// </value> + public string ReportType => "Cobertura"; + + /// <summary> + /// Gets or sets the report context. + /// </summary> + /// <value> + /// The report context. + /// </value> + public IReportContext ReportContext { get; set; } + + /// <summary> + /// Creates a class report. + /// </summary> + /// <param name="class">The class.</param> + /// <param name="fileAnalyses">The file analyses that correspond to the class.</param> + public void CreateClassReport(Class @class, IEnumerable<FileAnalysis> fileAnalyses) + { + XElement packageElement = null; + + if (!this.packageElementsByName.TryGetValue(@class.Assembly.Name, out packageElement)) + { + packageElement = new XElement("package", new XAttribute("name", @class.Assembly.Name)); + packageElement.Add(new XElement("classes")); + + this.packageElementsByName.Add(@class.Assembly.Name, packageElement); + } + + var classesElement = packageElement.Element("classes"); + + foreach (var fileAnalysis in fileAnalyses) + { + var classElement = new XElement( + "class", + new XAttribute("name", @class.Name), + new XAttribute("filename", fileAnalysis.Path)); + + var methodsElement = new XElement("methods"); + + foreach (var file in @class.Files) + { + if (file.Path == fileAnalysis.Path) + { + foreach (var codeElement in file.CodeElements) + { + int index = codeElement.Name.LastIndexOf('('); + + var methodElement = new XElement( + "method", + new XAttribute("name", index == -1 ? codeElement.Name : codeElement.Name.Substring(0, index)), + new XAttribute("signature", index == -1 ? string.Empty : codeElement.Name.Substring(index))); + + this.AddLineElements( + methodElement, + fileAnalysis.Lines.Skip(codeElement.FirstLine - 1).Take(codeElement.LastLine - codeElement.FirstLine + 1), + out double methodLineRate, + out double methodBranchRate); + + methodElement.Add(new XAttribute("line-rate", methodLineRate.ToString(CultureInfo.InvariantCulture))); + methodElement.Add(new XAttribute("branch-rate", methodBranchRate.ToString(CultureInfo.InvariantCulture))); + + methodsElement.Add(methodElement); + } + + break; + } + } + + classElement.Add(methodsElement); + + var linesElement = new XElement("lines"); + + this.AddLineElements(linesElement, fileAnalysis.Lines, out double lineRate, out double branchRate); + + classElement.Add(new XAttribute("line-rate", lineRate.ToString(CultureInfo.InvariantCulture))); + classElement.Add(new XAttribute("branch-rate", branchRate.ToString(CultureInfo.InvariantCulture))); + classElement.Add(new XAttribute("complexity", "NaN")); + + classElement.Add(linesElement); + + classesElement.Add(classElement); + } + } + + /// <summary> + /// Creates the summary report. + /// </summary> + /// <param name="summaryResult">The summary result.</param> + public void CreateSummaryReport(SummaryResult summaryResult) + { + foreach (var assembly in summaryResult.Assemblies) + { + if (this.packageElementsByName.TryGetValue(assembly.Name, out XElement packageElement)) + { + double packageLineRate = assembly.CoverableLines == 0 ? 1 : assembly.CoveredLines / (double)assembly.CoverableLines; + double packageBranchRate = assembly.TotalBranches.GetValueOrDefault() == 0 ? 1 : assembly.CoveredBranches.GetValueOrDefault() / (double)assembly.TotalBranches.GetValueOrDefault(); + + packageElement.Add(new XAttribute("line-rate", packageLineRate.ToString(CultureInfo.InvariantCulture))); + packageElement.Add(new XAttribute("branch-rate", packageBranchRate.ToString(CultureInfo.InvariantCulture))); + packageElement.Add(new XAttribute("complexity", "NaN")); + } + } + + double lineRate = summaryResult.CoverableLines == 0 ? 1 : summaryResult.CoveredLines / (double)summaryResult.CoverableLines; + double branchRate = summaryResult.TotalBranches.GetValueOrDefault() == 0 ? 1 : summaryResult.CoveredBranches.GetValueOrDefault() / (double)summaryResult.TotalBranches.GetValueOrDefault(); + + var rootElement = new XElement("coverage"); + + rootElement.Add(new XAttribute("line-rate", lineRate.ToString(CultureInfo.InvariantCulture))); + rootElement.Add(new XAttribute("branch-rate", branchRate.ToString(CultureInfo.InvariantCulture))); + rootElement.Add(new XAttribute("lines-covered", summaryResult.CoveredLines.ToString(CultureInfo.InvariantCulture))); + rootElement.Add(new XAttribute("lines-valid", summaryResult.CoverableLines.ToString(CultureInfo.InvariantCulture))); + rootElement.Add(new XAttribute("branches-covered", summaryResult.CoveredBranches.GetValueOrDefault().ToString(CultureInfo.InvariantCulture))); + rootElement.Add(new XAttribute("branches-valid", summaryResult.TotalBranches.GetValueOrDefault().ToString(CultureInfo.InvariantCulture))); + rootElement.Add(new XAttribute("complexity", "NaN")); + rootElement.Add(new XAttribute("version", 0)); + rootElement.Add(new XAttribute("timestamp", ((long)(DateTime.Now - new DateTime(1970, 1, 1)).TotalSeconds).ToString(CultureInfo.InvariantCulture))); + + var sourcesElement = new XElement("sources"); + + foreach (var sourceDirectory in summaryResult.SourceDirectories) + { + sourcesElement.Add(new XElement("source", sourceDirectory)); + } + + rootElement.Add(sourcesElement); + + var packagesElement = new XElement("packages"); + + foreach (var packageElement in this.packageElementsByName.Values) + { + packagesElement.Add(packageElement); + } + + rootElement.Add(packagesElement); + + XDocument result = new XDocument(new XDeclaration("1.0", null, null), rootElement); + result.AddFirst(new XDocumentType("coverage", null, "http://cobertura.sourceforge.net/xml/coverage-04.dtd", null)); + + result.Save(Path.Combine(this.ReportContext.ReportConfiguration.TargetDirectory, "Cobertura.xml")); + } + + /// <summary> + /// Adds the lines to the given parent element. + /// </summary> + /// <param name="parent">The parent element.</param> + /// <param name="lines">The lines to add.</param> + /// <param name="lineRate">The line rate.</param> + /// <param name="branchRate">The branch rate.</param> + private void AddLineElements(XElement parent, IEnumerable<LineAnalysis> lines, out double lineRate, out double branchRate) + { + int coveredLines = 0; + int totalLines = 0; + + int coveredBranches = 0; + int totalBranches = 0; + + foreach (var line in lines) + { + if (line.LineVisitStatus == LineVisitStatus.NotCoverable) + { + continue; + } + + totalLines++; + + if (line.LineVisits > 0) + { + coveredLines++; + } + + bool hasBranch = line.TotalBranches.GetValueOrDefault() > 0; + + var lineElement = new XElement( + "line", + new XAttribute("number", line.LineNumber), + new XAttribute("hits", line.LineVisits.ToString(CultureInfo.InvariantCulture)), + new XAttribute("branch", hasBranch ? "true" : "false")); + + if (hasBranch) + { + int visitedBranchesLine = line.CoveredBranches.GetValueOrDefault(); + int totalBranchesLine = line.TotalBranches.GetValueOrDefault(); + + coveredBranches += visitedBranchesLine; + totalBranches += totalBranchesLine; + + double coverage = visitedBranchesLine / (double)totalBranchesLine; + lineElement.Add(new XAttribute( + "condition-coverage", + string.Format("{0}% ({1}/{2})", Math.Round(coverage * 100, MidpointRounding.AwayFromZero), visitedBranchesLine, totalBranchesLine))); + } + + parent.Add(lineElement); + } + + lineRate = totalLines == 0 ? 1 : coveredLines / (double)totalLines; + branchRate = totalBranches == 0 ? 1 : coveredBranches / (double)totalBranches; + } + } +} diff --git a/src/ReportGenerator.Reporting/CsvSummaryReportBuilder.cs b/src/ReportGenerator.Core/Reporting/Builders/CsvSummaryReportBuilder.cs similarity index 92% rename from src/ReportGenerator.Reporting/CsvSummaryReportBuilder.cs rename to src/ReportGenerator.Core/Reporting/Builders/CsvSummaryReportBuilder.cs index 7e8602bc..8c7628be 100644 --- a/src/ReportGenerator.Reporting/CsvSummaryReportBuilder.cs +++ b/src/ReportGenerator.Core/Reporting/Builders/CsvSummaryReportBuilder.cs @@ -4,15 +4,14 @@ using System.IO; using System.Linq; using System.Text; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Properties; -namespace Palmmedia.ReportGenerator.Reporting +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders { /// <summary> /// Creates summary report in CSV format (no reports for classes are generated). /// </summary> - [System.ComponentModel.Composition.Export(typeof(IReportBuilder))] public class CsvSummaryReportBuilder : IReportBuilder { /// <summary> @@ -29,7 +28,7 @@ public class CsvSummaryReportBuilder : IReportBuilder /// <value> /// The report configuration. /// </value> - public IReportConfiguration ReportConfiguration { get; set; } + public IReportContext ReportContext { get; set; } /// <summary> /// Creates a class report. @@ -51,7 +50,7 @@ public void CreateSummaryReport(SummaryResult summaryResult) throw new ArgumentNullException(nameof(summaryResult)); } - string targetPath = Path.Combine(this.ReportConfiguration.TargetDirectory, "Summary.csv"); + string targetPath = Path.Combine(this.ReportContext.ReportConfiguration.TargetDirectory, "Summary.csv"); using (var reportTextWriter = new StreamWriter(new FileStream(targetPath, FileMode.Create), Encoding.UTF8)) { diff --git a/src/ReportGenerator.Reporting/HtmlChartReportBuilder.cs b/src/ReportGenerator.Core/Reporting/Builders/HtmlChartReportBuilder.cs similarity index 71% rename from src/ReportGenerator.Reporting/HtmlChartReportBuilder.cs rename to src/ReportGenerator.Core/Reporting/Builders/HtmlChartReportBuilder.cs index 16d100c1..39a6cc4a 100644 --- a/src/ReportGenerator.Reporting/HtmlChartReportBuilder.cs +++ b/src/ReportGenerator.Core/Reporting/Builders/HtmlChartReportBuilder.cs @@ -1,17 +1,16 @@ using System; using System.Collections.Generic; using System.Linq; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; -using Palmmedia.ReportGenerator.Reporting.CodeAnalysis; -using Palmmedia.ReportGenerator.Reporting.Rendering; +using Palmmedia.ReportGenerator.Core.CodeAnalysis; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Properties; +using Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering; -namespace Palmmedia.ReportGenerator.Reporting +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders { /// <summary> /// Creates HTML with chart component only (no reports for classes are generated). /// </summary> - [System.ComponentModel.Composition.Export(typeof(IReportBuilder))] public class HtmlChartReportBuilder : HtmlSummaryReportBuilder { /// <summary> @@ -39,9 +38,9 @@ public override void CreateSummaryReport(IReportRenderer reportRenderer, Summary throw new ArgumentNullException(nameof(summaryResult)); } - reportRenderer.BeginSummaryReport(this.ReportConfiguration.TargetDirectory, "CoverageHistory.htm", ReportResources.Summary); + reportRenderer.BeginSummaryReport(this.ReportContext.ReportConfiguration.TargetDirectory, "CoverageHistory.htm", ReportResources.Summary); - var historicCoverages = this.GetOverallHistoricCoverages(this.ReportConfiguration.OverallHistoricCoverages); + var historicCoverages = this.GetOverallHistoricCoverages(this.ReportContext.OverallHistoricCoverages); if (historicCoverages.Any(h => h.CoverageQuota.HasValue || h.BranchCoverageQuota.HasValue)) { reportRenderer.Chart(historicCoverages); @@ -49,7 +48,7 @@ public override void CreateSummaryReport(IReportRenderer reportRenderer, Summary reportRenderer.CustomSummary(summaryResult.Assemblies, new List<RiskHotspot>(), summaryResult.SupportsBranchCoverage); - reportRenderer.SaveSummaryReport(this.ReportConfiguration.TargetDirectory); + reportRenderer.SaveSummaryReport(this.ReportContext.ReportConfiguration.TargetDirectory); } } } diff --git a/src/ReportGenerator.Reporting/HtmlInlineCssAndJavaScriptReportBuilder.cs b/src/ReportGenerator.Core/Reporting/Builders/HtmlInlineCssAndJavaScriptReportBuilder.cs similarity index 87% rename from src/ReportGenerator.Reporting/HtmlInlineCssAndJavaScriptReportBuilder.cs rename to src/ReportGenerator.Core/Reporting/Builders/HtmlInlineCssAndJavaScriptReportBuilder.cs index 8bcf549e..76fa6036 100644 --- a/src/ReportGenerator.Reporting/HtmlInlineCssAndJavaScriptReportBuilder.cs +++ b/src/ReportGenerator.Core/Reporting/Builders/HtmlInlineCssAndJavaScriptReportBuilder.cs @@ -1,15 +1,13 @@ using System.Collections.Generic; -using System.ComponentModel.Composition; using System.Text; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Reporting.Rendering; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering; -namespace Palmmedia.ReportGenerator.Reporting +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders { /// <summary> /// Creates report in HTML format. /// </summary> - [Export(typeof(IReportBuilder))] public class HtmlInlineCssAndJavaScriptReportBuilder : ReportBuilderBase { /// <summary> diff --git a/src/ReportGenerator.Reporting/HtmlReportBuilder.cs b/src/ReportGenerator.Core/Reporting/Builders/HtmlReportBuilder.cs similarity index 87% rename from src/ReportGenerator.Reporting/HtmlReportBuilder.cs rename to src/ReportGenerator.Core/Reporting/Builders/HtmlReportBuilder.cs index 29c8d2cf..8ba0477b 100644 --- a/src/ReportGenerator.Reporting/HtmlReportBuilder.cs +++ b/src/ReportGenerator.Core/Reporting/Builders/HtmlReportBuilder.cs @@ -1,15 +1,13 @@ using System.Collections.Generic; -using System.ComponentModel.Composition; using System.Text; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Reporting.Rendering; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering; -namespace Palmmedia.ReportGenerator.Reporting +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders { /// <summary> /// Creates report in HTML format. /// </summary> - [Export(typeof(IReportBuilder))] public class HtmlReportBuilder : ReportBuilderBase { /// <summary> diff --git a/src/ReportGenerator.Reporting/HtmlSummaryReportBuilder.cs b/src/ReportGenerator.Core/Reporting/Builders/HtmlSummaryReportBuilder.cs similarity index 84% rename from src/ReportGenerator.Reporting/HtmlSummaryReportBuilder.cs rename to src/ReportGenerator.Core/Reporting/Builders/HtmlSummaryReportBuilder.cs index 2978554b..b5702e2b 100644 --- a/src/ReportGenerator.Reporting/HtmlSummaryReportBuilder.cs +++ b/src/ReportGenerator.Core/Reporting/Builders/HtmlSummaryReportBuilder.cs @@ -1,15 +1,13 @@ using System.Collections.Generic; -using System.ComponentModel.Composition; using System.Text; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Reporting.Rendering; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering; -namespace Palmmedia.ReportGenerator.Reporting +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders { /// <summary> /// Creates summary report in HTML format (no reports for classes are generated). /// </summary> - [Export(typeof(IReportBuilder))] public class HtmlSummaryReportBuilder : ReportBuilderBase { /// <summary> diff --git a/src/ReportGenerator.Reporting/LatexReportBuilder.cs b/src/ReportGenerator.Core/Reporting/Builders/LatexReportBuilder.cs similarity index 90% rename from src/ReportGenerator.Reporting/LatexReportBuilder.cs rename to src/ReportGenerator.Core/Reporting/Builders/LatexReportBuilder.cs index ce35b752..559103c8 100644 --- a/src/ReportGenerator.Reporting/LatexReportBuilder.cs +++ b/src/ReportGenerator.Core/Reporting/Builders/LatexReportBuilder.cs @@ -1,15 +1,13 @@ using System; using System.Collections.Generic; -using System.ComponentModel.Composition; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Reporting.Rendering; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering; -namespace Palmmedia.ReportGenerator.Reporting +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders { /// <summary> /// Creates report in Latex format. /// </summary> - [Export(typeof(IReportBuilder))] public class LatexReportBuilder : ReportBuilderBase, IDisposable { /// <summary> diff --git a/src/ReportGenerator.Reporting/LatexSummaryReportBuilder.cs b/src/ReportGenerator.Core/Reporting/Builders/LatexSummaryReportBuilder.cs similarity index 84% rename from src/ReportGenerator.Reporting/LatexSummaryReportBuilder.cs rename to src/ReportGenerator.Core/Reporting/Builders/LatexSummaryReportBuilder.cs index 809554d5..84ec75d1 100644 --- a/src/ReportGenerator.Reporting/LatexSummaryReportBuilder.cs +++ b/src/ReportGenerator.Core/Reporting/Builders/LatexSummaryReportBuilder.cs @@ -1,14 +1,12 @@ using System.Collections.Generic; -using System.ComponentModel.Composition; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Reporting.Rendering; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering; -namespace Palmmedia.ReportGenerator.Reporting +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders { /// <summary> /// Creates summary report in Latex format (no reports for classes are generated). /// </summary> - [Export(typeof(IReportBuilder))] public class LatexSummaryReportBuilder : ReportBuilderBase { /// <summary> diff --git a/src/ReportGenerator.Reporting/MhtmlReportBuilder.cs b/src/ReportGenerator.Core/Reporting/Builders/MhtmlReportBuilder.cs similarity index 66% rename from src/ReportGenerator.Reporting/MhtmlReportBuilder.cs rename to src/ReportGenerator.Core/Reporting/Builders/MhtmlReportBuilder.cs index a15dec3a..123ebfbc 100644 --- a/src/ReportGenerator.Reporting/MhtmlReportBuilder.cs +++ b/src/ReportGenerator.Core/Reporting/Builders/MhtmlReportBuilder.cs @@ -1,14 +1,14 @@ using System.Collections.Generic; using System.IO; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.CodeAnalysis; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; -namespace Palmmedia.ReportGenerator.Reporting +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders { /// <summary> /// Creates MHTML which is a container for the complete HTML report. /// </summary> - [System.ComponentModel.Composition.Export(typeof(IReportBuilder))] public class MhtmlReportBuilder : IReportBuilder { /// <summary> @@ -17,9 +17,9 @@ public class MhtmlReportBuilder : IReportBuilder private readonly IReportBuilder htmlReportBuilder = new HtmlReportBuilder(); /// <summary> - /// The report configuration. + /// The report context. /// </summary> - private IReportConfiguration reportConfiguration; + private IReportContext reportContext; /// <summary> /// The temporary HTML report target directory. @@ -35,23 +35,26 @@ public class MhtmlReportBuilder : IReportBuilder public string ReportType => "MHtml"; /// <summary> - /// Gets or sets the report configuration. + /// Gets or sets the report context. /// </summary> /// <value> - /// The report configuration. + /// The report context. /// </value> - public IReportConfiguration ReportConfiguration + public IReportContext ReportContext { get { - return this.reportConfiguration; + return this.reportContext; } set { - this.reportConfiguration = value; - this.htmlReportTargetDirectory = Path.Combine(value.TargetDirectory, "tmphtml"); - this.htmlReportBuilder.ReportConfiguration = new HtmlReportBuilderReportConfiguration(value, this.htmlReportTargetDirectory); + this.reportContext = value; + this.htmlReportTargetDirectory = Path.Combine(value.ReportConfiguration.TargetDirectory, "tmphtml"); + this.htmlReportBuilder.ReportContext = new HtmlReportBuilderReportContext( + new HtmlReportBuilderReportConfiguration(value.ReportConfiguration, this.htmlReportTargetDirectory), + value.RiskHotspotAnalysisResult, + value.OverallHistoricCoverages); } } @@ -123,7 +126,7 @@ private static string AddFilePrefixForCssAndJavaScript(string content) /// </summary> private void CreateMhtmlFile() { - using (var writer = new StreamWriter(new FileStream(Path.Combine(this.ReportConfiguration.TargetDirectory, "Summary.mht"), FileMode.Create))) + using (var writer = new StreamWriter(new FileStream(Path.Combine(this.ReportContext.ReportConfiguration.TargetDirectory, "Summary.mht"), FileMode.Create))) { writer.WriteLine("MIME-Version: 1.0"); writer.WriteLine("Content-Type: multipart/related;"); @@ -152,7 +155,7 @@ private void CreateMhtmlFile() file = "combined.js"; content = File.ReadAllText(Path.Combine(this.htmlReportTargetDirectory, file)); - content = content.Replace(", \"reportPath\" : \"", ", \"reportPath\" : \"file:///"); + content = content.Replace(", \"reportPath\": \"", ", \"reportPath\" : \"file:///"); WriteFile(writer, file, "application/javascript", content); file = "report.css"; @@ -163,6 +166,40 @@ private void CreateMhtmlFile() } } + /// <summary> + /// Wraps another <see cref="IReportConfiguration"/> but makes it possible to override the target directory. + /// </summary> + private class HtmlReportBuilderReportContext : IReportContext + { + /// <summary> + /// Initializes a new instance of the <see cref="HtmlReportBuilderReportContext"/> class. + /// </summary> + /// <param name="reportConfiguration">The configuration options.</param> + /// <param name="riskHotspotAnalysisResult">The risk hotspot analysis result.</param> + /// <param name="overallHistoricCoverages">The historic coverage elements.</param> + public HtmlReportBuilderReportContext(IReportConfiguration reportConfiguration, RiskHotspotAnalysisResult riskHotspotAnalysisResult, IReadOnlyCollection<HistoricCoverage> overallHistoricCoverages) + { + this.ReportConfiguration = reportConfiguration; + this.RiskHotspotAnalysisResult = riskHotspotAnalysisResult; + this.OverallHistoricCoverages = overallHistoricCoverages; + } + + /// <summary> + /// Gets the configuration options. + /// </summary> + public IReportConfiguration ReportConfiguration { get; } + + /// <summary> + /// Gets or sets the risk hotspot analysis result. + /// </summary> + public RiskHotspotAnalysisResult RiskHotspotAnalysisResult { get; set; } + + /// <summary> + /// Gets the historic coverage elements. + /// </summary> + public IReadOnlyCollection<HistoricCoverage> OverallHistoricCoverages { get; } + } + /// <summary> /// Wraps another <see cref="IReportConfiguration"/> but makes it possible to override the target directory. /// </summary> @@ -184,11 +221,21 @@ public HtmlReportBuilderReportConfiguration(IReportConfiguration reportConfigura this.TargetDirectory = targetDirectory; } + /// <summary> + /// Gets the files containing coverage information. + /// </summary> + public IReadOnlyCollection<string> ReportFiles => this.reportConfiguration.ReportFiles; + /// <summary> /// Gets the target directory. /// </summary> public string TargetDirectory { get; private set; } + /// <summary> + /// Gets the source directories. + /// </summary> + public IReadOnlyCollection<string> SourceDirectories => this.reportConfiguration.SourceDirectories; + /// <summary> /// Gets the history directory. /// </summary> @@ -197,27 +244,27 @@ public HtmlReportBuilderReportConfiguration(IReportConfiguration reportConfigura /// <summary> /// Gets the type of the report. /// </summary> - public IEnumerable<string> ReportTypes => this.reportConfiguration.ReportTypes; + public IReadOnlyCollection<string> ReportTypes => this.reportConfiguration.ReportTypes; /// <summary> - /// Gets the source directories. + /// Gets the plugins. /// </summary> - public IEnumerable<string> SourceDirectories => this.reportConfiguration.SourceDirectories; + public IReadOnlyCollection<string> Plugins => this.reportConfiguration.Plugins; /// <summary> /// Gets the assembly filters. /// </summary> - public IEnumerable<string> AssemblyFilters => this.reportConfiguration.AssemblyFilters; + public IReadOnlyCollection<string> AssemblyFilters => this.reportConfiguration.AssemblyFilters; /// <summary> /// Gets the class filters. /// </summary> - public IEnumerable<string> ClassFilters => this.reportConfiguration.ClassFilters; + public IReadOnlyCollection<string> ClassFilters => this.reportConfiguration.ClassFilters; /// <summary> /// Gets the file filters. /// </summary> - public IEnumerable<string> FileFilters => this.reportConfiguration.FileFilters; + public IReadOnlyCollection<string> FileFilters => this.reportConfiguration.FileFilters; /// <summary> /// Gets the verbosity level. @@ -225,14 +272,19 @@ public HtmlReportBuilderReportConfiguration(IReportConfiguration reportConfigura public VerbosityLevel VerbosityLevel => this.reportConfiguration.VerbosityLevel; /// <summary> - /// Gets all historic coverage elements. + /// Gets the custom tag (e.g. build number). /// </summary> - public IEnumerable<HistoricCoverage> OverallHistoricCoverages => this.reportConfiguration.OverallHistoricCoverages; + public string Tag => this.reportConfiguration.Tag; /// <summary> - /// Gets the custom tag (e.g. build number). + /// Gets the invalid file patters supplied by the user. /// </summary> - public string Tag => this.reportConfiguration.Tag; + public IReadOnlyCollection<string> InvalidReportFilePatterns => this.reportConfiguration.InvalidReportFilePatterns; + + /// <summary> + /// Gets a value indicating whether the verbosity level was successfully parsed during initialization. + /// </summary> + public bool VerbosityLevelValid => this.reportConfiguration.VerbosityLevelValid; } } } \ No newline at end of file diff --git a/src/ReportGenerator.Core/Reporting/Builders/PngChartReportBuilder.cs b/src/ReportGenerator.Core/Reporting/Builders/PngChartReportBuilder.cs new file mode 100644 index 00000000..ef811ba3 --- /dev/null +++ b/src/ReportGenerator.Core/Reporting/Builders/PngChartReportBuilder.cs @@ -0,0 +1,120 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering; + +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders +{ + /// <summary> + /// Creates history chart in PNG format. + /// </summary> + public class PngChartReportBuilder : IReportBuilder + { + /// <summary> + /// Gets the report type. + /// </summary> + /// <value> + /// The report type. + /// </value> + public string ReportType => "PngChart"; + + /// <summary> + /// Gets or sets the report configuration. + /// </summary> + /// <value> + /// The report configuration. + /// </value> + public IReportContext ReportContext { get; set; } + + /// <summary> + /// Creates a class report. + /// </summary> + /// <param name="class">The class.</param> + /// <param name="fileAnalyses">The file analyses that correspond to the class.</param> + public void CreateClassReport(Class @class, IEnumerable<FileAnalysis> fileAnalyses) + { + } + + /// <summary> + /// Creates the summary report. + /// </summary> + /// <param name="summaryResult">The summary result.</param> + public void CreateSummaryReport(SummaryResult summaryResult) + { + if (summaryResult == null) + { + throw new ArgumentNullException(nameof(summaryResult)); + } + + var historicCoverages = this.GetOverallHistoricCoverages(this.ReportContext.OverallHistoricCoverages); + + var filteredHistoricCoverages = this.FilterHistoricCoverages(historicCoverages, 100); + + if (filteredHistoricCoverages.Any(h => h.CoverageQuota.HasValue || h.BranchCoverageQuota.HasValue)) + { + byte[] image = PngHistoryChartRenderer.RenderHistoryChart(filteredHistoricCoverages); + File.WriteAllBytes(Path.Combine(this.ReportContext.ReportConfiguration.TargetDirectory, "CoverageHistory.png"), image); + } + } + + /// <summary> + /// Gets the overall historic coverages from all classes grouped by execution time. + /// </summary> + /// <param name="overallHistoricCoverages">All historic coverage elements.</param> + /// <returns> + /// The overall historic coverages from all classes grouped by execution time. + /// </returns> + protected virtual IEnumerable<HistoricCoverage> GetOverallHistoricCoverages(IEnumerable<HistoricCoverage> overallHistoricCoverages) + { + var executionTimes = overallHistoricCoverages + .Select(h => h.ExecutionTime) + .Distinct() + .OrderBy(e => e); + + var result = new List<HistoricCoverage>(); + + foreach (var executionTime in executionTimes) + { + var historicCoveragesOfExecutionTime = overallHistoricCoverages + .Where(h => h.ExecutionTime.Equals(executionTime)) + .ToArray(); + + result.Add(new HistoricCoverage(executionTime, historicCoveragesOfExecutionTime[0].Tag) + { + CoveredLines = historicCoveragesOfExecutionTime.Sum(h => h.CoveredLines), + CoverableLines = historicCoveragesOfExecutionTime.Sum(h => h.CoverableLines), + CoveredBranches = historicCoveragesOfExecutionTime.Sum(h => h.CoveredBranches), + TotalBranches = historicCoveragesOfExecutionTime.Sum(h => h.TotalBranches), + TotalLines = historicCoveragesOfExecutionTime.Sum(h => h.TotalLines) + }); + } + + return result; + } + + /// <summary> + /// Filters the historic coverages (equal elements are removed). + /// </summary> + /// <param name="historicCoverages">The historic coverages.</param> + /// <param name="maximum">The maximum.</param> + /// <returns>The filtered historic coverages.</returns> + private List<HistoricCoverage> FilterHistoricCoverages(IEnumerable<HistoricCoverage> historicCoverages, int maximum) + { + var result = new List<HistoricCoverage>(); + + foreach (var historicCoverage in historicCoverages) + { + if (result.Count == 0 || !result[result.Count - 1].Equals(historicCoverage)) + { + result.Add(historicCoverage); + } + } + + result.RemoveRange(0, Math.Max(0, result.Count - maximum)); + + return result; + } + } +} \ No newline at end of file diff --git a/src/ReportGenerator.Reporting/Rendering/HtmlRenderer.cs b/src/ReportGenerator.Core/Reporting/Builders/Rendering/HtmlRenderer.cs similarity index 79% rename from src/ReportGenerator.Reporting/Rendering/HtmlRenderer.cs rename to src/ReportGenerator.Core/Reporting/Builders/Rendering/HtmlRenderer.cs index 432c1eae..5a1770c1 100644 --- a/src/ReportGenerator.Reporting/Rendering/HtmlRenderer.cs +++ b/src/ReportGenerator.Core/Reporting/Builders/Rendering/HtmlRenderer.cs @@ -6,11 +6,11 @@ using System.Net; using System.Text; using System.Text.RegularExpressions; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; -using Palmmedia.ReportGenerator.Reporting.CodeAnalysis; +using Palmmedia.ReportGenerator.Core.CodeAnalysis; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Properties; -namespace Palmmedia.ReportGenerator.Reporting.Rendering +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering { /// <summary> /// HTML report renderer. @@ -84,6 +84,16 @@ internal HtmlRenderer(bool onlySummary, bool inlineCssAndJavaScript, StringBuild this.javaScriptContent = javaScriptContent; } + /// <summary> + /// Gets a value indicating whether renderer support rendering of charts. + /// </summary> + public bool SupportsCharts => true; + + /// <summary> + /// Gets a value indicating whether renderer support rendering of charts. + /// </summary> + public bool SupportsRiskHotsSpots => true; + /// <summary> /// Begins the summary report. /// </summary> @@ -220,7 +230,7 @@ public void TestMethods(IEnumerable<TestMethod> testMethods, IEnumerable<FileAna this.reportTextWriter.WriteLine( "<a href=\"#file{0}_line{1}\" data-ng-click=\"navigateToHash('#file{0}_line{1}')\" title=\"{2}\"><i class=\"icon-{3}\"></i>{2}</a><br />", item.Key, - codeElement.Line, + codeElement.FirstLine, WebUtility.HtmlEncode(codeElement.Name), codeElement.CodeElementType == CodeElementType.Method ? "cube" : "wrench"); } @@ -267,7 +277,7 @@ public void BeginKeyValueTable() /// <param name="branchCoverageAvailable">if set to <c>true</c> branch coverage is available.</param> public void BeginSummaryTable(bool branchCoverageAvailable) { - this.reportTextWriter.WriteLine("<div data-ng-if=\"coverageTableFilteringEnabled\" data-reactive-coverage-table data-assemblies=\"assemblies\" data-branch-coverage-available=\"branchCoverageAvailable\"></div>"); + this.reportTextWriter.WriteLine("<div data-ng-if=\"coverageTableFilteringEnabled\" data-reactive-coverage-table data-assemblies=\"assemblies\" data-historic-coverage-execution-times=\"historicCoverageExecutionTimes\" data-branch-coverage-available=\"branchCoverageAvailable\"></div>"); this.reportTextWriter.WriteLine("<div data-ng-if=\"!coverageTableFilteringEnabled\">"); this.reportTextWriter.WriteLine( @@ -302,6 +312,7 @@ public void BeginSummaryTable(bool branchCoverageAvailable) WebUtility.HtmlEncode(ReportResources.Coverable), WebUtility.HtmlEncode(ReportResources.Total), WebUtility.HtmlEncode(ReportResources.Coverage)); + if (branchCoverageAvailable) { this.reportTextWriter.Write( @@ -333,6 +344,8 @@ public void CustomSummary(IEnumerable<Assembly> assemblies, IEnumerable<RiskHots this.javaScriptContent.AppendLine("var assemblies = ["); + var historicCoverageExecutionTimes = new HashSet<DateTime>(); + foreach (var assembly in assemblies) { this.javaScriptContent.AppendLine(" {"); @@ -351,6 +364,34 @@ public void CustomSummary(IEnumerable<Assembly> assemblies, IEnumerable<RiskHots branchCoverageHistory = "[" + string.Join(",", historicCoverages.Select(h => h.BranchCoverageQuota.GetValueOrDefault().ToString(CultureInfo.InvariantCulture))) + "]"; } + var historicCoveragesSb = new StringBuilder(); + int historicCoveragesCounter = 0; + historicCoveragesSb.Append("["); + foreach (var historicCoverage in @class.HistoricCoverages) + { + historicCoverageExecutionTimes.Add(historicCoverage.ExecutionTime); + + if (historicCoveragesCounter++ > 0) + { + historicCoveragesSb.Append(", "); + } + + historicCoveragesSb.AppendFormat( + "{{ \"executionTime\": \"{0} - {1}\", \"coveredLines\": {2}, \"uncoveredLines\": {3}, \"coverableLines\": {4}, \"totalLines\": {5}, \"coverageQuota\": {6}, \"coveredBranches\": {7}, \"totalBranches\": {8}, \"branchCoverageQuota\": {9} }}", + historicCoverage.ExecutionTime.ToShortDateString(), + historicCoverage.ExecutionTime.ToLongTimeString(), + historicCoverage.CoveredLines.ToString(CultureInfo.InvariantCulture), + (historicCoverage.CoverableLines - historicCoverage.CoveredLines).ToString(CultureInfo.InvariantCulture), + historicCoverage.CoverableLines.ToString(CultureInfo.InvariantCulture), + historicCoverage.TotalLines.ToString(CultureInfo.InvariantCulture), + historicCoverage.CoverageQuota.GetValueOrDefault().ToString(CultureInfo.InvariantCulture), + historicCoverage.CoveredBranches.ToString(CultureInfo.InvariantCulture), + historicCoverage.TotalBranches.ToString(CultureInfo.InvariantCulture), + historicCoverage.BranchCoverageQuota.GetValueOrDefault().ToString(CultureInfo.InvariantCulture)); + } + + historicCoveragesSb.Append("]"); + this.javaScriptContent.Append(" { "); this.javaScriptContent.AppendFormat("\"name\": \"{0}\",", @class.Name.Replace(@"\", @"\\")); this.javaScriptContent.AppendFormat( @@ -367,7 +408,8 @@ public void CustomSummary(IEnumerable<Assembly> assemblies, IEnumerable<RiskHots this.javaScriptContent.AppendFormat(" \"coveredBranches\": {0},", @class.CoveredBranches.GetValueOrDefault()); this.javaScriptContent.AppendFormat(" \"totalBranches\": {0},", @class.TotalBranches.GetValueOrDefault()); this.javaScriptContent.AppendFormat(" \"lineCoverageHistory\": {0},", lineCoverageHistory); - this.javaScriptContent.AppendFormat(" \"branchCoverageHistory\": {0}", branchCoverageHistory); + this.javaScriptContent.AppendFormat(" \"branchCoverageHistory\": {0},", branchCoverageHistory); + this.javaScriptContent.AppendFormat(" \"historicCoverages\": {0}", historicCoveragesSb.ToString()); this.javaScriptContent.AppendLine(" },"); } @@ -379,6 +421,23 @@ public void CustomSummary(IEnumerable<Assembly> assemblies, IEnumerable<RiskHots this.javaScriptContent.AppendLine(); + this.javaScriptContent.Append("var historicCoverageExecutionTimes = ["); + int historicCoverageExecutionTimesCounter = 0; + + foreach (var item in historicCoverageExecutionTimes.OrderByDescending(i => i).Skip(1).Take(100).ToList()) + { + if (historicCoverageExecutionTimesCounter++ > 0) + { + this.javaScriptContent.Append(", "); + } + + this.javaScriptContent.AppendFormat("\"{0} - {1}\"", item.ToShortDateString(), item.ToLongTimeString()); + } + + this.javaScriptContent.AppendLine("];"); + + this.javaScriptContent.AppendLine(); + this.javaScriptContent.AppendLine("var riskHotspotMetrics = ["); if (riskHotspots.Any()) @@ -404,14 +463,17 @@ public void CustomSummary(IEnumerable<Assembly> assemblies, IEnumerable<RiskHots this.javaScriptContent.AppendFormat(" \"assembly\": \"{0}\",", riskHotspot.Assembly.ShortName); this.javaScriptContent.AppendFormat(" \"class\": \"{0}\",", riskHotspot.Class.Name); this.javaScriptContent.AppendFormat(" \"reportPath\": \"{0}\",", this.onlySummary ? string.Empty : GetClassReportFilename(riskHotspot.Assembly.ShortName, riskHotspot.Class.Name)); - this.javaScriptContent.AppendFormat(" \"method\": \"{0}\",", riskHotspot.MethodMetric.ShortName); + this.javaScriptContent.AppendFormat(" \"methodName\": \"{0}\",", riskHotspot.MethodMetric.FullName); + this.javaScriptContent.AppendFormat(" \"methodShortName\": \"{0}\",", riskHotspot.MethodMetric.ShortName); + this.javaScriptContent.AppendFormat(" \"fileIndex\": {0},", riskHotspot.FileIndex); + this.javaScriptContent.AppendFormat(" \"line\": {0},", !this.onlySummary && riskHotspot.MethodMetric.Line.HasValue ? riskHotspot.MethodMetric.Line.Value.ToString(CultureInfo.InvariantCulture) : "null"); this.javaScriptContent.AppendLine(); this.javaScriptContent.AppendLine(" \"metrics\": ["); foreach (var metric in riskHotspot.StatusMetrics) { this.javaScriptContent.Append(" { "); - this.javaScriptContent.AppendFormat("\"value\": {0},", metric.Metric.Value.ToString(CultureInfo.InvariantCulture)); + this.javaScriptContent.AppendFormat("\"value\": {0},", metric.Metric.Value.HasValue ? metric.Metric.Value.Value.ToString(CultureInfo.InvariantCulture) : "null"); this.javaScriptContent.AppendFormat(" \"exceeded\": {0}", metric.Exceeded.ToString().ToLowerInvariant()); this.javaScriptContent.AppendLine(" },"); } @@ -427,38 +489,6 @@ public void CustomSummary(IEnumerable<Assembly> assemblies, IEnumerable<RiskHots this.javaScriptContent.AppendLine(); } - /// <summary> - /// Adds a metrics table to the report. - /// </summary> - /// <param name="metric">The metric.</param> - public void BeginMetricsTable(MethodMetric metric) - { - if (metric == null) - { - throw new ArgumentNullException(nameof(metric)); - } - - this.reportTextWriter.WriteLine("<table class=\"overview table-fixed\">"); - this.reportTextWriter.Write("<thead><tr>"); - - this.reportTextWriter.Write("<th>{0}</th>", WebUtility.HtmlEncode(ReportResources.Method)); - - foreach (var met in metric.Metrics) - { - if (met.ExplanationUrl == null) - { - this.reportTextWriter.Write("<th>{0}</th>", WebUtility.HtmlEncode(met.Name)); - } - else - { - this.reportTextWriter.Write("<th>{0} <a href=\"{1}\"><i class=\"icon-info-circled\"></i></a></th>", WebUtility.HtmlEncode(met.Name), WebUtility.HtmlEncode(met.ExplanationUrl.OriginalString)); - } - } - - this.reportTextWriter.WriteLine("</tr></thead>"); - this.reportTextWriter.WriteLine("<tbody>"); - } - /// <summary> /// Adds a file analysis table to the report. /// </summary> @@ -511,26 +541,126 @@ public void KeyValueRow(string key, IEnumerable<string> files) } /// <summary> - /// Adds the given metric values to the report. + /// Adds metrics to the report /// </summary> - /// <param name="metric">The metric.</param> - public void MetricsRow(MethodMetric metric) + /// <param name="class">The class.</param> + public void MetricsTable(Class @class) { - if (metric == null) + if (@class == null) { - throw new ArgumentNullException(nameof(metric)); + throw new ArgumentNullException(nameof(@class)); } - this.reportTextWriter.Write("<tr>"); + var firstMethodMetric = @class.Files.SelectMany(f => f.MethodMetrics).First(); - this.reportTextWriter.Write("<td title=\"{0}\">{1}</td>", WebUtility.HtmlEncode(metric.Name), WebUtility.HtmlEncode(metric.ShortName)); + this.reportTextWriter.WriteLine("<table class=\"overview table-fixed\">"); + this.reportTextWriter.Write("<thead><tr>"); - foreach (var metricValue in metric.Metrics.Select(m => m.Value)) + this.reportTextWriter.Write("<th>{0}</th>", WebUtility.HtmlEncode(ReportResources.Method)); + + foreach (var met in firstMethodMetric.Metrics) { - this.reportTextWriter.Write("<td>{0}</td>", metricValue.ToString(CultureInfo.InvariantCulture)); + if (met.ExplanationUrl == null) + { + this.reportTextWriter.Write("<th>{0}</th>", WebUtility.HtmlEncode(met.Name)); + } + else + { + this.reportTextWriter.Write("<th>{0} <a href=\"{1}\"><i class=\"icon-info-circled\"></i></a></th>", WebUtility.HtmlEncode(met.Name), WebUtility.HtmlEncode(met.ExplanationUrl.OriginalString)); + } } - this.reportTextWriter.WriteLine("</tr>"); + this.reportTextWriter.WriteLine("</tr></thead>"); + this.reportTextWriter.WriteLine("<tbody>"); + + int fileIndex = 0; + + foreach (var file in @class.Files) + { + foreach (var methodMetric in file.MethodMetrics.OrderBy(c => c.Line)) + { + this.reportTextWriter.Write("<tr>"); + + if (methodMetric.Line.HasValue) + { + this.reportTextWriter.Write( + "<td title=\"{0}\"><a href=\"#file{1}_line{2}\" data-ng-click=\"navigateToHash('#file{1}_line{2}')\">{3}</a></td>", + WebUtility.HtmlEncode(methodMetric.FullName), + fileIndex, + methodMetric.Line, + WebUtility.HtmlEncode(methodMetric.ShortName)); + } + else + { + this.reportTextWriter.Write("<td title=\"{0}\">{1}</td>", WebUtility.HtmlEncode(methodMetric.FullName), WebUtility.HtmlEncode(methodMetric.ShortName)); + } + + foreach (var metricValue in methodMetric.Metrics) + { + this.reportTextWriter.Write("<td>{0}{1}</td>", + metricValue.Value.HasValue ? metricValue.Value.Value.ToString(CultureInfo.InvariantCulture) : "-", + metricValue.Value.HasValue && metricValue.MetricType == MetricType.CoveragePercentual ? "%" : string.Empty); + } + + this.reportTextWriter.WriteLine("</tr>"); + } + + fileIndex++; + } + + this.reportTextWriter.WriteLine("</tbody>"); + this.reportTextWriter.WriteLine("</table>"); + } + + /// <summary> + /// Adds metrics to the report + /// </summary> + /// <param name="methodMetrics">The method metrics.</param> + public void MetricsTable(IEnumerable<MethodMetric> methodMetrics) + { + if (methodMetrics == null) + { + throw new ArgumentNullException(nameof(methodMetrics)); + } + + var firstMethodMetric = methodMetrics.First(); + + this.reportTextWriter.WriteLine("<table class=\"overview table-fixed\">"); + this.reportTextWriter.Write("<thead><tr>"); + + this.reportTextWriter.Write("<th>{0}</th>", WebUtility.HtmlEncode(ReportResources.Method)); + + foreach (var met in firstMethodMetric.Metrics) + { + if (met.ExplanationUrl == null) + { + this.reportTextWriter.Write("<th>{0}</th>", WebUtility.HtmlEncode(met.Name)); + } + else + { + this.reportTextWriter.Write("<th>{0} <a href=\"{1}\"><i class=\"icon-info-circled\"></i></a></th>", WebUtility.HtmlEncode(met.Name), WebUtility.HtmlEncode(met.ExplanationUrl.OriginalString)); + } + } + + this.reportTextWriter.WriteLine("</tr></thead>"); + this.reportTextWriter.WriteLine("<tbody>"); + + foreach (var methodMetric in methodMetrics) + { + this.reportTextWriter.Write("<tr>"); + + this.reportTextWriter.Write("<td title=\"{0}\">{1}</td>", WebUtility.HtmlEncode(methodMetric.FullName), WebUtility.HtmlEncode(methodMetric.ShortName)); + + foreach (var metricValue in methodMetric.Metrics.Select(m => m.Value)) + { + this.reportTextWriter.Write("<td>{0}</td>", metricValue.HasValue ? metricValue.Value.ToString(CultureInfo.InvariantCulture) : "-"); + } + + this.reportTextWriter.WriteLine("</tr>"); + } + + this.reportTextWriter.WriteLine("</tbody>"); + this.reportTextWriter.WriteLine("</table>"); } /// <summary> @@ -640,21 +770,26 @@ public void Chart(IEnumerable<HistoricCoverage> historicCoverages) throw new ArgumentNullException(nameof(historicCoverages)); } + var filteredHistoricCoverages = this.FilterHistoricCoverages(historicCoverages, 100); + string id = Guid.NewGuid().ToString("N"); - this.reportTextWriter.WriteLine("<div id=\"mainHistoryChart\" class=\"ct-chart\" data-history-chart data-data=\"historyChartData{0}\"></div>", id); + byte[] pngHistory = PngHistoryChartRenderer.RenderHistoryChart(filteredHistoricCoverages); - historicCoverages = this.FilterHistoricCoverages(historicCoverages, 100); + this.reportTextWriter.WriteLine( + "<div id=\"mainHistoryChart\" class=\"ct-chart\" data-history-chart data-data=\"historyChartData{0}\"><img src=\"data:image/png;base64,{1}\" /></div>", + id, + Convert.ToBase64String(pngHistory)); var series = new List<string>(); - series.Add("[" + string.Join(",", historicCoverages.Select(h => h.CoverageQuota.GetValueOrDefault().ToString(CultureInfo.InvariantCulture))) + "]"); + series.Add("[" + string.Join(",", filteredHistoricCoverages.Select(h => h.CoverageQuota.GetValueOrDefault().ToString(CultureInfo.InvariantCulture))) + "]"); - if (historicCoverages.Any(h => h.BranchCoverageQuota.HasValue)) + if (filteredHistoricCoverages.Any(h => h.BranchCoverageQuota.HasValue)) { - series.Add("[" + string.Join(",", historicCoverages.Select(h => h.BranchCoverageQuota.GetValueOrDefault().ToString(CultureInfo.InvariantCulture))) + "]"); + series.Add("[" + string.Join(",", filteredHistoricCoverages.Select(h => h.BranchCoverageQuota.GetValueOrDefault().ToString(CultureInfo.InvariantCulture))) + "]"); } - var toolTips = historicCoverages.Select(h => + var toolTips = filteredHistoricCoverages.Select(h => string.Format( "'<h3>{0} - {1}</h3>{2}{3}{4}{5}'", h.ExecutionTime.ToShortDateString(), @@ -715,11 +850,11 @@ public void RiskHotspots(IEnumerable<RiskHotspot> riskHotspots) { if (metric.ExplanationUrl == null) { - this.reportTextWriter.WriteLine("<th class=\"right\">{0}</th>", WebUtility.HtmlEncode(metric.Name)); + this.reportTextWriter.WriteLine("<th>{0}</th>", WebUtility.HtmlEncode(metric.Name)); } else { - this.reportTextWriter.WriteLine("<th class=\"right\">{0} <a href=\"{1}\"><i class=\"icon-info-circled\"></i></a></th>", WebUtility.HtmlEncode(metric.Name), WebUtility.HtmlEncode(metric.ExplanationUrl.OriginalString)); + this.reportTextWriter.WriteLine("<th>{0} <a href=\"{1}\"><i class=\"icon-info-circled\"></i></a></th>", WebUtility.HtmlEncode(metric.Name), WebUtility.HtmlEncode(metric.ExplanationUrl.OriginalString)); } } @@ -743,11 +878,28 @@ public void RiskHotspots(IEnumerable<RiskHotspot> riskHotspots) this.reportTextWriter.WriteLine("<tr>"); this.reportTextWriter.WriteLine("<td>{0}</td>", WebUtility.HtmlEncode(riskHotspot.Assembly.ShortName)); this.reportTextWriter.WriteLine("<td>{0}</td>", filenameColumn); - this.reportTextWriter.WriteLine("<td>{0}</td>", WebUtility.HtmlEncode(riskHotspot.MethodMetric.ShortName)); + + if (!this.onlySummary && riskHotspot.MethodMetric.Line.HasValue) + { + this.reportTextWriter.Write( + "<td title=\"{0}\"><a href=\"{1}#file{2}_line{3}\">{4}</a></td>", + WebUtility.HtmlEncode(riskHotspot.MethodMetric.FullName), + WebUtility.HtmlEncode(GetClassReportFilename(riskHotspot.Assembly.ShortName, riskHotspot.Class.Name)), + riskHotspot.FileIndex, + riskHotspot.MethodMetric.Line, + WebUtility.HtmlEncode(riskHotspot.MethodMetric.ShortName)); + } + else + { + this.reportTextWriter.Write("<td title=\"{0}\">{1}</td>", WebUtility.HtmlEncode(riskHotspot.MethodMetric.FullName), WebUtility.HtmlEncode(riskHotspot.MethodMetric.ShortName)); + } foreach (var statusMetric in riskHotspot.StatusMetrics) { - this.reportTextWriter.WriteLine("<td class=\"right {0}\">{1}</td>", statusMetric.Exceeded ? "lightred" : "lightgreen", statusMetric.Metric.Value.ToString(CultureInfo.InvariantCulture)); + this.reportTextWriter.WriteLine( + "<td class=\"{0} right\">{1}</td>", + statusMetric.Exceeded ? "lightred" : "lightgreen", + statusMetric.Metric.Value.HasValue ? statusMetric.Metric.Value.Value.ToString(CultureInfo.InvariantCulture) : "-"); } this.reportTextWriter.WriteLine("</tr>"); @@ -845,9 +997,8 @@ public void AddFooter() { this.reportTextWriter.Write(string.Format( CultureInfo.InvariantCulture, - "<div class=\"footer\">{0} {1} {2}<br />{3} - {4}<br /><a href=\"https://github.com/danielpalme/ReportGenerator\">GitHub</a> | <a href=\"http://www.palmmedia.de\">www.palmmedia.de</a></div>", + "<div class=\"footer\">{0} ReportGenerator {1}<br />{2} - {3}<br /><a href=\"https://github.com/danielpalme/ReportGenerator\">GitHub</a> | <a href=\"http://www.palmmedia.de\">www.palmmedia.de</a></div>", WebUtility.HtmlEncode(ReportResources.GeneratedBy), - typeof(IReportBuilder).Assembly.GetName().Name, typeof(IReportBuilder).Assembly.GetName().Version, DateTime.Now.ToShortDateString(), DateTime.Now.ToLongTimeString())); @@ -972,28 +1123,31 @@ private static string GetClassReportFilename(string assemblyName, string classNa if (!FileNameByClass.TryGetValue(key, out fileName)) { - lock (FileNameByClass) + string shortClassName = className.Substring(className.LastIndexOf('.') + 1); + fileName = RendererBase.ReplaceInvalidPathChars(assemblyName + "_" + shortClassName) + ".htm"; + + if (fileName.Length > 100) { - if (!FileNameByClass.TryGetValue(key, out fileName)) - { - string shortClassName = className.Substring(className.LastIndexOf('.') + 1); - fileName = RendererBase.ReplaceInvalidPathChars(assemblyName + "_" + shortClassName) + ".htm"; + string firstPart = fileName.Substring(0, 50); + string lastPart = fileName.Substring(fileName.Length - 45, 45); - if (FileNameByClass.Values.Any(v => v.Equals(fileName, StringComparison.OrdinalIgnoreCase))) - { - int counter = 2; - - do - { - fileName = RendererBase.ReplaceInvalidPathChars(assemblyName + "_" + shortClassName + counter) + ".htm"; - counter++; - } - while (FileNameByClass.Values.Any(v => v.Equals(fileName, StringComparison.OrdinalIgnoreCase))); - } + fileName = firstPart + lastPart; + } - FileNameByClass.Add(key, fileName); + if (FileNameByClass.Values.Any(v => v.Equals(fileName, StringComparison.OrdinalIgnoreCase))) + { + int counter = 2; + string fileNameWithoutExtension = fileName.Substring(0, fileName.Length - 4); + + do + { + fileName = fileNameWithoutExtension + counter + ".htm"; + counter++; } + while (FileNameByClass.Values.Any(v => v.Equals(fileName, StringComparison.OrdinalIgnoreCase))); } + + FileNameByClass.Add(key, fileName); } return fileName; @@ -1057,7 +1211,7 @@ private Stream GetCombinedCss() var ms = new MemoryStream(); using (Stream stream = typeof(HtmlRenderer).Assembly.GetManifestResourceStream( - "Palmmedia.ReportGenerator.Reporting.Rendering.resources.custom.css")) + "Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering.resources.custom.css")) { stream.CopyTo(ms); } @@ -1067,7 +1221,7 @@ private Stream GetCombinedCss() ms.Write(lineBreak, 0, lineBreak.Length); using (Stream stream = typeof(HtmlRenderer).Assembly.GetManifestResourceStream( - "Palmmedia.ReportGenerator.Reporting.Rendering.resources.chartist.min.css")) + "Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering.resources.chartist.min.css")) { stream.CopyTo(ms); } @@ -1086,7 +1240,7 @@ private Stream GetCombinedJavascript() var ms = new MemoryStream(); using (Stream stream = typeof(HtmlRenderer).Assembly.GetManifestResourceStream( - "Palmmedia.ReportGenerator.Reporting.Rendering.resources.jquery-1.11.2.min.js")) + "Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering.resources.jquery-1.11.2.min.js")) { stream.CopyTo(ms); } @@ -1095,7 +1249,7 @@ private Stream GetCombinedJavascript() ms.Write(lineBreak, 0, lineBreak.Length); using (Stream stream = typeof(HtmlRenderer).Assembly.GetManifestResourceStream( - "Palmmedia.ReportGenerator.Reporting.Rendering.resources.angular.min.js")) + "Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering.resources.angular.min.js")) { stream.CopyTo(ms); } @@ -1103,7 +1257,7 @@ private Stream GetCombinedJavascript() ms.Write(lineBreak, 0, lineBreak.Length); using (Stream stream = typeof(HtmlRenderer).Assembly.GetManifestResourceStream( - "Palmmedia.ReportGenerator.Reporting.Rendering.resources.react.modified.min.js")) + "Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering.resources.react.modified.min.js")) { stream.CopyTo(ms); } @@ -1111,7 +1265,7 @@ private Stream GetCombinedJavascript() ms.Write(lineBreak, 0, lineBreak.Length); using (Stream stream = typeof(HtmlRenderer).Assembly.GetManifestResourceStream( - "Palmmedia.ReportGenerator.Reporting.Rendering.resources.chartist.min.js")) + "Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering.resources.chartist.min.js")) { stream.CopyTo(ms); } @@ -1120,7 +1274,7 @@ private Stream GetCombinedJavascript() // Required for rendering charts in IE 9 using (Stream stream = typeof(HtmlRenderer).Assembly.GetManifestResourceStream( - "Palmmedia.ReportGenerator.Reporting.Rendering.resources.matchMedia.js")) + "Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering.resources.matchMedia.js")) { stream.CopyTo(ms); } @@ -1178,6 +1332,12 @@ private Stream GetCombinedJavascript() sb.AppendFormat("'branchCoverage': '{0}'", WebUtility.HtmlEncode(ReportResources.BranchCoverage)); sb.AppendLine(","); sb.AppendFormat("'history': '{0}'", WebUtility.HtmlEncode(ReportResources.History)); + sb.AppendLine(","); + sb.AppendFormat("'compareHistory': '{0}'", WebUtility.HtmlEncode(ReportResources.CompareHistory)); + sb.AppendLine(","); + sb.AppendFormat("'date': '{0}'", WebUtility.HtmlEncode(ReportResources.Date)); + sb.AppendLine(","); + sb.AppendFormat("'changesOnly': '{0}'", WebUtility.HtmlEncode(ReportResources.ChangesOnly)); sb.AppendLine(); sb.AppendLine("};"); @@ -1188,7 +1348,7 @@ private Stream GetCombinedJavascript() ms.Write(lineBreak, 0, lineBreak.Length); using (Stream stream = typeof(HtmlRenderer).Assembly.GetManifestResourceStream( - "Palmmedia.ReportGenerator.Reporting.Rendering.resources.riskHotspotTableReactComponents.js")) + "Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering.resources.riskHotspotTableReactComponents.js")) { stream.CopyTo(ms); } @@ -1197,7 +1357,7 @@ private Stream GetCombinedJavascript() ms.Write(lineBreak, 0, lineBreak.Length); using (Stream stream = typeof(HtmlRenderer).Assembly.GetManifestResourceStream( - "Palmmedia.ReportGenerator.Reporting.Rendering.resources.coverageTableReactComponents.js")) + "Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering.resources.coverageTableReactComponents.js")) { stream.CopyTo(ms); } @@ -1206,7 +1366,7 @@ private Stream GetCombinedJavascript() ms.Write(lineBreak, 0, lineBreak.Length); using (Stream stream = typeof(HtmlRenderer).Assembly.GetManifestResourceStream( - "Palmmedia.ReportGenerator.Reporting.Rendering.resources.customAngularApp.js")) + "Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering.resources.customAngularApp.js")) { stream.CopyTo(ms); } @@ -1262,7 +1422,7 @@ private void FinishReport() /// <param name="historicCoverages">The historic coverages.</param> /// <param name="maximum">The maximum.</param> /// <returns>The filtered historic coverages.</returns> - private IEnumerable<HistoricCoverage> FilterHistoricCoverages(IEnumerable<HistoricCoverage> historicCoverages, int maximum) + private List<HistoricCoverage> FilterHistoricCoverages(IEnumerable<HistoricCoverage> historicCoverages, int maximum) { var result = new List<HistoricCoverage>(); diff --git a/src/ReportGenerator.Reporting/Rendering/IReportRenderer.cs b/src/ReportGenerator.Core/Reporting/Builders/Rendering/IReportRenderer.cs similarity index 88% rename from src/ReportGenerator.Reporting/Rendering/IReportRenderer.cs rename to src/ReportGenerator.Core/Reporting/Builders/Rendering/IReportRenderer.cs index 03672fa7..a7442934 100644 --- a/src/ReportGenerator.Reporting/Rendering/IReportRenderer.cs +++ b/src/ReportGenerator.Core/Reporting/Builders/Rendering/IReportRenderer.cs @@ -1,14 +1,24 @@ using System.Collections.Generic; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Reporting.CodeAnalysis; +using Palmmedia.ReportGenerator.Core.CodeAnalysis; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; -namespace Palmmedia.ReportGenerator.Reporting.Rendering +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering { /// <summary> /// Interface for report renderers. /// </summary> public interface IReportRenderer { + /// <summary> + /// Gets a value indicating whether renderer support rendering of charts. + /// </summary> + bool SupportsCharts { get; } + + /// <summary> + /// Gets a value indicating whether renderer support rendering risk hotspots. + /// </summary> + bool SupportsRiskHotsSpots { get; } + /// <summary> /// Begins the summary report. /// </summary> @@ -84,12 +94,6 @@ public interface IReportRenderer /// <param name="branchCoverageAvailable">if set to <c>true</c> branch coverage is available.</param> void CustomSummary(IEnumerable<Assembly> assemblies, IEnumerable<RiskHotspot> riskHotspots, bool branchCoverageAvailable); - /// <summary> - /// Adds a metrics table to the report. - /// </summary> - /// <param name="metric">The metric.</param> - void BeginMetricsTable(MethodMetric metric); - /// <summary> /// Adds a file analysis table to the report. /// </summary> @@ -125,10 +129,16 @@ public interface IReportRenderer void SummaryClass(Class @class, bool branchCoverageAvailable); /// <summary> - /// Adds the given metric values to the report. + /// Adds metrics to the report + /// </summary> + /// <param name="class">The class.</param> + void MetricsTable(Class @class); + + /// <summary> + /// Adds metrics to the report /// </summary> - /// <param name="metric">The metric.</param> - void MetricsRow(MethodMetric metric); + /// <param name="methodMetrics">The method metrics.</param> + void MetricsTable(IEnumerable<MethodMetric> methodMetrics); /// <summary> /// Adds the coverage information of a single line of a file to the report. diff --git a/src/ReportGenerator.Reporting/Rendering/LatexRenderer.cs b/src/ReportGenerator.Core/Reporting/Builders/Rendering/LatexRenderer.cs similarity index 68% rename from src/ReportGenerator.Reporting/Rendering/LatexRenderer.cs rename to src/ReportGenerator.Core/Reporting/Builders/Rendering/LatexRenderer.cs index 11085555..456d2067 100644 --- a/src/ReportGenerator.Reporting/Rendering/LatexRenderer.cs +++ b/src/ReportGenerator.Core/Reporting/Builders/Rendering/LatexRenderer.cs @@ -4,11 +4,11 @@ using System.IO; using System.Linq; using System.Text; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; -using Palmmedia.ReportGenerator.Reporting.CodeAnalysis; +using Palmmedia.ReportGenerator.Core.CodeAnalysis; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Properties; -namespace Palmmedia.ReportGenerator.Reporting.Rendering +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering { /// <summary> /// Latex report renderer. @@ -20,14 +20,15 @@ internal class LatexRenderer : RendererBase, IReportRenderer, IDisposable /// <summary> /// The head of each generated Latex file. /// </summary> - private const string LatexStart = @"\documentclass[a4paper,10pt]{{article}} -\usepackage[paper=a4paper,left=20mm,right=20mm,top=20mm,bottom=20mm]{{geometry}} + private const string LatexStart = @"\documentclass[a4paper,landscape,10pt]{{article}} +\usepackage[paper=a4paper,landscape,left=20mm,right=20mm,top=20mm,bottom=20mm]{{geometry}} \usepackage{{longtable}} \usepackage{{fancyhdr}} \usepackage[pdftex]{{color}} \usepackage{{colortbl}} -\definecolor{{green}}{{rgb}}{{0,1,0.12}} -\definecolor{{red}}{{rgb}}{{1,0,0}} +\definecolor{{green}}{{rgb}}{{0.04,0.68,0.04}} +\definecolor{{orange}}{{rgb}}{{0.97,0.65,0.12}} +\definecolor{{red}}{{rgb}}{{0.75,0.04,0.04}} \definecolor{{gray}}{{rgb}}{{0.86,0.86,0.86}} \usepackage[pdftex, @@ -44,13 +45,13 @@ internal class LatexRenderer : RendererBase, IReportRenderer, IDisposable ]{{hyperref}} \hypersetup{{pdftitle={{{0}}}, - pdfauthor={{{1} - {2}}} + pdfauthor={{ReportGenerator - {1}}} }} \pagestyle{{fancy}} \fancyhead[LE,LO]{{\leftmark}} \fancyhead[R]{{\thepage}} -\fancyfoot[C]{{{1} - {2}}} +\fancyfoot[C]{{ReportGenerator - {1}}} \begin{{document}} @@ -78,6 +79,16 @@ internal class LatexRenderer : RendererBase, IReportRenderer, IDisposable /// </summary> private Stream summaryReportStream, classReportStream; + /// <summary> + /// Gets a value indicating whether renderer support rendering of charts. + /// </summary> + public bool SupportsCharts => false; + + /// <summary> + /// Gets a value indicating whether renderer support rendering of charts. + /// </summary> + public bool SupportsRiskHotsSpots => true; + /// <summary> /// Begins the summary report. /// </summary> @@ -93,7 +104,6 @@ public void BeginSummaryReport(string targetDirectory, string fileName, string t CultureInfo.InvariantCulture, LatexStart, EscapeLatexChars(ReportResources.CoverageReport), - typeof(IReportBuilder).Assembly.GetName().Name, typeof(IReportBuilder).Assembly.GetName().Version); this.reportTextWriter.WriteLine(start); @@ -189,7 +199,34 @@ public void BeginKeyValueTable() /// <param name="branchCoverageAvailable">if set to <c>true</c> branch coverage is available.</param> public void BeginSummaryTable(bool branchCoverageAvailable) { - this.reportTextWriter.WriteLine(@"\begin{longtable}[l]{ll}"); + this.reportTextWriter.Write(@"\begin{longtable}[l]{|l|r|r|r|r|r|"); + + if (branchCoverageAvailable) + { + this.reportTextWriter.Write("r|"); + } + + this.reportTextWriter.WriteLine("}"); + this.reportTextWriter.WriteLine(@"\hline"); + + this.reportTextWriter.Write( + "\\textbf{{{0}}} & \\textbf{{{1}}} & \\textbf{{{2}}} & \\textbf{{{3}}} & \\textbf{{{4}}} & \\textbf{{{5}}}", + EscapeLatexChars(ReportResources.Name), + EscapeLatexChars(ReportResources.Covered), + EscapeLatexChars(ReportResources.Uncovered), + EscapeLatexChars(ReportResources.Coverable), + EscapeLatexChars(ReportResources.Total), + EscapeLatexChars(ReportResources.Coverage)); + + if (branchCoverageAvailable) + { + this.reportTextWriter.Write( + " & \\textbf{{{0}}}", + EscapeLatexChars(ReportResources.BranchCoverage)); + } + + this.reportTextWriter.WriteLine(@"\\"); + this.reportTextWriter.WriteLine(@"\hline"); } /// <summary> @@ -202,26 +239,6 @@ public void CustomSummary(IEnumerable<Assembly> assemblies, IEnumerable<RiskHots { } - /// <summary> - /// Adds a metrics table to the report. - /// </summary> - /// <param name="metric">The metric.</param> - public void BeginMetricsTable(MethodMetric metric) - { - if (metric == null) - { - throw new ArgumentNullException(nameof(metric)); - } - - string columns = "|l|" + string.Join("|", metric.Metrics.Select(m => "l")) + "|"; - - this.reportTextWriter.WriteLine(@"\begin{longtable}[l]{" + columns + "}"); - this.reportTextWriter.WriteLine(@"\hline"); - this.reportTextWriter.Write(@"\textbf{" + EscapeLatexChars(ReportResources.Method) + "} & " + string.Join(" & ", metric.Metrics.Select(m => @"\textbf{" + EscapeLatexChars(m.Name) + "}"))); - this.reportTextWriter.WriteLine(@"\\"); - this.reportTextWriter.WriteLine(@"\hline"); - } - /// <summary> /// Adds a file analysis table to the report. /// </summary> @@ -268,26 +285,61 @@ public void KeyValueRow(string key, IEnumerable<string> files) } /// <summary> - /// Adds the given metric values to the report. + /// Adds metrics to the report /// </summary> - /// <param name="metric">The metric.</param> - public void MetricsRow(MethodMetric metric) + /// <param name="class">The class.</param> + public void MetricsTable(Class @class) { - if (metric == null) + if (@class == null) { - throw new ArgumentNullException(nameof(metric)); + throw new ArgumentNullException(nameof(@class)); } - string metrics = string.Join(" & ", metric.Metrics.Select(m => m.Value.ToString(CultureInfo.InvariantCulture))); + var methodMetrics = @class.Files.SelectMany(f => f.MethodMetrics); - string row = string.Format( - CultureInfo.InvariantCulture, - @"\textbf{{{0}}} & {1}\\", - EscapeLatexChars(ShortenString(metric.ShortName, 20)), - metrics); + this.MetricsTable(methodMetrics); + } - this.reportTextWriter.WriteLine(row); - this.reportTextWriter.WriteLine(@"\hline"); + /// <summary> + /// Adds metrics to the report + /// </summary> + /// <param name="methodMetrics">The method metrics.</param> + public void MetricsTable(IEnumerable<MethodMetric> methodMetrics) + { + if (methodMetrics == null) + { + throw new ArgumentNullException(nameof(methodMetrics)); + } + + var firstMethodMetric = methodMetrics.First(); + int numberOfTables = (int)Math.Ceiling((double)firstMethodMetric.Metrics.Count() / 5); + + for (int i = 0; i < numberOfTables; i++) + { + string columns = "|l|" + string.Join("|", firstMethodMetric.Metrics.Skip(i * 5).Take(5).Select(m => "r")) + "|"; + + this.reportTextWriter.WriteLine(@"\begin{longtable}[l]{" + columns + "}"); + this.reportTextWriter.WriteLine(@"\hline"); + this.reportTextWriter.Write(@"\textbf{" + EscapeLatexChars(ReportResources.Method) + "} & " + string.Join(" & ", firstMethodMetric.Metrics.Skip(i * 5).Take(5).Select(m => @"\textbf{" + EscapeLatexChars(m.Name) + "}"))); + this.reportTextWriter.WriteLine(@"\\"); + this.reportTextWriter.WriteLine(@"\hline"); + + foreach (var methodMetric in methodMetrics.OrderBy(c => c.Line)) + { + string metrics = string.Join(" & ", methodMetric.Metrics.Skip(i * 5).Take(5).Select(m => string.Format("{0}{1}", m.Value.HasValue ? m.Value.Value.ToString(CultureInfo.InvariantCulture) : "-", m.Value.HasValue && m.MetricType == MetricType.CoveragePercentual ? "\\%" : string.Empty))); + + string row = string.Format( + CultureInfo.InvariantCulture, + @"\textbf{{{0}}} & {1}\\", + EscapeLatexChars(ShortenString(methodMetric.ShortName, 20)), + metrics); + + this.reportTextWriter.WriteLine(row); + this.reportTextWriter.WriteLine(@"\hline"); + } + + this.reportTextWriter.WriteLine(@"\end{longtable}"); + } } /// <summary> @@ -307,7 +359,7 @@ public void LineAnalysis(int fileIndex, LineAnalysis analysis) .Replace(((char)9).ToString(), " ") // replace tab .Replace("~", " "); // replace '~' since this used for the \verb command - formattedLine = ShortenString(formattedLine); + formattedLine = ShortenString(formattedLine, 120); formattedLine = XmlRenderer.ReplaceInvalidXmlChars(formattedLine); string lineVisitStatus; @@ -361,6 +413,58 @@ public void Chart(IEnumerable<HistoricCoverage> historicCoverages) /// <param name="riskHotspots">The risk hotspots.</param> public void RiskHotspots(IEnumerable<RiskHotspot> riskHotspots) { + if (riskHotspots == null) + { + throw new ArgumentNullException(nameof(riskHotspots)); + } + + var codeQualityMetrics = riskHotspots.First().MethodMetric.Metrics + .Where(m => m.MetricType == MetricType.CodeQuality) + .ToArray(); + + string columns = "|l|l|l|" + string.Join("|", codeQualityMetrics.Select(m => "r")) + "|"; + + this.reportTextWriter.WriteLine(@"\begin{longtable}[l]{" + columns + "}"); + this.reportTextWriter.WriteLine(@"\hline"); + this.reportTextWriter.Write( + "\\textbf{{{0}}} & \\textbf{{{1}}} & \\textbf{{{2}}}", + EscapeLatexChars(ReportResources.Assembly2), + EscapeLatexChars(ReportResources.Class2), + EscapeLatexChars(ReportResources.Method)); + + foreach (var metric in codeQualityMetrics) + { + this.reportTextWriter.Write(" & \\textbf{{{0}}}", EscapeLatexChars(metric.Name)); + } + + this.reportTextWriter.WriteLine(@"\\"); + this.reportTextWriter.WriteLine(@"\hline"); + + foreach (var riskHotspot in riskHotspots) + { + this.reportTextWriter.Write( + "{0} & {1} & {2}", + EscapeLatexChars(riskHotspot.Assembly.ShortName), + EscapeLatexChars(riskHotspot.Class.Name), + EscapeLatexChars(riskHotspot.MethodMetric.ShortName)); + + foreach (var statusMetric in riskHotspot.StatusMetrics) + { + if (statusMetric.Exceeded) + { + this.reportTextWriter.Write(" & \\textcolor{{red}}{{{0}}}", statusMetric.Metric.Value.HasValue ? statusMetric.Metric.Value.Value.ToString(CultureInfo.InvariantCulture) : "-"); + } + else + { + this.reportTextWriter.Write(" & {0}", statusMetric.Metric.Value.HasValue ? statusMetric.Metric.Value.Value.ToString(CultureInfo.InvariantCulture) : "-"); + } + } + + this.reportTextWriter.WriteLine(@"\\"); + this.reportTextWriter.WriteLine(@"\hline"); + } + + this.reportTextWriter.WriteLine(@"\end{longtable}"); } /// <summary> @@ -377,11 +481,28 @@ public void SummaryAssembly(Assembly assembly, bool branchCoverageAvailable) string row = string.Format( CultureInfo.InvariantCulture, - @"\textbf{{{0}}} & \textbf{{{1}}}\\", + @"\textbf{{{0}}} & \textbf{{{1}}} & \textbf{{{2}}} & \textbf{{{3}}} & \textbf{{{4}}} & \textbf{{{5}}}", EscapeLatexChars(assembly.Name), + assembly.CoveredLines, + assembly.CoverableLines - assembly.CoveredLines, + assembly.CoverableLines, + assembly.TotalLines.GetValueOrDefault(), assembly.CoverageQuota.HasValue ? assembly.CoverageQuota.Value.ToString(CultureInfo.InvariantCulture) + @"\%" : string.Empty); - this.reportTextWriter.WriteLine(row); + this.reportTextWriter.Write(row); + + if (branchCoverageAvailable) + { + row = string.Format( + CultureInfo.InvariantCulture, + @" & \textbf{{{0}}}", + assembly.BranchCoverageQuota.HasValue ? assembly.BranchCoverageQuota.Value.ToString(CultureInfo.InvariantCulture) + @"\%" : string.Empty); + + this.reportTextWriter.Write(row); + } + + this.reportTextWriter.WriteLine(@"\\"); + this.reportTextWriter.WriteLine(@"\hline"); } /// <summary> @@ -398,11 +519,28 @@ public void SummaryClass(Class @class, bool branchCoverageAvailable) string row = string.Format( CultureInfo.InvariantCulture, - @"{0} & {1}\\", + @"{0} & {1} & {2} & {3} & {4} & {5}", EscapeLatexChars(@class.Name), + @class.CoveredLines, + @class.CoverableLines - @class.CoveredLines, + @class.CoverableLines, + @class.TotalLines.GetValueOrDefault(), @class.CoverageQuota.HasValue ? @class.CoverageQuota.Value.ToString(CultureInfo.InvariantCulture) + @"\%" : string.Empty); - this.reportTextWriter.WriteLine(row); + this.reportTextWriter.Write(row); + + if (branchCoverageAvailable) + { + row = string.Format( + CultureInfo.InvariantCulture, + @" & {0}", + @class.BranchCoverageQuota.HasValue ? @class.BranchCoverageQuota.Value.ToString(CultureInfo.InvariantCulture) + @"\%" : string.Empty); + + this.reportTextWriter.Write(row); + } + + this.reportTextWriter.WriteLine(@"\\"); + this.reportTextWriter.WriteLine(@"\hline"); } /// <summary> diff --git a/src/ReportGenerator.Core/Reporting/Builders/Rendering/PngHistoryChartRenderer.cs b/src/ReportGenerator.Core/Reporting/Builders/Rendering/PngHistoryChartRenderer.cs new file mode 100644 index 00000000..a38f235a --- /dev/null +++ b/src/ReportGenerator.Core/Reporting/Builders/Rendering/PngHistoryChartRenderer.cs @@ -0,0 +1,126 @@ +using System.Collections.Generic; +using System.IO; +using System.Linq; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using SixLabors.Fonts; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.Formats.Png; +using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; +using SixLabors.ImageSharp.Processing.Drawing; +using SixLabors.ImageSharp.Processing.Drawing.Brushes; +using SixLabors.ImageSharp.Processing.Drawing.Pens; +using SixLabors.ImageSharp.Processing.Text; +using SixLabors.Primitives; +using SixLabors.Shapes; + +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering +{ + /// <summary> + /// Renderes history chart in PNG format. + /// </summary> + internal class PngHistoryChartRenderer + { + /// <summary> + /// Renderes the given historic coverages as PNG image. + /// </summary> + /// <param name="historicCoverages">The historic coverages.</param> + /// <returns>The image in PNG format.</returns> + public static byte[] RenderHistoryChart(IReadOnlyList<HistoricCoverage> historicCoverages) + { + using (Image<Rgba32> image = new Image<Rgba32>(1450, 150)) + using (MemoryStream output = new MemoryStream()) + { + var grayPen = Pens.Dash(Rgba32.LightGray, 1); + var redPen = Pens.Solid(Rgba32.FromHex("cc0000"), 2); + var bluePen = Pens.Solid(Rgba32.FromHex("1c2298"), 2); + + var redBrush = Brushes.Solid(Rgba32.FromHex("cc0000")); + var blueBrush = Brushes.Solid(Rgba32.FromHex("1c2298")); + + int numberOfLines = historicCoverages.Count; + + if (numberOfLines == 1) + { + numberOfLines = 2; + } + + float totalWidth = 1445 - 50; + float width = totalWidth / (numberOfLines - 1); + + float totalHeight = 115 - 15; + + image.Mutate(ctx => + { + ctx.Fill(NamedColors<Rgba32>.White); + + ctx.DrawLines(grayPen, new PointF(50, 115), new PointF(1445, 115)); + ctx.DrawLines(grayPen, new PointF(50, 90), new PointF(1445, 90)); + ctx.DrawLines(grayPen, new PointF(50, 65), new PointF(1445, 65)); + ctx.DrawLines(grayPen, new PointF(50, 40), new PointF(1445, 40)); + ctx.DrawLines(grayPen, new PointF(50, 15), new PointF(1445, 15)); + + for (int i = 0; i < numberOfLines; i++) + { + ctx.DrawLines(grayPen, new PointF(50 + (i * width), 15), new PointF(50 + (i * width), 115)); + } + + for (int i = 1; i < historicCoverages.Count; i++) + { + float x1 = 50 + ((i - 1) * width); + float y1 = 15 + (((100 - (float)historicCoverages[i - 1].CoverageQuota.GetValueOrDefault()) * totalHeight) / 100); + + float x2 = 50 + (i * width); + float y2 = 15 + (((100 - (float)historicCoverages[i].CoverageQuota.GetValueOrDefault()) * totalHeight) / 100); + + ctx.DrawLines(redPen, new PointF(x1, y1), new PointF(x2, y2)); + } + + if (historicCoverages.Any(h => h.BranchCoverageQuota.HasValue)) + { + for (int i = 1; i < historicCoverages.Count; i++) + { + float x1 = 50 + ((i - 1) * width); + float y1 = 15 + (((100 - (float)historicCoverages[i - 1].BranchCoverageQuota.GetValueOrDefault()) * totalHeight) / 100); + + float x2 = 50 + (i * width); + float y2 = 15 + (((100 - (float)historicCoverages[i].BranchCoverageQuota.GetValueOrDefault()) * totalHeight) / 100); + + ctx.DrawLines(bluePen, new PointF(x1, y1), new PointF(x2, y2)); + } + } + + for (int i = 0; i < historicCoverages.Count; i++) + { + float x1 = 50 + (i * width); + float y1 = 15 + (((100 - (float)historicCoverages[i].CoverageQuota.GetValueOrDefault()) * totalHeight) / 100); + + ctx.Fill(redBrush, new EllipsePolygon(x1, y1, 3)); + } + + if (historicCoverages.Any(h => h.BranchCoverageQuota.HasValue)) + { + for (int i = 0; i < historicCoverages.Count; i++) + { + float x1 = 50 + (i * width); + float y1 = 15 + (((100 - (float)historicCoverages[i].BranchCoverageQuota.GetValueOrDefault()) * totalHeight) / 100); + + ctx.Fill(blueBrush, new EllipsePolygon(x1, y1, 3)); + } + } + + var font = SystemFonts.CreateFont("Arial", 11, FontStyle.Regular); + var textGraphicsOptions = new TextGraphicsOptions() { HorizontalAlignment = HorizontalAlignment.Right }; + ctx.DrawText(textGraphicsOptions, "100", font, Rgba32.Gray, new PointF(38, 5)); + ctx.DrawText(textGraphicsOptions, "75", font, Rgba32.Gray, new PointF(38, 30)); + ctx.DrawText(textGraphicsOptions, "50", font, Rgba32.Gray, new PointF(38, 55)); + ctx.DrawText(textGraphicsOptions, "25", font, Rgba32.Gray, new PointF(38, 80)); + ctx.DrawText(textGraphicsOptions, "0", font, Rgba32.Gray, new PointF(38, 105)); + }); + + image.Save(output, new PngEncoder()); + return output.ToArray(); + } + } + } +} diff --git a/src/ReportGenerator.Reporting/Rendering/RendererBase.cs b/src/ReportGenerator.Core/Reporting/Builders/Rendering/RendererBase.cs similarity index 95% rename from src/ReportGenerator.Reporting/Rendering/RendererBase.cs rename to src/ReportGenerator.Core/Reporting/Builders/Rendering/RendererBase.cs index 2f2074a7..d4d1bf18 100644 --- a/src/ReportGenerator.Reporting/Rendering/RendererBase.cs +++ b/src/ReportGenerator.Core/Reporting/Builders/Rendering/RendererBase.cs @@ -1,6 +1,6 @@ using System.Text.RegularExpressions; -namespace Palmmedia.ReportGenerator.Reporting.Rendering +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering { /// <summary> /// Base class for the <see cref="IReportRenderer"/> implementations. diff --git a/src/ReportGenerator.Reporting/Rendering/XmlRenderer.cs b/src/ReportGenerator.Core/Reporting/Builders/Rendering/XmlRenderer.cs similarity index 88% rename from src/ReportGenerator.Reporting/Rendering/XmlRenderer.cs rename to src/ReportGenerator.Core/Reporting/Builders/Rendering/XmlRenderer.cs index 1b01fb14..481ecb06 100644 --- a/src/ReportGenerator.Reporting/Rendering/XmlRenderer.cs +++ b/src/ReportGenerator.Core/Reporting/Builders/Rendering/XmlRenderer.cs @@ -5,10 +5,10 @@ using System.Linq; using System.Text; using System.Xml; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Reporting.CodeAnalysis; +using Palmmedia.ReportGenerator.Core.CodeAnalysis; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; -namespace Palmmedia.ReportGenerator.Reporting.Rendering +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering { /// <summary> /// XML report renderer. @@ -25,6 +25,16 @@ internal class XmlRenderer : RendererBase, IReportRenderer /// </summary> private XmlWriter reportTextWriter; + /// <summary> + /// Gets a value indicating whether renderer support rendering of charts. + /// </summary> + public bool SupportsCharts => false; + + /// <summary> + /// Gets a value indicating whether renderer support rendering risk hotspots. + /// </summary> + public bool SupportsRiskHotsSpots => false; + /// <summary> /// Begins the summary report. /// </summary> @@ -117,14 +127,6 @@ public void BeginSummaryTable(bool branchCoverageAvailable) { } - /// <summary> - /// Adds a metrics table to the report. - /// </summary> - /// <param name="metric">The metric.</param> - public void BeginMetricsTable(MethodMetric metric) - { - } - /// <summary> /// Adds a file analysis table to the report. /// </summary> @@ -170,22 +172,48 @@ public void KeyValueRow(string key, IEnumerable<string> files) } /// <summary> - /// Adds the given metric values to the report. + /// Adds metrics to the report /// </summary> - /// <param name="metric">The metric.</param> - public void MetricsRow(MethodMetric metric) + /// <param name="class">The class.</param> + public void MetricsTable(Class @class) { - if (metric == null) + if (@class == null) { - throw new ArgumentNullException(nameof(metric)); + throw new ArgumentNullException(nameof(@class)); } - this.reportTextWriter.WriteStartElement(XmlRenderer.ReplaceNonLetterChars(metric.ShortName)); + var methodMetrics = @class.Files.SelectMany(f => f.MethodMetrics); + + this.MetricsTable(methodMetrics); + } + + /// <summary> + /// Adds metrics to the report + /// </summary> + /// <param name="methodMetrics">The method metrics.</param> + public void MetricsTable(IEnumerable<MethodMetric> methodMetrics) + { + if (methodMetrics == null) + { + throw new ArgumentNullException(nameof(methodMetrics)); + } - foreach (var m in metric.Metrics) + foreach (var methodMetric in methodMetrics.OrderBy(c => c.Line)) { - this.reportTextWriter.WriteStartElement(XmlRenderer.ReplaceNonLetterChars(m.Name)); - this.reportTextWriter.WriteValue(m.Value.ToString(CultureInfo.InvariantCulture)); + this.reportTextWriter.WriteStartElement("Element"); + this.reportTextWriter.WriteAttributeString("name", XmlRenderer.ReplaceNonLetterChars(methodMetric.ShortName)); + + foreach (var m in methodMetric.Metrics) + { + this.reportTextWriter.WriteStartElement(XmlRenderer.ReplaceNonLetterChars(m.Name)); + if (m.Value.HasValue) + { + this.reportTextWriter.WriteValue(m.Value.Value.ToString(CultureInfo.InvariantCulture)); + } + + this.reportTextWriter.WriteEndElement(); + } + this.reportTextWriter.WriteEndElement(); } diff --git a/src/ReportGenerator.Reporting/Rendering/resources/angular.min.js b/src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/angular.min.js similarity index 100% rename from src/ReportGenerator.Reporting/Rendering/resources/angular.min.js rename to src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/angular.min.js diff --git a/src/ReportGenerator.Reporting/Rendering/resources/chartist.min.css b/src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/chartist.min.css similarity index 100% rename from src/ReportGenerator.Reporting/Rendering/resources/chartist.min.css rename to src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/chartist.min.css diff --git a/src/ReportGenerator.Reporting/Rendering/resources/chartist.min.js b/src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/chartist.min.js similarity index 100% rename from src/ReportGenerator.Reporting/Rendering/resources/chartist.min.js rename to src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/chartist.min.js diff --git a/src/ReportGenerator.Reporting/Rendering/resources/coverageTableReactComponents.js b/src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/coverageTableReactComponents.js similarity index 77% rename from src/ReportGenerator.Reporting/Rendering/resources/coverageTableReactComponents.js rename to src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/coverageTableReactComponents.js index a2e66f37..9b4c55a7 100644 --- a/src/ReportGenerator.Reporting/Rendering/resources/coverageTableReactComponents.js +++ b/src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/coverageTableReactComponents.js @@ -46,6 +46,8 @@ function ClassViewModel(serializedClass) { self.totalBranches = serializedClass.totalBranches; self.lineCoverageHistory = serializedClass.lineCoverageHistory; self.branchCoverageHistory = serializedClass.branchCoverageHistory; + self.historicCoverages = serializedClass.historicCoverages; + self.currentHistoricCoverageData = null; if (serializedClass.coverableLines === 0) { if (isNaN(serializedClass.methodCoverage)) { @@ -71,8 +73,40 @@ function ClassViewModel(serializedClass) { self.branchCoveragePercent = self.branchCoverage + '%'; } - self.visible = function (filter) { - return filter === '' || self.name.toLowerCase().indexOf(filter) > -1; + self.updateCurrentHistoricCoverageData = function (historicCoverageExecutionTime) { + var i, l; + + self.currentHistoricCoverageData = null; + + if (historicCoverageExecutionTime !== '') { + for (i = 0, l = self.historicCoverages.length; i < l; i++) { + + if (self.historicCoverages[i].executionTime === historicCoverageExecutionTime) { + self.currentHistoricCoverageData = self.historicCoverages[i]; + break; + } + } + } + }; + + self.visible = function (filter, historicCoverageChangesOnly) { + if (filter !== '' && self.name.toLowerCase().indexOf(filter) === -1) { + return false; + } + + if (historicCoverageChangesOnly && self.currentHistoricCoverageData !== null) { + if (self.coveredLines === self.currentHistoricCoverageData.coveredLines + && self.coveredLines === self.currentHistoricCoverageData.coveredLines + && self.uncoveredLines === self.currentHistoricCoverageData.uncoveredLines + && self.coverableLines === self.currentHistoricCoverageData.coverableLines + && self.totalLines === self.currentHistoricCoverageData.totalLines + && self.coveredBranches === self.currentHistoricCoverageData.coveredBranches + && self.totalBranches === self.currentHistoricCoverageData.totalBranches) { + return false; + } + } + + return true; }; } @@ -109,7 +143,7 @@ function CodeElementViewModel(name, parent) { return roundNumber(100 * self.coveredBranches / self.totalBranches, 1); }; - self.visible = function (filter) { + self.visible = function (filter, historicCoverageChangesOnly) { var i, l; for (i = 0, l = self.subelements.length; i < l; i++) { if (self.subelements[i].visible(filter)) { @@ -180,6 +214,14 @@ function CodeElementViewModel(name, parent) { } }; + self.updateCurrentHistoricCoverageData = function (historicCoverageExecutionTime) { + var i, l; + + for (i = 0, l = self.subelements.length; i < l; i++) { + self.subelements[i].updateCurrentHistoricCoverageData(historicCoverageExecutionTime); + } + }; + self.toggleCollapse = function () { self.collapsed = !self.collapsed; }; @@ -345,6 +387,8 @@ var AssemblyComponent = React.createClass({ state = { grouping: '0', groupingMaximum: this.getGroupingMaximum(this.props.assemblies), + historicCoverageExecutionTime: '', + historicCoverageChangesOnly: false, filter: '', sortby: 'name', sortorder: 'asc', @@ -355,6 +399,11 @@ var AssemblyComponent = React.createClass({ state.assemblies = this.getAssemblies(this.props.assemblies, state.grouping, state.sortby, state.sortorder); + var i, l; + for (i = 0, l = state.assemblies.length; i < l; i++) { + state.assemblies[i].updateCurrentHistoricCoverageData(state.historicCoverageExecutionTime); + } + if (collapseState !== undefined) { this.restoreCollapseState(collapseState, state.assemblies); } @@ -390,6 +439,23 @@ var AssemblyComponent = React.createClass({ var assemblies = this.getAssemblies(this.props.assemblies, grouping, this.state.sortby, this.state.sortorder); this.setState({ grouping: grouping, assemblies: assemblies }); }, + updateHistoricCoverageExecutionTime: function (historicCoverageExecutionTime) { + console.log("Updating historic coverage execution time: " + historicCoverageExecutionTime); + var i, l; + for (i = 0, l = this.state.assemblies.length; i < l; i++) { + this.state.assemblies[i].updateCurrentHistoricCoverageData(historicCoverageExecutionTime); + } + + this.setState({ + historicCoverageExecutionTime: historicCoverageExecutionTime, + assemblies: this.state.assemblies + }); + }, + updateHistoricCoverageChangesOnly: function (historicCoverageChangesOnly) { + console.log("Updating historic coverage changes only: " + historicCoverageChangesOnly); + + this.setState({ historicCoverageChangesOnly: historicCoverageChangesOnly }); + }, updateFilter: function (filter) { filter = filter.toLowerCase(); @@ -423,7 +489,7 @@ var AssemblyComponent = React.createClass({ } } catch (e) { // This can only happen if assembly structure was changed. - // That means the complete report was updated in the background and the reloaded in the same tab/window. + // That means the complete report was updated in the background and was reloaded in the same tab/window. console.log("Restoring of collapse state failed."); } }, @@ -465,13 +531,20 @@ var AssemblyComponent = React.createClass({ SearchBar({ groupingMaximum: this.state.groupingMaximum, grouping: this.state.grouping, + historicCoverageExecutionTime: this.state.historicCoverageExecutionTime, + historicCoverageChangesOnly: this.state.historicCoverageChangesOnly, filter: this.state.filter, collapseAll: this.collapseAll, expandAll: this.expandAll, updateGrouping: this.updateGrouping, - updateFilter: this.updateFilter + updateHistoricCoverageExecutionTime: this.updateHistoricCoverageExecutionTime, + updateHistoricCoverageChangesOnly: this.updateHistoricCoverageChangesOnly, + updateFilter: this.updateFilter, + historicCoverageExecutionTimes: this.props.historicCoverageExecutionTimes }), AssemblyTable({ + historicCoverageExecutionTime: this.state.historicCoverageExecutionTime, + historicCoverageChangesOnly: this.state.historicCoverageChangesOnly, filter: this.state.filter, assemblies: this.state.assemblies, sortby: this.state.sortby, @@ -496,6 +569,12 @@ var SearchBar = React.createClass({ groupingChangedHandler: function () { this.props.updateGrouping(this.refs.groupingInput.getDOMNode().value); }, + historicCoverageExecutionTimeChanged: function () { + this.props.updateHistoricCoverageExecutionTime(this.refs.historicCoverageExecutionTimesSelect.getDOMNode().value); + }, + historicCoverageChangesOnlyChanged: function () { + this.props.updateHistoricCoverageChangesOnly(this.refs.historicCoverageChangesOnlyCheckbox.getDOMNode().checked); + }, filterChangedHandler: function () { this.props.updateFilter(this.refs.filterInput.getDOMNode().value); }, @@ -508,6 +587,36 @@ var SearchBar = React.createClass({ groupingDescription = translations.byAssembly; } + var historicCoverageExecutionTimesSelectContainer; + + if (this.props.historicCoverageExecutionTimes.length > 0) { + var historicCoverageExecutionTimeOptions = [React.DOM.option({ value: '' }, translations.date)], i, l; + for (i = 0, l = this.props.historicCoverageExecutionTimes.length; i < l; i++) { + historicCoverageExecutionTimeOptions.push(React.DOM.option({ + value: this.props.historicCoverageExecutionTimes[i] + }, this.props.historicCoverageExecutionTimes[i])); + } + + historicCoverageExecutionTimesSelectContainer = React.DOM.div({ className: 'center' }, + React.DOM.div({ className: 'center' }, + React.DOM.span(null, translations.compareHistory + ' '), + React.DOM.select({ + ref: 'historicCoverageExecutionTimesSelect', + value: this.props.historicCoverageExecutionTime, + onChange: this.historicCoverageExecutionTimeChanged + }, historicCoverageExecutionTimeOptions)), + React.DOM.div(null, + this.props.historicCoverageExecutionTime ? React.DOM.label(null, + React.DOM.input({ + type: 'checkbox', + ref: 'historicCoverageChangesOnlyCheckbox', + defaultChecked: this.props.historicCoverageChangesOnly, + onChange: this.historicCoverageChangesOnlyChanged + }), translations.changesOnly) : null)); + } else { + historicCoverageExecutionTimesSelectContainer = React.DOM.div({ className: 'center' }); + } + return ( React.DOM.div({ className: 'customizebox' }, React.DOM.div(null, @@ -527,6 +636,7 @@ var SearchBar = React.createClass({ value: this.props.grouping, onChange: this.groupingChangedHandler })), + historicCoverageExecutionTimesSelectContainer, React.DOM.div({ className: 'right' }, React.DOM.span(null, translations.filter + ' '), React.DOM.input({ @@ -544,7 +654,7 @@ var AssemblyTable = React.createClass({ renderAllChilds: function (result, currentElement) { var i, l; - if (currentElement.visible(this.props.filter)) { + if (currentElement.visible(this.props.filter, this.props.historicCoverageChangesOnly, this.props.historicCoverageExecutionTime)) { if (currentElement.isNamespace) { result.push(AssemblyRow({ assembly: currentElement, branchCoverageAvailable: this.props.branchCoverageAvailable, @@ -559,6 +669,7 @@ var AssemblyTable = React.createClass({ } else { result.push(ClassRow({ clazz: currentElement, + historicCoverageExecutionTime: this.props.historicCoverageExecutionTime, branchCoverageAvailable: this.props.branchCoverageAvailable })); } @@ -717,8 +828,17 @@ var AssemblyRow = React.createClass({ }); var ClassRow = React.createClass({ + getClassName: function (current, history) { + if (current > history) { + return 'lightgreen'; + } else if (current < history) { + return 'lightred'; + } else { + return 'lightgraybg'; + } + }, render: function () { - var nameElement, greenHidden, redHidden, grayHidden, coverageTable, branchGreenHidden, branchRedHidden, branchGrayHidden, branchCoverageTable; + var nameElement, greenHidden, redHidden, grayHidden, i, l, coverageTable, branchGreenHidden, branchRedHidden, branchGrayHidden, branchCoverageTable; if (this.props.clazz.reportPath === '') { nameElement = React.DOM.span(null, this.props.clazz.name); @@ -753,27 +873,37 @@ var ClassRow = React.createClass({ return ( React.DOM.tr({ className: this.props.clazz.parent.parent !== null ? 'namespace' : null }, React.DOM.td(null, nameElement), - React.DOM.td({ className: 'right' }, this.props.clazz.coveredLines), - React.DOM.td({ className: 'right' }, this.props.clazz.uncoveredLines), - React.DOM.td({ className: 'right' }, this.props.clazz.coverableLines), - React.DOM.td({ className: 'right' }, this.props.clazz.totalLines), + React.DOM.td({ className: 'right' }, + this.props.clazz.currentHistoricCoverageData ? React.DOM.div({ className: 'currenthistory ' + this.getClassName(this.props.clazz.coveredLines, this.props.clazz.currentHistoricCoverageData.coveredLines) }, this.props.clazz.coveredLines) : this.props.clazz.coveredLines, + this.props.clazz.currentHistoricCoverageData ? React.DOM.div({ title: this.props.historicCoverageExecutionTime }, this.props.clazz.currentHistoricCoverageData.coveredLines) : null), + React.DOM.td({ className: 'right' }, + this.props.clazz.currentHistoricCoverageData ? React.DOM.div({ className: 'currenthistory ' + this.getClassName(this.props.clazz.currentHistoricCoverageData.uncoveredLines, this.props.clazz.uncoveredLines) }, this.props.clazz.uncoveredLines) : this.props.clazz.uncoveredLines, + this.props.clazz.currentHistoricCoverageData ? React.DOM.div({ title: this.props.historicCoverageExecutionTime }, this.props.clazz.currentHistoricCoverageData.uncoveredLines) : null), + React.DOM.td({ className: 'right' }, + this.props.clazz.currentHistoricCoverageData ? React.DOM.div({ className: 'currenthistory' }, this.props.clazz.coverableLines) : this.props.clazz.coverableLines, + this.props.clazz.currentHistoricCoverageData ? React.DOM.div({ title: this.props.historicCoverageExecutionTime }, this.props.clazz.currentHistoricCoverageData.coverableLines) : null), + React.DOM.td({ className: 'right' }, + this.props.clazz.currentHistoricCoverageData ? React.DOM.div({ className: 'currenthistory' }, this.props.clazz.totalLines) : this.props.clazz.totalLines, + this.props.clazz.currentHistoricCoverageData ? React.DOM.div({ title: this.props.historicCoverageExecutionTime }, this.props.clazz.currentHistoricCoverageData.totalLines) : null), React.DOM.td({ className: 'right', title: this.props.clazz.coverageTitle }, CoverageHistoryChart({ historicCoverage: this.props.clazz.lineCoverageHistory, - cssClass: 'tinylinecoveragechart', + cssClass: 'tinylinecoveragechart' + (this.props.clazz.currentHistoricCoverageData ? ' historiccoverageoffset' : ''), title: translations.history + ": " + translations.coverage, id: 'chart' + createRandomId(8) }), - this.props.clazz.coveragePercent), + this.props.clazz.currentHistoricCoverageData ? React.DOM.div({ className: 'currenthistory ' + this.getClassName(this.props.clazz.coverage, this.props.clazz.currentHistoricCoverageData.coverageQuota) }, this.props.clazz.coveragePercent) : this.props.clazz.coveragePercent, + this.props.clazz.currentHistoricCoverageData ? React.DOM.div({ title: this.props.historicCoverageExecutionTime }, this.props.clazz.currentHistoricCoverageData.coverageQuota + '%') : null), React.DOM.td(null, coverageTable), this.props.branchCoverageAvailable ? React.DOM.td({ className: 'right' }, CoverageHistoryChart({ historicCoverage: this.props.clazz.branchCoverageHistory, - cssClass: 'tinybranchcoveragechart', + cssClass: 'tinybranchcoveragechart' + (this.props.clazz.currentHistoricCoverageData ? ' historiccoverageoffset' : ''), title: translations.history + ": " + translations.branchCoverage, id: 'chart' + createRandomId(8) }), - this.props.clazz.branchCoveragePercent) : null, + this.props.clazz.currentHistoricCoverageData ? React.DOM.div({ className: 'currenthistory ' + this.getClassName(this.props.clazz.branchCoverage, this.props.clazz.currentHistoricCoverageData.branchCoverageQuota) }, this.props.clazz.branchCoveragePercent) : this.props.clazz.branchCoveragePercent, + this.props.clazz.currentHistoricCoverageData ? React.DOM.div({ title: this.props.historicCoverageExecutionTime }, this.props.clazz.currentHistoricCoverageData.branchCoverageQuota + '%') : null) : null, this.props.branchCoverageAvailable ? React.DOM.td(null, branchCoverageTable) : null) ); } diff --git a/src/ReportGenerator.Reporting/Rendering/resources/custom.css b/src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/custom.css similarity index 92% rename from src/ReportGenerator.Reporting/Rendering/resources/custom.css rename to src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/custom.css index 4fd05933..f321ffaa 100644 --- a/src/ReportGenerator.Reporting/Rendering/resources/custom.css +++ b/src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/custom.css @@ -31,13 +31,14 @@ th { text-align: left; } .overview th a { color: #000; } .overview tr.namespace a { margin-left: 15px; } .overview td { border: solid 1px #c1c1c1; border-collapse: collapse; padding: 2px 5px 2px 5px; } +div.currenthistory { margin: -2px -5px 0 -5px; padding: 2px 5px 2px 5px; height: 16px; } .coverage { border: solid 1px #c1c1c1; border-collapse: collapse; font-size: 5px; height: 10px; } .coverage td { padding: 0; border: none; } .stripped tr:nth-child(2n+1) { background-color: #F3F3F3; } .customizebox { font-size: 0.75em; margin-bottom: 7px; } -.customizebox div { width: 33.33%; display: inline-block; } -.customizebox input { font-size: 0.8em; width: 150px; } +.customizebox>div { width: 25%; display: inline-block; } +.customizebox div.right input { font-size: 0.8em; width: 150px; } #namespaceslider { width: 200px; display: inline-block; margin-left: 8px; } .percentagebarundefined { @@ -45,56 +46,56 @@ th { text-align: left; } padding-left: 3px; } .percentagebar0 { - border-left: 2px solid #f00; + border-left: 2px solid #c10909; padding-left: 3px; } .percentagebar10 { border-left: 2px solid; - border-image: linear-gradient(to bottom, #f00 90%, #00ff21 90%, #00ff21 100%) 1; + border-image: linear-gradient(to bottom, #c10909 90%, #0aad0a 90%, #0aad0a 100%) 1; padding-left: 3px; } .percentagebar20 { border-left: 2px solid; - border-image: linear-gradient(to bottom, #f00 80%, #00ff21 80%, #00ff21 100%) 1; + border-image: linear-gradient(to bottom, #c10909 80%, #0aad0a 80%, #0aad0a 100%) 1; padding-left: 3px; } .percentagebar30 { border-left: 2px solid; - border-image: linear-gradient(to bottom, #f00 70%, #00ff21 70%, #00ff21 100%) 1; + border-image: linear-gradient(to bottom, #c10909 70%, #0aad0a 70%, #0aad0a 100%) 1; padding-left: 3px; } .percentagebar40 { border-left: 2px solid; - border-image: linear-gradient(to bottom, #f00 60%, #00ff21 60%, #00ff21 100%) 1; + border-image: linear-gradient(to bottom, #c10909 60%, #0aad0a 60%, #0aad0a 100%) 1; padding-left: 3px; } .percentagebar50 { border-left: 2px solid; - border-image: linear-gradient(to bottom, #f00 50%, #00ff21 50%, #00ff21 100%) 1; + border-image: linear-gradient(to bottom, #c10909 50%, #0aad0a 50%, #0aad0a 100%) 1; padding-left: 3px; } .percentagebar60 { border-left: 2px solid; - border-image: linear-gradient(to bottom, #f00 40%, #00ff21 40%, #00ff21 100%) 1; + border-image: linear-gradient(to bottom, #c10909 40%, #0aad0a 40%, #0aad0a 100%) 1; padding-left: 3px; } .percentagebar70 { border-left: 2px solid; - border-image: linear-gradient(to bottom, #f00 30%, #00ff21 30%, #00ff21 100%) 1; + border-image: linear-gradient(to bottom, #c10909 30%, #0aad0a 30%, #0aad0a 100%) 1; padding-left: 3px; } .percentagebar80 { border-left: 2px solid; - border-image: linear-gradient(to bottom, #f00 20%, #00ff21 20%, #00ff21 100%) 1; + border-image: linear-gradient(to bottom, #c10909 20%, #0aad0a 20%, #0aad0a 100%) 1; padding-left: 3px; } .percentagebar90 { border-left: 2px solid; - border-image: linear-gradient(to bottom, #f00 10%, #00ff21 10%, #00ff21 100%) 1; + border-image: linear-gradient(to bottom, #c10909 10%, #0aad0a 10%, #0aad0a 100%) 1; padding-left: 3px; } .percentagebar100 { - border-left: 2px solid #00ff21; + border-left: 2px solid #0aad0a; padding-left: 3px; } @@ -103,14 +104,15 @@ th { text-align: left; } .center { text-align: center; } .rightmargin { padding-right: 8px; } .leftmargin { padding-left: 5px; } -.green { background-color: #00ff21; } +.green { background-color: #0aad0a; } .lightgreen { background-color: #dcf4dc; } -.red { background-color: #f00; } +.red { background-color: #c10909; } .lightred { background-color: #f7dede; } .orange { background-color: #FFA500; } .lightorange { background-color: #FFEFD5; } .gray { background-color: #dcdcdc; } .lightgray { color: #888888; } +.lightgraybg { background-color: #dadada; } .toggleZoom { text-align:right; } @@ -122,6 +124,7 @@ th { text-align: left; } .ct-chart .ct-series.ct-series-b .ct-line, .ct-chart .ct-series.ct-series-b .ct-point { stroke: #1c2298 !important;} .tinylinecoveragechart, .tinybranchcoveragechart { background-color: #fff; margin-left: -3px; float: left; border: solid 1px #c1c1c1; width: 30px; height: 18px; } +.historiccoverageoffset { margin-top: 7px; } .tinylinecoveragechart .ct-line, .tinybranchcoveragechart .ct-line { stroke-width: 1px !important; } .tinybranchcoveragechart .ct-series.ct-series-a .ct-line { stroke: #1c2298 !important; } @@ -256,7 +259,7 @@ th { text-align: left; } background-repeat: no-repeat; background-size: contain; padding-left: 15px; - height: 1em; + height: 0.9em; display: inline-block; position: relative; top: 3px; @@ -266,7 +269,7 @@ th { text-align: left; } background-repeat: no-repeat; background-size: contain; padding-left: 15px; - height: 1em; + height: 0.9em; display: inline-block; position: relative; top: 3px; @@ -276,7 +279,7 @@ th { text-align: left; } background-repeat: no-repeat; background-size: contain; padding-left: 15px; - height: 1em; + height: 0.9em; display: inline-block; position: relative; top: 3px; @@ -286,7 +289,7 @@ th { text-align: left; } background-repeat: no-repeat; background-size: contain; padding-left: 15px; - height: 1em; + height: 0.9em; display: inline-block; } .icon-plus { @@ -294,7 +297,7 @@ th { text-align: left; } background-repeat: no-repeat; background-size: contain; padding-left: 15px; - height: 1em; + height: 0.9em; display: inline-block; position: relative; top: 3px; @@ -304,7 +307,7 @@ th { text-align: left; } background-repeat: no-repeat; background-size: contain; padding-left: 15px; - height: 1em; + height: 0.9em; display: inline-block; position: relative; top: 3px; @@ -314,7 +317,7 @@ th { text-align: left; } background-repeat: no-repeat; background-size: contain; padding-left: 20px; - height: 1em; + height: 0.9em; display: inline-block; } .icon-fork { @@ -322,7 +325,7 @@ th { text-align: left; } background-repeat: no-repeat; background-size: contain; padding-left: 20px; - height: 1em; + height: 0.9em; display: inline-block; } .icon-cube { @@ -330,7 +333,7 @@ th { text-align: left; } background-repeat: no-repeat; background-size: contain; padding-left: 20px; - height: 1em; + height: 0.9em; display: inline-block; } .icon-search-plus { @@ -338,7 +341,7 @@ th { text-align: left; } background-repeat: no-repeat; background-size: contain; padding-left: 20px; - height: 1em; + height: 0.9em; display: inline-block; } .icon-search-minus { @@ -346,6 +349,6 @@ th { text-align: left; } background-repeat: no-repeat; background-size: contain; padding-left: 20px; - height: 1em; + height: 0.9em; display: inline-block; } \ No newline at end of file diff --git a/src/ReportGenerator.Reporting/Rendering/resources/customAngularApp.js b/src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/customAngularApp.js similarity index 93% rename from src/ReportGenerator.Reporting/Rendering/resources/customAngularApp.js rename to src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/customAngularApp.js index 37a2a550..5e6c5e5e 100644 --- a/src/ReportGenerator.Reporting/Rendering/resources/customAngularApp.js +++ b/src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/customAngularApp.js @@ -4,6 +4,7 @@ function SummaryViewCtrl($scope, $window) { $scope.coverageTableFilteringEnabled = false; $scope.assemblies = []; + $scope.historicCoverageExecutionTimes = []; $scope.branchCoverageAvailable = branchCoverageAvailable; $scope.riskHotspots = riskHotspots; @@ -13,6 +14,7 @@ function SummaryViewCtrl($scope, $window) { console.log("Enabling filtering"); $scope.assemblies = assemblies; + $scope.historicCoverageExecutionTimes = historicCoverageExecutionTimes; $scope.coverageTableFilteringEnabled = true; }; @@ -107,12 +109,13 @@ coverageApp.directive('reactiveCoverageTable', function () { restrict: 'A', scope: { assemblies: '=', + historicCoverageExecutionTimes: '=', branchCoverageAvailable: '=' }, link: function (scope, el, attrs) { scope.$watchCollection('assemblies', function (newValue, oldValue) { React.renderComponent( - AssemblyComponent({ assemblies: newValue, branchCoverageAvailable: scope.branchCoverageAvailable }), + AssemblyComponent({ assemblies: newValue, historicCoverageExecutionTimes: scope.historicCoverageExecutionTimes, branchCoverageAvailable: scope.branchCoverageAvailable }), el[0]); }); } @@ -134,13 +137,14 @@ coverageApp.directive('historyChart', function ($window) { high: 100, scaleMinSpace: 20, onlyInteger: true, + fullWidth: true }; var lineChart = new Chartist.Line('#' + el[0].id, { labels: [], series: chartData.series }, options); - var chart = $(el[0]); + var chart = $(el[0]).empty(); var toggleZoomButton = chart .append('<div class="toggleZoom"><a href=""><i class="icon-search-plus" /></a></div>') diff --git a/src/ReportGenerator.Reporting/Rendering/resources/jquery-1.11.2.min.js b/src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/jquery-1.11.2.min.js similarity index 100% rename from src/ReportGenerator.Reporting/Rendering/resources/jquery-1.11.2.min.js rename to src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/jquery-1.11.2.min.js diff --git a/src/ReportGenerator.Reporting/Rendering/resources/matchMedia.js b/src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/matchMedia.js similarity index 100% rename from src/ReportGenerator.Reporting/Rendering/resources/matchMedia.js rename to src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/matchMedia.js diff --git a/src/ReportGenerator.Reporting/Rendering/resources/react.min.js b/src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/react.min.js similarity index 100% rename from src/ReportGenerator.Reporting/Rendering/resources/react.min.js rename to src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/react.min.js diff --git a/src/ReportGenerator.Reporting/Rendering/resources/react.modified.min.js b/src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/react.modified.min.js similarity index 100% rename from src/ReportGenerator.Reporting/Rendering/resources/react.modified.min.js rename to src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/react.modified.min.js diff --git a/src/ReportGenerator.Reporting/Rendering/resources/riskHotspotTableReactComponents.js b/src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/riskHotspotTableReactComponents.js similarity index 94% rename from src/ReportGenerator.Reporting/Rendering/resources/riskHotspotTableReactComponents.js rename to src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/riskHotspotTableReactComponents.js index 08837f0e..3d2f8766 100644 --- a/src/ReportGenerator.Reporting/Rendering/resources/riskHotspotTableReactComponents.js +++ b/src/ReportGenerator.Core/Reporting/Builders/Rendering/resources/riskHotspotTableReactComponents.js @@ -280,7 +280,7 @@ var RiskHotspotsTableHeader = React.createClass({ for (i = 0, l = this.props.riskHotspotMetrics.length; i < l; i++) { metricClass = this.props.sortby !== '' &&this.props.sortby == i ? (this.props.sortorder === 'desc' ? 'icon-up-dir_active' : 'icon-down-dir_active') : 'icon-down-dir'; - ths.push(React.DOM.th({ className: 'right' }, + ths.push(React.DOM.th(null, React.DOM.a( { href: '', 'data-metric': i, onClick: function (event) { this.sortingChangedHandler(event, $(event.nativeEvent.target).closest('a')[0].getAttribute('data-metric')); }.bind(this) }, React.DOM.i({ className: metricClass }), @@ -297,23 +297,30 @@ var RiskHotspotsTableHeader = React.createClass({ var RiskHotspotRow = React.createClass({ render: function () { - var tds, nameElement, metrics; + var tds, nameElement, methodElement; if (this.props.riskHotspot.reportPath === '') { nameElement = React.DOM.span(null, this.props.riskHotspot.class); + methodElement = this.props.riskHotspot.methodShortName; } else { nameElement = React.DOM.a({ href: this.props.riskHotspot.reportPath }, this.props.riskHotspot.class); + + if (this.props.riskHotspot.line !== null) { + methodElement = React.DOM.a({ href: this.props.riskHotspot.reportPath + '#file' + this.props.riskHotspot.fileIndex + '_line' + this.props.riskHotspot.line }, this.props.riskHotspot.methodShortName) + } else { + methodElement = this.props.riskHotspot.methodShortName; + } } tds = [ React.DOM.td(null, this.props.riskHotspot.assembly), React.DOM.td(null, nameElement), - React.DOM.td(null, this.props.riskHotspot.method) + React.DOM.td({ title: this.props.riskHotspot.methodName }, methodElement) ]; for (i = 0, l = this.props.riskHotspot.metrics.length; i < l; i++) { - tds.push(React.DOM.td({ className: this.props.riskHotspot.metrics[i].exceeded ? 'lightred' : 'lightgreen' }, - this.props.riskHotspot.metrics[i].value)); + tds.push(React.DOM.td({ className: this.props.riskHotspot.metrics[i].exceeded ? 'lightred right' : 'lightgreen right' }, + this.props.riskHotspot.metrics[i].value === null ? '-' : this.props.riskHotspot.metrics[i].value)); } return ( diff --git a/src/ReportGenerator.Reporting/ReportBuilderBase.cs b/src/ReportGenerator.Core/Reporting/Builders/ReportBuilderBase.cs similarity index 79% rename from src/ReportGenerator.Reporting/ReportBuilderBase.cs rename to src/ReportGenerator.Core/Reporting/Builders/ReportBuilderBase.cs index 6cb6934e..36d9dfd4 100644 --- a/src/ReportGenerator.Reporting/ReportBuilderBase.cs +++ b/src/ReportGenerator.Core/Reporting/Builders/ReportBuilderBase.cs @@ -2,12 +2,11 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; -using Palmmedia.ReportGenerator.Reporting.CodeAnalysis; -using Palmmedia.ReportGenerator.Reporting.Rendering; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Properties; +using Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering; -namespace Palmmedia.ReportGenerator.Reporting +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders { /// <summary> /// Implementation of <see cref="IReportBuilder"/> that uses <see cref="IReportRenderer"/> to create reports. @@ -23,12 +22,12 @@ public abstract class ReportBuilderBase : IReportBuilder public abstract string ReportType { get; } /// <summary> - /// Gets or sets the report configuration. + /// Gets or sets the report context. /// </summary> /// <value> - /// The report configuration. + /// The report context. /// </value> - public IReportConfiguration ReportConfiguration { get; set; } + public IReportContext ReportContext { get; set; } /// <summary> /// Creates a class report. @@ -53,7 +52,7 @@ public virtual void CreateClassReport(IReportRenderer reportRenderer, Class @cla throw new ArgumentNullException(nameof(fileAnalyses)); } - reportRenderer.BeginClassReport(this.ReportConfiguration.TargetDirectory, @class.Assembly.ShortName, @class.Name); + reportRenderer.BeginClassReport(this.ReportContext.ReportConfiguration.TargetDirectory, @class.Assembly.ShortName, @class.Name); reportRenderer.Header(ReportResources.Summary); @@ -74,33 +73,26 @@ public virtual void CreateClassReport(IReportRenderer reportRenderer, Class @cla reportRenderer.KeyValueRow(ReportResources.BranchCoverage2, branchCoverage.Value.ToString(CultureInfo.InvariantCulture) + "%"); } - if (this.ReportConfiguration.Tag != null) + if (this.ReportContext.ReportConfiguration.Tag != null) { - reportRenderer.KeyValueRow(ReportResources.Tag, this.ReportConfiguration.Tag); + reportRenderer.KeyValueRow(ReportResources.Tag, this.ReportContext.ReportConfiguration.Tag); } reportRenderer.FinishTable(); - if (@class.HistoricCoverages.Any(h => h.CoverageQuota.HasValue || h.BranchCoverageQuota.HasValue)) + if (reportRenderer.SupportsCharts) { - reportRenderer.Header(ReportResources.History); - reportRenderer.Chart(@class.HistoricCoverages); + if (@class.HistoricCoverages.Any(h => h.CoverageQuota.HasValue || h.BranchCoverageQuota.HasValue)) + { + reportRenderer.Header(ReportResources.History); + reportRenderer.Chart(@class.HistoricCoverages); + } } - var metrics = @class.MethodMetrics; - - if (metrics.Any()) + if (@class.Files.Any(f => f.MethodMetrics.Any())) { reportRenderer.Header(ReportResources.Metrics); - - reportRenderer.BeginMetricsTable(metrics.First()); - - foreach (var metric in metrics) - { - reportRenderer.MetricsRow(metric); - } - - reportRenderer.FinishTable(); + reportRenderer.MetricsTable(@class); } reportRenderer.Header(ReportResources.Files); @@ -150,13 +142,13 @@ public virtual void CreateClassReport(IReportRenderer reportRenderer, Class @cla int fileIndex = 0; foreach (var file in @class.Files) { - codeElementsByFileIndex.Add(fileIndex++, file.CodeElements.OrderBy(c => c.Line)); + codeElementsByFileIndex.Add(fileIndex++, file.CodeElements.OrderBy(c => c.FirstLine)); } reportRenderer.TestMethods(testMethods, fileAnalyses, codeElementsByFileIndex); } - reportRenderer.SaveClassReport(this.ReportConfiguration.TargetDirectory, @class.Assembly.ShortName, @class.Name); + reportRenderer.SaveClassReport(this.ReportContext.ReportConfiguration.TargetDirectory, @class.Assembly.ShortName, @class.Name); } /// <summary> @@ -176,7 +168,7 @@ public virtual void CreateSummaryReport(IReportRenderer reportRenderer, SummaryR throw new ArgumentNullException(nameof(summaryResult)); } - reportRenderer.BeginSummaryReport(this.ReportConfiguration.TargetDirectory, null, ReportResources.Summary); + reportRenderer.BeginSummaryReport(this.ReportContext.ReportConfiguration.TargetDirectory, null, ReportResources.Summary); reportRenderer.Header(ReportResources.Summary); reportRenderer.BeginKeyValueTable(); @@ -198,23 +190,27 @@ public virtual void CreateSummaryReport(IReportRenderer reportRenderer, SummaryR reportRenderer.KeyValueRow(ReportResources.BranchCoverage2, branchCoverage.Value.ToString(CultureInfo.InvariantCulture) + "%"); } - if (this.ReportConfiguration.Tag != null) + if (this.ReportContext.ReportConfiguration.Tag != null) { - reportRenderer.KeyValueRow(ReportResources.Tag, this.ReportConfiguration.Tag); + reportRenderer.KeyValueRow(ReportResources.Tag, this.ReportContext.ReportConfiguration.Tag); } reportRenderer.FinishTable(); - var historicCoverages = this.GetOverallHistoricCoverages(this.ReportConfiguration.OverallHistoricCoverages); - if (historicCoverages.Any(h => h.CoverageQuota.HasValue || h.BranchCoverageQuota.HasValue)) + if (reportRenderer.SupportsCharts) { - reportRenderer.Header(ReportResources.History); - reportRenderer.Chart(historicCoverages); + var historicCoverages = this.GetOverallHistoricCoverages(this.ReportContext.OverallHistoricCoverages); + if (historicCoverages.Any(h => h.CoverageQuota.HasValue || h.BranchCoverageQuota.HasValue)) + { + reportRenderer.Header(ReportResources.History); + reportRenderer.Chart(historicCoverages); + } } var summableMetrics = summaryResult.Assemblies .SelectMany(a => a.Classes) - .SelectMany(c => c.MethodMetrics) + .SelectMany(c => c.Files) + .SelectMany(f => f.MethodMetrics) .SelectMany(m => m.Metrics) .Where(m => m.MetricType == MetricType.CoverageAbsolute) .GroupBy(m => m.Name) @@ -225,18 +221,25 @@ public virtual void CreateSummaryReport(IReportRenderer reportRenderer, SummaryR { reportRenderer.Header(ReportResources.Metrics); - var methodMetric = new MethodMetric(ReportResources.Total, summableMetrics); - reportRenderer.BeginMetricsTable(methodMetric); - reportRenderer.MetricsRow(methodMetric); - - reportRenderer.FinishTable(); + var methodMetric = new MethodMetric(ReportResources.Total, ReportResources.Total, summableMetrics); + reportRenderer.MetricsTable(new[] { methodMetric }); } - var hotspots = RiskHotspotsAnalysis.DetectHotspotsByMetricName(summaryResult.Assemblies); - if (hotspots.Any()) + if (reportRenderer.SupportsRiskHotsSpots) { - reportRenderer.Header(ReportResources.RiskHotspots); - reportRenderer.RiskHotspots(hotspots); + if (this.ReportContext.RiskHotspotAnalysisResult.CodeCodeQualityMetricsAvailable) + { + reportRenderer.Header(ReportResources.RiskHotspots); + + if (this.ReportContext.RiskHotspotAnalysisResult.RiskHotspots.Count > 0) + { + reportRenderer.RiskHotspots(this.ReportContext.RiskHotspotAnalysisResult.RiskHotspots); + } + else + { + reportRenderer.Paragraph(ReportResources.NoRiskHotspots); + } + } } reportRenderer.Header(ReportResources.Coverage3); @@ -262,10 +265,10 @@ public virtual void CreateSummaryReport(IReportRenderer reportRenderer, SummaryR reportRenderer.Paragraph(ReportResources.NoCoveredAssemblies); } - reportRenderer.CustomSummary(summaryResult.Assemblies, hotspots, summaryResult.SupportsBranchCoverage); + reportRenderer.CustomSummary(summaryResult.Assemblies, this.ReportContext.RiskHotspotAnalysisResult.RiskHotspots, summaryResult.SupportsBranchCoverage); reportRenderer.AddFooter(); - reportRenderer.SaveSummaryReport(this.ReportConfiguration.TargetDirectory); + reportRenderer.SaveSummaryReport(this.ReportContext.ReportConfiguration.TargetDirectory); } /// <summary> diff --git a/src/ReportGenerator.Reporting/TextSummaryReportBuilder.cs b/src/ReportGenerator.Core/Reporting/Builders/TextSummaryReportBuilder.cs similarity index 91% rename from src/ReportGenerator.Reporting/TextSummaryReportBuilder.cs rename to src/ReportGenerator.Core/Reporting/Builders/TextSummaryReportBuilder.cs index fd2355e9..834e1529 100644 --- a/src/ReportGenerator.Reporting/TextSummaryReportBuilder.cs +++ b/src/ReportGenerator.Core/Reporting/Builders/TextSummaryReportBuilder.cs @@ -1,19 +1,17 @@ using System; using System.Collections.Generic; -using System.ComponentModel.Composition; using System.Globalization; using System.IO; using System.Linq; using System.Text; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Properties; -namespace Palmmedia.ReportGenerator.Reporting +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders { /// <summary> /// Creates summary report in Text format (no reports for classes are generated). /// </summary> - [Export(typeof(IReportBuilder))] public class TextSummaryReportBuilder : IReportBuilder { /// <summary> @@ -25,12 +23,12 @@ public class TextSummaryReportBuilder : IReportBuilder public string ReportType => "TextSummary"; /// <summary> - /// Gets or sets the report configuration. + /// Gets or sets the report context. /// </summary> /// <value> - /// The report configuration. + /// The report context. /// </value> - public IReportConfiguration ReportConfiguration { get; set; } + public IReportContext ReportContext { get; set; } /// <summary> /// Creates a class report. @@ -52,7 +50,7 @@ public void CreateSummaryReport(SummaryResult summaryResult) throw new ArgumentNullException(nameof(summaryResult)); } - string targetPath = Path.Combine(this.ReportConfiguration.TargetDirectory, "Summary.txt"); + string targetPath = Path.Combine(this.ReportContext.ReportConfiguration.TargetDirectory, "Summary.txt"); using (var reportTextWriter = new StreamWriter(new FileStream(targetPath, FileMode.Create), Encoding.UTF8)) { diff --git a/src/ReportGenerator.Reporting/XmlReportBuilder.cs b/src/ReportGenerator.Core/Reporting/Builders/XmlReportBuilder.cs similarity index 83% rename from src/ReportGenerator.Reporting/XmlReportBuilder.cs rename to src/ReportGenerator.Core/Reporting/Builders/XmlReportBuilder.cs index b850210c..7ae23460 100644 --- a/src/ReportGenerator.Reporting/XmlReportBuilder.cs +++ b/src/ReportGenerator.Core/Reporting/Builders/XmlReportBuilder.cs @@ -1,14 +1,12 @@ using System.Collections.Generic; -using System.ComponentModel.Composition; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Reporting.Rendering; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering; -namespace Palmmedia.ReportGenerator.Reporting +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders { /// <summary> /// Creates report in XML format. /// </summary> - [Export(typeof(IReportBuilder))] public class XmlReportBuilder : ReportBuilderBase { /// <summary> diff --git a/src/ReportGenerator.Reporting/XmlSummaryReportBuilder.cs b/src/ReportGenerator.Core/Reporting/Builders/XmlSummaryReportBuilder.cs similarity index 83% rename from src/ReportGenerator.Reporting/XmlSummaryReportBuilder.cs rename to src/ReportGenerator.Core/Reporting/Builders/XmlSummaryReportBuilder.cs index fd2ba8ef..3c937004 100644 --- a/src/ReportGenerator.Reporting/XmlSummaryReportBuilder.cs +++ b/src/ReportGenerator.Core/Reporting/Builders/XmlSummaryReportBuilder.cs @@ -1,14 +1,12 @@ using System.Collections.Generic; -using System.ComponentModel.Composition; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Reporting.Rendering; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering; -namespace Palmmedia.ReportGenerator.Reporting +namespace Palmmedia.ReportGenerator.Core.Reporting.Builders { /// <summary> /// Creates summary report in XML format (no reports for classes are generated). /// </summary> - [Export(typeof(IReportBuilder))] public class XmlSummaryReportBuilder : ReportBuilderBase { /// <summary> diff --git a/src/ReportGenerator.Console/Reporting/History/FileHistoryStorage.cs b/src/ReportGenerator.Core/Reporting/History/FileHistoryStorage.cs similarity index 97% rename from src/ReportGenerator.Console/Reporting/History/FileHistoryStorage.cs rename to src/ReportGenerator.Core/Reporting/History/FileHistoryStorage.cs index 77642254..35e89776 100644 --- a/src/ReportGenerator.Console/Reporting/History/FileHistoryStorage.cs +++ b/src/ReportGenerator.Core/Reporting/History/FileHistoryStorage.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -namespace Palmmedia.ReportGenerator.Reporting.History +namespace Palmmedia.ReportGenerator.Core.Reporting.History { /// <summary> /// Default implementation of <see cref="IHistoryStorage"/> based on file system. diff --git a/src/ReportGenerator.Console/Reporting/History/HistoryParser.cs b/src/ReportGenerator.Core/Reporting/History/HistoryParser.cs similarity index 81% rename from src/ReportGenerator.Console/Reporting/History/HistoryParser.cs rename to src/ReportGenerator.Core/Reporting/History/HistoryParser.cs index 0e133a04..0cd18e31 100644 --- a/src/ReportGenerator.Console/Reporting/History/HistoryParser.cs +++ b/src/ReportGenerator.Core/Reporting/History/HistoryParser.cs @@ -3,11 +3,12 @@ using System.Globalization; using System.Linq; using System.Xml.Linq; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; +using Palmmedia.ReportGenerator.Core.Common; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Properties; -namespace Palmmedia.ReportGenerator.Reporting.History +namespace Palmmedia.ReportGenerator.Core.Reporting.History { /// <summary> /// Reads all historic coverage files created by <see cref="HistoryReportGenerator"/> and adds the information to all classes. @@ -24,18 +25,20 @@ internal class HistoryParser /// </summary> private readonly IHistoryStorage historyStorage; + /// <summary> + /// The maximum number of historic coverage files that get parsed. + /// </summary> + private int maximumNumberOfHistoricCoverageFiles; + /// <summary> /// Initializes a new instance of the <see cref="HistoryParser" /> class. /// </summary> /// <param name="historyStorage">The history storage.</param> - internal HistoryParser(IHistoryStorage historyStorage) + /// <param name="maximumNumberOfHistoricCoverageFiles">The maximum number of historic coverage files that get parsed.</param> + internal HistoryParser(IHistoryStorage historyStorage, int maximumNumberOfHistoricCoverageFiles) { - if (historyStorage == null) - { - throw new ArgumentNullException(nameof(historyStorage)); - } - - this.historyStorage = historyStorage; + this.historyStorage = historyStorage ?? throw new ArgumentNullException(nameof(historyStorage)); + this.maximumNumberOfHistoricCoverageFiles = maximumNumberOfHistoricCoverageFiles; } /// <summary> @@ -63,13 +66,13 @@ internal void ApplyHistoricCoverage(IEnumerable<Assembly> assemblies, IList<Hist { files = this.historyStorage.GetHistoryFilePaths() .OrderByDescending(f => f) - .Take(Settings.Default.MaximumOfHistoricCoverageFiles) + .Take(this.maximumNumberOfHistoricCoverageFiles) .Reverse() .ToArray(); } catch (Exception ex) { - Logger.ErrorFormat(" " + Resources.ErrorDuringReadingHistoricReports, ex.Message); + Logger.ErrorFormat(" " + Resources.ErrorDuringReadingHistoricReports, ex.GetExceptionMessageForDisplay()); return; } @@ -125,7 +128,7 @@ internal void ApplyHistoricCoverage(IEnumerable<Assembly> assemblies, IList<Hist } catch (Exception ex) { - Logger.ErrorFormat(" " + Resources.ErrorDuringReadingHistoricReport, file, ex.Message); + Logger.ErrorFormat(" " + Resources.ErrorDuringReadingHistoricReport, file, ex.GetExceptionMessageForDisplay()); } } } diff --git a/src/ReportGenerator.Console/Reporting/History/HistoryReportGenerator.cs b/src/ReportGenerator.Core/Reporting/History/HistoryReportGenerator.cs similarity index 89% rename from src/ReportGenerator.Console/Reporting/History/HistoryReportGenerator.cs rename to src/ReportGenerator.Core/Reporting/History/HistoryReportGenerator.cs index 501d6e24..73288bd1 100644 --- a/src/ReportGenerator.Console/Reporting/History/HistoryReportGenerator.cs +++ b/src/ReportGenerator.Core/Reporting/History/HistoryReportGenerator.cs @@ -3,11 +3,12 @@ using System.Globalization; using System.IO; using System.Xml.Linq; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; +using Palmmedia.ReportGenerator.Core.Common; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Properties; -namespace Palmmedia.ReportGenerator.Reporting.History +namespace Palmmedia.ReportGenerator.Core.Reporting.History { /// <summary> /// Generates historic report containing coverage information of current test run. @@ -31,12 +32,7 @@ internal class HistoryReportGenerator /// <param name="historyStorage">The history storage.</param> internal HistoryReportGenerator(IHistoryStorage historyStorage) { - if (historyStorage == null) - { - throw new ArgumentNullException(nameof(historyStorage)); - } - - this.historyStorage = historyStorage; + this.historyStorage = historyStorage ?? throw new ArgumentNullException(nameof(historyStorage)); } /// <summary> @@ -98,7 +94,7 @@ internal void CreateReport(IEnumerable<Assembly> assemblies, DateTime executionT } catch (Exception ex) { - Logger.ErrorFormat(" " + Resources.ErrorDuringSavingHistoricReport, fileName, ex.Message); + Logger.ErrorFormat(" " + Resources.ErrorDuringSavingHistoricReport, fileName, ex.GetExceptionMessageForDisplay()); } } } diff --git a/src/ReportGenerator.Core/Reporting/History/HistoryStorageFactory.cs b/src/ReportGenerator.Core/Reporting/History/HistoryStorageFactory.cs new file mode 100644 index 00000000..5d4e0529 --- /dev/null +++ b/src/ReportGenerator.Core/Reporting/History/HistoryStorageFactory.cs @@ -0,0 +1,60 @@ +using System; +using System.Linq; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Plugin; +using Palmmedia.ReportGenerator.Core.Properties; + +namespace Palmmedia.ReportGenerator.Core.Reporting.History +{ + /// <summary> + /// Factory of <see cref="IHistoryStorage"/>. + /// </summary> + internal class HistoryStorageFactory + { + /// <summary> + /// The Logger. + /// </summary> + private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(HistoryStorageFactory)); + + /// <summary> + /// The plugin loader. + /// </summary> + private readonly IPluginLoader pluginLoader; + + /// <summary> + /// Initializes a new instance of the <see cref="HistoryStorageFactory" /> class. + /// </summary> + /// <param name="pluginLoader">The plugin loader.</param> + public HistoryStorageFactory(IPluginLoader pluginLoader) + { + this.pluginLoader = pluginLoader ?? throw new ArgumentNullException(nameof(pluginLoader)); + } + + /// <summary> + /// Gets the history storage. + /// </summary> + /// <param name="reportConfiguration">The report configuration.</param> + /// <returns> + /// The history storage or <code>null</code> if no storage exists. + /// </returns> + public IHistoryStorage GetHistoryStorage(IReportConfiguration reportConfiguration) + { + var storages = this.pluginLoader.LoadInstancesOfType<IHistoryStorage>().ToArray(); + + if (storages.Length == 1) + { + return storages[0]; + } + else if (storages.Length > 1) + { + Logger.WarnFormat(Resources.SeveralCustomHistoryStorages); + } + else if (reportConfiguration.HistoryDirectory != null) + { + return new FileHistoryStorage(reportConfiguration.HistoryDirectory); + } + + return null; + } + } +} diff --git a/src/ReportGenerator.Console/Reporting/History/IHistoryStorage.cs b/src/ReportGenerator.Core/Reporting/History/IHistoryStorage.cs similarity index 93% rename from src/ReportGenerator.Console/Reporting/History/IHistoryStorage.cs rename to src/ReportGenerator.Core/Reporting/History/IHistoryStorage.cs index dfe04a98..9a94d150 100644 --- a/src/ReportGenerator.Console/Reporting/History/IHistoryStorage.cs +++ b/src/ReportGenerator.Core/Reporting/History/IHistoryStorage.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; -namespace Palmmedia.ReportGenerator.Reporting.History +namespace Palmmedia.ReportGenerator.Core.Reporting.History { /// <summary> /// Interface for storage of history reports. diff --git a/src/ReportGenerator.Console/Reporting/IReportBuilder.cs b/src/ReportGenerator.Core/Reporting/IReportBuilder.cs similarity index 80% rename from src/ReportGenerator.Console/Reporting/IReportBuilder.cs rename to src/ReportGenerator.Core/Reporting/IReportBuilder.cs index 6a74ef46..890830d6 100644 --- a/src/ReportGenerator.Console/Reporting/IReportBuilder.cs +++ b/src/ReportGenerator.Core/Reporting/IReportBuilder.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Palmmedia.ReportGenerator.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; -namespace Palmmedia.ReportGenerator.Reporting +namespace Palmmedia.ReportGenerator.Core.Reporting { /// <summary> /// Interface that has to be implemented by classes capable of rendering reports. @@ -17,12 +17,12 @@ public interface IReportBuilder string ReportType { get; } /// <summary> - /// Gets or sets the report configuration. + /// Gets or sets the report context. /// </summary> /// <value> - /// The report configuration. + /// The report context. /// </value> - IReportConfiguration ReportConfiguration { get; set; } + IReportContext ReportContext { get; set; } /// <summary> /// Creates a class report. diff --git a/src/ReportGenerator.Console/Reporting/IReportBuilderFactory.cs b/src/ReportGenerator.Core/Reporting/IReportBuilderFactory.cs similarity index 81% rename from src/ReportGenerator.Console/Reporting/IReportBuilderFactory.cs rename to src/ReportGenerator.Core/Reporting/IReportBuilderFactory.cs index 1a70f093..22c47a10 100644 --- a/src/ReportGenerator.Console/Reporting/IReportBuilderFactory.cs +++ b/src/ReportGenerator.Core/Reporting/IReportBuilderFactory.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Palmmedia.ReportGenerator.Reporting +namespace Palmmedia.ReportGenerator.Core.Reporting { /// <summary> /// Interface for factories that create instances of <see cref="IReportBuilder"/>. @@ -16,10 +16,10 @@ public interface IReportBuilderFactory /// <summary> /// Gets the report builders that correspond to the given <paramref name="reportConfiguration"/>. /// </summary> - /// <param name="reportConfiguration">The report configuration.</param> + /// <param name="reportContext">The report context.</param> /// <returns> /// The report builders. /// </returns> - IEnumerable<IReportBuilder> GetReportBuilders(IReportConfiguration reportConfiguration); + IEnumerable<IReportBuilder> GetReportBuilders(IReportContext reportContext); } } diff --git a/src/ReportGenerator.Console/Reporting/IReportConfiguration.cs b/src/ReportGenerator.Core/Reporting/IReportConfiguration.cs similarity index 53% rename from src/ReportGenerator.Console/Reporting/IReportConfiguration.cs rename to src/ReportGenerator.Core/Reporting/IReportConfiguration.cs index e945547c..a94ac319 100644 --- a/src/ReportGenerator.Console/Reporting/IReportConfiguration.cs +++ b/src/ReportGenerator.Core/Reporting/IReportConfiguration.cs @@ -1,19 +1,28 @@ using System.Collections.Generic; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Logging; -namespace Palmmedia.ReportGenerator.Reporting +namespace Palmmedia.ReportGenerator.Core.Reporting { /// <summary> /// Provides all parameters that are required for report generation. /// </summary> public interface IReportConfiguration { + /// <summary> + /// Gets the files containing coverage information. + /// </summary> + IReadOnlyCollection<string> ReportFiles { get; } + /// <summary> /// Gets the target directory. /// </summary> string TargetDirectory { get; } + /// <summary> + /// Gets the source directories. + /// </summary> + IReadOnlyCollection<string> SourceDirectories { get; } + /// <summary> /// Gets the history directory. /// </summary> @@ -22,27 +31,27 @@ public interface IReportConfiguration /// <summary> /// Gets the type of the report. /// </summary> - IEnumerable<string> ReportTypes { get; } + IReadOnlyCollection<string> ReportTypes { get; } /// <summary> - /// Gets the source directories. + /// Gets the plugins. /// </summary> - IEnumerable<string> SourceDirectories { get; } + IReadOnlyCollection<string> Plugins { get; } /// <summary> /// Gets the assembly filters. /// </summary> - IEnumerable<string> AssemblyFilters { get; } + IReadOnlyCollection<string> AssemblyFilters { get; } /// <summary> /// Gets the class filters. /// </summary> - IEnumerable<string> ClassFilters { get; } + IReadOnlyCollection<string> ClassFilters { get; } /// <summary> /// Gets the file filters. /// </summary> - IEnumerable<string> FileFilters { get; } + IReadOnlyCollection<string> FileFilters { get; } /// <summary> /// Gets the verbosity level. @@ -55,8 +64,13 @@ public interface IReportConfiguration string Tag { get; } /// <summary> - /// Gets all historic coverage elements. + /// Gets the invalid file patters supplied by the user. + /// </summary> + IReadOnlyCollection<string> InvalidReportFilePatterns { get; } + + /// <summary> + /// Gets a value indicating whether the verbosity level was successfully parsed during initialization. /// </summary> - IEnumerable<HistoricCoverage> OverallHistoricCoverages { get; } + bool VerbosityLevelValid { get; } } } diff --git a/src/ReportGenerator.Core/Reporting/IReportContext.cs b/src/ReportGenerator.Core/Reporting/IReportContext.cs new file mode 100644 index 00000000..9215e784 --- /dev/null +++ b/src/ReportGenerator.Core/Reporting/IReportContext.cs @@ -0,0 +1,27 @@ +using System.Collections.Generic; +using Palmmedia.ReportGenerator.Core.CodeAnalysis; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; + +namespace Palmmedia.ReportGenerator.Core.Reporting +{ + /// <summary> + /// The context containing configuration and runtime information of the current execution. + /// </summary> + public interface IReportContext + { + /// <summary> + /// Gets the configuration options. + /// </summary> + IReportConfiguration ReportConfiguration { get; } + + /// <summary> + /// Gets the risk hotspot analysis result. + /// </summary> + RiskHotspotAnalysisResult RiskHotspotAnalysisResult { get; } + + /// <summary> + /// Gets the historic coverage elements. + /// </summary> + IReadOnlyCollection<HistoricCoverage> OverallHistoricCoverages { get; } + } +} diff --git a/src/ReportGenerator.Console/Reporting/MefReportBuilderFactory.cs b/src/ReportGenerator.Core/Reporting/ReportBuilderFactory.cs similarity index 62% rename from src/ReportGenerator.Console/Reporting/MefReportBuilderFactory.cs rename to src/ReportGenerator.Core/Reporting/ReportBuilderFactory.cs index 4844128d..c9956144 100644 --- a/src/ReportGenerator.Console/Reporting/MefReportBuilderFactory.cs +++ b/src/ReportGenerator.Core/Reporting/ReportBuilderFactory.cs @@ -1,20 +1,35 @@ using System; using System.Collections.Generic; using System.Linq; -using Palmmedia.ReportGenerator.Logging; -using Palmmedia.ReportGenerator.Properties; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Plugin; +using Palmmedia.ReportGenerator.Core.Properties; -namespace Palmmedia.ReportGenerator.Reporting +namespace Palmmedia.ReportGenerator.Core.Reporting { /// <summary> - /// Implementation of <see cref="IReportBuilderFactory"/> based on MEF. + /// Implementation of <see cref="IReportBuilderFactory"/>. /// </summary> - internal class MefReportBuilderFactory : IReportBuilderFactory + internal class ReportBuilderFactory : IReportBuilderFactory { /// <summary> /// The Logger. /// </summary> - private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(MefReportBuilderFactory)); + private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(ReportBuilderFactory)); + + /// <summary> + /// The plugin loader. + /// </summary> + private readonly IPluginLoader pluginLoader; + + /// <summary> + /// Initializes a new instance of the <see cref="ReportBuilderFactory" /> class. + /// </summary> + /// <param name="pluginLoader">The plugin loader.</param> + public ReportBuilderFactory(IPluginLoader pluginLoader) + { + this.pluginLoader = pluginLoader ?? throw new ArgumentNullException(nameof(pluginLoader)); + } /// <summary> /// Gets the available report types. @@ -24,7 +39,7 @@ internal class MefReportBuilderFactory : IReportBuilderFactory /// </returns> public IEnumerable<string> GetAvailableReportTypes() { - var reportBuilders = MefHelper.LoadInstancesOfType<IReportBuilder>().ToArray(); + var reportBuilders = this.pluginLoader.LoadInstancesOfType<IReportBuilder>(); return reportBuilders .Select(r => r.ReportType) @@ -36,16 +51,16 @@ public IEnumerable<string> GetAvailableReportTypes() /// <summary> /// Gets the report builders that correspond to the given <paramref name="reportConfiguration" />. /// </summary> - /// <param name="reportConfiguration">The report configuration.</param> + /// <param name="reportContext">The report context.</param> /// <returns> /// The report builders. /// </returns> - public IEnumerable<IReportBuilder> GetReportBuilders(IReportConfiguration reportConfiguration) + public IEnumerable<IReportBuilder> GetReportBuilders(IReportContext reportContext) { - Logger.InfoFormat(Resources.InitializingReportBuilders, string.Join(", ", reportConfiguration.ReportTypes)); + Logger.InfoFormat(Resources.InitializingReportBuilders, string.Join(", ", reportContext.ReportConfiguration.ReportTypes)); - var reportBuilders = MefHelper.LoadInstancesOfType<IReportBuilder>() - .Where(r => reportConfiguration.ReportTypes.Contains(r.ReportType, StringComparer.OrdinalIgnoreCase)) + var reportBuilders = this.pluginLoader.LoadInstancesOfType<IReportBuilder>() + .Where(r => reportContext.ReportConfiguration.ReportTypes.Contains(r.ReportType, StringComparer.OrdinalIgnoreCase)) .OrderBy(r => r.ReportType) .ToArray(); @@ -60,7 +75,7 @@ public IEnumerable<IReportBuilder> GetReportBuilders(IReportConfiguration report else { var nonDefaultParsers = reportBuilderGroup - .Where(r => r.GetType().Assembly.GetName().Name != "ReportGenerator.Reporting") + .Where(r => r.GetType().Assembly.GetName().Name != "ReportGenerator.Core") .ToArray(); foreach (var reportBuilder in nonDefaultParsers) @@ -82,7 +97,7 @@ public IEnumerable<IReportBuilder> GetReportBuilders(IReportConfiguration report foreach (var reportBuilder in result) { - reportBuilder.ReportConfiguration = reportConfiguration; + reportBuilder.ReportContext = reportContext; } return result; diff --git a/src/ReportGenerator.Core/Reporting/ReportGenerator.cs b/src/ReportGenerator.Core/Reporting/ReportGenerator.cs new file mode 100644 index 00000000..08c78bb5 --- /dev/null +++ b/src/ReportGenerator.Core/Reporting/ReportGenerator.cs @@ -0,0 +1,120 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Palmmedia.ReportGenerator.Core.Common; +using Palmmedia.ReportGenerator.Core.Logging; +using Palmmedia.ReportGenerator.Core.Parser; +using Palmmedia.ReportGenerator.Core.Parser.Analysis; +using Palmmedia.ReportGenerator.Core.Properties; + +namespace Palmmedia.ReportGenerator.Core.Reporting +{ + /// <summary> + /// Converts a coverage report generated by OpenCoverand other tools into a readable report. + /// </summary> + internal class ReportGenerator + { + /// <summary> + /// The Logger. + /// </summary> + private static readonly ILogger Logger = LoggerFactory.GetLogger(typeof(ReportGenerator)); + + /// <summary> + /// The parser to use. + /// </summary> + private readonly ParserResult parserResult; + + /// <summary> + /// The renderers. + /// </summary> + private readonly IEnumerable<IReportBuilder> renderers; + + /// <summary> + /// Initializes a new instance of the <see cref="ReportGenerator" /> class. + /// </summary> + /// <param name="parserResult">The parser result to use.</param> + /// <param name="renderers">The renderers.</param> + internal ReportGenerator(ParserResult parserResult, IEnumerable<IReportBuilder> renderers) + { + this.parserResult = parserResult ?? throw new ArgumentNullException(nameof(parserResult)); + this.renderers = renderers ?? throw new ArgumentNullException(nameof(renderers)); + } + + /// <summary> + /// Starts the generation of the report. + /// </summary> + /// <param name="addHistoricCoverage">if set to <c>true</c> historic coverage information is added to classes.</param> + /// <param name="overallHistoricCoverages">All historic coverage elements.</param> + /// <param name="executionTime">The execution time.</param> + /// <param name="tag">The custom tag (e.g. build number).</param> + internal void CreateReport(bool addHistoricCoverage, List<HistoricCoverage> overallHistoricCoverages, DateTime executionTime, string tag) + { + int numberOfClasses = this.parserResult.Assemblies.Sum(a => a.Classes.Count()); + + Logger.InfoFormat(Resources.AnalyzingClasses, numberOfClasses); + + int counter = 0; + + foreach (var assembly in this.parserResult.Assemblies) + { + foreach (var @class in assembly.Classes) + { + counter++; + + Logger.DebugFormat( + " " + Resources.CreatingReport, + counter, + numberOfClasses, + @class.Assembly.ShortName, + @class.Name); + + var fileAnalyses = @class.Files.Select(f => f.AnalyzeFile()).ToArray(); + + if (addHistoricCoverage) + { + var historicCoverage = new HistoricCoverage(@class, executionTime, tag); + @class.AddHistoricCoverage(historicCoverage); + overallHistoricCoverages.Add(historicCoverage); + } + + Parallel.ForEach( + this.renderers, + renderer => + { + try + { + renderer.CreateClassReport(@class, fileAnalyses); + } + catch (Exception ex) + { + Logger.ErrorFormat( + " " + Resources.ErrorDuringRenderingClassReport, + @class.Name, + renderer.ReportType, + ex.GetExceptionMessageForDisplay()); + } + }); + } + } + + Logger.Debug(" " + Resources.CreatingSummary); + SummaryResult summaryResult = new SummaryResult(this.parserResult.Assemblies, this.parserResult.ParserName, this.parserResult.SupportsBranchCoverage, this.parserResult.SourceDirectories); + + foreach (var renderer in this.renderers) + { + try + { + renderer.CreateSummaryReport(summaryResult); + } + catch (Exception ex) + { + Logger.ErrorFormat( + " " + Resources.ErrorDuringRenderingSummaryReport, + renderer.ReportType, + ex.GetExceptionMessageForDisplay()); + } + } + } + } +} \ No newline at end of file diff --git a/src/ReportGenerator.Core/Settings.cs b/src/ReportGenerator.Core/Settings.cs new file mode 100644 index 00000000..2ca9c165 --- /dev/null +++ b/src/ReportGenerator.Core/Settings.cs @@ -0,0 +1,18 @@ +namespace Palmmedia.ReportGenerator.Core +{ + /// <summary> + /// Global settings. + /// </summary> + internal class Settings + { + /// <summary> + /// Gets or sets the number reports that are parsed and processed in parallel. + /// </summary> + public int NumberOfReportsParsedInParallel { get; set; } = 1; + + /// <summary> + /// Gets or sets the maximum number of historic coverage files that get parsed. + /// </summary> + public int MaximumNumberOfHistoricCoverageFiles { get; set; } = 100; + } +} diff --git a/src/ReportGenerator.Core/appsettings.json b/src/ReportGenerator.Core/appsettings.json new file mode 100644 index 00000000..9ff1d03d --- /dev/null +++ b/src/ReportGenerator.Core/appsettings.json @@ -0,0 +1,11 @@ +{ + "riskHotspotsAnalysisThresholds": { + "metricThresholdForCyclomaticComplexity": 30, + "metricThresholdForCrapScore": 15, + "metricThresholdForNPathComplexity": 200 + }, + "settings": { + "numberOfReportsParsedInParallel": 1, + "maximumNumberOfHistoricCoverageFiles": 100 + } +} \ No newline at end of file diff --git a/src/ReportGenerator.DotnetCliTool/Program.cs b/src/ReportGenerator.DotnetCliTool/Program.cs new file mode 100644 index 00000000..5b54dd2a --- /dev/null +++ b/src/ReportGenerator.DotnetCliTool/Program.cs @@ -0,0 +1,18 @@ +namespace Palmmedia.ReportGenerator.DotnetCliTool +{ + /// <summary> + /// Command line access to the ReportBuilder. + /// </summary> + internal class Program + { + /// <summary> + /// The main method. + /// </summary> + /// <param name="args">The command line arguments.</param> + /// <returns>Return code indicating success/failure.</returns> + internal static int Main(string[] args) + { + return Core.Program.Main(args); + } + } +} diff --git a/src/ReportGenerator.DotnetCliTool/ProgramIcon.ico b/src/ReportGenerator.DotnetCliTool/ProgramIcon.ico new file mode 100644 index 00000000..1d455f70 Binary files /dev/null and b/src/ReportGenerator.DotnetCliTool/ProgramIcon.ico differ diff --git a/src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool.csproj b/src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool.csproj new file mode 100644 index 00000000..085b148e --- /dev/null +++ b/src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool.csproj @@ -0,0 +1,35 @@ +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <OutputType>Exe</OutputType> + <TargetFramework>netcoreapp2.0</TargetFramework> + <ApplicationIcon>ProgramIcon.ico</ApplicationIcon> + <AssemblyName>dotnet-reportgenerator</AssemblyName> + <RootNamespace>Palmmedia.ReportGenerator</RootNamespace> + <StartupObject>Palmmedia.ReportGenerator.DotnetCliTool.Program</StartupObject> + <AssemblyVersion>4.0.0.0</AssemblyVersion> + <FileVersion>4.0.0.0</FileVersion> + </PropertyGroup> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> + <OutputPath>..\target\bin\Debug\</OutputPath> + </PropertyGroup> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> + <OutputPath>..\target\bin\Release\</OutputPath> + </PropertyGroup> + + <ItemGroup> + <None Remove="ProgramIcon.ico" /> + </ItemGroup> + + <ItemGroup> + <Content Include="ProgramIcon.ico" /> + </ItemGroup> + + <ItemGroup> + <ProjectReference Include="..\ReportGenerator.Core\ReportGenerator.Core.csproj" /> + <ProjectReference Include="..\ReportGenerator.DotnetCorePluginLoader\ReportGenerator.DotnetCorePluginLoader.csproj" /> + </ItemGroup> + +</Project> \ No newline at end of file diff --git a/src/ReportGenerator.DotnetCorePluginLoader/DotnetCoreAssemblyLoader.cs b/src/ReportGenerator.DotnetCorePluginLoader/DotnetCoreAssemblyLoader.cs new file mode 100644 index 00000000..3d0dcc93 --- /dev/null +++ b/src/ReportGenerator.DotnetCorePluginLoader/DotnetCoreAssemblyLoader.cs @@ -0,0 +1,27 @@ +using System.Reflection; +using McMaster.NETCore.Plugins; +using Palmmedia.ReportGenerator.Core.Plugin; +using Palmmedia.ReportGenerator.Core.Reporting; +using Palmmedia.ReportGenerator.Core.Reporting.History; + +namespace ReportGenerator.DotnetCorePluginLoader +{ + public class DotNetCoreAssemblyLoader : IAssemblyLoader + { + /// <summary> + /// Loads the assembly with the given name. + /// </summary> + /// <param name="name">The name of the assembly.</param> + /// <returns>The assembly.</returns> + public Assembly Load(string name) + { + PluginLoader loader = PluginLoader.CreateFromAssemblyFile( + name, + sharedTypes: new[] { typeof(IReportBuilder), typeof(IHistoryStorage) }); + + Assembly assembly = loader.LoadDefaultAssembly(); + + return assembly; + } + } +} diff --git a/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj b/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj new file mode 100644 index 00000000..8a98fa90 --- /dev/null +++ b/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj @@ -0,0 +1,25 @@ +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> + <TargetFramework>netcoreapp2.0</TargetFramework> + <RootNamespace>ReportGenerator.DotnetCorePluginLoader</RootNamespace> + <AssemblyVersion>4.0.0.0</AssemblyVersion> + <FileVersion>4.0.0.0</FileVersion> + </PropertyGroup> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> + <OutputPath>..\target\bin\Debug\</OutputPath> + </PropertyGroup> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> + <OutputPath>..\target\bin\Release\</OutputPath> + </PropertyGroup> + + <ItemGroup> + <PackageReference Include="McMaster.NETCore.Plugins" Version="0.1.1" /> + </ItemGroup> + + <ItemGroup> + <ProjectReference Include="..\ReportGenerator.Core\ReportGenerator.Core.csproj" /> + </ItemGroup> + +</Project> diff --git a/src/ReportGenerator.DotnetGlobalTool/Program.cs b/src/ReportGenerator.DotnetGlobalTool/Program.cs new file mode 100644 index 00000000..ab648f7f --- /dev/null +++ b/src/ReportGenerator.DotnetGlobalTool/Program.cs @@ -0,0 +1,18 @@ +namespace Palmmedia.ReportGenerator.DotnetGlobalTool +{ + /// <summary> + /// Command line access to the ReportBuilder. + /// </summary> + internal class Program + { + /// <summary> + /// The main method. + /// </summary> + /// <param name="args">The command line arguments.</param> + /// <returns>Return code indicating success/failure.</returns> + internal static int Main(string[] args) + { + return Core.Program.Main(args); + } + } +} diff --git a/src/ReportGenerator.DotnetGlobalTool/ProgramIcon.ico b/src/ReportGenerator.DotnetGlobalTool/ProgramIcon.ico new file mode 100644 index 00000000..1d455f70 Binary files /dev/null and b/src/ReportGenerator.DotnetGlobalTool/ProgramIcon.ico differ diff --git a/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj b/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj new file mode 100644 index 00000000..2b59b9a2 --- /dev/null +++ b/src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj @@ -0,0 +1,35 @@ +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <OutputType>Exe</OutputType> + <TargetFramework>netcoreapp2.1</TargetFramework> + <ApplicationIcon>ProgramIcon.ico</ApplicationIcon> + <AssemblyName>ReportGenerator</AssemblyName> + <RootNamespace>Palmmedia.ReportGenerator</RootNamespace> + <StartupObject>Palmmedia.ReportGenerator.DotnetGlobalTool.Program</StartupObject> + <AssemblyVersion>4.0.0.0</AssemblyVersion> + <FileVersion>4.0.0.0</FileVersion> + </PropertyGroup> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> + <OutputPath>..\target\bin\Debug\</OutputPath> + </PropertyGroup> + + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> + <OutputPath>..\target\bin\Release\</OutputPath> + </PropertyGroup> + + <ItemGroup> + <None Remove="ProgramIcon.ico" /> + </ItemGroup> + + <ItemGroup> + <Content Include="ProgramIcon.ico" /> + </ItemGroup> + + <ItemGroup> + <ProjectReference Include="..\ReportGenerator.Core\ReportGenerator.Core.csproj" /> + <ProjectReference Include="..\ReportGenerator.DotnetCorePluginLoader\ReportGenerator.DotnetCorePluginLoader.csproj" /> + </ItemGroup> + +</Project> \ No newline at end of file diff --git a/src/ReportGenerator.Reporting/CodeAnalysis/RiskHotspotsAnalysis.cs b/src/ReportGenerator.Reporting/CodeAnalysis/RiskHotspotsAnalysis.cs deleted file mode 100644 index e6be7d4c..00000000 --- a/src/ReportGenerator.Reporting/CodeAnalysis/RiskHotspotsAnalysis.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; -using Palmmedia.ReportGenerator.Reporting.Properties; - -namespace Palmmedia.ReportGenerator.Reporting.CodeAnalysis -{ - /// <summary> - /// Analyses the method metrics for risk hotspots based on exceeded thresholds. - /// </summary> - internal static class RiskHotspotsAnalysis - { - /// <summary> - /// The thresholds of the various metrics. - /// </summary> - private static readonly Dictionary<string, decimal> ThresholdsByMetricName = new Dictionary<string, decimal>() - { - { ReportResources.CyclomaticComplexity, Settings.Default.MetricThresholdForCyclomaticComplexity }, - { ReportResources.NPathComplexity, Settings.Default.MetricThresholdForNPathComplexity }, - { ReportResources.CrapScore, Settings.Default.MetricThresholdForCrapScore } - }; - - /// <summary> - /// Determines the risk hotspots in the code base. - /// </summary> - /// <param name="assemblies">The assemblies.</param> - /// <returns>The risk hotspots.</returns> - public static IEnumerable<RiskHotspot> DetectHotspotsByMetricName(IEnumerable<Assembly> assemblies) - { - var riskHotspots = new List<RiskHotspot>(); - decimal threshold = -1; - - foreach (var assembly in assemblies) - { - foreach (var clazz in assembly.Classes) - { - foreach (var methodMetric in clazz.MethodMetrics) - { - var statusMetrics = methodMetric.Metrics - .Where(m => m.MetricType == MetricType.CodeQuality) - .Select(m => new MetricStatus(m, ThresholdsByMetricName.TryGetValue(m.Name, out threshold) && m.Value > threshold)) - .ToArray(); - - if (statusMetrics.Any(m => m.Exceeded)) - { - riskHotspots.Add(new RiskHotspot(assembly, clazz, methodMetric, statusMetrics)); - } - } - } - } - - return riskHotspots - .OrderByDescending(r => r.StatusMetrics.Where(m => m.Exceeded).Max(m => m.Metric.Value)) - .ToList(); - } - } -} \ No newline at end of file diff --git a/src/ReportGenerator.Reporting/PngChartReportBuilder.cs b/src/ReportGenerator.Reporting/PngChartReportBuilder.cs deleted file mode 100644 index 4f41b05e..00000000 --- a/src/ReportGenerator.Reporting/PngChartReportBuilder.cs +++ /dev/null @@ -1,175 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Drawing; -using System.IO; -using System.Linq; -using System.Windows.Forms.DataVisualization.Charting; -using Palmmedia.ReportGenerator.Parser.Analysis; -using Palmmedia.ReportGenerator.Properties; - -namespace Palmmedia.ReportGenerator.Reporting -{ - /// <summary> - /// Creates HTML with chart component only (no reports for classes are generated). - /// </summary> - [System.ComponentModel.Composition.Export(typeof(IReportBuilder))] - public class PngChartReportBuilder : IReportBuilder - { - /// <summary> - /// Gets the report type. - /// </summary> - /// <value> - /// The report type. - /// </value> - public string ReportType => "PngChart"; - - /// <summary> - /// Gets or sets the report configuration. - /// </summary> - /// <value> - /// The report configuration. - /// </value> - public IReportConfiguration ReportConfiguration { get; set; } - - /// <summary> - /// Creates a class report. - /// </summary> - /// <param name="class">The class.</param> - /// <param name="fileAnalyses">The file analyses that correspond to the class.</param> - public void CreateClassReport(Palmmedia.ReportGenerator.Parser.Analysis.Class @class, IEnumerable<Palmmedia.ReportGenerator.Parser.Analysis.FileAnalysis> fileAnalyses) - { - } - - /// <summary> - /// Creates the summary report. - /// </summary> - /// <param name="summaryResult">The summary result.</param> - public void CreateSummaryReport(Palmmedia.ReportGenerator.Parser.Analysis.SummaryResult summaryResult) - { - var historicCoverages = this.GetOverallHistoricCoverages(this.ReportConfiguration.OverallHistoricCoverages); - - historicCoverages = this.FilterHistoricCoverages(historicCoverages, 100); - - if (historicCoverages.Any(h => h.CoverageQuota.HasValue || h.BranchCoverageQuota.HasValue)) - { - Chart chart = new Chart() - { - Size = new Size(900, 300), - }; - - chart.ChartAreas.Add("Default"); - chart.ChartAreas[0].AxisX.LineColor = Color.LightGray; - chart.ChartAreas[0].AxisX.MajorTickMark.LineColor = Color.LightGray; - chart.ChartAreas[0].AxisX.MajorTickMark.TickMarkStyle = TickMarkStyle.None; - chart.ChartAreas[0].AxisX.MajorTickMark.Enabled = false; - chart.ChartAreas[0].AxisX.MajorGrid.Enabled = false; - chart.ChartAreas[0].AxisX.LabelStyle.Enabled = false; - - chart.ChartAreas[0].AxisY.LineColor = Color.LightGray; - chart.ChartAreas[0].AxisY.MajorTickMark.LineColor = Color.LightGray; - chart.ChartAreas[0].AxisY.MajorGrid.LineColor = Color.LightGray; - chart.ChartAreas[0].AxisY.MajorGrid.LineDashStyle = ChartDashStyle.Dash; - chart.ChartAreas[0].AxisY.Minimum = 0; - chart.ChartAreas[0].AxisY.Maximum = 100; - - chart.Legends.Add(new Legend("Default") - { - Docking = Docking.Bottom, - Alignment = StringAlignment.Center, - BorderWidth = 1, - BorderColor = Color.LightGray - }); - - chart.Series.Add(ReportResources.Coverage2); - chart.Series[ReportResources.Coverage2].ChartType = SeriesChartType.Line; - chart.Series[ReportResources.Coverage2].Color = Color.Red; - chart.Series[ReportResources.Coverage2].MarkerSize = 5; - chart.Series[ReportResources.Coverage2].MarkerColor = Color.Red; - chart.Series[ReportResources.Coverage2].MarkerStyle = MarkerStyle.Circle; - - if (historicCoverages.Any(h => h.BranchCoverageQuota.HasValue)) - { - chart.Series.Add(ReportResources.BranchCoverage2); - chart.Series[ReportResources.BranchCoverage2].ChartType = SeriesChartType.Line; - chart.Series[ReportResources.BranchCoverage2].Color = Color.Blue; - chart.Series[ReportResources.BranchCoverage2].MarkerSize = 5; - chart.Series[ReportResources.BranchCoverage2].MarkerColor = Color.Blue; - chart.Series[ReportResources.BranchCoverage2].MarkerStyle = MarkerStyle.Circle; - } - - int counter = 0; - foreach (var historicCoverage in historicCoverages) - { - chart.Series[ReportResources.Coverage2].Points.AddXY(counter, historicCoverage.CoverageQuota.GetValueOrDefault()); - - if (historicCoverages.Any(h => h.BranchCoverageQuota.HasValue)) - { - chart.Series[ReportResources.BranchCoverage2].Points.AddXY(counter, historicCoverage.BranchCoverageQuota.GetValueOrDefault()); - } - - counter++; - } - - chart.SaveImage(Path.Combine(this.ReportConfiguration.TargetDirectory, "CoverageHistory.png"), ChartImageFormat.Png); - } - } - - /// <summary> - /// Gets the overall historic coverages from all classes grouped by execution time. - /// </summary> - /// <param name="overallHistoricCoverages">All historic coverage elements.</param> - /// <returns> - /// The overall historic coverages from all classes grouped by execution time. - /// </returns> - protected virtual IEnumerable<HistoricCoverage> GetOverallHistoricCoverages(IEnumerable<HistoricCoverage> overallHistoricCoverages) - { - var executionTimes = overallHistoricCoverages - .Select(h => h.ExecutionTime) - .Distinct() - .OrderBy(e => e); - - var result = new List<HistoricCoverage>(); - - foreach (var executionTime in executionTimes) - { - var historicCoveragesOfExecutionTime = overallHistoricCoverages - .Where(h => h.ExecutionTime.Equals(executionTime)) - .ToArray(); - - result.Add(new HistoricCoverage(executionTime, historicCoveragesOfExecutionTime[0].Tag) - { - CoveredLines = historicCoveragesOfExecutionTime.Sum(h => h.CoveredLines), - CoverableLines = historicCoveragesOfExecutionTime.Sum(h => h.CoverableLines), - CoveredBranches = historicCoveragesOfExecutionTime.Sum(h => h.CoveredBranches), - TotalBranches = historicCoveragesOfExecutionTime.Sum(h => h.TotalBranches), - TotalLines = historicCoveragesOfExecutionTime.Sum(h => h.TotalLines) - }); - } - - return result; - } - - /// <summary> - /// Filters the historic coverages (equal elements are removed). - /// </summary> - /// <param name="historicCoverages">The historic coverages.</param> - /// <param name="maximum">The maximum.</param> - /// <returns>The filtered historic coverages.</returns> - private IEnumerable<HistoricCoverage> FilterHistoricCoverages(IEnumerable<HistoricCoverage> historicCoverages, int maximum) - { - var result = new List<HistoricCoverage>(); - - foreach (var historicCoverage in historicCoverages) - { - if (result.Count == 0 || !result[result.Count - 1].Equals(historicCoverage)) - { - result.Add(historicCoverage); - } - } - - result.RemoveRange(0, Math.Max(0, result.Count - maximum)); - - return result; - } - } -} diff --git a/src/ReportGenerator.Reporting/Properties/AssemblyInfo.cs b/src/ReportGenerator.Reporting/Properties/AssemblyInfo.cs deleted file mode 100644 index f9b3518f..00000000 --- a/src/ReportGenerator.Reporting/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ReportGenerator.Reporting")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Palmmedia")] -[assembly: AssemblyProduct("ReportGenerator")] -[assembly: AssemblyCopyright("Copyright © Palmmedia 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("11e87681-9352-49f2-8dc8-d492b5bfee49")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.1.2.0")] -[assembly: AssemblyFileVersion("3.1.2.0")] - -[assembly: CLSCompliant(true)] -[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("ReportGenerator.Reporting.Test")] \ No newline at end of file diff --git a/src/ReportGenerator.Reporting/Properties/Settings.Designer.cs b/src/ReportGenerator.Reporting/Properties/Settings.Designer.cs deleted file mode 100644 index 1109ee58..00000000 --- a/src/ReportGenerator.Reporting/Properties/Settings.Designer.cs +++ /dev/null @@ -1,53 +0,0 @@ -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// </auto-generated> -//------------------------------------------------------------------------------ - -namespace Palmmedia.ReportGenerator.Reporting.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("200")] - public decimal MetricThresholdForNPathComplexity { - get { - return ((decimal)(this["MetricThresholdForNPathComplexity"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("30")] - public decimal MetricThresholdForCrapScore { - get { - return ((decimal)(this["MetricThresholdForCrapScore"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("15")] - public decimal MetricThresholdForCyclomaticComplexity { - get { - return ((decimal)(this["MetricThresholdForCyclomaticComplexity"])); - } - } - } -} diff --git a/src/ReportGenerator.Reporting/Properties/Settings.settings b/src/ReportGenerator.Reporting/Properties/Settings.settings deleted file mode 100644 index cd701d5d..00000000 --- a/src/ReportGenerator.Reporting/Properties/Settings.settings +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='utf-8'?> -<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Palmmedia.ReportGenerator.Reporting.Properties" GeneratedClassName="Settings"> - <Profiles /> - <Settings> - <Setting Name="MetricThresholdForNPathComplexity" Type="System.Decimal" Scope="Application"> - <Value Profile="(Default)">200</Value> - </Setting> - <Setting Name="MetricThresholdForCrapScore" Type="System.Decimal" Scope="Application"> - <Value Profile="(Default)">30</Value> - </Setting> - <Setting Name="MetricThresholdForCyclomaticComplexity" Type="System.Decimal" Scope="Application"> - <Value Profile="(Default)">15</Value> - </Setting> - </Settings> -</SettingsFile> \ No newline at end of file diff --git a/src/ReportGenerator.Reporting/ReportGenerator.Reporting.csproj b/src/ReportGenerator.Reporting/ReportGenerator.Reporting.csproj deleted file mode 100644 index 1a4ceff1..00000000 --- a/src/ReportGenerator.Reporting/ReportGenerator.Reporting.csproj +++ /dev/null @@ -1,130 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{006E4F14-5F6F-416C-8F81-9082ED76A991}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>Palmmedia.ReportGenerator.Reporting</RootNamespace> - <AssemblyName>ReportGenerator.Reporting</AssemblyName> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - <TargetFrameworkProfile /> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>..\target\bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>..\target\bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <DocumentationFile>..\target\bin\Release\ReportGenerator.Reporting.XML</DocumentationFile> - </PropertyGroup> - <ItemGroup> - <Reference Include="System" /> - <Reference Include="System.ComponentModel.Composition" /> - <Reference Include="System.Core" /> - <Reference Include="System.Drawing" /> - <Reference Include="System.Windows.Forms" /> - <Reference Include="System.Windows.Forms.DataVisualization" /> - <Reference Include="System.Xml.Linq" /> - <Reference Include="Microsoft.CSharp" /> - <Reference Include="System.Data" /> - <Reference Include="System.Xml" /> - </ItemGroup> - <ItemGroup> - <Compile Include="BadgeReportBuilder.cs" /> - <Compile Include="CodeAnalysis\MetricStatus.cs" /> - <Compile Include="CsvSummaryReportBuilder.cs" /> - <Compile Include="HtmlInlineCssAndJavaScriptReportBuilder.cs" /> - <Compile Include="MhtmlReportBuilder.cs" /> - <Compile Include="HtmlChartReportBuilder.cs" /> - <Compile Include="PngChartReportBuilder.cs" /> - <Compile Include="Properties\Settings.Designer.cs"> - <AutoGen>True</AutoGen> - <DesignTimeSharedInput>True</DesignTimeSharedInput> - <DependentUpon>Settings.settings</DependentUpon> - </Compile> - <Compile Include="CodeAnalysis\RiskHotspot.cs" /> - <Compile Include="CodeAnalysis\RiskHotspotsAnalysis.cs" /> - <Compile Include="TextSummaryReportBuilder.cs" /> - <Compile Include="XmlReportBuilder.cs" /> - <Compile Include="XmlSummaryReportBuilder.cs" /> - <Compile Include="LatexReportBuilder.cs" /> - <Compile Include="LatexSummaryReportBuilder.cs" /> - <Compile Include="HtmlSummaryReportBuilder.cs" /> - <Compile Include="Rendering\HtmlRenderer.cs" /> - <Compile Include="Rendering\IReportRenderer.cs" /> - <Compile Include="Rendering\LatexRenderer.cs" /> - <Compile Include="Rendering\RendererBase.cs" /> - <Compile Include="Rendering\XmlRenderer.cs" /> - <Compile Include="ReportBuilderBase.cs" /> - <Compile Include="HtmlReportBuilder.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\ReportGenerator.Console\ReportGenerator.Console.csproj"> - <Project>{bbdf4589-00c7-44c9-97e5-641d708bca3c}</Project> - <Name>ReportGenerator.Console</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Rendering\resources\custom.css" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Rendering\resources\customAngularApp.js" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Rendering\resources\angular.min.js" /> - <EmbeddedResource Include="Rendering\resources\react.min.js" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Rendering\resources\coverageTableReactComponents.js" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Rendering\resources\react.modified.min.js" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Rendering\resources\chartist.min.css" /> - <EmbeddedResource Include="Rendering\resources\chartist.min.js" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Rendering\resources\jquery-1.11.2.min.js" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Rendering\resources\matchMedia.js" /> - </ItemGroup> - <ItemGroup> - <None Include="app.config" /> - <None Include="Properties\Settings.settings"> - <Generator>SettingsSingleFileGenerator</Generator> - <LastGenOutput>Settings.Designer.cs</LastGenOutput> - </None> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Rendering\resources\riskHotspotTableReactComponents.js" /> - </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <PropertyGroup> - <PostBuildEvent> - </PostBuildEvent> - </PropertyGroup> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> -</Project> \ No newline at end of file diff --git a/src/ReportGenerator.Reporting/app.config b/src/ReportGenerator.Reporting/app.config deleted file mode 100644 index bc337678..00000000 --- a/src/ReportGenerator.Reporting/app.config +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<configuration> - <configSections> - <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" > - <section name="Palmmedia.ReportGenerator.Reporting.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> - </sectionGroup> - </configSections> - <applicationSettings> - <Palmmedia.ReportGenerator.Reporting.Properties.Settings> - <setting name="MetricThresholdForNPathComplexity" serializeAs="String"> - <value>200</value> - </setting> - <setting name="MetricThresholdForCrapScore" serializeAs="String"> - <value>30</value> - </setting> - <setting name="MetricThresholdForCyclomaticComplexity" serializeAs="String"> - <value>15</value> - </setting> - </Palmmedia.ReportGenerator.Reporting.Properties.Settings> - </applicationSettings> -</configuration> \ No newline at end of file diff --git a/src/ReportGenerator.sln b/src/ReportGenerator.sln index eeea4fb3..1c651809 100644 --- a/src/ReportGenerator.sln +++ b/src/ReportGenerator.sln @@ -1,120 +1,150 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27004.2005 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSharp", "CSharp", "{B27F2CDF-8E01-4D2C-9A26-972F02A0EFB6}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{792589C7-7E2C-4C31-9FB3-A64F85BDF826}" - ProjectSection(SolutionItems) = preProject - Testprojects\CSharp\Reports\dotCover.xml = Testprojects\CSharp\Reports\dotCover.xml - Testprojects\CSharp\Reports\DynamicCodeCoverage.xml = Testprojects\CSharp\Reports\DynamicCodeCoverage.xml - Testprojects\CSharp\Reports\mprof-report.xml = Testprojects\CSharp\Reports\mprof-report.xml - Testprojects\CSharp\Reports\MultiDynamicCodeCoverage.xml = Testprojects\CSharp\Reports\MultiDynamicCodeCoverage.xml - Testprojects\CSharp\Reports\MultiNCover1.5.8.xml = Testprojects\CSharp\Reports\MultiNCover1.5.8.xml - Testprojects\CSharp\Reports\MultiOpenCover.xml = Testprojects\CSharp\Reports\MultiOpenCover.xml - Testprojects\CSharp\Reports\MultiPartcover2.2.xml = Testprojects\CSharp\Reports\MultiPartcover2.2.xml - Testprojects\CSharp\Reports\MultiPartcover2.3.xml = Testprojects\CSharp\Reports\MultiPartcover2.3.xml - Testprojects\CSharp\Reports\MultiVisualStudio2010.coveragexml = Testprojects\CSharp\Reports\MultiVisualStudio2010.coveragexml - Testprojects\CSharp\Reports\NCover1.5.8.xml = Testprojects\CSharp\Reports\NCover1.5.8.xml - Testprojects\CSharp\Reports\OpenCover.xml = Testprojects\CSharp\Reports\OpenCover.xml - Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml = Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml - Testprojects\CSharp\Reports\Partcover2.2.xml = Testprojects\CSharp\Reports\Partcover2.2.xml - Testprojects\CSharp\Reports\Partcover2.3.0.35109.xml = Testprojects\CSharp\Reports\Partcover2.3.0.35109.xml - Testprojects\CSharp\Reports\Partcover2.3.xml = Testprojects\CSharp\Reports\Partcover2.3.xml - Testprojects\CSharp\Reports\Partcover4.0.10620.xml = Testprojects\CSharp\Reports\Partcover4.0.10620.xml - Testprojects\CSharp\Reports\VisualStudio2010.coveragexml = Testprojects\CSharp\Reports\VisualStudio2010.coveragexml - Testprojects\CSharp\Reports\VisualStudio2012.coveragexml = Testprojects\CSharp\Reports\VisualStudio2012.coveragexml - Testprojects\CSharp\Reports\VisualStudio2013.coveragexml = Testprojects\CSharp\Reports\VisualStudio2013.coveragexml - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FSharp", "FSharp", "{9223804A-D678-4EE8-BD89-19A6114DB86F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{8775E975-19C9-4F40-869B-04A8488AECC3}" - ProjectSection(SolutionItems) = preProject - Testprojects\FSharp\Reports\dotCover.xml = Testprojects\FSharp\Reports\dotCover.xml - Testprojects\FSharp\Reports\DynamicCodeCoverage.xml = Testprojects\FSharp\Reports\DynamicCodeCoverage.xml - Testprojects\CSharp\Reports\MultidotCover.xml = Testprojects\CSharp\Reports\MultidotCover.xml - Testprojects\FSharp\Reports\OpenCover.xml = Testprojects\FSharp\Reports\OpenCover.xml - Testprojects\FSharp\Reports\VisualStudio2010.coveragexml = Testprojects\FSharp\Reports\VisualStudio2010.coveragexml - Testprojects\FSharp\Reports\VisualStudio2013.coveragexml = Testprojects\FSharp\Reports\VisualStudio2013.coveragexml - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReportGenerator.Console", "ReportGenerator.Console\ReportGenerator.Console.csproj", "{BBDF4589-00C7-44C9-97E5-641D708BCA3C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReportGenerator.Console.Test", "ReportGenerator.Console.Test\ReportGenerator.Console.Test.csproj", "{FFCA13D6-B6CE-442A-9F93-149AE9B0AA1B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReportGenerator.Reporting", "ReportGenerator.Reporting\ReportGenerator.Reporting.csproj", "{006E4F14-5F6F-416C-8F81-9082ED76A991}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_CSharp", "Testprojects\CSharp\Project\Test_CSharp.csproj", "{E035281E-8AB7-4A3E-98D2-C14DF6E9B741}" -EndProject -Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Test_FSharp", "Testprojects\FSharp\Project\Test_FSharp.fsproj", "{953D4A9C-5271-4A6D-876A-7E41B93BEE77}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Java", "Java", "{89813866-CE17-47E5-BCA3-4740F8624BA5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project", "Project", "{F02BAC2E-AD05-4AE9-B37B-A6B7CA732FBA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{654FDEDF-31DE-47E4-A02E-F42DB1ACC722}" - ProjectSection(SolutionItems) = preProject - Testprojects\Java\Reports\Cobertura2.1.1.xml = Testprojects\Java\Reports\Cobertura2.1.1.xml - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{1749EF69-D43F-4874-8290-8134B80D65E5}" - ProjectSection(SolutionItems) = preProject - Testprojects\Java\Project\test\AbstractClass.java = Testprojects\Java\Project\test\AbstractClass.java - Testprojects\Java\Project\test\AbstractClass_SampleImpl1.java = Testprojects\Java\Project\test\AbstractClass_SampleImpl1.java - Testprojects\Java\Project\test\AbstractClass_SampleImpl2.java = Testprojects\Java\Project\test\AbstractClass_SampleImpl2.java - Testprojects\Java\Project\test\GenericClass.java = Testprojects\Java\Project\test\GenericClass.java - Testprojects\Java\Project\test\Program.java = Testprojects\Java\Project\test\Program.java - Testprojects\Java\Project\test\TestClass.java = Testprojects\Java\Project\test\TestClass.java - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sub", "sub", "{2EE13C01-7211-44B6-81A7-7D02DD7C1B3F}" - ProjectSection(SolutionItems) = preProject - Testprojects\Java\Project\test\sub\Sub.java = Testprojects\Java\Project\test\sub\Sub.java - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BBDF4589-00C7-44C9-97E5-641D708BCA3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BBDF4589-00C7-44C9-97E5-641D708BCA3C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BBDF4589-00C7-44C9-97E5-641D708BCA3C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BBDF4589-00C7-44C9-97E5-641D708BCA3C}.Release|Any CPU.Build.0 = Release|Any CPU - {FFCA13D6-B6CE-442A-9F93-149AE9B0AA1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FFCA13D6-B6CE-442A-9F93-149AE9B0AA1B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FFCA13D6-B6CE-442A-9F93-149AE9B0AA1B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FFCA13D6-B6CE-442A-9F93-149AE9B0AA1B}.Release|Any CPU.Build.0 = Release|Any CPU - {006E4F14-5F6F-416C-8F81-9082ED76A991}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {006E4F14-5F6F-416C-8F81-9082ED76A991}.Debug|Any CPU.Build.0 = Debug|Any CPU - {006E4F14-5F6F-416C-8F81-9082ED76A991}.Release|Any CPU.ActiveCfg = Release|Any CPU - {006E4F14-5F6F-416C-8F81-9082ED76A991}.Release|Any CPU.Build.0 = Release|Any CPU - {E035281E-8AB7-4A3E-98D2-C14DF6E9B741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E035281E-8AB7-4A3E-98D2-C14DF6E9B741}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E035281E-8AB7-4A3E-98D2-C14DF6E9B741}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E035281E-8AB7-4A3E-98D2-C14DF6E9B741}.Release|Any CPU.Build.0 = Release|Any CPU - {953D4A9C-5271-4A6D-876A-7E41B93BEE77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {953D4A9C-5271-4A6D-876A-7E41B93BEE77}.Debug|Any CPU.Build.0 = Debug|Any CPU - {953D4A9C-5271-4A6D-876A-7E41B93BEE77}.Release|Any CPU.ActiveCfg = Release|Any CPU - {953D4A9C-5271-4A6D-876A-7E41B93BEE77}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {792589C7-7E2C-4C31-9FB3-A64F85BDF826} = {B27F2CDF-8E01-4D2C-9A26-972F02A0EFB6} - {8775E975-19C9-4F40-869B-04A8488AECC3} = {9223804A-D678-4EE8-BD89-19A6114DB86F} - {E035281E-8AB7-4A3E-98D2-C14DF6E9B741} = {B27F2CDF-8E01-4D2C-9A26-972F02A0EFB6} - {953D4A9C-5271-4A6D-876A-7E41B93BEE77} = {9223804A-D678-4EE8-BD89-19A6114DB86F} - {F02BAC2E-AD05-4AE9-B37B-A6B7CA732FBA} = {89813866-CE17-47E5-BCA3-4740F8624BA5} - {654FDEDF-31DE-47E4-A02E-F42DB1ACC722} = {89813866-CE17-47E5-BCA3-4740F8624BA5} - {1749EF69-D43F-4874-8290-8134B80D65E5} = {F02BAC2E-AD05-4AE9-B37B-A6B7CA732FBA} - {2EE13C01-7211-44B6-81A7-7D02DD7C1B3F} = {1749EF69-D43F-4874-8290-8134B80D65E5} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {2D015F29-27FC-43DD-91EE-3E5BA880F7D2} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2010 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSharp", "CSharp", "{B27F2CDF-8E01-4D2C-9A26-972F02A0EFB6}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{792589C7-7E2C-4C31-9FB3-A64F85BDF826}" + ProjectSection(SolutionItems) = preProject + Testprojects\CSharp\Reports\Cobertura_altcover.xml = Testprojects\CSharp\Reports\Cobertura_altcover.xml + Testprojects\CSharp\Reports\Cobertura_coverlet.xml = Testprojects\CSharp\Reports\Cobertura_coverlet.xml + Testprojects\CSharp\Reports\dotCover.xml = Testprojects\CSharp\Reports\dotCover.xml + Testprojects\CSharp\Reports\DynamicCodeCoverage.xml = Testprojects\CSharp\Reports\DynamicCodeCoverage.xml + Testprojects\CSharp\Reports\mprof-report.xml = Testprojects\CSharp\Reports\mprof-report.xml + Testprojects\CSharp\Reports\MultiDynamicCodeCoverage.xml = Testprojects\CSharp\Reports\MultiDynamicCodeCoverage.xml + Testprojects\CSharp\Reports\MultiNCover1.5.8.xml = Testprojects\CSharp\Reports\MultiNCover1.5.8.xml + Testprojects\CSharp\Reports\MultiOpenCover.xml = Testprojects\CSharp\Reports\MultiOpenCover.xml + Testprojects\CSharp\Reports\MultiPartcover2.2.xml = Testprojects\CSharp\Reports\MultiPartcover2.2.xml + Testprojects\CSharp\Reports\MultiPartcover2.3.xml = Testprojects\CSharp\Reports\MultiPartcover2.3.xml + Testprojects\CSharp\Reports\MultiVisualStudio2010.coveragexml = Testprojects\CSharp\Reports\MultiVisualStudio2010.coveragexml + Testprojects\CSharp\Reports\NCover1.5.8.xml = Testprojects\CSharp\Reports\NCover1.5.8.xml + Testprojects\CSharp\Reports\OpenCover.xml = Testprojects\CSharp\Reports\OpenCover.xml + Testprojects\CSharp\Reports\OpenCover_altcover.xml = Testprojects\CSharp\Reports\OpenCover_altcover.xml + Testprojects\CSharp\Reports\OpenCover_coverlet.xml = Testprojects\CSharp\Reports\OpenCover_coverlet.xml + Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml = Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml + Testprojects\CSharp\Reports\Partcover2.2.xml = Testprojects\CSharp\Reports\Partcover2.2.xml + Testprojects\CSharp\Reports\Partcover2.3.0.35109.xml = Testprojects\CSharp\Reports\Partcover2.3.0.35109.xml + Testprojects\CSharp\Reports\Partcover2.3.xml = Testprojects\CSharp\Reports\Partcover2.3.xml + Testprojects\CSharp\Reports\Partcover4.0.10620.xml = Testprojects\CSharp\Reports\Partcover4.0.10620.xml + Testprojects\CSharp\Reports\VisualStudio2010.coveragexml = Testprojects\CSharp\Reports\VisualStudio2010.coveragexml + Testprojects\CSharp\Reports\VisualStudio2012.coveragexml = Testprojects\CSharp\Reports\VisualStudio2012.coveragexml + Testprojects\CSharp\Reports\VisualStudio2013.coveragexml = Testprojects\CSharp\Reports\VisualStudio2013.coveragexml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FSharp", "FSharp", "{9223804A-D678-4EE8-BD89-19A6114DB86F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{8775E975-19C9-4F40-869B-04A8488AECC3}" + ProjectSection(SolutionItems) = preProject + Testprojects\FSharp\Reports\dotCover.xml = Testprojects\FSharp\Reports\dotCover.xml + Testprojects\FSharp\Reports\DynamicCodeCoverage.xml = Testprojects\FSharp\Reports\DynamicCodeCoverage.xml + Testprojects\CSharp\Reports\MultidotCover.xml = Testprojects\CSharp\Reports\MultidotCover.xml + Testprojects\FSharp\Reports\OpenCover.xml = Testprojects\FSharp\Reports\OpenCover.xml + Testprojects\FSharp\Reports\VisualStudio2010.coveragexml = Testprojects\FSharp\Reports\VisualStudio2010.coveragexml + Testprojects\FSharp\Reports\VisualStudio2013.coveragexml = Testprojects\FSharp\Reports\VisualStudio2013.coveragexml + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_CSharp", "Testprojects\CSharp\Project\Test_CSharp.csproj", "{E035281E-8AB7-4A3E-98D2-C14DF6E9B741}" +EndProject +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Test_FSharp", "Testprojects\FSharp\Project\Test_FSharp.fsproj", "{953D4A9C-5271-4A6D-876A-7E41B93BEE77}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Java", "Java", "{89813866-CE17-47E5-BCA3-4740F8624BA5}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project", "Project", "{F02BAC2E-AD05-4AE9-B37B-A6B7CA732FBA}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{654FDEDF-31DE-47E4-A02E-F42DB1ACC722}" + ProjectSection(SolutionItems) = preProject + Testprojects\Java\Reports\Cobertura2.1.1.xml = Testprojects\Java\Reports\Cobertura2.1.1.xml + Testprojects\Java\Reports\JaCoCo0.7.7.xml = Testprojects\Java\Reports\JaCoCo0.7.7.xml + Testprojects\Java\Reports\JaCoCo0.8.3.xml = Testprojects\Java\Reports\JaCoCo0.8.3.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{1749EF69-D43F-4874-8290-8134B80D65E5}" + ProjectSection(SolutionItems) = preProject + Testprojects\Java\Project\test\AbstractClass.java = Testprojects\Java\Project\test\AbstractClass.java + Testprojects\Java\Project\test\AbstractClass_SampleImpl1.java = Testprojects\Java\Project\test\AbstractClass_SampleImpl1.java + Testprojects\Java\Project\test\AbstractClass_SampleImpl2.java = Testprojects\Java\Project\test\AbstractClass_SampleImpl2.java + Testprojects\Java\Project\test\GenericClass.java = Testprojects\Java\Project\test\GenericClass.java + Testprojects\Java\Project\test\Program.java = Testprojects\Java\Project\test\Program.java + Testprojects\Java\Project\test\TestClass.java = Testprojects\Java\Project\test\TestClass.java + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sub", "sub", "{2EE13C01-7211-44B6-81A7-7D02DD7C1B3F}" + ProjectSection(SolutionItems) = preProject + Testprojects\Java\Project\test\sub\Sub.java = Testprojects\Java\Project\test\sub\Sub.java + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReportGenerator.Core", "ReportGenerator.Core\ReportGenerator.Core.csproj", "{8DBCF22A-18A3-4A50-899D-8AF6ED9975D0}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReportGenerator.Core.Test", "ReportGenerator.Core.Test\ReportGenerator.Core.Test.csproj", "{C65D4ED2-5C0C-4ECA-A8FD-DF9C25297F9D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReportGenerator.Console.NetCore", "ReportGenerator.Console.NetCore\ReportGenerator.Console.NetCore.csproj", "{C6110743-B7C9-4D1D-B210-3601E5A380F4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReportGenerator.Console.Net", "ReportGenerator.Console\ReportGenerator.Console.Net.csproj", "{19A59768-9410-440D-A857-A1B5D44787B8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReportGenerator.DotnetCliTool", "ReportGenerator.DotnetCliTool\ReportGenerator.DotnetCliTool.csproj", "{4C5489D8-077A-49A8-8042-1E6844D48185}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReportGenerator.DotnetGlobalTool", "ReportGenerator.DotnetGlobalTool\ReportGenerator.DotnetGlobalTool.csproj", "{B697EF09-935C-482A-89BB-78D9E8BBB387}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReportGenerator.DotnetCorePluginLoader", "ReportGenerator.DotnetCorePluginLoader\ReportGenerator.DotnetCorePluginLoader.csproj", "{E3CA3149-7810-4E0C-9CF8-97E39DFDD5AF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E035281E-8AB7-4A3E-98D2-C14DF6E9B741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E035281E-8AB7-4A3E-98D2-C14DF6E9B741}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E035281E-8AB7-4A3E-98D2-C14DF6E9B741}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E035281E-8AB7-4A3E-98D2-C14DF6E9B741}.Release|Any CPU.Build.0 = Release|Any CPU + {953D4A9C-5271-4A6D-876A-7E41B93BEE77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {953D4A9C-5271-4A6D-876A-7E41B93BEE77}.Debug|Any CPU.Build.0 = Debug|Any CPU + {953D4A9C-5271-4A6D-876A-7E41B93BEE77}.Release|Any CPU.ActiveCfg = Release|Any CPU + {953D4A9C-5271-4A6D-876A-7E41B93BEE77}.Release|Any CPU.Build.0 = Release|Any CPU + {8DBCF22A-18A3-4A50-899D-8AF6ED9975D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8DBCF22A-18A3-4A50-899D-8AF6ED9975D0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8DBCF22A-18A3-4A50-899D-8AF6ED9975D0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8DBCF22A-18A3-4A50-899D-8AF6ED9975D0}.Release|Any CPU.Build.0 = Release|Any CPU + {C65D4ED2-5C0C-4ECA-A8FD-DF9C25297F9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C65D4ED2-5C0C-4ECA-A8FD-DF9C25297F9D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C65D4ED2-5C0C-4ECA-A8FD-DF9C25297F9D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C65D4ED2-5C0C-4ECA-A8FD-DF9C25297F9D}.Release|Any CPU.Build.0 = Release|Any CPU + {C6110743-B7C9-4D1D-B210-3601E5A380F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C6110743-B7C9-4D1D-B210-3601E5A380F4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C6110743-B7C9-4D1D-B210-3601E5A380F4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C6110743-B7C9-4D1D-B210-3601E5A380F4}.Release|Any CPU.Build.0 = Release|Any CPU + {19A59768-9410-440D-A857-A1B5D44787B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {19A59768-9410-440D-A857-A1B5D44787B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {19A59768-9410-440D-A857-A1B5D44787B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {19A59768-9410-440D-A857-A1B5D44787B8}.Release|Any CPU.Build.0 = Release|Any CPU + {4C5489D8-077A-49A8-8042-1E6844D48185}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4C5489D8-077A-49A8-8042-1E6844D48185}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4C5489D8-077A-49A8-8042-1E6844D48185}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4C5489D8-077A-49A8-8042-1E6844D48185}.Release|Any CPU.Build.0 = Release|Any CPU + {B697EF09-935C-482A-89BB-78D9E8BBB387}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B697EF09-935C-482A-89BB-78D9E8BBB387}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B697EF09-935C-482A-89BB-78D9E8BBB387}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B697EF09-935C-482A-89BB-78D9E8BBB387}.Release|Any CPU.Build.0 = Release|Any CPU + {E3CA3149-7810-4E0C-9CF8-97E39DFDD5AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E3CA3149-7810-4E0C-9CF8-97E39DFDD5AF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E3CA3149-7810-4E0C-9CF8-97E39DFDD5AF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E3CA3149-7810-4E0C-9CF8-97E39DFDD5AF}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {792589C7-7E2C-4C31-9FB3-A64F85BDF826} = {B27F2CDF-8E01-4D2C-9A26-972F02A0EFB6} + {8775E975-19C9-4F40-869B-04A8488AECC3} = {9223804A-D678-4EE8-BD89-19A6114DB86F} + {E035281E-8AB7-4A3E-98D2-C14DF6E9B741} = {B27F2CDF-8E01-4D2C-9A26-972F02A0EFB6} + {953D4A9C-5271-4A6D-876A-7E41B93BEE77} = {9223804A-D678-4EE8-BD89-19A6114DB86F} + {F02BAC2E-AD05-4AE9-B37B-A6B7CA732FBA} = {89813866-CE17-47E5-BCA3-4740F8624BA5} + {654FDEDF-31DE-47E4-A02E-F42DB1ACC722} = {89813866-CE17-47E5-BCA3-4740F8624BA5} + {1749EF69-D43F-4874-8290-8134B80D65E5} = {F02BAC2E-AD05-4AE9-B37B-A6B7CA732FBA} + {2EE13C01-7211-44B6-81A7-7D02DD7C1B3F} = {1749EF69-D43F-4874-8290-8134B80D65E5} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {2D015F29-27FC-43DD-91EE-3E5BA880F7D2} + EndGlobalSection +EndGlobal diff --git a/src/Testprojects/CSharp/Project_DotNetCore/Test.sln b/src/Testprojects/CSharp/Project_DotNetCore/Test.sln new file mode 100644 index 00000000..0ed67eb4 --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/Test.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28010.2041 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "Test\Test.csproj", "{FDDB0388-B1B2-4DB8-A608-6E030A83FC4B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{5420CE36-6E21-4896-8F8C-51C6E4E41EBC}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {FDDB0388-B1B2-4DB8-A608-6E030A83FC4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FDDB0388-B1B2-4DB8-A608-6E030A83FC4B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FDDB0388-B1B2-4DB8-A608-6E030A83FC4B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FDDB0388-B1B2-4DB8-A608-6E030A83FC4B}.Release|Any CPU.Build.0 = Release|Any CPU + {5420CE36-6E21-4896-8F8C-51C6E4E41EBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5420CE36-6E21-4896-8F8C-51C6E4E41EBC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5420CE36-6E21-4896-8F8C-51C6E4E41EBC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5420CE36-6E21-4896-8F8C-51C6E4E41EBC}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {670E16AC-E701-447E-8BD9-978E36C08BB2} + EndGlobalSection +EndGlobal diff --git a/src/Testprojects/CSharp/Project_DotNetCore/Test/AbstractClass.cs b/src/Testprojects/CSharp/Project_DotNetCore/Test/AbstractClass.cs new file mode 100644 index 00000000..6baaf0f8 --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/Test/AbstractClass.cs @@ -0,0 +1,54 @@ +using System; + +namespace Test +{ + public abstract class AbstractClass + { + public AbstractClass() + { + Console.WriteLine("AbstractClass constructed"); + } + + public abstract void Method1(); + + public abstract void Method2(); + } + + public class AbstractClass_SampleImpl1 : AbstractClass + { + public AbstractClass_SampleImpl1() + : base() + { + Console.WriteLine("SampleImpl1 constructed"); + } + + public override void Method1() + { + throw new NotImplementedException(); + } + + public override void Method2() + { + throw new NotImplementedException(); + } + } + + public class AbstractClass_SampleImpl2 : AbstractClass + { + public AbstractClass_SampleImpl2() + : base() + { + Console.WriteLine("SampleImpl2 constructed"); + } + + public override void Method1() + { + throw new NotImplementedException(); + } + + public override void Method2() + { + throw new NotImplementedException(); + } + } +} \ No newline at end of file diff --git a/src/Testprojects/CSharp/Project_DotNetCore/Test/AnalyzerTestClass.cs b/src/Testprojects/CSharp/Project_DotNetCore/Test/AnalyzerTestClass.cs new file mode 100644 index 00000000..45f269a8 --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/Test/AnalyzerTestClass.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; + +namespace Test +{ + public class AnalyzerTestClass + { + public AnalyzerTestClass() + { + Console.WriteLine(".ctor"); + } + + public string DoSomething( + string value, + string[] stringArray, + Guid id, + IEnumerable<string> stringEnumerable, + IList<string> stringList, + decimal dec, + int i, + long l, + Dictionary<string, int> dict, + out int g, + float fff, + double dou, + bool bo, + byte by, + char ch, + object o, + sbyte sby, + short sh, + uint ui, + ulong ul, + ushort usho) + { + g = 0; + return null; + } + + public void GenericMethod<T1, T2>(T1 t1, T2 t2, int i) + { + } + + public string AutoProperty { get; set; } + } +} diff --git a/src/Testprojects/CSharp/Project_DotNetCore/Test/AsyncClass.cs b/src/Testprojects/CSharp/Project_DotNetCore/Test/AsyncClass.cs new file mode 100644 index 00000000..1b291474 --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/Test/AsyncClass.cs @@ -0,0 +1,15 @@ +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; + +namespace Test +{ + public class AsyncClass : DelegatingHandler + { + protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) + { + request.Properties.Add("hello", true); + return await base.SendAsync(request, cancellationToken); + } + } +} diff --git a/src/Testprojects/CSharp/Project_DotNetCore/Test/ClassWithExcludes.cs b/src/Testprojects/CSharp/Project_DotNetCore/Test/ClassWithExcludes.cs new file mode 100644 index 00000000..1c3e7097 --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/Test/ClassWithExcludes.cs @@ -0,0 +1,22 @@ + +namespace Test +{ + public class ClassWithExcludes + { + public string IncludedProperty { get; set; } + + [CoverageExclude] + public string ExcludedProperty { get; set; } + + public void IncludedMethod() + { + this.IncludedProperty = "Test"; + } + + [CoverageExclude] + public void ExcludedMethod() + { + this.ExcludedProperty = "Test"; + } + } +} diff --git a/src/Testprojects/CSharp/Project_DotNetCore/Test/CodeContract_Contract.cs b/src/Testprojects/CSharp/Project_DotNetCore/Test/CodeContract_Contract.cs new file mode 100644 index 00000000..bba54519 --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/Test/CodeContract_Contract.cs @@ -0,0 +1,16 @@ +using System; +using System.Diagnostics.Contracts; + +namespace Test +{ + [ContractClassFor(typeof(CodeContract_Interface))] + internal abstract class CodeContract_Contract : CodeContract_Interface + { + public int Calculate(int value) + { + Contract.Requires<ArgumentException>(value != 0, "Value must not be zero"); + + return default(int); + } + } +} diff --git a/src/Testprojects/CSharp/Project_DotNetCore/Test/CodeContract_Interface.cs b/src/Testprojects/CSharp/Project_DotNetCore/Test/CodeContract_Interface.cs new file mode 100644 index 00000000..4dec321c --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/Test/CodeContract_Interface.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics.Contracts; +using System.Linq; +using System.Text; + +namespace Test +{ + [ContractClass(typeof(CodeContract_Contract))] + public interface CodeContract_Interface + { + int Calculate(int value); + } +} diff --git a/src/Testprojects/CSharp/Project_DotNetCore/Test/CodeContract_Target.cs b/src/Testprojects/CSharp/Project_DotNetCore/Test/CodeContract_Target.cs new file mode 100644 index 00000000..b8dbe9a3 --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/Test/CodeContract_Target.cs @@ -0,0 +1,18 @@ + +namespace Test +{ + public class CodeContract_Target : CodeContract_Interface + { + public int Calculate(int value) + { + if (value < 0) + { + return 0; + } + else + { + return 1; + } + } + } +} diff --git a/src/Testprojects/CSharp/Project_DotNetCore/Test/CoverageExcludeAttribute.cs b/src/Testprojects/CSharp/Project_DotNetCore/Test/CoverageExcludeAttribute.cs new file mode 100644 index 00000000..9729c2bd --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/Test/CoverageExcludeAttribute.cs @@ -0,0 +1,10 @@ +using System; + +namespace Test +{ + [CoverageExclude] + [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Class)] + public class CoverageExcludeAttribute : Attribute + { + } +} diff --git a/src/Testprojects/CSharp/Project_DotNetCore/Test/GenericClass.cs b/src/Testprojects/CSharp/Project_DotNetCore/Test/GenericClass.cs new file mode 100644 index 00000000..3babeec8 --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/Test/GenericClass.cs @@ -0,0 +1,49 @@ +using System; + +namespace Test +{ + public abstract class AbstractGenericClass<TModel, TState> : ISomeClassInterface<TModel, TState> + where TModel : SomeModel + where TState : IState + { + public abstract bool Process(ISomeObjectInterface<TModel, TState> someObject); + + public virtual bool PostProcess(ISomeObjectInterface<TModel, TState> someObject) + { + return true; + } + } + + public class GenericClass<TModel, TState> : AbstractGenericClass<TModel, TState> + where TModel : SomeModel + where TState : IState + { + public override bool Process(ISomeObjectInterface<TModel, TState> someObject) + { + Console.WriteLine("Process"); + return true; + } + + public override bool PostProcess(ISomeObjectInterface<TModel, TState> someObject) + { + Console.WriteLine("PostProcess"); + return true; + } + } + + public class SomeModel + { + } + + public interface IState + { + } + + public interface ISomeClassInterface<T1, T2> + { + } + + public interface ISomeObjectInterface<T1, T2> + { + } +} \ No newline at end of file diff --git a/src/Testprojects/CSharp/Project_DotNetCore/Test/NotMatchingFileName.cs b/src/Testprojects/CSharp/Project_DotNetCore/Test/NotMatchingFileName.cs new file mode 100644 index 00000000..db71cf19 --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/Test/NotMatchingFileName.cs @@ -0,0 +1,8 @@ + +namespace Test +{ + public class SomeClass + { + public string Property1 { get; set; } + } +} diff --git a/src/Testprojects/CSharp/Project_DotNetCore/Test/PartialClass.cs b/src/Testprojects/CSharp/Project_DotNetCore/Test/PartialClass.cs new file mode 100644 index 00000000..1be933e2 --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/Test/PartialClass.cs @@ -0,0 +1,36 @@ +using System; + +namespace Test +{ + partial class PartialClass + { + public void ExecutedMethod_1() + { + Console.WriteLine("Test"); + } + + public void UnExecutedMethod_1() + { + Console.WriteLine("Test"); + } + + private int someProperty; + + public int SomeProperty + { + get { return this.someProperty; } + + set + { + if (value < 0) + { + this.someProperty = 0; + } + else + { + this.someProperty = value; + } + } + } + } +} diff --git a/src/Testprojects/CSharp/Project_DotNetCore/Test/PartialClass2.cs b/src/Testprojects/CSharp/Project_DotNetCore/Test/PartialClass2.cs new file mode 100644 index 00000000..8f8e3674 --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/Test/PartialClass2.cs @@ -0,0 +1,17 @@ +using System; + +namespace Test +{ + partial class PartialClass + { + public void ExecutedMethod_2() + { + Console.WriteLine("Test"); + } + + public void UnExecutedMethod_2() + { + Console.WriteLine("Test"); + } + } +} diff --git a/src/Testprojects/CSharp/Project_DotNetCore/Test/PartialClassWithAutoProperties.cs b/src/Testprojects/CSharp/Project_DotNetCore/Test/PartialClassWithAutoProperties.cs new file mode 100644 index 00000000..cd0e7dfa --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/Test/PartialClassWithAutoProperties.cs @@ -0,0 +1,8 @@ + +namespace Test +{ + public partial class PartialClassWithAutoProperties + { + public string Property1 { get; set; } + } +} diff --git a/src/Testprojects/CSharp/Project_DotNetCore/Test/PartialClassWithAutoProperties2.cs b/src/Testprojects/CSharp/Project_DotNetCore/Test/PartialClassWithAutoProperties2.cs new file mode 100644 index 00000000..8302b1ec --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/Test/PartialClassWithAutoProperties2.cs @@ -0,0 +1,10 @@ + +namespace Test +{ + public partial class PartialClassWithAutoProperties + { + public string Property2 { get; set; } + + public string ExpressionBodiedProperty => "Test"; + } +} diff --git a/src/Testprojects/CSharp/Project_DotNetCore/Test/Program.cs b/src/Testprojects/CSharp/Project_DotNetCore/Test/Program.cs new file mode 100644 index 00000000..aa146956 --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/Test/Program.cs @@ -0,0 +1,70 @@ +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; + +namespace Test +{ + public class Program + { + public static void Main(string[] args) + { + new TestClass().SampleFunction(); + + new TestClass2("Test").ExecutedMethod(); + new TestClass2("Test").SampleFunction("Munich"); + + new PartialClass().ExecutedMethod_1(); + new PartialClass().ExecutedMethod_2(); + new PartialClass().SomeProperty = -10; + + new PartialClassWithAutoProperties().Property1 = "Test"; + new PartialClassWithAutoProperties().Property2 = "Test"; + + new SomeClass().Property1 = "Test"; + + new ClassWithExcludes().IncludedMethod(); + new ClassWithExcludes().ExcludedMethod(); + + new GenericClass<SomeModel, IState>().Process(null); + new GenericClass<SomeModel, IState>().PostProcess(null); + + new CodeContract_Target().Calculate(-1); + + new AbstractClass_SampleImpl1(); + new AbstractClass_SampleImpl2(); + + CallAsyncMethod(); + + try + { + new CodeContract_Target().Calculate(0); + } + catch (System.ArgumentException) + { + } + } + + private static async void CallAsyncMethod() + { + var expected = new HttpResponseMessage(); + var handler = new AsyncClass() { InnerHandler = new EchoHandler(expected) }; + var invoker = new HttpMessageInvoker(handler, false); + var actual = await invoker.SendAsync(new HttpRequestMessage(), new CancellationToken()); + } + + private class EchoHandler : DelegatingHandler + { + private HttpResponseMessage _response; + + public EchoHandler(HttpResponseMessage response) + { + this._response = response; + } + + protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) + { + return Task.FromResult(this._response); + } + } + } +} diff --git a/src/Testprojects/CSharp/Project_DotNetCore/Test/Test.csproj b/src/Testprojects/CSharp/Project_DotNetCore/Test/Test.csproj new file mode 100644 index 00000000..2d9796dd --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/Test/Test.csproj @@ -0,0 +1,6 @@ +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> + <TargetFramework>netcoreapp2.0</TargetFramework> + <IsPackable>false</IsPackable> + </PropertyGroup> +</Project> diff --git a/src/Testprojects/CSharp/Project_DotNetCore/Test/TestClass.cs b/src/Testprojects/CSharp/Project_DotNetCore/Test/TestClass.cs new file mode 100644 index 00000000..5c2edb18 --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/Test/TestClass.cs @@ -0,0 +1,38 @@ +using System; + +namespace Test +{ + class TestClass + { + public void SampleFunction() + { + string test = string.Format( + "{0} {1}", + "Hello", + "World"); + + Console.WriteLine(test); + int i = 10; + + if (i > 0 || i > 1) + { + Console.WriteLine(i + " is greater that 0"); + } + else + { + Console.WriteLine(i + " is not greater that 0"); + } + } + + public class NestedClass + { + public void SampleFunction() + { + Console.WriteLine( + "{0} {1}", + "Hello", + "World"); + } + } + } +} \ No newline at end of file diff --git a/src/Testprojects/CSharp/Project_DotNetCore/Test/TestClass2.cs b/src/Testprojects/CSharp/Project_DotNetCore/Test/TestClass2.cs new file mode 100644 index 00000000..0f929978 --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/Test/TestClass2.cs @@ -0,0 +1,85 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace Test +{ + class TestClass2 + { + private string name; + + private Dictionary<string, int> dict = new Dictionary<string, int>(); + + public string ExecutedProperty { get; set; } + + public string UnExecutedProperty { get; set; } + + public TestClass2() + { + this.name = "Nobody"; + this.ExecutedProperty = "Nobody"; + } + + public TestClass2(string name) + { + this.name = name; + this.ExecutedProperty = name + name; + } + + public void ExecutedMethod() + { + Console.WriteLine(this.name); + Console.WriteLine(this.ExecutedProperty); + } + + public void UnExecutedMethod() + { + Console.WriteLine(this.name); + Console.WriteLine(this.ExecutedProperty); + } + + public void SampleFunction(string city) + { + int[] values = new int[] { 0, 1, 2, 3 }; + + var doubled = values.Select(i => i * 2); + + foreach (var item in doubled) + { + Console.WriteLine(item); + } + + string[] cities = new string[] { "Berlin", "Munich", "Paris" }; + + if (cities.SingleOrDefault(c => c.Equals(city, StringComparison.OrdinalIgnoreCase)) != null) + { + Console.WriteLine("Found " + city); + } + } + + public string DoSomething(string value, + string[] stringArray, + Guid id, + IEnumerable<string> stringEnumerable, + IList<string> stringList, + decimal dec, + int i, + Dictionary<string, int> dict, + out int g, + float fff, + double dou, + bool bo, + byte by, + char ch, + object o, + sbyte sby, + short sh, + uint ui, + ulong ul, + ushort usho) + { + g = 0; + return null; + } + } +} diff --git a/src/Testprojects/CSharp/Project_DotNetCore/UnitTests/UnitTest.cs b/src/Testprojects/CSharp/Project_DotNetCore/UnitTests/UnitTest.cs new file mode 100644 index 00000000..3aa7bbe2 --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/UnitTests/UnitTest.cs @@ -0,0 +1,20 @@ +using Test; +using Xunit; + +namespace UnitTests +{ + public class UnitTest + { + [Fact] + public void CSharp_ExecuteTest1() + { + Program.Main(null); + } + + [Fact] + public void CSharp_ExecuteTest2() + { + Program.Main(null); + } + } +} diff --git a/src/Testprojects/CSharp/Project_DotNetCore/UnitTests/UnitTests.csproj b/src/Testprojects/CSharp/Project_DotNetCore/UnitTests/UnitTests.csproj new file mode 100644 index 00000000..5f346a0c --- /dev/null +++ b/src/Testprojects/CSharp/Project_DotNetCore/UnitTests/UnitTests.csproj @@ -0,0 +1,27 @@ +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <TargetFramework>netcoreapp2.0</TargetFramework> + <IsPackable>false</IsPackable> + </PropertyGroup> + + <ItemGroup> + <PackageReference Include="altcover" Version="4.0.644" /> + <PackageReference Include="coverlet.msbuild" Version="2.3.1"> + <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> + <PrivateAssets>all</PrivateAssets> + </PackageReference> + <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" /> + <PackageReference Include="xunit" Version="2.3.1" /> + <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1"> + <PrivateAssets>all</PrivateAssets> + <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> + </PackageReference> + <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" /> + </ItemGroup> + + <ItemGroup> + <ProjectReference Include="..\Test\Test.csproj" /> + </ItemGroup> + +</Project> diff --git a/src/Testprojects/CSharp/Reports/Cobertura_altcover.xml b/src/Testprojects/CSharp/Reports/Cobertura_altcover.xml new file mode 100644 index 00000000..dfac9dcd --- /dev/null +++ b/src/Testprojects/CSharp/Reports/Cobertura_altcover.xml @@ -0,0 +1,698 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<coverage line-rate="0.6648351648351648" branch-rate="0.22448979591836735" version="4.0.0.0" timestamp="1539803661"> + <sources> + <source>C:\temp</source> + </sources> + <packages> + <package name="Test" line-rate="0.6648351648351648" branch-rate="0.22448979591836735" complexity="1.3076923076923077"> + <classes> + <class name="Test.AbstractClass" filename="C:\temp\AbstractClass.cs" line-rate="1" branch-rate="0" complexity="1"> + <methods> + <method name=".ctor" signature="System.Void )" line-rate="1" branch-rate="0"> + <lines> + <line number="7" hits="4" branch="false" /> + <line number="8" hits="4" branch="false" /> + <line number="9" hits="4" branch="false" /> + <line number="10" hits="4" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="7" hits="4" branch="false" /> + <line number="8" hits="4" branch="false" /> + <line number="9" hits="4" branch="false" /> + <line number="10" hits="4" branch="false" /> + </lines> + </class> + <class name="Test.AbstractClass_SampleImpl1" filename="C:\temp\AbstractClass.cs" line-rate="0.5" branch-rate="0" complexity="1"> + <methods> + <method name=".ctor" signature="System.Void )" line-rate="1" branch-rate="0"> + <lines> + <line number="20" hits="2" branch="false" /> + <line number="21" hits="2" branch="false" /> + <line number="22" hits="2" branch="false" /> + <line number="23" hits="2" branch="false" /> + </lines> + </method> + <method name="Method1" signature="System.Void )" line-rate="0" branch-rate="0"> + <lines> + <line number="26" hits="0" branch="false" /> + <line number="27" hits="0" branch="false" /> + </lines> + </method> + <method name="Method2" signature="System.Void )" line-rate="0" branch-rate="0"> + <lines> + <line number="31" hits="0" branch="false" /> + <line number="32" hits="0" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="20" hits="2" branch="false" /> + <line number="21" hits="2" branch="false" /> + <line number="22" hits="2" branch="false" /> + <line number="23" hits="2" branch="false" /> + <line number="26" hits="0" branch="false" /> + <line number="27" hits="0" branch="false" /> + <line number="31" hits="0" branch="false" /> + <line number="32" hits="0" branch="false" /> + </lines> + </class> + <class name="Test.AbstractClass_SampleImpl2" filename="C:\temp\AbstractClass.cs" line-rate="0.5" branch-rate="0" complexity="1"> + <methods> + <method name=".ctor" signature="System.Void )" line-rate="1" branch-rate="0"> + <lines> + <line number="39" hits="2" branch="false" /> + <line number="40" hits="2" branch="false" /> + <line number="41" hits="2" branch="false" /> + <line number="42" hits="2" branch="false" /> + </lines> + </method> + <method name="Method1" signature="System.Void )" line-rate="0" branch-rate="0"> + <lines> + <line number="45" hits="0" branch="false" /> + <line number="46" hits="0" branch="false" /> + </lines> + </method> + <method name="Method2" signature="System.Void )" line-rate="0" branch-rate="0"> + <lines> + <line number="50" hits="0" branch="false" /> + <line number="51" hits="0" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="39" hits="2" branch="false" /> + <line number="40" hits="2" branch="false" /> + <line number="41" hits="2" branch="false" /> + <line number="42" hits="2" branch="false" /> + <line number="45" hits="0" branch="false" /> + <line number="46" hits="0" branch="false" /> + <line number="50" hits="0" branch="false" /> + <line number="51" hits="0" branch="false" /> + </lines> + </class> + <class name="Test.AbstractGenericClass`2" filename="C:\temp\GenericClass.cs" line-rate="0" branch-rate="0" complexity="1"> + <methods> + <method name="PostProcess" signature="System.Boolean Test.ISomeObjectInterface`2<TModel,TState>)" line-rate="0" branch-rate="0"> + <lines> + <line number="12" hits="0" branch="false" /> + <line number="13" hits="0" branch="false" /> + <line number="14" hits="0" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="12" hits="0" branch="false" /> + <line number="13" hits="0" branch="false" /> + <line number="14" hits="0" branch="false" /> + </lines> + </class> + <class name="Test.AnalyzerTestClass" filename="C:\temp\AnalyzerTestClass.cs" line-rate="0" branch-rate="0" complexity="1"> + <methods> + <method name=".ctor" signature="System.Void )" line-rate="0" branch-rate="0"> + <lines> + <line number="8" hits="0" branch="false" /> + <line number="9" hits="0" branch="false" /> + <line number="10" hits="0" branch="false" /> + <line number="11" hits="0" branch="false" /> + </lines> + </method> + <method name="DoSomething" signature="System.String System.String,System.String[],System.Guid,System.Collections.Generic.IEnumerable`1<System.String>,System.Collections.Generic.IList`1<System.String>,System.Decimal,System.Int32,System.Int64,System.Collections.Generic.Dictionary`2<System.String,System.Int32>,System.Int32&,System.Single,System.Double,System.Boolean,System.Byte,System.Char,System.Object,System.SByte,System.Int16,System.UInt32,System.UInt64,System.UInt16)" line-rate="0" branch-rate="0"> + <lines> + <line number="35" hits="0" branch="false" /> + <line number="36" hits="0" branch="false" /> + <line number="37" hits="0" branch="false" /> + <line number="38" hits="0" branch="false" /> + </lines> + </method> + <method name="GenericMethod" signature="System.Void T1,T2,System.Int32)" line-rate="0" branch-rate="0"> + <lines> + <line number="41" hits="0" branch="false" /> + <line number="42" hits="0" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="8" hits="0" branch="false" /> + <line number="9" hits="0" branch="false" /> + <line number="10" hits="0" branch="false" /> + <line number="11" hits="0" branch="false" /> + <line number="35" hits="0" branch="false" /> + <line number="36" hits="0" branch="false" /> + <line number="37" hits="0" branch="false" /> + <line number="38" hits="0" branch="false" /> + <line number="41" hits="0" branch="false" /> + <line number="42" hits="0" branch="false" /> + </lines> + </class> + <class name="Test.AsyncClass/<SendAsync>d__0" filename="C:\temp\AsyncClass.cs" line-rate="1" branch-rate="0" complexity="3"> + <methods> + <method name="MoveNext" signature="System.Void )" line-rate="1" branch-rate="0"> + <lines> + <line number="10" hits="2" branch="false" /> + <line number="11" hits="2" branch="false" /> + <line number="12" hits="2" branch="false" /> + <line number="13" hits="2" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="10" hits="2" branch="false" /> + <line number="11" hits="2" branch="false" /> + <line number="12" hits="2" branch="false" /> + <line number="13" hits="2" branch="false" /> + </lines> + </class> + <class name="Test.ClassWithExcludes" filename="C:\temp\ClassWithExcludes.cs" line-rate="1" branch-rate="0" complexity="1"> + <methods> + <method name="ExcludedMethod" signature="System.Void )" line-rate="1" branch-rate="0"> + <lines> + <line number="18" hits="2" branch="false" /> + <line number="19" hits="2" branch="false" /> + <line number="20" hits="2" branch="false" /> + </lines> + </method> + <method name="IncludedMethod" signature="System.Void )" line-rate="1" branch-rate="0"> + <lines> + <line number="12" hits="2" branch="false" /> + <line number="13" hits="2" branch="false" /> + <line number="14" hits="2" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="12" hits="2" branch="false" /> + <line number="13" hits="2" branch="false" /> + <line number="14" hits="2" branch="false" /> + <line number="18" hits="2" branch="false" /> + <line number="19" hits="2" branch="false" /> + <line number="20" hits="2" branch="false" /> + </lines> + </class> + <class name="Test.CodeContract_Contract" filename="C:\temp\CodeContract_Contract.cs" line-rate="0" branch-rate="0" complexity="1"> + <methods> + <method name="Calculate" signature="System.Int32 System.Int32)" line-rate="0" branch-rate="0"> + <lines> + <line number="10" hits="0" branch="false" /> + <line number="11" hits="0" branch="false" /> + <line number="13" hits="0" branch="false" /> + <line number="14" hits="0" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="10" hits="0" branch="false" /> + <line number="11" hits="0" branch="false" /> + <line number="13" hits="0" branch="false" /> + <line number="14" hits="0" branch="false" /> + </lines> + </class> + <class name="Test.CodeContract_Target" filename="C:\temp\CodeContract_Target.cs" line-rate="1" branch-rate="1" complexity="2"> + <methods> + <method name="Calculate" signature="System.Int32 System.Int32)" line-rate="1" branch-rate="1"> + <lines> + <line number="7" hits="4" branch="false" /> + <line number="8" hits="4" branch="true" condition-coverage="100% (2/2)"> + <conditions> + <condition number="0" type="jump" coverage="100%" /> + </conditions> + </line> + <line number="9" hits="2" branch="false" /> + <line number="10" hits="2" branch="false" /> + <line number="13" hits="2" branch="false" /> + <line number="14" hits="2" branch="false" /> + <line number="16" hits="4" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="7" hits="4" branch="false" /> + <line number="8" hits="4" branch="true" condition-coverage="100% (2/2)"> + <conditions> + <condition number="0" type="jump" coverage="100%" /> + </conditions> + </line> + <line number="9" hits="2" branch="false" /> + <line number="10" hits="2" branch="false" /> + <line number="13" hits="2" branch="false" /> + <line number="14" hits="2" branch="false" /> + <line number="16" hits="4" branch="false" /> + </lines> + </class> + <class name="Test.GenericClass`2" filename="C:\temp\GenericClass.cs" line-rate="1" branch-rate="0" complexity="1"> + <methods> + <method name="PostProcess" signature="System.Boolean Test.ISomeObjectInterface`2<TModel,TState>)" line-rate="1" branch-rate="0"> + <lines> + <line number="28" hits="2" branch="false" /> + <line number="29" hits="2" branch="false" /> + <line number="30" hits="2" branch="false" /> + <line number="31" hits="2" branch="false" /> + </lines> + </method> + <method name="Process" signature="System.Boolean Test.ISomeObjectInterface`2<TModel,TState>)" line-rate="1" branch-rate="0"> + <lines> + <line number="22" hits="2" branch="false" /> + <line number="23" hits="2" branch="false" /> + <line number="24" hits="2" branch="false" /> + <line number="25" hits="2" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="22" hits="2" branch="false" /> + <line number="23" hits="2" branch="false" /> + <line number="24" hits="2" branch="false" /> + <line number="25" hits="2" branch="false" /> + <line number="28" hits="2" branch="false" /> + <line number="29" hits="2" branch="false" /> + <line number="30" hits="2" branch="false" /> + <line number="31" hits="2" branch="false" /> + </lines> + </class> + <class name="Test.PartialClass" filename="C:\temp\PartialClass.cs" line-rate="0.5" branch-rate="0.33333333333333331" complexity="1.25"> + <methods> + <method name="ExecutedMethod_1" signature="System.Void )" line-rate="1" branch-rate="0"> + <lines> + <line number="8" hits="2" branch="false" /> + <line number="9" hits="2" branch="false" /> + <line number="10" hits="2" branch="false" /> + </lines> + </method> + <method name="UnExecutedMethod_1" signature="System.Void )" line-rate="0" branch-rate="0"> + <lines> + <line number="13" hits="0" branch="false" /> + <line number="14" hits="0" branch="false" /> + <line number="15" hits="0" branch="false" /> + </lines> + </method> + <method name="get_SomeProperty" signature="System.Int32 )" line-rate="0" branch-rate="0"> + <lines> + <line number="21" hits="0" branch="false" /> + <line number="21" hits="0" branch="false" /> + <line number="21" hits="0" branch="false" /> + </lines> + </method> + <method name="set_SomeProperty" signature="System.Void System.Int32)" line-rate="0.66666666666666663" branch-rate="0.66666666666666663"> + <lines> + <line number="24" hits="2" branch="false" /> + <line number="25" hits="2" branch="true" condition-coverage="50% (1/2)"> + <conditions> + <condition number="0" type="jump" coverage="50%" /> + </conditions> + </line> + <line number="26" hits="2" branch="false" /> + <line number="27" hits="2" branch="false" /> + <line number="28" hits="2" branch="false" /> + <line number="30" hits="0" branch="false" /> + <line number="31" hits="0" branch="false" /> + <line number="32" hits="0" branch="false" /> + <line number="33" hits="2" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="8" hits="2" branch="false" /> + <line number="9" hits="2" branch="false" /> + <line number="10" hits="2" branch="false" /> + <line number="13" hits="0" branch="false" /> + <line number="14" hits="0" branch="false" /> + <line number="15" hits="0" branch="false" /> + <line number="21" hits="0" branch="false" /> + <line number="21" hits="0" branch="false" /> + <line number="21" hits="0" branch="false" /> + <line number="24" hits="2" branch="false" /> + <line number="25" hits="2" branch="true" condition-coverage="50% (1/2)"> + <conditions> + <condition number="0" type="jump" coverage="50%" /> + </conditions> + </line> + <line number="26" hits="2" branch="false" /> + <line number="27" hits="2" branch="false" /> + <line number="28" hits="2" branch="false" /> + <line number="30" hits="0" branch="false" /> + <line number="31" hits="0" branch="false" /> + <line number="32" hits="0" branch="false" /> + <line number="33" hits="2" branch="false" /> + </lines> + </class> + <class name="Test.PartialClass" filename="C:\temp\PartialClass2.cs" line-rate="0.5" branch-rate="0" complexity="1"> + <methods> + <method name="ExecutedMethod_2" signature="System.Void )" line-rate="1" branch-rate="0"> + <lines> + <line number="8" hits="2" branch="false" /> + <line number="9" hits="2" branch="false" /> + <line number="10" hits="2" branch="false" /> + </lines> + </method> + <method name="UnExecutedMethod_2" signature="System.Void )" line-rate="0" branch-rate="0"> + <lines> + <line number="13" hits="0" branch="false" /> + <line number="14" hits="0" branch="false" /> + <line number="15" hits="0" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="8" hits="2" branch="false" /> + <line number="9" hits="2" branch="false" /> + <line number="10" hits="2" branch="false" /> + <line number="13" hits="0" branch="false" /> + <line number="14" hits="0" branch="false" /> + <line number="15" hits="0" branch="false" /> + </lines> + </class> + <class name="Test.PartialClassWithAutoProperties" filename="C:\temp\PartialClassWithAutoProperties2.cs" line-rate="0" branch-rate="0" complexity="1"> + <methods> + <method name="get_ExpressionBodiedProperty" signature="System.String )" line-rate="0" branch-rate="0"> + <lines> + <line number="8" hits="0" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="8" hits="0" branch="false" /> + </lines> + </class> + <class name="Test.Program" filename="C:\temp\Program.cs" line-rate="0.88" branch-rate="0" complexity="1"> + <methods> + <method name="Main" signature="System.Void System.String[])" line-rate="0.88" branch-rate="0"> + <lines> + <line number="10" hits="2" branch="false" /> + <line number="11" hits="2" branch="false" /> + <line number="13" hits="2" branch="false" /> + <line number="14" hits="2" branch="false" /> + <line number="16" hits="2" branch="false" /> + <line number="17" hits="2" branch="false" /> + <line number="18" hits="2" branch="false" /> + <line number="20" hits="2" branch="false" /> + <line number="21" hits="2" branch="false" /> + <line number="23" hits="2" branch="false" /> + <line number="25" hits="2" branch="false" /> + <line number="26" hits="2" branch="false" /> + <line number="28" hits="2" branch="false" /> + <line number="29" hits="2" branch="false" /> + <line number="31" hits="2" branch="false" /> + <line number="33" hits="2" branch="false" /> + <line number="34" hits="2" branch="false" /> + <line number="36" hits="2" branch="false" /> + <line number="39" hits="2" branch="false" /> + <line number="40" hits="2" branch="false" /> + <line number="41" hits="2" branch="false" /> + <line number="42" hits="0" branch="false" /> + <line number="43" hits="0" branch="false" /> + <line number="44" hits="0" branch="false" /> + <line number="45" hits="2" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="10" hits="2" branch="false" /> + <line number="11" hits="2" branch="false" /> + <line number="13" hits="2" branch="false" /> + <line number="14" hits="2" branch="false" /> + <line number="16" hits="2" branch="false" /> + <line number="17" hits="2" branch="false" /> + <line number="18" hits="2" branch="false" /> + <line number="20" hits="2" branch="false" /> + <line number="21" hits="2" branch="false" /> + <line number="23" hits="2" branch="false" /> + <line number="25" hits="2" branch="false" /> + <line number="26" hits="2" branch="false" /> + <line number="28" hits="2" branch="false" /> + <line number="29" hits="2" branch="false" /> + <line number="31" hits="2" branch="false" /> + <line number="33" hits="2" branch="false" /> + <line number="34" hits="2" branch="false" /> + <line number="36" hits="2" branch="false" /> + <line number="39" hits="2" branch="false" /> + <line number="40" hits="2" branch="false" /> + <line number="41" hits="2" branch="false" /> + <line number="42" hits="0" branch="false" /> + <line number="43" hits="0" branch="false" /> + <line number="44" hits="0" branch="false" /> + <line number="45" hits="2" branch="false" /> + </lines> + </class> + <class name="Test.Program/<CallAsyncMethod>d__1" filename="C:\temp\Program.cs" line-rate="1" branch-rate="0" complexity="3"> + <methods> + <method name="MoveNext" signature="System.Void )" line-rate="1" branch-rate="0"> + <lines> + <line number="48" hits="2" branch="false" /> + <line number="49" hits="2" branch="false" /> + <line number="50" hits="2" branch="false" /> + <line number="51" hits="2" branch="false" /> + <line number="52" hits="2" branch="false" /> + <line number="53" hits="2" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="48" hits="2" branch="false" /> + <line number="49" hits="2" branch="false" /> + <line number="50" hits="2" branch="false" /> + <line number="51" hits="2" branch="false" /> + <line number="52" hits="2" branch="false" /> + <line number="53" hits="2" branch="false" /> + </lines> + </class> + <class name="Test.Program/EchoHandler" filename="C:\temp\Program.cs" line-rate="1" branch-rate="0" complexity="1"> + <methods> + <method name=".ctor" signature="System.Void System.Net.Http.HttpResponseMessage)" line-rate="1" branch-rate="0"> + <lines> + <line number="59" hits="2" branch="false" /> + <line number="60" hits="2" branch="false" /> + <line number="61" hits="2" branch="false" /> + <line number="62" hits="2" branch="false" /> + </lines> + </method> + <method name="SendAsync" signature="System.Threading.Tasks.Task`1<System.Net.Http.HttpResponseMessage> System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)" line-rate="1" branch-rate="0"> + <lines> + <line number="65" hits="2" branch="false" /> + <line number="66" hits="2" branch="false" /> + <line number="67" hits="2" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="59" hits="2" branch="false" /> + <line number="60" hits="2" branch="false" /> + <line number="61" hits="2" branch="false" /> + <line number="62" hits="2" branch="false" /> + <line number="65" hits="2" branch="false" /> + <line number="66" hits="2" branch="false" /> + <line number="67" hits="2" branch="false" /> + </lines> + </class> + <class name="Test.TestClass" filename="C:\temp\TestClass.cs" line-rate="0.75" branch-rate="0.66666666666666663" complexity="3"> + <methods> + <method name="SampleFunction" signature="System.Void )" line-rate="0.75" branch-rate="0.66666666666666663"> + <lines> + <line number="8" hits="2" branch="false" /> + <line number="9" hits="2" branch="false" /> + <line number="14" hits="2" branch="false" /> + <line number="15" hits="2" branch="false" /> + <line number="17" hits="2" branch="true" condition-coverage="50% (1/2)"> + <conditions> + <condition number="0" type="jump" coverage="50%" /> + </conditions> + </line> + <line number="18" hits="2" branch="false" /> + <line number="19" hits="2" branch="false" /> + <line number="20" hits="2" branch="false" /> + <line number="22" hits="0" branch="false" /> + <line number="23" hits="0" branch="false" /> + <line number="24" hits="0" branch="false" /> + <line number="25" hits="2" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="8" hits="2" branch="false" /> + <line number="9" hits="2" branch="false" /> + <line number="14" hits="2" branch="false" /> + <line number="15" hits="2" branch="false" /> + <line number="17" hits="2" branch="true" condition-coverage="50% (1/2)"> + <conditions> + <condition number="0" type="jump" coverage="50%" /> + </conditions> + </line> + <line number="18" hits="2" branch="false" /> + <line number="19" hits="2" branch="false" /> + <line number="20" hits="2" branch="false" /> + <line number="22" hits="0" branch="false" /> + <line number="23" hits="0" branch="false" /> + <line number="24" hits="0" branch="false" /> + <line number="25" hits="2" branch="false" /> + </lines> + </class> + <class name="Test.TestClass/NestedClass" filename="C:\temp\TestClass.cs" line-rate="0" branch-rate="0" complexity="1"> + <methods> + <method name="SampleFunction" signature="System.Void )" line-rate="0" branch-rate="0"> + <lines> + <line number="30" hits="0" branch="false" /> + <line number="31" hits="0" branch="false" /> + <line number="35" hits="0" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="30" hits="0" branch="false" /> + <line number="31" hits="0" branch="false" /> + <line number="35" hits="0" branch="false" /> + </lines> + </class> + <class name="Test.TestClass2" filename="C:\temp\TestClass2.cs" line-rate="0.65" branch-rate="0.4" complexity="1.6666666666666667"> + <methods> + <method name=".ctor" signature="System.Void )" line-rate="0" branch-rate="0"> + <lines> + <line number="11" hits="0" branch="false" /> + <line number="17" hits="0" branch="false" /> + <line number="18" hits="0" branch="false" /> + <line number="19" hits="0" branch="false" /> + <line number="20" hits="0" branch="false" /> + <line number="21" hits="0" branch="false" /> + </lines> + </method> + <method name=".ctor" signature="System.Void System.String)" line-rate="1" branch-rate="0"> + <lines> + <line number="11" hits="4" branch="false" /> + <line number="23" hits="4" branch="false" /> + <line number="24" hits="4" branch="false" /> + <line number="25" hits="4" branch="false" /> + <line number="26" hits="4" branch="false" /> + <line number="27" hits="4" branch="false" /> + </lines> + </method> + <method name="DoSomething" signature="System.String System.String,System.String[],System.Guid,System.Collections.Generic.IEnumerable`1<System.String>,System.Collections.Generic.IList`1<System.String>,System.Decimal,System.Int32,System.Collections.Generic.Dictionary`2<System.String,System.Int32>,System.Int32&,System.Single,System.Double,System.Boolean,System.Byte,System.Char,System.Object,System.SByte,System.Int16,System.UInt32,System.UInt64,System.UInt16)" line-rate="0" branch-rate="0"> + <lines> + <line number="80" hits="0" branch="false" /> + <line number="81" hits="0" branch="false" /> + <line number="82" hits="0" branch="false" /> + <line number="83" hits="0" branch="false" /> + </lines> + </method> + <method name="ExecutedMethod" signature="System.Void )" line-rate="1" branch-rate="0"> + <lines> + <line number="30" hits="2" branch="false" /> + <line number="31" hits="2" branch="false" /> + <line number="32" hits="2" branch="false" /> + <line number="33" hits="2" branch="false" /> + </lines> + </method> + <method name="SampleFunction" signature="System.Void System.String)" line-rate="1" branch-rate="0.8"> + <lines> + <line number="42" hits="2" branch="false" /> + <line number="43" hits="2" branch="false" /> + <line number="45" hits="2" branch="false" /> + <line number="47" hits="2" branch="false" /> + <line number="47" hits="2" branch="false" /> + <line number="47" hits="8" branch="false" /> + <line number="48" hits="8" branch="false" /> + <line number="49" hits="8" branch="false" /> + <line number="50" hits="8" branch="false" /> + <line number="47" hits="10" branch="true" condition-coverage="100% (2/2)"> + <conditions> + <condition number="0" type="jump" coverage="100%" /> + </conditions> + </line> + <line number="52" hits="2" branch="false" /> + <line number="54" hits="2" branch="true" condition-coverage="50% (1/2)"> + <conditions> + <condition number="0" type="jump" coverage="50%" /> + </conditions> + </line> + <line number="55" hits="2" branch="false" /> + <line number="56" hits="2" branch="false" /> + <line number="57" hits="2" branch="false" /> + <line number="58" hits="2" branch="false" /> + </lines> + </method> + <method name="UnExecutedMethod" signature="System.Void )" line-rate="0" branch-rate="0"> + <lines> + <line number="36" hits="0" branch="false" /> + <line number="37" hits="0" branch="false" /> + <line number="38" hits="0" branch="false" /> + <line number="39" hits="0" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="11" hits="0" branch="false" /> + <line number="11" hits="4" branch="false" /> + <line number="17" hits="0" branch="false" /> + <line number="18" hits="0" branch="false" /> + <line number="19" hits="0" branch="false" /> + <line number="20" hits="0" branch="false" /> + <line number="21" hits="0" branch="false" /> + <line number="23" hits="4" branch="false" /> + <line number="24" hits="4" branch="false" /> + <line number="25" hits="4" branch="false" /> + <line number="26" hits="4" branch="false" /> + <line number="27" hits="4" branch="false" /> + <line number="30" hits="2" branch="false" /> + <line number="31" hits="2" branch="false" /> + <line number="32" hits="2" branch="false" /> + <line number="33" hits="2" branch="false" /> + <line number="36" hits="0" branch="false" /> + <line number="37" hits="0" branch="false" /> + <line number="38" hits="0" branch="false" /> + <line number="39" hits="0" branch="false" /> + <line number="42" hits="2" branch="false" /> + <line number="43" hits="2" branch="false" /> + <line number="45" hits="2" branch="false" /> + <line number="47" hits="2" branch="false" /> + <line number="47" hits="2" branch="false" /> + <line number="47" hits="8" branch="false" /> + <line number="47" hits="10" branch="true" condition-coverage="100% (2/2)"> + <conditions> + <condition number="0" type="jump" coverage="100%" /> + </conditions> + </line> + <line number="48" hits="8" branch="false" /> + <line number="49" hits="8" branch="false" /> + <line number="50" hits="8" branch="false" /> + <line number="52" hits="2" branch="false" /> + <line number="54" hits="2" branch="true" condition-coverage="50% (1/2)"> + <conditions> + <condition number="0" type="jump" coverage="50%" /> + </conditions> + </line> + <line number="55" hits="2" branch="false" /> + <line number="56" hits="2" branch="false" /> + <line number="57" hits="2" branch="false" /> + <line number="58" hits="2" branch="false" /> + <line number="80" hits="0" branch="false" /> + <line number="81" hits="0" branch="false" /> + <line number="82" hits="0" branch="false" /> + <line number="83" hits="0" branch="false" /> + </lines> + </class> + <class name="Test.TestClass2/<>c" filename="C:\temp\TestClass2.cs" line-rate="1" branch-rate="0" complexity="1"> + <methods> + <method name="<SampleFunction>b__14_0" signature="System.Int32 System.Int32)" line-rate="1" branch-rate="0"> + <lines> + <line number="45" hits="8" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="45" hits="8" branch="false" /> + </lines> + </class> + <class name="Test.TestClass2/<>c__DisplayClass14_0" filename="C:\temp\TestClass2.cs" line-rate="1" branch-rate="0" complexity="1"> + <methods> + <method name="<SampleFunction>b__1" signature="System.Boolean System.String)" line-rate="1" branch-rate="0"> + <lines> + <line number="54" hits="6" branch="false" /> + </lines> + </method> + </methods> + <lines> + <line number="54" hits="6" branch="false" /> + </lines> + </class> + </classes> + </package> + </packages> +</coverage> diff --git a/src/Testprojects/CSharp/Reports/Cobertura_coverlet.xml b/src/Testprojects/CSharp/Reports/Cobertura_coverlet.xml new file mode 100644 index 00000000..58b6ff4d --- /dev/null +++ b/src/Testprojects/CSharp/Reports/Cobertura_coverlet.xml @@ -0,0 +1,760 @@ +<?xml version="1.0" encoding="utf-8"?> +<coverage line-rate="0,665" branch-rate="0,812" version="1.9" timestamp="1539804059" lines-covered="125" lines-valid="188" branches-covered="13" branches-valid="16"> + <sources> + <source>C:\temp\</source> + </sources> + <packages> + <package name="Test" line-rate="0,665" branch-rate="0,812" complexity="0"> + <classes> + <class name="Test.AbstractClass" filename="AbstractClass.cs" line-rate="1" branch-rate="0" complexity="0"> + <methods> + <method name=".ctor" signature="()" line-rate="1" branch-rate="0"> + <lines> + <line number="7" hits="4" branch="False" /> + <line number="8" hits="4" branch="False" /> + <line number="9" hits="4" branch="False" /> + <line number="10" hits="4" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="7" hits="4" branch="False" /> + <line number="8" hits="4" branch="False" /> + <line number="9" hits="4" branch="False" /> + <line number="10" hits="4" branch="False" /> + </lines> + </class> + <class name="Test.AbstractClass_SampleImpl1" filename="AbstractClass.cs" line-rate="0,5" branch-rate="0" complexity="0"> + <methods> + <method name="Method1" signature="()" line-rate="0" branch-rate="0"> + <lines> + <line number="26" hits="0" branch="False" /> + <line number="27" hits="0" branch="False" /> + </lines> + </method> + <method name="Method2" signature="()" line-rate="0" branch-rate="0"> + <lines> + <line number="31" hits="0" branch="False" /> + <line number="32" hits="0" branch="False" /> + </lines> + </method> + <method name=".ctor" signature="()" line-rate="1" branch-rate="0"> + <lines> + <line number="20" hits="2" branch="False" /> + <line number="21" hits="2" branch="False" /> + <line number="22" hits="2" branch="False" /> + <line number="23" hits="2" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="26" hits="0" branch="False" /> + <line number="27" hits="0" branch="False" /> + <line number="31" hits="0" branch="False" /> + <line number="32" hits="0" branch="False" /> + <line number="20" hits="2" branch="False" /> + <line number="21" hits="2" branch="False" /> + <line number="22" hits="2" branch="False" /> + <line number="23" hits="2" branch="False" /> + </lines> + </class> + <class name="Test.AbstractClass_SampleImpl2" filename="AbstractClass.cs" line-rate="0,5" branch-rate="0" complexity="0"> + <methods> + <method name="Method1" signature="()" line-rate="0" branch-rate="0"> + <lines> + <line number="45" hits="0" branch="False" /> + <line number="46" hits="0" branch="False" /> + </lines> + </method> + <method name="Method2" signature="()" line-rate="0" branch-rate="0"> + <lines> + <line number="50" hits="0" branch="False" /> + <line number="51" hits="0" branch="False" /> + </lines> + </method> + <method name=".ctor" signature="()" line-rate="1" branch-rate="0"> + <lines> + <line number="39" hits="2" branch="False" /> + <line number="40" hits="2" branch="False" /> + <line number="41" hits="2" branch="False" /> + <line number="42" hits="2" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="45" hits="0" branch="False" /> + <line number="46" hits="0" branch="False" /> + <line number="50" hits="0" branch="False" /> + <line number="51" hits="0" branch="False" /> + <line number="39" hits="2" branch="False" /> + <line number="40" hits="2" branch="False" /> + <line number="41" hits="2" branch="False" /> + <line number="42" hits="2" branch="False" /> + </lines> + </class> + <class name="Test.AnalyzerTestClass" filename="AnalyzerTestClass.cs" line-rate="0" branch-rate="0" complexity="0"> + <methods> + <method name="DoSomething" signature="(System.String,System.String[],System.Guid,System.Collections.Generic.IEnumerable`1<System.String>,System.Collections.Generic.IList`1<System.String>,System.Decimal,System.Int32,System.Int64,System.Collections.Generic.Dictionary`2<System.String,System.Int32>,System.Int32&,System.Single,System.Double,System.Boolean,System.Byte,System.Char,System.Object,System.SByte,System.Int16,System.UInt32,System.UInt64,System.UInt16)" line-rate="0" branch-rate="0"> + <lines> + <line number="35" hits="0" branch="False" /> + <line number="36" hits="0" branch="False" /> + <line number="37" hits="0" branch="False" /> + <line number="38" hits="0" branch="False" /> + </lines> + </method> + <method name="GenericMethod" signature="(T1,T2,System.Int32)" line-rate="0" branch-rate="0"> + <lines> + <line number="41" hits="0" branch="False" /> + <line number="42" hits="0" branch="False" /> + </lines> + </method> + <method name="get_AutoProperty" signature="()" line-rate="0" branch-rate="0"> + <lines> + <line number="44" hits="0" branch="False" /> + </lines> + </method> + <method name=".ctor" signature="()" line-rate="0" branch-rate="0"> + <lines> + <line number="8" hits="0" branch="False" /> + <line number="9" hits="0" branch="False" /> + <line number="10" hits="0" branch="False" /> + <line number="11" hits="0" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="35" hits="0" branch="False" /> + <line number="36" hits="0" branch="False" /> + <line number="37" hits="0" branch="False" /> + <line number="38" hits="0" branch="False" /> + <line number="41" hits="0" branch="False" /> + <line number="42" hits="0" branch="False" /> + <line number="44" hits="0" branch="False" /> + <line number="8" hits="0" branch="False" /> + <line number="9" hits="0" branch="False" /> + <line number="10" hits="0" branch="False" /> + <line number="11" hits="0" branch="False" /> + </lines> + </class> + <class name="Test.AsyncClass/<SendAsync>d__0" filename="AsyncClass.cs" line-rate="1" branch-rate="1" complexity="0"> + <methods> + <method name="MoveNext" signature="()" line-rate="1" branch-rate="1"> + <lines> + <line number="10" hits="2" branch="False" /> + <line number="11" hits="2" branch="False" /> + <line number="12" hits="2" branch="True" condition-coverage="100% (1/1)"> + <conditions> + <condition number="79" type="jump" coverage="100%" /> + </conditions> + </line> + <line number="13" hits="2" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="10" hits="2" branch="False" /> + <line number="11" hits="2" branch="False" /> + <line number="12" hits="2" branch="True" condition-coverage="100% (1/1)"> + <conditions> + <condition number="79" type="jump" coverage="100%" /> + </conditions> + </line> + <line number="13" hits="2" branch="False" /> + </lines> + </class> + <class name="Test.ClassWithExcludes" filename="ClassWithExcludes.cs" line-rate="1" branch-rate="0" complexity="0"> + <methods> + <method name="get_IncludedProperty" signature="()" line-rate="1" branch-rate="0"> + <lines> + <line number="6" hits="2" branch="False" /> + </lines> + </method> + <method name="get_ExcludedProperty" signature="()" line-rate="1" branch-rate="0"> + <lines> + <line number="9" hits="2" branch="False" /> + </lines> + </method> + <method name="IncludedMethod" signature="()" line-rate="1" branch-rate="0"> + <lines> + <line number="12" hits="2" branch="False" /> + <line number="13" hits="2" branch="False" /> + <line number="14" hits="2" branch="False" /> + </lines> + </method> + <method name="ExcludedMethod" signature="()" line-rate="1" branch-rate="0"> + <lines> + <line number="18" hits="2" branch="False" /> + <line number="19" hits="2" branch="False" /> + <line number="20" hits="2" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="6" hits="2" branch="False" /> + <line number="9" hits="2" branch="False" /> + <line number="12" hits="2" branch="False" /> + <line number="13" hits="2" branch="False" /> + <line number="14" hits="2" branch="False" /> + <line number="18" hits="2" branch="False" /> + <line number="19" hits="2" branch="False" /> + <line number="20" hits="2" branch="False" /> + </lines> + </class> + <class name="Test.CodeContract_Contract" filename="CodeContract_Contract.cs" line-rate="0" branch-rate="0" complexity="0"> + <methods> + <method name="Calculate" signature="(System.Int32)" line-rate="0" branch-rate="0"> + <lines> + <line number="10" hits="0" branch="False" /> + <line number="11" hits="0" branch="False" /> + <line number="13" hits="0" branch="False" /> + <line number="14" hits="0" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="10" hits="0" branch="False" /> + <line number="11" hits="0" branch="False" /> + <line number="13" hits="0" branch="False" /> + <line number="14" hits="0" branch="False" /> + </lines> + </class> + <class name="Test.CodeContract_Target" filename="CodeContract_Target.cs" line-rate="1" branch-rate="1" complexity="0"> + <methods> + <method name="Calculate" signature="(System.Int32)" line-rate="1" branch-rate="1"> + <lines> + <line number="7" hits="4" branch="False" /> + <line number="8" hits="4" branch="True" condition-coverage="100% (2/2)"> + <conditions> + <condition number="7" type="jump" coverage="100%" /> + </conditions> + </line> + <line number="9" hits="2" branch="False" /> + <line number="10" hits="2" branch="False" /> + <line number="13" hits="2" branch="False" /> + <line number="14" hits="2" branch="False" /> + <line number="16" hits="4" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="7" hits="4" branch="False" /> + <line number="8" hits="4" branch="True" condition-coverage="100% (2/2)"> + <conditions> + <condition number="7" type="jump" coverage="100%" /> + </conditions> + </line> + <line number="9" hits="2" branch="False" /> + <line number="10" hits="2" branch="False" /> + <line number="13" hits="2" branch="False" /> + <line number="14" hits="2" branch="False" /> + <line number="16" hits="4" branch="False" /> + </lines> + </class> + <class name="Test.AbstractGenericClass`2" filename="GenericClass.cs" line-rate="0" branch-rate="0" complexity="0"> + <methods> + <method name="PostProcess" signature="(Test.ISomeObjectInterface`2<TModel,TState>)" line-rate="0" branch-rate="0"> + <lines> + <line number="12" hits="0" branch="False" /> + <line number="13" hits="0" branch="False" /> + <line number="14" hits="0" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="12" hits="0" branch="False" /> + <line number="13" hits="0" branch="False" /> + <line number="14" hits="0" branch="False" /> + </lines> + </class> + <class name="Test.GenericClass`2" filename="GenericClass.cs" line-rate="1" branch-rate="0" complexity="0"> + <methods> + <method name="Process" signature="(Test.ISomeObjectInterface`2<TModel,TState>)" line-rate="1" branch-rate="0"> + <lines> + <line number="22" hits="2" branch="False" /> + <line number="23" hits="2" branch="False" /> + <line number="24" hits="2" branch="False" /> + <line number="25" hits="2" branch="False" /> + </lines> + </method> + <method name="PostProcess" signature="(Test.ISomeObjectInterface`2<TModel,TState>)" line-rate="1" branch-rate="0"> + <lines> + <line number="28" hits="2" branch="False" /> + <line number="29" hits="2" branch="False" /> + <line number="30" hits="2" branch="False" /> + <line number="31" hits="2" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="22" hits="2" branch="False" /> + <line number="23" hits="2" branch="False" /> + <line number="24" hits="2" branch="False" /> + <line number="25" hits="2" branch="False" /> + <line number="28" hits="2" branch="False" /> + <line number="29" hits="2" branch="False" /> + <line number="30" hits="2" branch="False" /> + <line number="31" hits="2" branch="False" /> + </lines> + </class> + <class name="Test.SomeClass" filename="NotMatchingFileName.cs" line-rate="1" branch-rate="0" complexity="0"> + <methods> + <method name="get_Property1" signature="()" line-rate="1" branch-rate="0"> + <lines> + <line number="6" hits="2" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="6" hits="2" branch="False" /> + </lines> + </class> + <class name="Test.PartialClass" filename="PartialClass.cs" line-rate="0,562" branch-rate="0,5" complexity="0"> + <methods> + <method name="ExecutedMethod_1" signature="()" line-rate="1" branch-rate="0"> + <lines> + <line number="8" hits="2" branch="False" /> + <line number="9" hits="2" branch="False" /> + <line number="10" hits="2" branch="False" /> + </lines> + </method> + <method name="UnExecutedMethod_1" signature="()" line-rate="0" branch-rate="0"> + <lines> + <line number="13" hits="0" branch="False" /> + <line number="14" hits="0" branch="False" /> + <line number="15" hits="0" branch="False" /> + </lines> + </method> + <method name="get_SomeProperty" signature="()" line-rate="0" branch-rate="0"> + <lines> + <line number="21" hits="0" branch="False" /> + </lines> + </method> + <method name="set_SomeProperty" signature="(System.Int32)" line-rate="0,667" branch-rate="0,5"> + <lines> + <line number="24" hits="2" branch="False" /> + <line number="25" hits="2" branch="True" condition-coverage="50% (1/2)"> + <conditions> + <condition number="7" type="jump" coverage="50%" /> + </conditions> + </line> + <line number="26" hits="2" branch="False" /> + <line number="27" hits="2" branch="False" /> + <line number="28" hits="2" branch="False" /> + <line number="30" hits="0" branch="False" /> + <line number="31" hits="0" branch="False" /> + <line number="32" hits="0" branch="False" /> + <line number="33" hits="2" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="8" hits="2" branch="False" /> + <line number="9" hits="2" branch="False" /> + <line number="10" hits="2" branch="False" /> + <line number="13" hits="0" branch="False" /> + <line number="14" hits="0" branch="False" /> + <line number="15" hits="0" branch="False" /> + <line number="21" hits="0" branch="False" /> + <line number="24" hits="2" branch="False" /> + <line number="25" hits="2" branch="True" condition-coverage="50% (1/2)"> + <conditions> + <condition number="7" type="jump" coverage="50%" /> + </conditions> + </line> + <line number="26" hits="2" branch="False" /> + <line number="27" hits="2" branch="False" /> + <line number="28" hits="2" branch="False" /> + <line number="30" hits="0" branch="False" /> + <line number="31" hits="0" branch="False" /> + <line number="32" hits="0" branch="False" /> + <line number="33" hits="2" branch="False" /> + </lines> + </class> + <class name="Test.PartialClass" filename="PartialClass2.cs" line-rate="0,5" branch-rate="0" complexity="0"> + <methods> + <method name="ExecutedMethod_2" signature="()" line-rate="1" branch-rate="0"> + <lines> + <line number="8" hits="2" branch="False" /> + <line number="9" hits="2" branch="False" /> + <line number="10" hits="2" branch="False" /> + </lines> + </method> + <method name="UnExecutedMethod_2" signature="()" line-rate="0" branch-rate="0"> + <lines> + <line number="13" hits="0" branch="False" /> + <line number="14" hits="0" branch="False" /> + <line number="15" hits="0" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="8" hits="2" branch="False" /> + <line number="9" hits="2" branch="False" /> + <line number="10" hits="2" branch="False" /> + <line number="13" hits="0" branch="False" /> + <line number="14" hits="0" branch="False" /> + <line number="15" hits="0" branch="False" /> + </lines> + </class> + <class name="Test.PartialClassWithAutoProperties" filename="PartialClassWithAutoProperties.cs" line-rate="1" branch-rate="0" complexity="0"> + <methods> + <method name="get_Property1" signature="()" line-rate="1" branch-rate="0"> + <lines> + <line number="6" hits="2" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="6" hits="2" branch="False" /> + </lines> + </class> + <class name="Test.PartialClassWithAutoProperties" filename="PartialClassWithAutoProperties2.cs" line-rate="0,5" branch-rate="0" complexity="0"> + <methods> + <method name="get_Property2" signature="()" line-rate="1" branch-rate="0"> + <lines> + <line number="6" hits="2" branch="False" /> + </lines> + </method> + <method name="get_ExpressionBodiedProperty" signature="()" line-rate="0" branch-rate="0"> + <lines> + <line number="8" hits="0" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="6" hits="2" branch="False" /> + <line number="8" hits="0" branch="False" /> + </lines> + </class> + <class name="Test.Program" filename="Program.cs" line-rate="0,88" branch-rate="0" complexity="0"> + <methods> + <method name="Main" signature="(System.String[])" line-rate="0,88" branch-rate="0"> + <lines> + <line number="10" hits="2" branch="False" /> + <line number="11" hits="2" branch="False" /> + <line number="13" hits="2" branch="False" /> + <line number="14" hits="2" branch="False" /> + <line number="16" hits="2" branch="False" /> + <line number="17" hits="2" branch="False" /> + <line number="18" hits="2" branch="False" /> + <line number="20" hits="2" branch="False" /> + <line number="21" hits="2" branch="False" /> + <line number="23" hits="2" branch="False" /> + <line number="25" hits="2" branch="False" /> + <line number="26" hits="2" branch="False" /> + <line number="28" hits="2" branch="False" /> + <line number="29" hits="2" branch="False" /> + <line number="31" hits="2" branch="False" /> + <line number="33" hits="2" branch="False" /> + <line number="34" hits="2" branch="False" /> + <line number="36" hits="2" branch="False" /> + <line number="39" hits="2" branch="False" /> + <line number="40" hits="2" branch="False" /> + <line number="41" hits="2" branch="False" /> + <line number="42" hits="0" branch="False" /> + <line number="43" hits="0" branch="False" /> + <line number="44" hits="0" branch="False" /> + <line number="45" hits="2" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="10" hits="2" branch="False" /> + <line number="11" hits="2" branch="False" /> + <line number="13" hits="2" branch="False" /> + <line number="14" hits="2" branch="False" /> + <line number="16" hits="2" branch="False" /> + <line number="17" hits="2" branch="False" /> + <line number="18" hits="2" branch="False" /> + <line number="20" hits="2" branch="False" /> + <line number="21" hits="2" branch="False" /> + <line number="23" hits="2" branch="False" /> + <line number="25" hits="2" branch="False" /> + <line number="26" hits="2" branch="False" /> + <line number="28" hits="2" branch="False" /> + <line number="29" hits="2" branch="False" /> + <line number="31" hits="2" branch="False" /> + <line number="33" hits="2" branch="False" /> + <line number="34" hits="2" branch="False" /> + <line number="36" hits="2" branch="False" /> + <line number="39" hits="2" branch="False" /> + <line number="40" hits="2" branch="False" /> + <line number="41" hits="2" branch="False" /> + <line number="42" hits="0" branch="False" /> + <line number="43" hits="0" branch="False" /> + <line number="44" hits="0" branch="False" /> + <line number="45" hits="2" branch="False" /> + </lines> + </class> + <class name="Test.Program/EchoHandler" filename="Program.cs" line-rate="1" branch-rate="0" complexity="0"> + <methods> + <method name="SendAsync" signature="(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)" line-rate="1" branch-rate="0"> + <lines> + <line number="65" hits="2" branch="False" /> + <line number="66" hits="2" branch="False" /> + <line number="67" hits="2" branch="False" /> + </lines> + </method> + <method name=".ctor" signature="(System.Net.Http.HttpResponseMessage)" line-rate="1" branch-rate="0"> + <lines> + <line number="59" hits="2" branch="False" /> + <line number="60" hits="2" branch="False" /> + <line number="61" hits="2" branch="False" /> + <line number="62" hits="2" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="65" hits="2" branch="False" /> + <line number="66" hits="2" branch="False" /> + <line number="67" hits="2" branch="False" /> + <line number="59" hits="2" branch="False" /> + <line number="60" hits="2" branch="False" /> + <line number="61" hits="2" branch="False" /> + <line number="62" hits="2" branch="False" /> + </lines> + </class> + <class name="Test.Program/<CallAsyncMethod>d__1" filename="Program.cs" line-rate="1" branch-rate="1" complexity="0"> + <methods> + <method name="MoveNext" signature="()" line-rate="1" branch-rate="1"> + <lines> + <line number="48" hits="2" branch="False" /> + <line number="49" hits="2" branch="False" /> + <line number="50" hits="2" branch="False" /> + <line number="51" hits="2" branch="False" /> + <line number="52" hits="2" branch="True" condition-coverage="100% (1/1)"> + <conditions> + <condition number="114" type="jump" coverage="100%" /> + </conditions> + </line> + <line number="53" hits="2" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="48" hits="2" branch="False" /> + <line number="49" hits="2" branch="False" /> + <line number="50" hits="2" branch="False" /> + <line number="51" hits="2" branch="False" /> + <line number="52" hits="2" branch="True" condition-coverage="100% (1/1)"> + <conditions> + <condition number="114" type="jump" coverage="100%" /> + </conditions> + </line> + <line number="53" hits="2" branch="False" /> + </lines> + </class> + <class name="Test.TestClass" filename="TestClass.cs" line-rate="0,8" branch-rate="0,5" complexity="0"> + <methods> + <method name="SampleFunction" signature="()" line-rate="0,8" branch-rate="0,5"> + <lines> + <line number="8" hits="2" branch="False" /> + <line number="9" hits="2" branch="False" /> + <line number="10" hits="2" branch="False" /> + <line number="11" hits="2" branch="False" /> + <line number="12" hits="2" branch="False" /> + <line number="14" hits="2" branch="False" /> + <line number="15" hits="2" branch="False" /> + <line number="17" hits="2" branch="True" condition-coverage="50% (2/4)"> + <conditions> + <condition number="34" type="jump" coverage="50%" /> + <condition number="45" type="jump" coverage="50%" /> + </conditions> + </line> + <line number="18" hits="2" branch="False" /> + <line number="19" hits="2" branch="False" /> + <line number="20" hits="2" branch="False" /> + <line number="22" hits="0" branch="False" /> + <line number="23" hits="0" branch="False" /> + <line number="24" hits="0" branch="False" /> + <line number="25" hits="2" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="8" hits="2" branch="False" /> + <line number="9" hits="2" branch="False" /> + <line number="10" hits="2" branch="False" /> + <line number="11" hits="2" branch="False" /> + <line number="12" hits="2" branch="False" /> + <line number="14" hits="2" branch="False" /> + <line number="15" hits="2" branch="False" /> + <line number="17" hits="2" branch="True" condition-coverage="50% (2/4)"> + <conditions> + <condition number="34" type="jump" coverage="50%" /> + <condition number="45" type="jump" coverage="50%" /> + </conditions> + </line> + <line number="18" hits="2" branch="False" /> + <line number="19" hits="2" branch="False" /> + <line number="20" hits="2" branch="False" /> + <line number="22" hits="0" branch="False" /> + <line number="23" hits="0" branch="False" /> + <line number="24" hits="0" branch="False" /> + <line number="25" hits="2" branch="False" /> + </lines> + </class> + <class name="Test.TestClass/NestedClass" filename="TestClass.cs" line-rate="0" branch-rate="0" complexity="0"> + <methods> + <method name="SampleFunction" signature="()" line-rate="0" branch-rate="0"> + <lines> + <line number="30" hits="0" branch="False" /> + <line number="31" hits="0" branch="False" /> + <line number="32" hits="0" branch="False" /> + <line number="33" hits="0" branch="False" /> + <line number="34" hits="0" branch="False" /> + <line number="35" hits="0" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="30" hits="0" branch="False" /> + <line number="31" hits="0" branch="False" /> + <line number="32" hits="0" branch="False" /> + <line number="33" hits="0" branch="False" /> + <line number="34" hits="0" branch="False" /> + <line number="35" hits="0" branch="False" /> + </lines> + </class> + <class name="Test.TestClass2" filename="TestClass2.cs" line-rate="0,632" branch-rate="1" complexity="0"> + <methods> + <method name="get_ExecutedProperty" signature="()" line-rate="1" branch-rate="0"> + <lines> + <line number="13" hits="6" branch="False" /> + </lines> + </method> + <method name="get_UnExecutedProperty" signature="()" line-rate="0" branch-rate="0"> + <lines> + <line number="15" hits="0" branch="False" /> + </lines> + </method> + <method name="ExecutedMethod" signature="()" line-rate="1" branch-rate="0"> + <lines> + <line number="30" hits="2" branch="False" /> + <line number="31" hits="2" branch="False" /> + <line number="32" hits="2" branch="False" /> + <line number="33" hits="2" branch="False" /> + </lines> + </method> + <method name="UnExecutedMethod" signature="()" line-rate="0" branch-rate="0"> + <lines> + <line number="36" hits="0" branch="False" /> + <line number="37" hits="0" branch="False" /> + <line number="38" hits="0" branch="False" /> + <line number="39" hits="0" branch="False" /> + </lines> + </method> + <method name="SampleFunction" signature="(System.String)" line-rate="1" branch-rate="1"> + <lines> + <line number="42" hits="2" branch="False" /> + <line number="43" hits="2" branch="False" /> + <line number="45" hits="10" branch="True" condition-coverage="100% (2/2)"> + <conditions> + <condition number="39" type="jump" coverage="100%" /> + </conditions> + </line> + <line number="47" hits="22" branch="True" condition-coverage="100% (2/2)"> + <conditions> + <condition number="107" type="jump" coverage="100%" /> + </conditions> + </line> + <line number="48" hits="8" branch="False" /> + <line number="49" hits="8" branch="False" /> + <line number="50" hits="8" branch="False" /> + <line number="52" hits="2" branch="False" /> + <line number="54" hits="8" branch="True" condition-coverage="100% (2/2)"> + <conditions> + <condition number="180" type="jump" coverage="100%" /> + </conditions> + </line> + <line number="55" hits="2" branch="False" /> + <line number="56" hits="2" branch="False" /> + <line number="57" hits="2" branch="False" /> + <line number="58" hits="2" branch="False" /> + </lines> + </method> + <method name="DoSomething" signature="(System.String,System.String[],System.Guid,System.Collections.Generic.IEnumerable`1<System.String>,System.Collections.Generic.IList`1<System.String>,System.Decimal,System.Int32,System.Collections.Generic.Dictionary`2<System.String,System.Int32>,System.Int32&,System.Single,System.Double,System.Boolean,System.Byte,System.Char,System.Object,System.SByte,System.Int16,System.UInt32,System.UInt64,System.UInt16)" line-rate="0" branch-rate="0"> + <lines> + <line number="80" hits="0" branch="False" /> + <line number="81" hits="0" branch="False" /> + <line number="82" hits="0" branch="False" /> + <line number="83" hits="0" branch="False" /> + </lines> + </method> + <method name=".ctor" signature="()" line-rate="0,167" branch-rate="0"> + <lines> + <line number="11" hits="4" branch="False" /> + <line number="17" hits="0" branch="False" /> + <line number="18" hits="0" branch="False" /> + <line number="19" hits="0" branch="False" /> + <line number="20" hits="0" branch="False" /> + <line number="21" hits="0" branch="False" /> + </lines> + </method> + <method name=".ctor" signature="(System.String)" line-rate="1" branch-rate="0"> + <lines> + <line number="23" hits="4" branch="False" /> + <line number="24" hits="4" branch="False" /> + <line number="25" hits="4" branch="False" /> + <line number="26" hits="4" branch="False" /> + <line number="27" hits="4" branch="False" /> + </lines> + </method> + </methods> + <lines> + <line number="13" hits="6" branch="False" /> + <line number="15" hits="0" branch="False" /> + <line number="30" hits="2" branch="False" /> + <line number="31" hits="2" branch="False" /> + <line number="32" hits="2" branch="False" /> + <line number="33" hits="2" branch="False" /> + <line number="36" hits="0" branch="False" /> + <line number="37" hits="0" branch="False" /> + <line number="38" hits="0" branch="False" /> + <line number="39" hits="0" branch="False" /> + <line number="42" hits="2" branch="False" /> + <line number="43" hits="2" branch="False" /> + <line number="45" hits="10" branch="True" condition-coverage="100% (2/2)"> + <conditions> + <condition number="39" type="jump" coverage="100%" /> + </conditions> + </line> + <line number="47" hits="22" branch="True" condition-coverage="100% (2/2)"> + <conditions> + <condition number="107" type="jump" coverage="100%" /> + </conditions> + </line> + <line number="48" hits="8" branch="False" /> + <line number="49" hits="8" branch="False" /> + <line number="50" hits="8" branch="False" /> + <line number="52" hits="2" branch="False" /> + <line number="54" hits="8" branch="True" condition-coverage="100% (2/2)"> + <conditions> + <condition number="180" type="jump" coverage="100%" /> + </conditions> + </line> + <line number="55" hits="2" branch="False" /> + <line number="56" hits="2" branch="False" /> + <line number="57" hits="2" branch="False" /> + <line number="58" hits="2" branch="False" /> + <line number="80" hits="0" branch="False" /> + <line number="81" hits="0" branch="False" /> + <line number="82" hits="0" branch="False" /> + <line number="83" hits="0" branch="False" /> + <line number="11" hits="4" branch="False" /> + <line number="17" hits="0" branch="False" /> + <line number="18" hits="0" branch="False" /> + <line number="19" hits="0" branch="False" /> + <line number="20" hits="0" branch="False" /> + <line number="21" hits="0" branch="False" /> + <line number="23" hits="4" branch="False" /> + <line number="24" hits="4" branch="False" /> + <line number="25" hits="4" branch="False" /> + <line number="26" hits="4" branch="False" /> + <line number="27" hits="4" branch="False" /> + </lines> + </class> + </classes> + </package> + </packages> +</coverage> diff --git a/src/Testprojects/CSharp/Reports/OpenCover_altcover.xml b/src/Testprojects/CSharp/Reports/OpenCover_altcover.xml new file mode 100644 index 00000000..aaa27cba --- /dev/null +++ b/src/Testprojects/CSharp/Reports/OpenCover_altcover.xml @@ -0,0 +1,938 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<CoverageSession xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <Summary numSequencePoints="182" visitedSequencePoints="121" numBranchPoints="49" visitedBranchPoints="11" sequenceCoverage="66.48" branchCoverage="22.45" maxCyclomaticComplexity="5" minCyclomaticComplexity="1" visitedClasses="15" numClasses="20" visitedMethods="22" numMethods="39" minCrapScore="-1132818.35" maxCrapScore="5" /> + <Modules> + <Module hash="3D-AD-C8-27-DD-DF-93-E7-67-E0-1C-E0-5C-BE-17-E6-7E-04-47-88"> + <Summary numSequencePoints="182" visitedSequencePoints="121" numBranchPoints="49" visitedBranchPoints="11" sequenceCoverage="66.48" branchCoverage="22.45" maxCyclomaticComplexity="5" minCyclomaticComplexity="1" visitedClasses="15" numClasses="20" visitedMethods="22" numMethods="39" minCrapScore="-1132818.35" maxCrapScore="5" /> + <ModulePath>C:\temp\Test.dll</ModulePath> + <ModuleTime>2018-10-17T19:02:11.4516973Z</ModuleTime> + <ModuleName>Test</ModuleName> + <Files> + <File uid="1" fullPath="C:\temp\AbstractClass.cs" /> + <File uid="2" fullPath="C:\temp\AnalyzerTestClass.cs" /> + <File uid="3" fullPath="C:\temp\AsyncClass.cs" /> + <File uid="4" fullPath="C:\temp\ClassWithExcludes.cs" /> + <File uid="5" fullPath="C:\temp\CodeContract_Contract.cs" /> + <File uid="6" fullPath="C:\temp\CodeContract_Target.cs" /> + <File uid="7" fullPath="C:\temp\GenericClass.cs" /> + <File uid="8" fullPath="C:\temp\PartialClass.cs" /> + <File uid="9" fullPath="C:\temp\PartialClass2.cs" /> + <File uid="10" fullPath="C:\temp\PartialClassWithAutoProperties2.cs" /> + <File uid="11" fullPath="C:\temp\Program.cs" /> + <File uid="12" fullPath="C:\temp\TestClass.cs" /> + <File uid="13" fullPath="C:\temp\TestClass2.cs" /> + </Files> + <Classes> + <Class> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <FullName><Module></FullName> + <Methods /> + </Class> + <Class> + <Summary numSequencePoints="4" visitedSequencePoints="4" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" /> + <FullName>Test.AbstractClass</FullName> + <Methods> + <Method visited="true" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="100" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="1"> + <Summary numSequencePoints="4" visitedSequencePoints="4" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" /> + <MetadataToken>100663297</MetadataToken> + <Name>System.Void Test.AbstractClass::.ctor()</Name> + <FileRef uid="1" /> + <SequencePoints> + <SequencePoint vc="4" uspid="3" ordinal="0" offset="0" sl="7" sc="9" el="7" ec="31" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="4" uspid="2" ordinal="1" offset="7" sl="8" sc="9" el="8" ec="10" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="4" uspid="1" ordinal="2" offset="8" sl="9" sc="13" el="9" ec="60" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="4" uspid="0" ordinal="3" offset="19" sl="10" sc="9" el="10" ec="10" bec="0" bev="0" fileid="1" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="4" uspid="3" ordinal="0" offset="0" sl="7" sc="9" el="7" ec="31" bec="0" bev="0" fileid="1" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="8" visitedSequencePoints="4" numBranchPoints="3" visitedBranchPoints="0" sequenceCoverage="50" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="3" minCrapScore="1" maxCrapScore="1" /> + <FullName>Test.AbstractClass_SampleImpl1</FullName> + <Methods> + <Method visited="true" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="100" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="1"> + <Summary numSequencePoints="4" visitedSequencePoints="4" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" /> + <MetadataToken>100663300</MetadataToken> + <Name>System.Void Test.AbstractClass_SampleImpl1::.ctor()</Name> + <FileRef uid="1" /> + <SequencePoints> + <SequencePoint vc="2" uspid="7" ordinal="0" offset="0" sl="20" sc="15" el="20" ec="21" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="2" uspid="6" ordinal="1" offset="7" sl="21" sc="9" el="21" ec="10" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="2" uspid="5" ordinal="2" offset="8" sl="22" sc="13" el="22" ec="58" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="2" uspid="4" ordinal="3" offset="19" sl="23" sc="9" el="23" ec="10" bec="0" bev="0" fileid="1" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="2" uspid="7" ordinal="0" offset="0" sl="20" sc="15" el="20" ec="21" bec="0" bev="0" fileid="1" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="2" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663301</MetadataToken> + <Name>System.Void Test.AbstractClass_SampleImpl1::Method1()</Name> + <FileRef uid="1" /> + <SequencePoints> + <SequencePoint vc="0" uspid="9" ordinal="0" offset="0" sl="26" sc="9" el="26" ec="10" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="0" uspid="8" ordinal="1" offset="1" sl="27" sc="13" el="27" ec="49" bec="0" bev="0" fileid="1" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="0" uspid="9" ordinal="0" offset="0" sl="26" sc="9" el="26" ec="10" bec="0" bev="0" fileid="1" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="2" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663302</MetadataToken> + <Name>System.Void Test.AbstractClass_SampleImpl1::Method2()</Name> + <FileRef uid="1" /> + <SequencePoints> + <SequencePoint vc="0" uspid="11" ordinal="0" offset="0" sl="31" sc="9" el="31" ec="10" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="0" uspid="10" ordinal="1" offset="1" sl="32" sc="13" el="32" ec="49" bec="0" bev="0" fileid="1" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="0" uspid="11" ordinal="0" offset="0" sl="31" sc="9" el="31" ec="10" bec="0" bev="0" fileid="1" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="8" visitedSequencePoints="4" numBranchPoints="3" visitedBranchPoints="0" sequenceCoverage="50" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="3" minCrapScore="1" maxCrapScore="1" /> + <FullName>Test.AbstractClass_SampleImpl2</FullName> + <Methods> + <Method visited="true" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="100" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="1"> + <Summary numSequencePoints="4" visitedSequencePoints="4" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" /> + <MetadataToken>100663303</MetadataToken> + <Name>System.Void Test.AbstractClass_SampleImpl2::.ctor()</Name> + <FileRef uid="1" /> + <SequencePoints> + <SequencePoint vc="2" uspid="15" ordinal="0" offset="0" sl="39" sc="15" el="39" ec="21" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="2" uspid="14" ordinal="1" offset="7" sl="40" sc="9" el="40" ec="10" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="2" uspid="13" ordinal="2" offset="8" sl="41" sc="13" el="41" ec="58" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="2" uspid="12" ordinal="3" offset="19" sl="42" sc="9" el="42" ec="10" bec="0" bev="0" fileid="1" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="2" uspid="15" ordinal="0" offset="0" sl="39" sc="15" el="39" ec="21" bec="0" bev="0" fileid="1" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="2" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663304</MetadataToken> + <Name>System.Void Test.AbstractClass_SampleImpl2::Method1()</Name> + <FileRef uid="1" /> + <SequencePoints> + <SequencePoint vc="0" uspid="17" ordinal="0" offset="0" sl="45" sc="9" el="45" ec="10" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="0" uspid="16" ordinal="1" offset="1" sl="46" sc="13" el="46" ec="49" bec="0" bev="0" fileid="1" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="0" uspid="17" ordinal="0" offset="0" sl="45" sc="9" el="45" ec="10" bec="0" bev="0" fileid="1" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="2" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663305</MetadataToken> + <Name>System.Void Test.AbstractClass_SampleImpl2::Method2()</Name> + <FileRef uid="1" /> + <SequencePoints> + <SequencePoint vc="0" uspid="19" ordinal="0" offset="0" sl="50" sc="9" el="50" ec="10" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="0" uspid="18" ordinal="1" offset="1" sl="51" sc="13" el="51" ec="49" bec="0" bev="0" fileid="1" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="0" uspid="19" ordinal="0" offset="0" sl="50" sc="9" el="50" ec="10" bec="0" bev="0" fileid="1" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="10" visitedSequencePoints="0" numBranchPoints="3" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="1" visitedMethods="0" numMethods="3" minCrapScore="0" maxCrapScore="0" /> + <FullName>Test.AnalyzerTestClass</FullName> + <Methods> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="4" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663306</MetadataToken> + <Name>System.Void Test.AnalyzerTestClass::.ctor()</Name> + <FileRef uid="2" /> + <SequencePoints> + <SequencePoint vc="0" uspid="23" ordinal="0" offset="0" sl="8" sc="9" el="8" ec="35" bec="0" bev="0" fileid="2" /> + <SequencePoint vc="0" uspid="22" ordinal="1" offset="7" sl="9" sc="9" el="9" ec="10" bec="0" bev="0" fileid="2" /> + <SequencePoint vc="0" uspid="21" ordinal="2" offset="8" sl="10" sc="13" el="10" ec="40" bec="0" bev="0" fileid="2" /> + <SequencePoint vc="0" uspid="20" ordinal="3" offset="19" sl="11" sc="9" el="11" ec="10" bec="0" bev="0" fileid="2" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="0" uspid="23" ordinal="0" offset="0" sl="8" sc="9" el="8" ec="35" bec="0" bev="0" fileid="2" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="4" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663307</MetadataToken> + <Name>System.String Test.AnalyzerTestClass::DoSomething(System.String,System.String[],System.Guid,System.Collections.Generic.IEnumerable`1<System.String>,System.Collections.Generic.IList`1<System.String>,System.Decimal,System.Int32,System.Int64,System.Collections.Generic.Dictionary`2<System.String,System.Int32>,System.Int32&,System.Single,System.Double,System.Boolean,System.Byte,System.Char,System.Object,System.SByte,System.Int16,System.UInt32,System.UInt64,System.UInt16)</Name> + <FileRef uid="2" /> + <SequencePoints> + <SequencePoint vc="0" uspid="27" ordinal="0" offset="0" sl="35" sc="9" el="35" ec="10" bec="0" bev="0" fileid="2" /> + <SequencePoint vc="0" uspid="26" ordinal="1" offset="1" sl="36" sc="13" el="36" ec="19" bec="0" bev="0" fileid="2" /> + <SequencePoint vc="0" uspid="25" ordinal="2" offset="5" sl="37" sc="13" el="37" ec="25" bec="0" bev="0" fileid="2" /> + <SequencePoint vc="0" uspid="24" ordinal="3" offset="9" sl="38" sc="9" el="38" ec="10" bec="0" bev="0" fileid="2" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="0" uspid="27" ordinal="0" offset="0" sl="35" sc="9" el="35" ec="10" bec="0" bev="0" fileid="2" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="2" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663308</MetadataToken> + <Name>System.Void Test.AnalyzerTestClass::GenericMethod(T1,T2,System.Int32)</Name> + <FileRef uid="2" /> + <SequencePoints> + <SequencePoint vc="0" uspid="29" ordinal="0" offset="0" sl="41" sc="9" el="41" ec="10" bec="0" bev="0" fileid="2" /> + <SequencePoint vc="0" uspid="28" ordinal="1" offset="1" sl="42" sc="9" el="42" ec="10" bec="0" bev="0" fileid="2" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="0" uspid="29" ordinal="0" offset="0" sl="41" sc="9" el="41" ec="10" bec="0" bev="0" fileid="2" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <FullName>Test.AsyncClass</FullName> + <Methods> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663311</MetadataToken> + <Name>System.Threading.Tasks.Task`1<System.Net.Http.HttpResponseMessage> Test.AsyncClass::SendAsync(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)</Name> + <SequencePoints /> + <BranchPoints /> + <MethodPoint vc="2" uspid="100663311" ordinal="0" offset="0" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663312</MetadataToken> + <Name>System.Void Test.AsyncClass::.ctor()</Name> + <SequencePoints /> + <BranchPoints /> + <MethodPoint vc="2" uspid="100663312" ordinal="0" offset="0" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="4" visitedSequencePoints="4" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="3" minCyclomaticComplexity="1" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="1" minCrapScore="3" maxCrapScore="3" /> + <FullName>Test.AsyncClass/<SendAsync>d__0</FullName> + <Methods> + <Method visited="true" cyclomaticComplexity="3" nPathComplexity="0" sequenceCoverage="100" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="3"> + <Summary numSequencePoints="4" visitedSequencePoints="4" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="3" minCyclomaticComplexity="3" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="3" maxCrapScore="3" /> + <MetadataToken>100663366</MetadataToken> + <Name>System.Void Test.AsyncClass/<SendAsync>d__0::MoveNext()</Name> + <FileRef uid="3" /> + <SequencePoints> + <SequencePoint vc="2" uspid="33" ordinal="0" offset="14" sl="10" sc="9" el="10" ec="10" bec="0" bev="0" fileid="3" /> + <SequencePoint vc="2" uspid="32" ordinal="1" offset="15" sl="11" sc="13" el="11" ec="51" bec="0" bev="0" fileid="3" /> + <SequencePoint vc="2" uspid="31" ordinal="2" offset="43" sl="12" sc="13" el="12" ec="69" bec="0" bev="0" fileid="3" /> + <SequencePoint vc="2" uspid="30" ordinal="3" offset="193" sl="13" sc="9" el="13" ec="10" bec="0" bev="0" fileid="3" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="2" uspid="33" ordinal="0" offset="14" sl="10" sc="9" el="10" ec="10" bec="0" bev="0" fileid="3" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663367</MetadataToken> + <Name>System.Void Test.AsyncClass/<SendAsync>d__0::SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)</Name> + <SequencePoints /> + <BranchPoints /> + <MethodPoint vc="0" uspid="100663367" ordinal="0" offset="0" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="6" visitedSequencePoints="6" numBranchPoints="2" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="1" numClasses="1" visitedMethods="2" numMethods="2" minCrapScore="1" maxCrapScore="1" /> + <FullName>Test.ClassWithExcludes</FullName> + <Methods> + <Method visited="true" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="100" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="1"> + <Summary numSequencePoints="3" visitedSequencePoints="3" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" /> + <MetadataToken>100663318</MetadataToken> + <Name>System.Void Test.ClassWithExcludes::IncludedMethod()</Name> + <FileRef uid="4" /> + <SequencePoints> + <SequencePoint vc="2" uspid="36" ordinal="0" offset="0" sl="12" sc="9" el="12" ec="10" bec="0" bev="0" fileid="4" /> + <SequencePoint vc="2" uspid="35" ordinal="1" offset="1" sl="13" sc="13" el="13" ec="44" bec="0" bev="0" fileid="4" /> + <SequencePoint vc="2" uspid="34" ordinal="2" offset="13" sl="14" sc="9" el="14" ec="10" bec="0" bev="0" fileid="4" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="2" uspid="36" ordinal="0" offset="0" sl="12" sc="9" el="12" ec="10" bec="0" bev="0" fileid="4" /> + </Method> + <Method visited="true" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="100" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="1"> + <Summary numSequencePoints="3" visitedSequencePoints="3" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" /> + <MetadataToken>100663319</MetadataToken> + <Name>System.Void Test.ClassWithExcludes::ExcludedMethod()</Name> + <FileRef uid="4" /> + <SequencePoints> + <SequencePoint vc="2" uspid="39" ordinal="0" offset="0" sl="18" sc="9" el="18" ec="10" bec="0" bev="0" fileid="4" /> + <SequencePoint vc="2" uspid="38" ordinal="1" offset="1" sl="19" sc="13" el="19" ec="44" bec="0" bev="0" fileid="4" /> + <SequencePoint vc="2" uspid="37" ordinal="2" offset="13" sl="20" sc="9" el="20" ec="10" bec="0" bev="0" fileid="4" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="2" uspid="39" ordinal="0" offset="0" sl="18" sc="9" el="18" ec="10" bec="0" bev="0" fileid="4" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663320</MetadataToken> + <Name>System.Void Test.ClassWithExcludes::.ctor()</Name> + <SequencePoints /> + <BranchPoints /> + <MethodPoint vc="4" uspid="100663320" ordinal="0" offset="0" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="4" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="1" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <FullName>Test.CodeContract_Contract</FullName> + <Methods> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="4" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663321</MetadataToken> + <Name>System.Int32 Test.CodeContract_Contract::Calculate(System.Int32)</Name> + <FileRef uid="5" /> + <SequencePoints> + <SequencePoint vc="0" uspid="43" ordinal="0" offset="0" sl="10" sc="9" el="10" ec="10" bec="0" bev="0" fileid="5" /> + <SequencePoint vc="0" uspid="42" ordinal="1" offset="1" sl="11" sc="13" el="11" ec="88" bec="0" bev="0" fileid="5" /> + <SequencePoint vc="0" uspid="41" ordinal="2" offset="16" sl="13" sc="13" el="13" ec="33" bec="0" bev="0" fileid="5" /> + <SequencePoint vc="0" uspid="40" ordinal="3" offset="20" sl="14" sc="9" el="14" ec="10" bec="0" bev="0" fileid="5" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="0" uspid="43" ordinal="0" offset="0" sl="10" sc="9" el="10" ec="10" bec="0" bev="0" fileid="5" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663322</MetadataToken> + <Name>System.Void Test.CodeContract_Contract::.ctor()</Name> + <SequencePoints /> + <BranchPoints /> + <MethodPoint vc="0" uspid="100663322" ordinal="0" offset="0" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <FullName>Test.CodeContract_Interface</FullName> + <Methods /> + </Class> + <Class> + <Summary numSequencePoints="7" visitedSequencePoints="7" numBranchPoints="3" visitedBranchPoints="3" sequenceCoverage="100" branchCoverage="100" maxCyclomaticComplexity="2" minCyclomaticComplexity="1" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="1" minCrapScore="2" maxCrapScore="2" /> + <FullName>Test.CodeContract_Target</FullName> + <Methods> + <Method visited="true" cyclomaticComplexity="2" nPathComplexity="2" sequenceCoverage="100" branchCoverage="100" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="2"> + <Summary numSequencePoints="7" visitedSequencePoints="7" numBranchPoints="3" visitedBranchPoints="3" sequenceCoverage="100" branchCoverage="100" maxCyclomaticComplexity="2" minCyclomaticComplexity="2" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="2" maxCrapScore="2" /> + <MetadataToken>100663324</MetadataToken> + <Name>System.Int32 Test.CodeContract_Target::Calculate(System.Int32)</Name> + <FileRef uid="6" /> + <SequencePoints> + <SequencePoint vc="4" uspid="50" ordinal="0" offset="0" sl="7" sc="9" el="7" ec="10" bec="0" bev="0" fileid="6" /> + <SequencePoint vc="4" uspid="49" ordinal="1" offset="1" sl="8" sc="13" el="8" ec="27" bec="2" bev="2" fileid="6" /> + <SequencePoint vc="2" uspid="48" ordinal="2" offset="9" sl="9" sc="13" el="9" ec="14" bec="0" bev="0" fileid="6" /> + <SequencePoint vc="2" uspid="47" ordinal="3" offset="10" sl="10" sc="17" el="10" ec="26" bec="0" bev="0" fileid="6" /> + <SequencePoint vc="2" uspid="46" ordinal="4" offset="14" sl="13" sc="13" el="13" ec="14" bec="0" bev="0" fileid="6" /> + <SequencePoint vc="2" uspid="45" ordinal="5" offset="15" sl="14" sc="17" el="14" ec="26" bec="0" bev="0" fileid="6" /> + <SequencePoint vc="4" uspid="44" ordinal="6" offset="19" sl="16" sc="9" el="16" ec="10" bec="0" bev="0" fileid="6" /> + </SequencePoints> + <BranchPoints> + <BranchPoint vc="2" uspid="0" ordinal="0" offset="7" sl="8" path="0" offsetend="9" fileid="6" /> + <BranchPoint vc="2" uspid="1" ordinal="1" offset="7" sl="8" path="1" offsetend="14" fileid="6" /> + </BranchPoints> + <MethodPoint xsi:type="SequencePoint" vc="4" uspid="50" ordinal="0" offset="0" sl="7" sc="9" el="7" ec="10" bec="0" bev="0" fileid="6" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663325</MetadataToken> + <Name>System.Void Test.CodeContract_Target::.ctor()</Name> + <SequencePoints /> + <BranchPoints /> + <MethodPoint vc="4" uspid="100663325" ordinal="0" offset="0" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <FullName>Test.CoverageExcludeAttribute</FullName> + <Methods> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663326</MetadataToken> + <Name>System.Void Test.CoverageExcludeAttribute::.ctor()</Name> + <SequencePoints /> + <BranchPoints /> + <MethodPoint vc="0" uspid="100663326" ordinal="0" offset="0" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="3" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="1" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <FullName>Test.AbstractGenericClass`2</FullName> + <Methods> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="3" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663328</MetadataToken> + <Name>System.Boolean Test.AbstractGenericClass`2::PostProcess(Test.ISomeObjectInterface`2<TModel,TState>)</Name> + <FileRef uid="7" /> + <SequencePoints> + <SequencePoint vc="0" uspid="53" ordinal="0" offset="0" sl="12" sc="9" el="12" ec="10" bec="0" bev="0" fileid="7" /> + <SequencePoint vc="0" uspid="52" ordinal="1" offset="1" sl="13" sc="13" el="13" ec="25" bec="0" bev="0" fileid="7" /> + <SequencePoint vc="0" uspid="51" ordinal="2" offset="5" sl="14" sc="9" el="14" ec="10" bec="0" bev="0" fileid="7" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="0" uspid="53" ordinal="0" offset="0" sl="12" sc="9" el="12" ec="10" bec="0" bev="0" fileid="7" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663329</MetadataToken> + <Name>System.Void Test.AbstractGenericClass`2::.ctor()</Name> + <SequencePoints /> + <BranchPoints /> + <MethodPoint vc="4" uspid="100663329" ordinal="0" offset="0" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="8" visitedSequencePoints="8" numBranchPoints="2" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="1" numClasses="1" visitedMethods="2" numMethods="2" minCrapScore="1" maxCrapScore="1" /> + <FullName>Test.GenericClass`2</FullName> + <Methods> + <Method visited="true" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="100" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="1"> + <Summary numSequencePoints="4" visitedSequencePoints="4" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" /> + <MetadataToken>100663330</MetadataToken> + <Name>System.Boolean Test.GenericClass`2::Process(Test.ISomeObjectInterface`2<TModel,TState>)</Name> + <FileRef uid="7" /> + <SequencePoints> + <SequencePoint vc="2" uspid="57" ordinal="0" offset="0" sl="22" sc="9" el="22" ec="10" bec="0" bev="0" fileid="7" /> + <SequencePoint vc="2" uspid="56" ordinal="1" offset="1" sl="23" sc="13" el="23" ec="42" bec="0" bev="0" fileid="7" /> + <SequencePoint vc="2" uspid="55" ordinal="2" offset="12" sl="24" sc="13" el="24" ec="25" bec="0" bev="0" fileid="7" /> + <SequencePoint vc="2" uspid="54" ordinal="3" offset="16" sl="25" sc="9" el="25" ec="10" bec="0" bev="0" fileid="7" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="2" uspid="57" ordinal="0" offset="0" sl="22" sc="9" el="22" ec="10" bec="0" bev="0" fileid="7" /> + </Method> + <Method visited="true" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="100" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="1"> + <Summary numSequencePoints="4" visitedSequencePoints="4" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" /> + <MetadataToken>100663331</MetadataToken> + <Name>System.Boolean Test.GenericClass`2::PostProcess(Test.ISomeObjectInterface`2<TModel,TState>)</Name> + <FileRef uid="7" /> + <SequencePoints> + <SequencePoint vc="2" uspid="61" ordinal="0" offset="0" sl="28" sc="9" el="28" ec="10" bec="0" bev="0" fileid="7" /> + <SequencePoint vc="2" uspid="60" ordinal="1" offset="1" sl="29" sc="13" el="29" ec="46" bec="0" bev="0" fileid="7" /> + <SequencePoint vc="2" uspid="59" ordinal="2" offset="12" sl="30" sc="13" el="30" ec="25" bec="0" bev="0" fileid="7" /> + <SequencePoint vc="2" uspid="58" ordinal="3" offset="16" sl="31" sc="9" el="31" ec="10" bec="0" bev="0" fileid="7" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="2" uspid="61" ordinal="0" offset="0" sl="28" sc="9" el="28" ec="10" bec="0" bev="0" fileid="7" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663332</MetadataToken> + <Name>System.Void Test.GenericClass`2::.ctor()</Name> + <SequencePoints /> + <BranchPoints /> + <MethodPoint vc="4" uspid="100663332" ordinal="0" offset="0" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <FullName>Test.SomeModel</FullName> + <Methods> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663333</MetadataToken> + <Name>System.Void Test.SomeModel::.ctor()</Name> + <SequencePoints /> + <BranchPoints /> + <MethodPoint vc="0" uspid="100663333" ordinal="0" offset="0" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <FullName>Test.IState</FullName> + <Methods /> + </Class> + <Class> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <FullName>Test.ISomeClassInterface`2</FullName> + <Methods /> + </Class> + <Class> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <FullName>Test.ISomeObjectInterface`2</FullName> + <Methods /> + </Class> + <Class> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <FullName>Test.SomeClass</FullName> + <Methods> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663336</MetadataToken> + <Name>System.Void Test.SomeClass::.ctor()</Name> + <SequencePoints /> + <BranchPoints /> + <MethodPoint vc="2" uspid="100663336" ordinal="0" offset="0" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="24" visitedSequencePoints="12" numBranchPoints="8" visitedBranchPoints="2" sequenceCoverage="50" branchCoverage="25" maxCyclomaticComplexity="2" minCyclomaticComplexity="1" visitedClasses="1" numClasses="1" visitedMethods="3" numMethods="6" minCrapScore="-1132818.35" maxCrapScore="1" /> + <FullName>Test.PartialClass</FullName> + <Methods> + <Method visited="true" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="100" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="1"> + <Summary numSequencePoints="3" visitedSequencePoints="3" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" /> + <MetadataToken>100663337</MetadataToken> + <Name>System.Void Test.PartialClass::ExecutedMethod_1()</Name> + <FileRef uid="8" /> + <SequencePoints> + <SequencePoint vc="2" uspid="64" ordinal="0" offset="0" sl="8" sc="9" el="8" ec="10" bec="0" bev="0" fileid="8" /> + <SequencePoint vc="2" uspid="63" ordinal="1" offset="1" sl="9" sc="13" el="9" ec="39" bec="0" bev="0" fileid="8" /> + <SequencePoint vc="2" uspid="62" ordinal="2" offset="12" sl="10" sc="9" el="10" ec="10" bec="0" bev="0" fileid="8" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="2" uspid="64" ordinal="0" offset="0" sl="8" sc="9" el="8" ec="10" bec="0" bev="0" fileid="8" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="3" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663338</MetadataToken> + <Name>System.Void Test.PartialClass::UnExecutedMethod_1()</Name> + <FileRef uid="8" /> + <SequencePoints> + <SequencePoint vc="0" uspid="67" ordinal="0" offset="0" sl="13" sc="9" el="13" ec="10" bec="0" bev="0" fileid="8" /> + <SequencePoint vc="0" uspid="66" ordinal="1" offset="1" sl="14" sc="13" el="14" ec="39" bec="0" bev="0" fileid="8" /> + <SequencePoint vc="0" uspid="65" ordinal="2" offset="12" sl="15" sc="9" el="15" ec="10" bec="0" bev="0" fileid="8" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="0" uspid="67" ordinal="0" offset="0" sl="13" sc="9" el="13" ec="10" bec="0" bev="0" fileid="8" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="true" isSetter="false" crapScore="0"> + <Summary numSequencePoints="3" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663339</MetadataToken> + <Name>System.Int32 Test.PartialClass::get_SomeProperty()</Name> + <FileRef uid="8" /> + <SequencePoints> + <SequencePoint vc="0" uspid="70" ordinal="0" offset="0" sl="21" sc="17" el="21" ec="18" bec="0" bev="0" fileid="8" /> + <SequencePoint vc="0" uspid="69" ordinal="1" offset="1" sl="21" sc="19" el="21" ec="44" bec="0" bev="0" fileid="8" /> + <SequencePoint vc="0" uspid="68" ordinal="2" offset="10" sl="21" sc="45" el="21" ec="46" bec="0" bev="0" fileid="8" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="0" uspid="70" ordinal="0" offset="0" sl="21" sc="17" el="21" ec="18" bec="0" bev="0" fileid="8" /> + </Method> + <Method visited="true" cyclomaticComplexity="2" nPathComplexity="2" sequenceCoverage="66.67" branchCoverage="66.67" isConstructor="false" isStatic="false" isGetter="false" isSetter="true" crapScore="-1132818.35"> + <Summary numSequencePoints="9" visitedSequencePoints="6" numBranchPoints="3" visitedBranchPoints="2" sequenceCoverage="66.67" branchCoverage="66.67" maxCyclomaticComplexity="2" minCyclomaticComplexity="2" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="-1132818.35" maxCrapScore="-1132818.35" /> + <MetadataToken>100663340</MetadataToken> + <Name>System.Void Test.PartialClass::set_SomeProperty(System.Int32)</Name> + <FileRef uid="8" /> + <SequencePoints> + <SequencePoint vc="2" uspid="79" ordinal="0" offset="0" sl="24" sc="13" el="24" ec="14" bec="0" bev="0" fileid="8" /> + <SequencePoint vc="2" uspid="78" ordinal="1" offset="1" sl="25" sc="17" el="25" ec="31" bec="2" bev="1" fileid="8" /> + <SequencePoint vc="2" uspid="77" ordinal="2" offset="9" sl="26" sc="17" el="26" ec="18" bec="0" bev="0" fileid="8" /> + <SequencePoint vc="2" uspid="76" ordinal="3" offset="10" sl="27" sc="21" el="27" ec="43" bec="0" bev="0" fileid="8" /> + <SequencePoint vc="2" uspid="75" ordinal="4" offset="17" sl="28" sc="17" el="28" ec="18" bec="0" bev="0" fileid="8" /> + <SequencePoint vc="0" uspid="74" ordinal="5" offset="20" sl="30" sc="17" el="30" ec="18" bec="0" bev="0" fileid="8" /> + <SequencePoint vc="0" uspid="73" ordinal="6" offset="21" sl="31" sc="21" el="31" ec="47" bec="0" bev="0" fileid="8" /> + <SequencePoint vc="0" uspid="72" ordinal="7" offset="28" sl="32" sc="17" el="32" ec="18" bec="0" bev="0" fileid="8" /> + <SequencePoint vc="2" uspid="71" ordinal="8" offset="29" sl="33" sc="13" el="33" ec="14" bec="0" bev="0" fileid="8" /> + </SequencePoints> + <BranchPoints> + <BranchPoint vc="2" uspid="2" ordinal="0" offset="7" sl="25" path="0" offsetend="9" fileid="8" /> + <BranchPoint vc="0" uspid="3" ordinal="1" offset="7" sl="25" path="1" offsetend="20" fileid="8" /> + </BranchPoints> + <MethodPoint xsi:type="SequencePoint" vc="2" uspid="79" ordinal="0" offset="0" sl="24" sc="13" el="24" ec="14" bec="0" bev="0" fileid="8" /> + </Method> + <Method visited="true" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="100" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="1"> + <Summary numSequencePoints="3" visitedSequencePoints="3" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" /> + <MetadataToken>100663341</MetadataToken> + <Name>System.Void Test.PartialClass::ExecutedMethod_2()</Name> + <FileRef uid="9" /> + <SequencePoints> + <SequencePoint vc="2" uspid="82" ordinal="0" offset="0" sl="8" sc="9" el="8" ec="10" bec="0" bev="0" fileid="9" /> + <SequencePoint vc="2" uspid="81" ordinal="1" offset="1" sl="9" sc="13" el="9" ec="39" bec="0" bev="0" fileid="9" /> + <SequencePoint vc="2" uspid="80" ordinal="2" offset="12" sl="10" sc="9" el="10" ec="10" bec="0" bev="0" fileid="9" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="2" uspid="82" ordinal="0" offset="0" sl="8" sc="9" el="8" ec="10" bec="0" bev="0" fileid="9" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="3" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663342</MetadataToken> + <Name>System.Void Test.PartialClass::UnExecutedMethod_2()</Name> + <FileRef uid="9" /> + <SequencePoints> + <SequencePoint vc="0" uspid="85" ordinal="0" offset="0" sl="13" sc="9" el="13" ec="10" bec="0" bev="0" fileid="9" /> + <SequencePoint vc="0" uspid="84" ordinal="1" offset="1" sl="14" sc="13" el="14" ec="39" bec="0" bev="0" fileid="9" /> + <SequencePoint vc="0" uspid="83" ordinal="2" offset="12" sl="15" sc="9" el="15" ec="10" bec="0" bev="0" fileid="9" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="0" uspid="85" ordinal="0" offset="0" sl="13" sc="9" el="13" ec="10" bec="0" bev="0" fileid="9" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663343</MetadataToken> + <Name>System.Void Test.PartialClass::.ctor()</Name> + <SequencePoints /> + <BranchPoints /> + <MethodPoint vc="6" uspid="100663343" ordinal="0" offset="0" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="1" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="1" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <FullName>Test.PartialClassWithAutoProperties</FullName> + <Methods> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="true" isSetter="false" crapScore="0"> + <Summary numSequencePoints="1" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663348</MetadataToken> + <Name>System.String Test.PartialClassWithAutoProperties::get_ExpressionBodiedProperty()</Name> + <FileRef uid="10" /> + <SequencePoints> + <SequencePoint vc="0" uspid="86" ordinal="0" offset="0" sl="8" sc="51" el="8" ec="57" bec="0" bev="0" fileid="10" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="0" uspid="86" ordinal="0" offset="0" sl="8" sc="51" el="8" ec="57" bec="0" bev="0" fileid="10" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663349</MetadataToken> + <Name>System.Void Test.PartialClassWithAutoProperties::.ctor()</Name> + <SequencePoints /> + <BranchPoints /> + <MethodPoint vc="4" uspid="100663349" ordinal="0" offset="0" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="25" visitedSequencePoints="22" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="88" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" /> + <FullName>Test.Program</FullName> + <Methods> + <Method visited="true" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="88" branchCoverage="0" isConstructor="false" isStatic="true" isGetter="false" isSetter="false" crapScore="1"> + <Summary numSequencePoints="25" visitedSequencePoints="22" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="88" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" /> + <MetadataToken>100663350</MetadataToken> + <Name>System.Void Test.Program::Main(System.String[])</Name> + <FileRef uid="11" /> + <SequencePoints> + <SequencePoint vc="2" uspid="111" ordinal="0" offset="0" sl="10" sc="9" el="10" ec="10" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="110" ordinal="1" offset="1" sl="11" sc="13" el="11" ec="46" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="109" ordinal="2" offset="12" sl="13" sc="13" el="13" ec="53" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="108" ordinal="3" offset="28" sl="14" sc="13" el="14" ec="61" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="107" ordinal="4" offset="49" sl="16" sc="13" el="16" ec="51" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="106" ordinal="5" offset="60" sl="17" sc="13" el="17" ec="51" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="105" ordinal="6" offset="71" sl="18" sc="13" el="18" ec="51" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="104" ordinal="7" offset="84" sl="20" sc="13" el="20" ec="69" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="103" ordinal="8" offset="100" sl="21" sc="13" el="21" ec="69" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="102" ordinal="9" offset="116" sl="23" sc="13" el="23" ec="48" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="101" ordinal="10" offset="132" sl="25" sc="13" el="25" ec="54" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="100" ordinal="11" offset="143" sl="26" sc="13" el="26" ec="54" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="99" ordinal="12" offset="154" sl="28" sc="13" el="28" ec="65" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="98" ordinal="13" offset="166" sl="29" sc="13" el="29" ec="69" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="97" ordinal="14" offset="178" sl="31" sc="13" el="31" ec="53" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="96" ordinal="15" offset="190" sl="33" sc="13" el="33" ec="45" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="95" ordinal="16" offset="196" sl="34" sc="13" el="34" ec="45" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="94" ordinal="17" offset="202" sl="36" sc="13" el="36" ec="31" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="93" ordinal="18" offset="208" sl="39" sc="13" el="39" ec="14" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="92" ordinal="19" offset="209" sl="40" sc="17" el="40" ec="56" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="91" ordinal="20" offset="221" sl="41" sc="13" el="41" ec="14" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="0" uspid="90" ordinal="21" offset="224" sl="42" sc="13" el="42" ec="45" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="0" uspid="89" ordinal="22" offset="225" sl="43" sc="13" el="43" ec="14" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="0" uspid="88" ordinal="23" offset="226" sl="44" sc="13" el="44" ec="14" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="87" ordinal="24" offset="229" sl="45" sc="9" el="45" ec="10" bec="0" bev="0" fileid="11" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="2" uspid="111" ordinal="0" offset="0" sl="10" sc="9" el="10" ec="10" bec="0" bev="0" fileid="11" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="true" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663351</MetadataToken> + <Name>System.Void Test.Program::CallAsyncMethod()</Name> + <SequencePoints /> + <BranchPoints /> + <MethodPoint vc="2" uspid="100663351" ordinal="0" offset="0" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663352</MetadataToken> + <Name>System.Void Test.Program::.ctor()</Name> + <SequencePoints /> + <BranchPoints /> + <MethodPoint vc="0" uspid="100663352" ordinal="0" offset="0" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="7" visitedSequencePoints="7" numBranchPoints="2" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="1" numClasses="1" visitedMethods="2" numMethods="2" minCrapScore="1" maxCrapScore="1" /> + <FullName>Test.Program/EchoHandler</FullName> + <Methods> + <Method visited="true" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="100" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="1"> + <Summary numSequencePoints="4" visitedSequencePoints="4" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" /> + <MetadataToken>100663368</MetadataToken> + <Name>System.Void Test.Program/EchoHandler::.ctor(System.Net.Http.HttpResponseMessage)</Name> + <FileRef uid="11" /> + <SequencePoints> + <SequencePoint vc="2" uspid="115" ordinal="0" offset="0" sl="59" sc="13" el="59" ec="61" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="114" ordinal="1" offset="7" sl="60" sc="13" el="60" ec="14" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="113" ordinal="2" offset="8" sl="61" sc="17" el="61" ec="43" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="112" ordinal="3" offset="15" sl="62" sc="13" el="62" ec="14" bec="0" bev="0" fileid="11" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="2" uspid="115" ordinal="0" offset="0" sl="59" sc="13" el="59" ec="61" bec="0" bev="0" fileid="11" /> + </Method> + <Method visited="true" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="100" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="1"> + <Summary numSequencePoints="3" visitedSequencePoints="3" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" /> + <MetadataToken>100663369</MetadataToken> + <Name>System.Threading.Tasks.Task`1<System.Net.Http.HttpResponseMessage> Test.Program/EchoHandler::SendAsync(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)</Name> + <FileRef uid="11" /> + <SequencePoints> + <SequencePoint vc="2" uspid="118" ordinal="0" offset="0" sl="65" sc="13" el="65" ec="14" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="117" ordinal="1" offset="1" sl="66" sc="17" el="66" ec="56" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="116" ordinal="2" offset="15" sl="67" sc="13" el="67" ec="14" bec="0" bev="0" fileid="11" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="2" uspid="118" ordinal="0" offset="0" sl="65" sc="13" el="65" ec="14" bec="0" bev="0" fileid="11" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="6" visitedSequencePoints="6" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="3" minCyclomaticComplexity="1" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="1" minCrapScore="3" maxCrapScore="3" /> + <FullName>Test.Program/<CallAsyncMethod>d__1</FullName> + <Methods> + <Method visited="true" cyclomaticComplexity="3" nPathComplexity="0" sequenceCoverage="100" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="3"> + <Summary numSequencePoints="6" visitedSequencePoints="6" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="3" minCyclomaticComplexity="3" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="3" maxCrapScore="3" /> + <MetadataToken>100663371</MetadataToken> + <Name>System.Void Test.Program/<CallAsyncMethod>d__1::MoveNext()</Name> + <FileRef uid="11" /> + <SequencePoints> + <SequencePoint vc="2" uspid="124" ordinal="0" offset="17" sl="48" sc="9" el="48" ec="10" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="123" ordinal="1" offset="18" sl="49" sc="13" el="49" ec="54" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="122" ordinal="2" offset="29" sl="50" sc="13" el="50" ec="89" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="121" ordinal="3" offset="58" sl="51" sc="13" el="51" ec="66" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="120" ordinal="4" offset="76" sl="52" sc="13" el="52" ec="101" bec="0" bev="0" fileid="11" /> + <SequencePoint vc="2" uspid="119" ordinal="5" offset="240" sl="53" sc="9" el="53" ec="10" bec="0" bev="0" fileid="11" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="2" uspid="124" ordinal="0" offset="17" sl="48" sc="9" el="48" ec="10" bec="0" bev="0" fileid="11" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663372</MetadataToken> + <Name>System.Void Test.Program/<CallAsyncMethod>d__1::SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)</Name> + <SequencePoints /> + <BranchPoints /> + <MethodPoint vc="0" uspid="100663372" ordinal="0" offset="0" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="12" visitedSequencePoints="9" numBranchPoints="3" visitedBranchPoints="2" sequenceCoverage="75" branchCoverage="66.67" maxCyclomaticComplexity="3" minCyclomaticComplexity="1" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="1" minCrapScore="3.14" maxCrapScore="3.14" /> + <FullName>Test.TestClass</FullName> + <Methods> + <Method visited="true" cyclomaticComplexity="3" nPathComplexity="2" sequenceCoverage="75" branchCoverage="66.67" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="3.14"> + <Summary numSequencePoints="12" visitedSequencePoints="9" numBranchPoints="3" visitedBranchPoints="2" sequenceCoverage="75" branchCoverage="66.67" maxCyclomaticComplexity="3" minCyclomaticComplexity="3" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="3.14" maxCrapScore="3.14" /> + <MetadataToken>100663353</MetadataToken> + <Name>System.Void Test.TestClass::SampleFunction()</Name> + <FileRef uid="12" /> + <SequencePoints> + <SequencePoint vc="2" uspid="136" ordinal="0" offset="0" sl="8" sc="9" el="8" ec="10" bec="0" bev="0" fileid="12" /> + <SequencePoint vc="2" uspid="135" ordinal="1" offset="1" sl="9" sc="13" el="12" ec="27" bec="0" bev="0" fileid="12" /> + <SequencePoint vc="2" uspid="134" ordinal="2" offset="22" sl="14" sc="13" el="14" ec="37" bec="0" bev="0" fileid="12" /> + <SequencePoint vc="2" uspid="133" ordinal="3" offset="29" sl="15" sc="13" el="15" ec="24" bec="0" bev="0" fileid="12" /> + <SequencePoint vc="2" uspid="132" ordinal="4" offset="32" sl="17" sc="13" el="17" ec="32" bec="2" bev="1" fileid="12" /> + <SequencePoint vc="2" uspid="131" ordinal="5" offset="47" sl="18" sc="13" el="18" ec="14" bec="0" bev="0" fileid="12" /> + <SequencePoint vc="2" uspid="130" ordinal="6" offset="48" sl="19" sc="17" el="19" ec="61" bec="0" bev="0" fileid="12" /> + <SequencePoint vc="2" uspid="129" ordinal="7" offset="70" sl="20" sc="13" el="20" ec="14" bec="0" bev="0" fileid="12" /> + <SequencePoint vc="0" uspid="128" ordinal="8" offset="73" sl="22" sc="13" el="22" ec="14" bec="0" bev="0" fileid="12" /> + <SequencePoint vc="0" uspid="127" ordinal="9" offset="74" sl="23" sc="17" el="23" ec="65" bec="0" bev="0" fileid="12" /> + <SequencePoint vc="0" uspid="126" ordinal="10" offset="96" sl="24" sc="13" el="24" ec="14" bec="0" bev="0" fileid="12" /> + <SequencePoint vc="2" uspid="125" ordinal="11" offset="97" sl="25" sc="9" el="25" ec="10" bec="0" bev="0" fileid="12" /> + </SequencePoints> + <BranchPoints> + <BranchPoint vc="2" uspid="4" ordinal="0" offset="45" sl="17" path="0" offsetend="47" fileid="12" /> + <BranchPoint vc="0" uspid="5" ordinal="1" offset="45" sl="17" path="1" offsetend="73" fileid="12" /> + </BranchPoints> + <MethodPoint xsi:type="SequencePoint" vc="2" uspid="136" ordinal="0" offset="0" sl="8" sc="9" el="8" ec="10" bec="0" bev="0" fileid="12" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663354</MetadataToken> + <Name>System.Void Test.TestClass::.ctor()</Name> + <SequencePoints /> + <BranchPoints /> + <MethodPoint vc="2" uspid="100663354" ordinal="0" offset="0" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="3" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="1" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <FullName>Test.TestClass/NestedClass</FullName> + <Methods> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="3" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663373</MetadataToken> + <Name>System.Void Test.TestClass/NestedClass::SampleFunction()</Name> + <FileRef uid="12" /> + <SequencePoints> + <SequencePoint vc="0" uspid="139" ordinal="0" offset="0" sl="30" sc="13" el="30" ec="14" bec="0" bev="0" fileid="12" /> + <SequencePoint vc="0" uspid="138" ordinal="1" offset="1" sl="31" sc="17" el="34" ec="31" bec="0" bev="0" fileid="12" /> + <SequencePoint vc="0" uspid="137" ordinal="2" offset="22" sl="35" sc="13" el="35" ec="14" bec="0" bev="0" fileid="12" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="0" uspid="139" ordinal="0" offset="0" sl="30" sc="13" el="30" ec="14" bec="0" bev="0" fileid="12" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663374</MetadataToken> + <Name>System.Void Test.TestClass/NestedClass::.ctor()</Name> + <SequencePoints /> + <BranchPoints /> + <MethodPoint vc="0" uspid="100663374" ordinal="0" offset="0" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="40" visitedSequencePoints="26" numBranchPoints="10" visitedBranchPoints="4" sequenceCoverage="65" branchCoverage="40" maxCyclomaticComplexity="5" minCyclomaticComplexity="1" visitedClasses="1" numClasses="1" visitedMethods="3" numMethods="6" minCrapScore="1" maxCrapScore="5" /> + <FullName>Test.TestClass2</FullName> + <Methods> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="6" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663359</MetadataToken> + <Name>System.Void Test.TestClass2::.ctor()</Name> + <FileRef uid="13" /> + <SequencePoints> + <SequencePoint vc="0" uspid="145" ordinal="0" offset="0" sl="11" sc="9" el="11" ec="78" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="0" uspid="144" ordinal="1" offset="11" sl="17" sc="9" el="17" ec="28" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="0" uspid="143" ordinal="2" offset="18" sl="18" sc="9" el="18" ec="10" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="0" uspid="142" ordinal="3" offset="19" sl="19" sc="13" el="19" ec="34" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="0" uspid="141" ordinal="4" offset="30" sl="20" sc="13" el="20" ec="46" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="0" uspid="140" ordinal="5" offset="42" sl="21" sc="9" el="21" ec="10" bec="0" bev="0" fileid="13" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="0" uspid="145" ordinal="0" offset="0" sl="11" sc="9" el="11" ec="78" bec="0" bev="0" fileid="13" /> + </Method> + <Method visited="true" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="100" branchCoverage="0" isConstructor="true" isStatic="false" isGetter="false" isSetter="false" crapScore="1"> + <Summary numSequencePoints="6" visitedSequencePoints="6" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" /> + <MetadataToken>100663360</MetadataToken> + <Name>System.Void Test.TestClass2::.ctor(System.String)</Name> + <FileRef uid="13" /> + <SequencePoints> + <SequencePoint vc="4" uspid="151" ordinal="0" offset="0" sl="11" sc="9" el="11" ec="78" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="4" uspid="150" ordinal="1" offset="11" sl="23" sc="9" el="23" ec="39" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="4" uspid="149" ordinal="2" offset="18" sl="24" sc="9" el="24" ec="10" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="4" uspid="148" ordinal="3" offset="19" sl="25" sc="13" el="25" ec="30" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="4" uspid="147" ordinal="4" offset="26" sl="26" sc="13" el="26" ec="49" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="4" uspid="146" ordinal="5" offset="40" sl="27" sc="9" el="27" ec="10" bec="0" bev="0" fileid="13" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="4" uspid="151" ordinal="0" offset="0" sl="11" sc="9" el="11" ec="78" bec="0" bev="0" fileid="13" /> + </Method> + <Method visited="true" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="100" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="1"> + <Summary numSequencePoints="4" visitedSequencePoints="4" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" /> + <MetadataToken>100663361</MetadataToken> + <Name>System.Void Test.TestClass2::ExecutedMethod()</Name> + <FileRef uid="13" /> + <SequencePoints> + <SequencePoint vc="2" uspid="155" ordinal="0" offset="0" sl="30" sc="9" el="30" ec="10" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" uspid="154" ordinal="1" offset="1" sl="31" sc="13" el="31" ec="42" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" uspid="153" ordinal="2" offset="13" sl="32" sc="13" el="32" ec="54" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" uspid="152" ordinal="3" offset="25" sl="33" sc="9" el="33" ec="10" bec="0" bev="0" fileid="13" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="2" uspid="155" ordinal="0" offset="0" sl="30" sc="9" el="30" ec="10" bec="0" bev="0" fileid="13" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="4" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663362</MetadataToken> + <Name>System.Void Test.TestClass2::UnExecutedMethod()</Name> + <FileRef uid="13" /> + <SequencePoints> + <SequencePoint vc="0" uspid="159" ordinal="0" offset="0" sl="36" sc="9" el="36" ec="10" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="0" uspid="158" ordinal="1" offset="1" sl="37" sc="13" el="37" ec="42" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="0" uspid="157" ordinal="2" offset="13" sl="38" sc="13" el="38" ec="54" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="0" uspid="156" ordinal="3" offset="25" sl="39" sc="9" el="39" ec="10" bec="0" bev="0" fileid="13" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="0" uspid="159" ordinal="0" offset="0" sl="36" sc="9" el="36" ec="10" bec="0" bev="0" fileid="13" /> + </Method> + <Method visited="true" cyclomaticComplexity="5" nPathComplexity="4" sequenceCoverage="100" branchCoverage="80" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="5"> + <Summary numSequencePoints="16" visitedSequencePoints="16" numBranchPoints="5" visitedBranchPoints="4" sequenceCoverage="100" branchCoverage="80" maxCyclomaticComplexity="5" minCyclomaticComplexity="5" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="5" maxCrapScore="5" /> + <MetadataToken>100663363</MetadataToken> + <Name>System.Void Test.TestClass2::SampleFunction(System.String)</Name> + <FileRef uid="13" /> + <SequencePoints> + <SequencePoint vc="2" uspid="175" ordinal="0" offset="13" sl="42" sc="9" el="42" ec="10" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" uspid="174" ordinal="1" offset="14" sl="43" sc="13" el="43" ec="53" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" uspid="173" ordinal="2" offset="32" sl="45" sc="13" el="45" ec="53" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" uspid="172" ordinal="3" offset="70" sl="47" sc="13" el="47" ec="20" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" uspid="171" ordinal="4" offset="71" sl="47" sc="34" el="47" ec="41" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="8" uspid="170" ordinal="5" offset="81" sl="47" sc="22" el="47" ec="30" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="8" uspid="169" ordinal="6" offset="90" sl="48" sc="13" el="48" ec="14" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="8" uspid="168" ordinal="7" offset="91" sl="49" sc="17" el="49" ec="41" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="8" uspid="167" ordinal="8" offset="99" sl="50" sc="13" el="50" ec="14" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="10" uspid="166" ordinal="9" offset="100" sl="47" sc="31" el="47" ec="33" bec="2" bev="2" fileid="13" /> + <SequencePoint vc="2" uspid="165" ordinal="10" offset="124" sl="52" sc="13" el="52" ec="76" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" uspid="164" ordinal="11" offset="155" sl="54" sc="13" el="54" ec="105" bec="2" bev="1" fileid="13" /> + <SequencePoint vc="2" uspid="163" ordinal="12" offset="182" sl="55" sc="13" el="55" ec="14" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" uspid="162" ordinal="13" offset="183" sl="56" sc="17" el="56" ec="52" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" uspid="161" ordinal="14" offset="205" sl="57" sc="13" el="57" ec="14" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" uspid="160" ordinal="15" offset="206" sl="58" sc="9" el="58" ec="10" bec="0" bev="0" fileid="13" /> + </SequencePoints> + <BranchPoints> + <BranchPoint vc="2" uspid="6" ordinal="0" offset="107" sl="47" path="0" offsetend="109" fileid="13" /> + <BranchPoint vc="8" uspid="7" ordinal="1" offset="107" sl="47" path="1" offsetend="81" fileid="13" /> + <BranchPoint vc="2" uspid="8" ordinal="2" offset="180" sl="54" path="0" offsetend="182" fileid="13" /> + <BranchPoint vc="0" uspid="9" ordinal="3" offset="180" sl="54" path="1" offsetend="206" fileid="13" /> + </BranchPoints> + <MethodPoint xsi:type="SequencePoint" vc="2" uspid="175" ordinal="0" offset="13" sl="42" sc="9" el="42" ec="10" bec="0" bev="0" fileid="13" /> + </Method> + <Method visited="false" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="0"> + <Summary numSequencePoints="4" visitedSequencePoints="0" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" minCrapScore="0" maxCrapScore="0" /> + <MetadataToken>100663364</MetadataToken> + <Name>System.String Test.TestClass2::DoSomething(System.String,System.String[],System.Guid,System.Collections.Generic.IEnumerable`1<System.String>,System.Collections.Generic.IList`1<System.String>,System.Decimal,System.Int32,System.Collections.Generic.Dictionary`2<System.String,System.Int32>,System.Int32&,System.Single,System.Double,System.Boolean,System.Byte,System.Char,System.Object,System.SByte,System.Int16,System.UInt32,System.UInt64,System.UInt16)</Name> + <FileRef uid="13" /> + <SequencePoints> + <SequencePoint vc="0" uspid="179" ordinal="0" offset="0" sl="80" sc="9" el="80" ec="10" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="0" uspid="178" ordinal="1" offset="1" sl="81" sc="13" el="81" ec="19" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="0" uspid="177" ordinal="2" offset="5" sl="82" sc="13" el="82" ec="25" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="0" uspid="176" ordinal="3" offset="9" sl="83" sc="9" el="83" ec="10" bec="0" bev="0" fileid="13" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="0" uspid="179" ordinal="0" offset="0" sl="80" sc="9" el="80" ec="10" bec="0" bev="0" fileid="13" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="1" visitedSequencePoints="1" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" /> + <FullName>Test.TestClass2/<>c__DisplayClass14_0</FullName> + <Methods> + <Method visited="true" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="100" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="1"> + <Summary numSequencePoints="1" visitedSequencePoints="1" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" /> + <MetadataToken>100663376</MetadataToken> + <Name>System.Boolean Test.TestClass2/<>c__DisplayClass14_0::<SampleFunction>b__1(System.String)</Name> + <FileRef uid="13" /> + <SequencePoints> + <SequencePoint vc="6" uspid="180" ordinal="0" offset="0" sl="54" sc="45" el="54" ec="95" bec="0" bev="0" fileid="13" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="6" uspid="180" ordinal="0" offset="0" sl="54" sc="45" el="54" ec="95" bec="0" bev="0" fileid="13" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="1" visitedSequencePoints="1" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" /> + <FullName>Test.TestClass2/<>c</FullName> + <Methods> + <Method visited="true" cyclomaticComplexity="1" nPathComplexity="0" sequenceCoverage="100" branchCoverage="0" isConstructor="false" isStatic="false" isGetter="false" isSetter="false" crapScore="1"> + <Summary numSequencePoints="1" visitedSequencePoints="1" numBranchPoints="1" visitedBranchPoints="0" sequenceCoverage="100" branchCoverage="0" maxCyclomaticComplexity="1" minCyclomaticComplexity="1" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" minCrapScore="1" maxCrapScore="1" /> + <MetadataToken>100663379</MetadataToken> + <Name>System.Int32 Test.TestClass2/<>c::<SampleFunction>b__14_0(System.Int32)</Name> + <FileRef uid="13" /> + <SequencePoints> + <SequencePoint vc="8" uspid="181" ordinal="0" offset="0" sl="45" sc="46" el="45" ec="51" bec="0" bev="0" fileid="13" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint xsi:type="SequencePoint" vc="8" uspid="181" ordinal="0" offset="0" sl="45" sc="46" el="45" ec="51" bec="0" bev="0" fileid="13" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <FullName><PrivateImplementationDetails></FullName> + <Methods /> + </Class> + <Class> + <Summary numSequencePoints="0" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="0" minCrapScore="0" maxCrapScore="0" /> + <FullName><PrivateImplementationDetails>/__StaticArrayInitTypeSize=16</FullName> + <Methods /> + </Class> + </Classes> + </Module> + </Modules> +</CoverageSession> diff --git a/src/Testprojects/CSharp/Reports/OpenCover_coverlet.xml b/src/Testprojects/CSharp/Reports/OpenCover_coverlet.xml new file mode 100644 index 00000000..c8d9a8cf --- /dev/null +++ b/src/Testprojects/CSharp/Reports/OpenCover_coverlet.xml @@ -0,0 +1,816 @@ +<?xml version="1.0" encoding="utf-8"?> +<CoverageSession> + <Summary numSequencePoints="188" visitedSequencePoints="125" numBranchPoints="188" visitedBranchPoints="125" sequenceCoverage="0,665" branchCoverage="0,665" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="17" numClasses="21" visitedMethods="27" numMethods="45" /> + <Modules> + <Module hash="62C33F36-87DE-46E7-9BF4-7A39C62700CA"> + <ModulePath>Test.dll</ModulePath> + <ModuleTime>2018-10-17T07:20:55</ModuleTime> + <ModuleName>Test</ModuleName> + <Files> + <File uid="1" fullPath="C:\temp\AbstractClass.cs" /> + <File uid="2" fullPath="C:\temp\AnalyzerTestClass.cs" /> + <File uid="3" fullPath="C:\temp\AsyncClass.cs" /> + <File uid="4" fullPath="C:\temp\ClassWithExcludes.cs" /> + <File uid="5" fullPath="C:\temp\CodeContract_Contract.cs" /> + <File uid="6" fullPath="C:\temp\CodeContract_Target.cs" /> + <File uid="7" fullPath="C:\temp\GenericClass.cs" /> + <File uid="8" fullPath="C:\temp\NotMatchingFileName.cs" /> + <File uid="9" fullPath="C:\temp\PartialClass.cs" /> + <File uid="10" fullPath="C:\temp\PartialClass2.cs" /> + <File uid="11" fullPath="C:\temp\PartialClassWithAutoProperties.cs" /> + <File uid="12" fullPath="C:\temp\PartialClassWithAutoProperties2.cs" /> + <File uid="13" fullPath="C:\temp\Program.cs" /> + <File uid="14" fullPath="C:\temp\TestClass.cs" /> + <File uid="15" fullPath="C:\temp\TestClass2.cs" /> + </Files> + <Classes> + <Class> + <Summary numSequencePoints="4" visitedSequencePoints="4" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="1" /> + <FullName>Test.AbstractClass</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="0" isConstructor="True" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="4" visitedSequencePoints="4" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.AbstractClass::.ctor()</Name> + <FileRef uid="1" /> + <SequencePoints> + <SequencePoint vc="4" upsid="7" ordinal="0" sl="7" sc="1" el="7" ec="2" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="4" upsid="8" ordinal="1" sl="8" sc="1" el="8" ec="2" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="4" upsid="9" ordinal="2" sl="9" sc="1" el="9" ec="2" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="4" upsid="10" ordinal="3" sl="10" sc="1" el="10" ec="2" bec="0" bev="0" fileid="1" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="4" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="7" ec="1" el="10" bec="0" bev="0" fileid="1" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="8" visitedSequencePoints="4" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0,5" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="3" /> + <FullName>Test.AbstractClass_SampleImpl1</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="2" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.AbstractClass_SampleImpl1::Method1()</Name> + <FileRef uid="1" /> + <SequencePoints> + <SequencePoint vc="0" upsid="26" ordinal="0" sl="26" sc="1" el="26" ec="2" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="0" upsid="27" ordinal="1" sl="27" sc="1" el="27" ec="2" bec="0" bev="0" fileid="1" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="0" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="26" ec="1" el="27" bec="0" bev="0" fileid="1" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="2" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.AbstractClass_SampleImpl1::Method2()</Name> + <FileRef uid="1" /> + <SequencePoints> + <SequencePoint vc="0" upsid="31" ordinal="0" sl="31" sc="1" el="31" ec="2" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="0" upsid="32" ordinal="1" sl="32" sc="1" el="32" ec="2" bec="0" bev="0" fileid="1" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="0" upsid="0" p8:type="SequencePoint" ordinal="1" offset="1" sc="0" sl="31" ec="1" el="32" bec="0" bev="0" fileid="1" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="0" isConstructor="True" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="4" visitedSequencePoints="4" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.AbstractClass_SampleImpl1::.ctor()</Name> + <FileRef uid="1" /> + <SequencePoints> + <SequencePoint vc="2" upsid="20" ordinal="0" sl="20" sc="1" el="20" ec="2" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="2" upsid="21" ordinal="1" sl="21" sc="1" el="21" ec="2" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="2" upsid="22" ordinal="2" sl="22" sc="1" el="22" ec="2" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="2" upsid="23" ordinal="3" sl="23" sc="1" el="23" ec="2" bec="0" bev="0" fileid="1" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="4" upsid="0" p8:type="SequencePoint" ordinal="2" offset="2" sc="0" sl="20" ec="1" el="23" bec="0" bev="0" fileid="1" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="8" visitedSequencePoints="4" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0,5" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="3" /> + <FullName>Test.AbstractClass_SampleImpl2</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="2" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.AbstractClass_SampleImpl2::Method1()</Name> + <FileRef uid="1" /> + <SequencePoints> + <SequencePoint vc="0" upsid="45" ordinal="0" sl="45" sc="1" el="45" ec="2" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="0" upsid="46" ordinal="1" sl="46" sc="1" el="46" ec="2" bec="0" bev="0" fileid="1" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="0" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="45" ec="1" el="46" bec="0" bev="0" fileid="1" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="2" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.AbstractClass_SampleImpl2::Method2()</Name> + <FileRef uid="1" /> + <SequencePoints> + <SequencePoint vc="0" upsid="50" ordinal="0" sl="50" sc="1" el="50" ec="2" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="0" upsid="51" ordinal="1" sl="51" sc="1" el="51" ec="2" bec="0" bev="0" fileid="1" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="0" upsid="0" p8:type="SequencePoint" ordinal="1" offset="1" sc="0" sl="50" ec="1" el="51" bec="0" bev="0" fileid="1" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="0" isConstructor="True" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="4" visitedSequencePoints="4" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.AbstractClass_SampleImpl2::.ctor()</Name> + <FileRef uid="1" /> + <SequencePoints> + <SequencePoint vc="2" upsid="39" ordinal="0" sl="39" sc="1" el="39" ec="2" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="2" upsid="40" ordinal="1" sl="40" sc="1" el="40" ec="2" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="2" upsid="41" ordinal="2" sl="41" sc="1" el="41" ec="2" bec="0" bev="0" fileid="1" /> + <SequencePoint vc="2" upsid="42" ordinal="3" sl="42" sc="1" el="42" ec="2" bec="0" bev="0" fileid="1" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="4" upsid="0" p8:type="SequencePoint" ordinal="2" offset="2" sc="0" sl="39" ec="1" el="42" bec="0" bev="0" fileid="1" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="11" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="1" visitedMethods="0" numMethods="4" /> + <FullName>Test.AnalyzerTestClass</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="4" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" /> + <MetadataToken /> + <Name>System.String Test.AnalyzerTestClass::DoSomething(System.String,System.String[],System.Guid,System.Collections.Generic.IEnumerable`1<System.String>,System.Collections.Generic.IList`1<System.String>,System.Decimal,System.Int32,System.Int64,System.Collections.Generic.Dictionary`2<System.String,System.Int32>,System.Int32&,System.Single,System.Double,System.Boolean,System.Byte,System.Char,System.Object,System.SByte,System.Int16,System.UInt32,System.UInt64,System.UInt16)</Name> + <FileRef uid="2" /> + <SequencePoints> + <SequencePoint vc="0" upsid="35" ordinal="0" sl="35" sc="1" el="35" ec="2" bec="0" bev="0" fileid="2" /> + <SequencePoint vc="0" upsid="36" ordinal="1" sl="36" sc="1" el="36" ec="2" bec="0" bev="0" fileid="2" /> + <SequencePoint vc="0" upsid="37" ordinal="2" sl="37" sc="1" el="37" ec="2" bec="0" bev="0" fileid="2" /> + <SequencePoint vc="0" upsid="38" ordinal="3" sl="38" sc="1" el="38" ec="2" bec="0" bev="0" fileid="2" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="0" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="35" ec="1" el="38" bec="0" bev="0" fileid="2" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="2" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.AnalyzerTestClass::GenericMethod(T1,T2,System.Int32)</Name> + <FileRef uid="2" /> + <SequencePoints> + <SequencePoint vc="0" upsid="41" ordinal="0" sl="41" sc="1" el="41" ec="2" bec="0" bev="0" fileid="2" /> + <SequencePoint vc="0" upsid="42" ordinal="1" sl="42" sc="1" el="42" ec="2" bec="0" bev="0" fileid="2" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="0" upsid="0" p8:type="SequencePoint" ordinal="1" offset="1" sc="0" sl="41" ec="1" el="42" bec="0" bev="0" fileid="2" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="False" isGetter="True" isSetter="False" isStatic="True"> + <Summary numSequencePoints="1" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" /> + <MetadataToken /> + <Name>System.String Test.AnalyzerTestClass::get_AutoProperty()</Name> + <FileRef uid="2" /> + <SequencePoints> + <SequencePoint vc="0" upsid="44" ordinal="0" sl="44" sc="1" el="44" ec="2" bec="0" bev="0" fileid="2" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="0" upsid="0" p8:type="SequencePoint" ordinal="2" offset="2" sc="0" sl="44" ec="1" el="44" bec="0" bev="0" fileid="2" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="True" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="4" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.AnalyzerTestClass::.ctor()</Name> + <FileRef uid="2" /> + <SequencePoints> + <SequencePoint vc="0" upsid="8" ordinal="0" sl="8" sc="1" el="8" ec="2" bec="0" bev="0" fileid="2" /> + <SequencePoint vc="0" upsid="9" ordinal="1" sl="9" sc="1" el="9" ec="2" bec="0" bev="0" fileid="2" /> + <SequencePoint vc="0" upsid="10" ordinal="2" sl="10" sc="1" el="10" ec="2" bec="0" bev="0" fileid="2" /> + <SequencePoint vc="0" upsid="11" ordinal="3" sl="11" sc="1" el="11" ec="2" bec="0" bev="0" fileid="2" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="0" upsid="0" p8:type="SequencePoint" ordinal="3" offset="3" sc="0" sl="8" ec="1" el="11" bec="0" bev="0" fileid="2" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="4" visitedSequencePoints="4" numBranchPoints="1" visitedBranchPoints="1" sequenceCoverage="1" branchCoverage="1" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="1" /> + <FullName>Test.AsyncClass/<SendAsync>d__0</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="1" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="4" visitedSequencePoints="4" numBranchPoints="1" visitedBranchPoints="1" sequenceCoverage="1" branchCoverage="1" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.AsyncClass/<SendAsync>d__0::MoveNext()</Name> + <FileRef uid="3" /> + <SequencePoints> + <SequencePoint vc="2" upsid="10" ordinal="0" sl="10" sc="1" el="10" ec="2" bec="0" bev="0" fileid="3" /> + <SequencePoint vc="2" upsid="11" ordinal="1" sl="11" sc="1" el="11" ec="2" bec="0" bev="0" fileid="3" /> + <SequencePoint vc="2" upsid="12" ordinal="2" sl="12" sc="1" el="12" ec="2" bec="0" bev="0" fileid="3" /> + <SequencePoint vc="2" upsid="13" ordinal="3" sl="13" sc="1" el="13" ec="2" bec="0" bev="0" fileid="3" /> + </SequencePoints> + <BranchPoints> + <BranchPoint vc="2" upsid="12" ordinal="1" path="1" offset="79" offsetend="145" sl="12" fileid="3" /> + </BranchPoints> + <MethodPoint vc="4" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="10" ec="1" el="13" bec="0" bev="0" fileid="3" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="8" visitedSequencePoints="8" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="1" numClasses="1" visitedMethods="4" numMethods="4" /> + <FullName>Test.ClassWithExcludes</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="0" isConstructor="False" isGetter="True" isSetter="False" isStatic="True"> + <Summary numSequencePoints="1" visitedSequencePoints="1" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.String Test.ClassWithExcludes::get_IncludedProperty()</Name> + <FileRef uid="4" /> + <SequencePoints> + <SequencePoint vc="2" upsid="6" ordinal="0" sl="6" sc="1" el="6" ec="2" bec="0" bev="0" fileid="4" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="1" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="6" ec="1" el="6" bec="0" bev="0" fileid="4" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="0" isConstructor="False" isGetter="True" isSetter="False" isStatic="True"> + <Summary numSequencePoints="1" visitedSequencePoints="1" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.String Test.ClassWithExcludes::get_ExcludedProperty()</Name> + <FileRef uid="4" /> + <SequencePoints> + <SequencePoint vc="2" upsid="9" ordinal="0" sl="9" sc="1" el="9" ec="2" bec="0" bev="0" fileid="4" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="1" upsid="0" p8:type="SequencePoint" ordinal="1" offset="1" sc="0" sl="9" ec="1" el="9" bec="0" bev="0" fileid="4" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="3" visitedSequencePoints="3" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.ClassWithExcludes::IncludedMethod()</Name> + <FileRef uid="4" /> + <SequencePoints> + <SequencePoint vc="2" upsid="12" ordinal="0" sl="12" sc="1" el="12" ec="2" bec="0" bev="0" fileid="4" /> + <SequencePoint vc="2" upsid="13" ordinal="1" sl="13" sc="1" el="13" ec="2" bec="0" bev="0" fileid="4" /> + <SequencePoint vc="2" upsid="14" ordinal="2" sl="14" sc="1" el="14" ec="2" bec="0" bev="0" fileid="4" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="3" upsid="0" p8:type="SequencePoint" ordinal="2" offset="2" sc="0" sl="12" ec="1" el="14" bec="0" bev="0" fileid="4" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="3" visitedSequencePoints="3" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.ClassWithExcludes::ExcludedMethod()</Name> + <FileRef uid="4" /> + <SequencePoints> + <SequencePoint vc="2" upsid="18" ordinal="0" sl="18" sc="1" el="18" ec="2" bec="0" bev="0" fileid="4" /> + <SequencePoint vc="2" upsid="19" ordinal="1" sl="19" sc="1" el="19" ec="2" bec="0" bev="0" fileid="4" /> + <SequencePoint vc="2" upsid="20" ordinal="2" sl="20" sc="1" el="20" ec="2" bec="0" bev="0" fileid="4" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="3" upsid="0" p8:type="SequencePoint" ordinal="3" offset="3" sc="0" sl="18" ec="1" el="20" bec="0" bev="0" fileid="4" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="4" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="1" visitedMethods="0" numMethods="1" /> + <FullName>Test.CodeContract_Contract</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="4" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" /> + <MetadataToken /> + <Name>System.Int32 Test.CodeContract_Contract::Calculate(System.Int32)</Name> + <FileRef uid="5" /> + <SequencePoints> + <SequencePoint vc="0" upsid="10" ordinal="0" sl="10" sc="1" el="10" ec="2" bec="0" bev="0" fileid="5" /> + <SequencePoint vc="0" upsid="11" ordinal="1" sl="11" sc="1" el="11" ec="2" bec="0" bev="0" fileid="5" /> + <SequencePoint vc="0" upsid="13" ordinal="2" sl="13" sc="1" el="13" ec="2" bec="0" bev="0" fileid="5" /> + <SequencePoint vc="0" upsid="14" ordinal="3" sl="14" sc="1" el="14" ec="2" bec="0" bev="0" fileid="5" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="0" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="10" ec="1" el="14" bec="0" bev="0" fileid="5" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="7" visitedSequencePoints="7" numBranchPoints="2" visitedBranchPoints="2" sequenceCoverage="1" branchCoverage="1" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="1" /> + <FullName>Test.CodeContract_Target</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="1" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="7" visitedSequencePoints="7" numBranchPoints="2" visitedBranchPoints="2" sequenceCoverage="1" branchCoverage="1" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Int32 Test.CodeContract_Target::Calculate(System.Int32)</Name> + <FileRef uid="6" /> + <SequencePoints> + <SequencePoint vc="4" upsid="7" ordinal="0" sl="7" sc="1" el="7" ec="2" bec="0" bev="0" fileid="6" /> + <SequencePoint vc="4" upsid="8" ordinal="1" sl="8" sc="1" el="8" ec="2" bec="0" bev="0" fileid="6" /> + <SequencePoint vc="2" upsid="9" ordinal="2" sl="9" sc="1" el="9" ec="2" bec="0" bev="0" fileid="6" /> + <SequencePoint vc="2" upsid="10" ordinal="3" sl="10" sc="1" el="10" ec="2" bec="0" bev="0" fileid="6" /> + <SequencePoint vc="2" upsid="13" ordinal="4" sl="13" sc="1" el="13" ec="2" bec="0" bev="0" fileid="6" /> + <SequencePoint vc="2" upsid="14" ordinal="5" sl="14" sc="1" el="14" ec="2" bec="0" bev="0" fileid="6" /> + <SequencePoint vc="4" upsid="16" ordinal="6" sl="16" sc="1" el="16" ec="2" bec="0" bev="0" fileid="6" /> + </SequencePoints> + <BranchPoints> + <BranchPoint vc="2" upsid="8" ordinal="0" path="0" offset="7" offsetend="9" sl="8" fileid="6" /> + <BranchPoint vc="2" upsid="8" ordinal="1" path="1" offset="7" offsetend="14" sl="8" fileid="6" /> + </BranchPoints> + <MethodPoint vc="7" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="7" ec="1" el="16" bec="0" bev="0" fileid="6" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="3" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="1" visitedMethods="0" numMethods="1" /> + <FullName>Test.AbstractGenericClass`2</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="3" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" /> + <MetadataToken /> + <Name>System.Boolean Test.AbstractGenericClass`2::PostProcess(Test.ISomeObjectInterface`2<TModel,TState>)</Name> + <FileRef uid="7" /> + <SequencePoints> + <SequencePoint vc="0" upsid="12" ordinal="0" sl="12" sc="1" el="12" ec="2" bec="0" bev="0" fileid="7" /> + <SequencePoint vc="0" upsid="13" ordinal="1" sl="13" sc="1" el="13" ec="2" bec="0" bev="0" fileid="7" /> + <SequencePoint vc="0" upsid="14" ordinal="2" sl="14" sc="1" el="14" ec="2" bec="0" bev="0" fileid="7" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="0" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="12" ec="1" el="14" bec="0" bev="0" fileid="7" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="8" visitedSequencePoints="8" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="1" numClasses="1" visitedMethods="2" numMethods="2" /> + <FullName>Test.GenericClass`2</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="4" visitedSequencePoints="4" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Boolean Test.GenericClass`2::Process(Test.ISomeObjectInterface`2<TModel,TState>)</Name> + <FileRef uid="7" /> + <SequencePoints> + <SequencePoint vc="2" upsid="22" ordinal="0" sl="22" sc="1" el="22" ec="2" bec="0" bev="0" fileid="7" /> + <SequencePoint vc="2" upsid="23" ordinal="1" sl="23" sc="1" el="23" ec="2" bec="0" bev="0" fileid="7" /> + <SequencePoint vc="2" upsid="24" ordinal="2" sl="24" sc="1" el="24" ec="2" bec="0" bev="0" fileid="7" /> + <SequencePoint vc="2" upsid="25" ordinal="3" sl="25" sc="1" el="25" ec="2" bec="0" bev="0" fileid="7" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="4" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="22" ec="1" el="25" bec="0" bev="0" fileid="7" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="4" visitedSequencePoints="4" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Boolean Test.GenericClass`2::PostProcess(Test.ISomeObjectInterface`2<TModel,TState>)</Name> + <FileRef uid="7" /> + <SequencePoints> + <SequencePoint vc="2" upsid="28" ordinal="0" sl="28" sc="1" el="28" ec="2" bec="0" bev="0" fileid="7" /> + <SequencePoint vc="2" upsid="29" ordinal="1" sl="29" sc="1" el="29" ec="2" bec="0" bev="0" fileid="7" /> + <SequencePoint vc="2" upsid="30" ordinal="2" sl="30" sc="1" el="30" ec="2" bec="0" bev="0" fileid="7" /> + <SequencePoint vc="2" upsid="31" ordinal="3" sl="31" sc="1" el="31" ec="2" bec="0" bev="0" fileid="7" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="4" upsid="0" p8:type="SequencePoint" ordinal="1" offset="1" sc="0" sl="28" ec="1" el="31" bec="0" bev="0" fileid="7" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="1" visitedSequencePoints="1" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="1" /> + <FullName>Test.SomeClass</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="0" isConstructor="False" isGetter="True" isSetter="False" isStatic="True"> + <Summary numSequencePoints="1" visitedSequencePoints="1" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.String Test.SomeClass::get_Property1()</Name> + <FileRef uid="8" /> + <SequencePoints> + <SequencePoint vc="2" upsid="6" ordinal="0" sl="6" sc="1" el="6" ec="2" bec="0" bev="0" fileid="8" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="1" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="6" ec="1" el="6" bec="0" bev="0" fileid="8" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="16" visitedSequencePoints="9" numBranchPoints="2" visitedBranchPoints="1" sequenceCoverage="0,562" branchCoverage="0,5" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="1" numClasses="1" visitedMethods="2" numMethods="4" /> + <FullName>Test.PartialClass</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="3" visitedSequencePoints="3" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.PartialClass::ExecutedMethod_1()</Name> + <FileRef uid="9" /> + <SequencePoints> + <SequencePoint vc="2" upsid="8" ordinal="0" sl="8" sc="1" el="8" ec="2" bec="0" bev="0" fileid="9" /> + <SequencePoint vc="2" upsid="9" ordinal="1" sl="9" sc="1" el="9" ec="2" bec="0" bev="0" fileid="9" /> + <SequencePoint vc="2" upsid="10" ordinal="2" sl="10" sc="1" el="10" ec="2" bec="0" bev="0" fileid="9" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="3" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="8" ec="1" el="10" bec="0" bev="0" fileid="9" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="3" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.PartialClass::UnExecutedMethod_1()</Name> + <FileRef uid="9" /> + <SequencePoints> + <SequencePoint vc="0" upsid="13" ordinal="0" sl="13" sc="1" el="13" ec="2" bec="0" bev="0" fileid="9" /> + <SequencePoint vc="0" upsid="14" ordinal="1" sl="14" sc="1" el="14" ec="2" bec="0" bev="0" fileid="9" /> + <SequencePoint vc="0" upsid="15" ordinal="2" sl="15" sc="1" el="15" ec="2" bec="0" bev="0" fileid="9" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="0" upsid="0" p8:type="SequencePoint" ordinal="1" offset="1" sc="0" sl="13" ec="1" el="15" bec="0" bev="0" fileid="9" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="False" isGetter="True" isSetter="False" isStatic="True"> + <Summary numSequencePoints="1" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" /> + <MetadataToken /> + <Name>System.Int32 Test.PartialClass::get_SomeProperty()</Name> + <FileRef uid="9" /> + <SequencePoints> + <SequencePoint vc="0" upsid="21" ordinal="0" sl="21" sc="1" el="21" ec="2" bec="0" bev="0" fileid="9" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="0" upsid="0" p8:type="SequencePoint" ordinal="2" offset="2" sc="0" sl="21" ec="1" el="21" bec="0" bev="0" fileid="9" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0,667" branchCoverage="0,5" isConstructor="False" isGetter="False" isSetter="True" isStatic="True"> + <Summary numSequencePoints="9" visitedSequencePoints="6" numBranchPoints="2" visitedBranchPoints="1" sequenceCoverage="0,667" branchCoverage="0,5" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.PartialClass::set_SomeProperty(System.Int32)</Name> + <FileRef uid="9" /> + <SequencePoints> + <SequencePoint vc="2" upsid="24" ordinal="0" sl="24" sc="1" el="24" ec="2" bec="0" bev="0" fileid="9" /> + <SequencePoint vc="2" upsid="25" ordinal="1" sl="25" sc="1" el="25" ec="2" bec="0" bev="0" fileid="9" /> + <SequencePoint vc="2" upsid="26" ordinal="2" sl="26" sc="1" el="26" ec="2" bec="0" bev="0" fileid="9" /> + <SequencePoint vc="2" upsid="27" ordinal="3" sl="27" sc="1" el="27" ec="2" bec="0" bev="0" fileid="9" /> + <SequencePoint vc="2" upsid="28" ordinal="4" sl="28" sc="1" el="28" ec="2" bec="0" bev="0" fileid="9" /> + <SequencePoint vc="0" upsid="30" ordinal="5" sl="30" sc="1" el="30" ec="2" bec="0" bev="0" fileid="9" /> + <SequencePoint vc="0" upsid="31" ordinal="6" sl="31" sc="1" el="31" ec="2" bec="0" bev="0" fileid="9" /> + <SequencePoint vc="0" upsid="32" ordinal="7" sl="32" sc="1" el="32" ec="2" bec="0" bev="0" fileid="9" /> + <SequencePoint vc="2" upsid="33" ordinal="8" sl="33" sc="1" el="33" ec="2" bec="0" bev="0" fileid="9" /> + </SequencePoints> + <BranchPoints> + <BranchPoint vc="2" upsid="25" ordinal="0" path="0" offset="7" offsetend="9" sl="25" fileid="9" /> + <BranchPoint vc="0" upsid="25" ordinal="1" path="1" offset="7" offsetend="20" sl="25" fileid="9" /> + </BranchPoints> + <MethodPoint vc="6" upsid="0" p8:type="SequencePoint" ordinal="3" offset="3" sc="0" sl="24" ec="1" el="33" bec="0" bev="0" fileid="9" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="6" visitedSequencePoints="3" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0,5" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="2" /> + <FullName>Test.PartialClass</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="3" visitedSequencePoints="3" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.PartialClass::ExecutedMethod_2()</Name> + <FileRef uid="10" /> + <SequencePoints> + <SequencePoint vc="2" upsid="8" ordinal="0" sl="8" sc="1" el="8" ec="2" bec="0" bev="0" fileid="10" /> + <SequencePoint vc="2" upsid="9" ordinal="1" sl="9" sc="1" el="9" ec="2" bec="0" bev="0" fileid="10" /> + <SequencePoint vc="2" upsid="10" ordinal="2" sl="10" sc="1" el="10" ec="2" bec="0" bev="0" fileid="10" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="3" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="8" ec="1" el="10" bec="0" bev="0" fileid="10" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="3" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.PartialClass::UnExecutedMethod_2()</Name> + <FileRef uid="10" /> + <SequencePoints> + <SequencePoint vc="0" upsid="13" ordinal="0" sl="13" sc="1" el="13" ec="2" bec="0" bev="0" fileid="10" /> + <SequencePoint vc="0" upsid="14" ordinal="1" sl="14" sc="1" el="14" ec="2" bec="0" bev="0" fileid="10" /> + <SequencePoint vc="0" upsid="15" ordinal="2" sl="15" sc="1" el="15" ec="2" bec="0" bev="0" fileid="10" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="0" upsid="0" p8:type="SequencePoint" ordinal="1" offset="1" sc="0" sl="13" ec="1" el="15" bec="0" bev="0" fileid="10" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="1" visitedSequencePoints="1" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="1" /> + <FullName>Test.PartialClassWithAutoProperties</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="0" isConstructor="False" isGetter="True" isSetter="False" isStatic="True"> + <Summary numSequencePoints="1" visitedSequencePoints="1" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.String Test.PartialClassWithAutoProperties::get_Property1()</Name> + <FileRef uid="11" /> + <SequencePoints> + <SequencePoint vc="2" upsid="6" ordinal="0" sl="6" sc="1" el="6" ec="2" bec="0" bev="0" fileid="11" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="1" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="6" ec="1" el="6" bec="0" bev="0" fileid="11" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="2" visitedSequencePoints="1" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0,5" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="2" /> + <FullName>Test.PartialClassWithAutoProperties</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="0" isConstructor="False" isGetter="True" isSetter="False" isStatic="True"> + <Summary numSequencePoints="1" visitedSequencePoints="1" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.String Test.PartialClassWithAutoProperties::get_Property2()</Name> + <FileRef uid="12" /> + <SequencePoints> + <SequencePoint vc="2" upsid="6" ordinal="0" sl="6" sc="1" el="6" ec="2" bec="0" bev="0" fileid="12" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="1" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="6" ec="1" el="6" bec="0" bev="0" fileid="12" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="False" isGetter="True" isSetter="False" isStatic="True"> + <Summary numSequencePoints="1" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" /> + <MetadataToken /> + <Name>System.String Test.PartialClassWithAutoProperties::get_ExpressionBodiedProperty()</Name> + <FileRef uid="12" /> + <SequencePoints> + <SequencePoint vc="0" upsid="8" ordinal="0" sl="8" sc="1" el="8" ec="2" bec="0" bev="0" fileid="12" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="0" upsid="0" p8:type="SequencePoint" ordinal="1" offset="1" sc="0" sl="8" ec="1" el="8" bec="0" bev="0" fileid="12" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="25" visitedSequencePoints="22" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0,88" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="1" /> + <FullName>Test.Program</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0,88" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="25" visitedSequencePoints="22" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0,88" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.Program::Main(System.String[])</Name> + <FileRef uid="13" /> + <SequencePoints> + <SequencePoint vc="2" upsid="10" ordinal="0" sl="10" sc="1" el="10" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="11" ordinal="1" sl="11" sc="1" el="11" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="13" ordinal="2" sl="13" sc="1" el="13" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="14" ordinal="3" sl="14" sc="1" el="14" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="16" ordinal="4" sl="16" sc="1" el="16" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="17" ordinal="5" sl="17" sc="1" el="17" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="18" ordinal="6" sl="18" sc="1" el="18" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="20" ordinal="7" sl="20" sc="1" el="20" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="21" ordinal="8" sl="21" sc="1" el="21" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="23" ordinal="9" sl="23" sc="1" el="23" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="25" ordinal="10" sl="25" sc="1" el="25" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="26" ordinal="11" sl="26" sc="1" el="26" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="28" ordinal="12" sl="28" sc="1" el="28" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="29" ordinal="13" sl="29" sc="1" el="29" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="31" ordinal="14" sl="31" sc="1" el="31" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="33" ordinal="15" sl="33" sc="1" el="33" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="34" ordinal="16" sl="34" sc="1" el="34" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="36" ordinal="17" sl="36" sc="1" el="36" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="39" ordinal="18" sl="39" sc="1" el="39" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="40" ordinal="19" sl="40" sc="1" el="40" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="41" ordinal="20" sl="41" sc="1" el="41" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="0" upsid="42" ordinal="21" sl="42" sc="1" el="42" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="0" upsid="43" ordinal="22" sl="43" sc="1" el="43" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="0" upsid="44" ordinal="23" sl="44" sc="1" el="44" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="45" ordinal="24" sl="45" sc="1" el="45" ec="2" bec="0" bev="0" fileid="13" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="22" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="10" ec="1" el="45" bec="0" bev="0" fileid="13" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="7" visitedSequencePoints="7" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="1" numClasses="1" visitedMethods="2" numMethods="2" /> + <FullName>Test.Program/EchoHandler</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="3" visitedSequencePoints="3" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Threading.Tasks.Task`1<System.Net.Http.HttpResponseMessage> Test.Program/EchoHandler::SendAsync(System.Net.Http.HttpRequestMessage,System.Threading.CancellationToken)</Name> + <FileRef uid="13" /> + <SequencePoints> + <SequencePoint vc="2" upsid="65" ordinal="0" sl="65" sc="1" el="65" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="66" ordinal="1" sl="66" sc="1" el="66" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="67" ordinal="2" sl="67" sc="1" el="67" ec="2" bec="0" bev="0" fileid="13" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="3" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="65" ec="1" el="67" bec="0" bev="0" fileid="13" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="0" isConstructor="True" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="4" visitedSequencePoints="4" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.Program/EchoHandler::.ctor(System.Net.Http.HttpResponseMessage)</Name> + <FileRef uid="13" /> + <SequencePoints> + <SequencePoint vc="2" upsid="59" ordinal="0" sl="59" sc="1" el="59" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="60" ordinal="1" sl="60" sc="1" el="60" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="61" ordinal="2" sl="61" sc="1" el="61" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="62" ordinal="3" sl="62" sc="1" el="62" ec="2" bec="0" bev="0" fileid="13" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="4" upsid="0" p8:type="SequencePoint" ordinal="1" offset="1" sc="0" sl="59" ec="1" el="62" bec="0" bev="0" fileid="13" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="6" visitedSequencePoints="6" numBranchPoints="1" visitedBranchPoints="1" sequenceCoverage="1" branchCoverage="1" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="1" /> + <FullName>Test.Program/<CallAsyncMethod>d__1</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="1" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="6" visitedSequencePoints="6" numBranchPoints="1" visitedBranchPoints="1" sequenceCoverage="1" branchCoverage="1" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.Program/<CallAsyncMethod>d__1::MoveNext()</Name> + <FileRef uid="13" /> + <SequencePoints> + <SequencePoint vc="2" upsid="48" ordinal="0" sl="48" sc="1" el="48" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="49" ordinal="1" sl="49" sc="1" el="49" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="50" ordinal="2" sl="50" sc="1" el="50" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="51" ordinal="3" sl="51" sc="1" el="51" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="52" ordinal="4" sl="52" sc="1" el="52" ec="2" bec="0" bev="0" fileid="13" /> + <SequencePoint vc="2" upsid="53" ordinal="5" sl="53" sc="1" el="53" ec="2" bec="0" bev="0" fileid="13" /> + </SequencePoints> + <BranchPoints> + <BranchPoint vc="2" upsid="52" ordinal="1" path="1" offset="114" offsetend="180" sl="52" fileid="13" /> + </BranchPoints> + <MethodPoint vc="6" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="48" ec="1" el="53" bec="0" bev="0" fileid="13" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="15" visitedSequencePoints="12" numBranchPoints="4" visitedBranchPoints="2" sequenceCoverage="0,8" branchCoverage="0,5" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="1" numClasses="1" visitedMethods="1" numMethods="1" /> + <FullName>Test.TestClass</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0,8" branchCoverage="0,5" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="15" visitedSequencePoints="12" numBranchPoints="4" visitedBranchPoints="2" sequenceCoverage="0,8" branchCoverage="0,5" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.TestClass::SampleFunction()</Name> + <FileRef uid="14" /> + <SequencePoints> + <SequencePoint vc="2" upsid="8" ordinal="0" sl="8" sc="1" el="8" ec="2" bec="0" bev="0" fileid="14" /> + <SequencePoint vc="2" upsid="9" ordinal="1" sl="9" sc="1" el="9" ec="2" bec="0" bev="0" fileid="14" /> + <SequencePoint vc="2" upsid="10" ordinal="2" sl="10" sc="1" el="10" ec="2" bec="0" bev="0" fileid="14" /> + <SequencePoint vc="2" upsid="11" ordinal="3" sl="11" sc="1" el="11" ec="2" bec="0" bev="0" fileid="14" /> + <SequencePoint vc="2" upsid="12" ordinal="4" sl="12" sc="1" el="12" ec="2" bec="0" bev="0" fileid="14" /> + <SequencePoint vc="2" upsid="14" ordinal="5" sl="14" sc="1" el="14" ec="2" bec="0" bev="0" fileid="14" /> + <SequencePoint vc="2" upsid="15" ordinal="6" sl="15" sc="1" el="15" ec="2" bec="0" bev="0" fileid="14" /> + <SequencePoint vc="2" upsid="17" ordinal="7" sl="17" sc="1" el="17" ec="2" bec="0" bev="0" fileid="14" /> + <SequencePoint vc="2" upsid="18" ordinal="8" sl="18" sc="1" el="18" ec="2" bec="0" bev="0" fileid="14" /> + <SequencePoint vc="2" upsid="19" ordinal="9" sl="19" sc="1" el="19" ec="2" bec="0" bev="0" fileid="14" /> + <SequencePoint vc="2" upsid="20" ordinal="10" sl="20" sc="1" el="20" ec="2" bec="0" bev="0" fileid="14" /> + <SequencePoint vc="0" upsid="22" ordinal="11" sl="22" sc="1" el="22" ec="2" bec="0" bev="0" fileid="14" /> + <SequencePoint vc="0" upsid="23" ordinal="12" sl="23" sc="1" el="23" ec="2" bec="0" bev="0" fileid="14" /> + <SequencePoint vc="0" upsid="24" ordinal="13" sl="24" sc="1" el="24" ec="2" bec="0" bev="0" fileid="14" /> + <SequencePoint vc="2" upsid="25" ordinal="14" sl="25" sc="1" el="25" ec="2" bec="0" bev="0" fileid="14" /> + </SequencePoints> + <BranchPoints> + <BranchPoint vc="0" upsid="17" ordinal="0" path="0" offset="34" offsetend="36" sl="17" fileid="14" /> + <BranchPoint vc="2" upsid="17" ordinal="1" path="1" offset="34" offsetend="42" sl="17" fileid="14" /> + <BranchPoint vc="2" upsid="17" ordinal="2" path="0" offset="45" offsetend="47" sl="17" fileid="14" /> + <BranchPoint vc="0" upsid="17" ordinal="3" path="1" offset="45" offsetend="73" sl="17" fileid="14" /> + </BranchPoints> + <MethodPoint vc="12" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="8" ec="1" el="25" bec="0" bev="0" fileid="14" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="6" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="1" visitedMethods="0" numMethods="1" /> + <FullName>Test.TestClass/NestedClass</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="6" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.TestClass/NestedClass::SampleFunction()</Name> + <FileRef uid="14" /> + <SequencePoints> + <SequencePoint vc="0" upsid="30" ordinal="0" sl="30" sc="1" el="30" ec="2" bec="0" bev="0" fileid="14" /> + <SequencePoint vc="0" upsid="31" ordinal="1" sl="31" sc="1" el="31" ec="2" bec="0" bev="0" fileid="14" /> + <SequencePoint vc="0" upsid="32" ordinal="2" sl="32" sc="1" el="32" ec="2" bec="0" bev="0" fileid="14" /> + <SequencePoint vc="0" upsid="33" ordinal="3" sl="33" sc="1" el="33" ec="2" bec="0" bev="0" fileid="14" /> + <SequencePoint vc="0" upsid="34" ordinal="4" sl="34" sc="1" el="34" ec="2" bec="0" bev="0" fileid="14" /> + <SequencePoint vc="0" upsid="35" ordinal="5" sl="35" sc="1" el="35" ec="2" bec="0" bev="0" fileid="14" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="0" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="30" ec="1" el="35" bec="0" bev="0" fileid="14" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + <Class> + <Summary numSequencePoints="38" visitedSequencePoints="24" numBranchPoints="6" visitedBranchPoints="6" sequenceCoverage="0,632" branchCoverage="1" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="1" numClasses="1" visitedMethods="5" numMethods="8" /> + <FullName>Test.TestClass2</FullName> + <Methods> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="0" isConstructor="False" isGetter="True" isSetter="False" isStatic="True"> + <Summary numSequencePoints="1" visitedSequencePoints="1" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.String Test.TestClass2::get_ExecutedProperty()</Name> + <FileRef uid="15" /> + <SequencePoints> + <SequencePoint vc="6" upsid="13" ordinal="0" sl="13" sc="1" el="13" ec="2" bec="0" bev="0" fileid="15" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="1" upsid="0" p8:type="SequencePoint" ordinal="0" offset="0" sc="0" sl="13" ec="1" el="13" bec="0" bev="0" fileid="15" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="False" isGetter="True" isSetter="False" isStatic="True"> + <Summary numSequencePoints="1" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" /> + <MetadataToken /> + <Name>System.String Test.TestClass2::get_UnExecutedProperty()</Name> + <FileRef uid="15" /> + <SequencePoints> + <SequencePoint vc="0" upsid="15" ordinal="0" sl="15" sc="1" el="15" ec="2" bec="0" bev="0" fileid="15" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="0" upsid="0" p8:type="SequencePoint" ordinal="1" offset="1" sc="0" sl="15" ec="1" el="15" bec="0" bev="0" fileid="15" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="4" visitedSequencePoints="4" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.TestClass2::ExecutedMethod()</Name> + <FileRef uid="15" /> + <SequencePoints> + <SequencePoint vc="2" upsid="30" ordinal="0" sl="30" sc="1" el="30" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="2" upsid="31" ordinal="1" sl="31" sc="1" el="31" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="2" upsid="32" ordinal="2" sl="32" sc="1" el="32" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="2" upsid="33" ordinal="3" sl="33" sc="1" el="33" ec="2" bec="0" bev="0" fileid="15" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="4" upsid="0" p8:type="SequencePoint" ordinal="2" offset="2" sc="0" sl="30" ec="1" el="33" bec="0" bev="0" fileid="15" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="4" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.TestClass2::UnExecutedMethod()</Name> + <FileRef uid="15" /> + <SequencePoints> + <SequencePoint vc="0" upsid="36" ordinal="0" sl="36" sc="1" el="36" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="0" upsid="37" ordinal="1" sl="37" sc="1" el="37" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="0" upsid="38" ordinal="2" sl="38" sc="1" el="38" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="0" upsid="39" ordinal="3" sl="39" sc="1" el="39" ec="2" bec="0" bev="0" fileid="15" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="0" upsid="0" p8:type="SequencePoint" ordinal="3" offset="3" sc="0" sl="36" ec="1" el="39" bec="0" bev="0" fileid="15" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="1" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="13" visitedSequencePoints="13" numBranchPoints="6" visitedBranchPoints="6" sequenceCoverage="1" branchCoverage="1" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.TestClass2::SampleFunction(System.String)</Name> + <FileRef uid="15" /> + <SequencePoints> + <SequencePoint vc="2" upsid="42" ordinal="0" sl="42" sc="1" el="42" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="2" upsid="43" ordinal="1" sl="43" sc="1" el="43" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="10" upsid="45" ordinal="2" sl="45" sc="1" el="45" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="22" upsid="47" ordinal="3" sl="47" sc="1" el="47" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="8" upsid="48" ordinal="4" sl="48" sc="1" el="48" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="8" upsid="49" ordinal="5" sl="49" sc="1" el="49" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="8" upsid="50" ordinal="6" sl="50" sc="1" el="50" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="2" upsid="52" ordinal="7" sl="52" sc="1" el="52" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="8" upsid="54" ordinal="8" sl="54" sc="1" el="54" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="2" upsid="55" ordinal="9" sl="55" sc="1" el="55" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="2" upsid="56" ordinal="10" sl="56" sc="1" el="56" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="2" upsid="57" ordinal="11" sl="57" sc="1" el="57" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="2" upsid="58" ordinal="12" sl="58" sc="1" el="58" ec="2" bec="0" bev="0" fileid="15" /> + </SequencePoints> + <BranchPoints> + <BranchPoint vc="1" upsid="45" ordinal="0" path="0" offset="39" offsetend="41" sl="45" fileid="15" /> + <BranchPoint vc="2" upsid="45" ordinal="1" path="1" offset="39" offsetend="64" sl="45" fileid="15" /> + <BranchPoint vc="8" upsid="47" ordinal="3" path="1" offset="107" offsetend="81" sl="47" fileid="15" /> + <BranchPoint vc="2" upsid="47" ordinal="2" path="0" offset="107" offsetend="109" sl="47" fileid="15" /> + <BranchPoint vc="2" upsid="54" ordinal="4" path="0" offset="180" offsetend="182" sl="54" fileid="15" /> + <BranchPoint vc="2" upsid="54" ordinal="5" path="1" offset="180" offsetend="206" sl="54" fileid="15" /> + </BranchPoints> + <MethodPoint vc="13" upsid="0" p8:type="SequencePoint" ordinal="4" offset="4" sc="0" sl="42" ec="1" el="58" bec="0" bev="0" fileid="15" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0" branchCoverage="0" isConstructor="False" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="4" visitedSequencePoints="0" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="0" numMethods="1" /> + <MetadataToken /> + <Name>System.String Test.TestClass2::DoSomething(System.String,System.String[],System.Guid,System.Collections.Generic.IEnumerable`1<System.String>,System.Collections.Generic.IList`1<System.String>,System.Decimal,System.Int32,System.Collections.Generic.Dictionary`2<System.String,System.Int32>,System.Int32&,System.Single,System.Double,System.Boolean,System.Byte,System.Char,System.Object,System.SByte,System.Int16,System.UInt32,System.UInt64,System.UInt16)</Name> + <FileRef uid="15" /> + <SequencePoints> + <SequencePoint vc="0" upsid="80" ordinal="0" sl="80" sc="1" el="80" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="0" upsid="81" ordinal="1" sl="81" sc="1" el="81" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="0" upsid="82" ordinal="2" sl="82" sc="1" el="82" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="0" upsid="83" ordinal="3" sl="83" sc="1" el="83" ec="2" bec="0" bev="0" fileid="15" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="0" upsid="0" p8:type="SequencePoint" ordinal="5" offset="5" sc="0" sl="80" ec="1" el="83" bec="0" bev="0" fileid="15" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="0,167" branchCoverage="0" isConstructor="True" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="6" visitedSequencePoints="1" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="0,167" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.TestClass2::.ctor()</Name> + <FileRef uid="15" /> + <SequencePoints> + <SequencePoint vc="4" upsid="11" ordinal="0" sl="11" sc="1" el="11" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="0" upsid="17" ordinal="1" sl="17" sc="1" el="17" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="0" upsid="18" ordinal="2" sl="18" sc="1" el="18" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="0" upsid="19" ordinal="3" sl="19" sc="1" el="19" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="0" upsid="20" ordinal="4" sl="20" sc="1" el="20" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="0" upsid="21" ordinal="5" sl="21" sc="1" el="21" ec="2" bec="0" bev="0" fileid="15" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="1" upsid="0" p8:type="SequencePoint" ordinal="6" offset="6" sc="0" sl="11" ec="1" el="21" bec="0" bev="0" fileid="15" xmlns:p8="xsi" /> + </Method> + <Method cyclomaticComplexity="0" nPathComplexity="0" sequenceCoverage="1" branchCoverage="0" isConstructor="True" isGetter="False" isSetter="False" isStatic="True"> + <Summary numSequencePoints="5" visitedSequencePoints="5" numBranchPoints="0" visitedBranchPoints="0" sequenceCoverage="1" branchCoverage="0" maxCyclomaticComplexity="0" minCyclomaticComplexity="0" visitedClasses="0" numClasses="0" visitedMethods="1" numMethods="1" /> + <MetadataToken /> + <Name>System.Void Test.TestClass2::.ctor(System.String)</Name> + <FileRef uid="15" /> + <SequencePoints> + <SequencePoint vc="4" upsid="23" ordinal="0" sl="23" sc="1" el="23" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="4" upsid="24" ordinal="1" sl="24" sc="1" el="24" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="4" upsid="25" ordinal="2" sl="25" sc="1" el="25" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="4" upsid="26" ordinal="3" sl="26" sc="1" el="26" ec="2" bec="0" bev="0" fileid="15" /> + <SequencePoint vc="4" upsid="27" ordinal="4" sl="27" sc="1" el="27" ec="2" bec="0" bev="0" fileid="15" /> + </SequencePoints> + <BranchPoints /> + <MethodPoint vc="5" upsid="0" p8:type="SequencePoint" ordinal="7" offset="7" sc="0" sl="23" ec="1" el="27" bec="0" bev="0" fileid="15" xmlns:p8="xsi" /> + </Method> + </Methods> + </Class> + </Classes> + </Module> + </Modules> +</CoverageSession> diff --git a/src/Testprojects/JaCoCo_Ant.xml b/src/Testprojects/JaCoCo_Ant.xml index 71350b62..3313afd3 100644 --- a/src/Testprojects/JaCoCo_Ant.xml +++ b/src/Testprojects/JaCoCo_Ant.xml @@ -1,6 +1,6 @@ <project name="JaCoCo" xmlns:jacoco="antlib:org.jacoco.ant"> <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml"> - <classpath path="CoverageTools/JaCoCo/jacoco-0.7.7/jacocoant.jar" /> + <classpath path="CoverageTools/JaCoCo/jacoco-0.8.3/jacocoant.jar" /> </taskdef> <jacoco:coverage> @@ -26,6 +26,6 @@ </structure> <!--html destdir="Java/Reports"/--> - <xml destfile="Java/Reports/JaCoCo0.7.7.xml"/> + <xml destfile="Java/Reports/JaCoCo0.8.3.xml"/> </jacoco:report> </project> \ No newline at end of file diff --git a/src/Testprojects/Java/Reports/Cobertura2.1.1.xml b/src/Testprojects/Java/Reports/Cobertura2.1.1.xml index fdeb123c..b9f66cca 100644 --- a/src/Testprojects/Java/Reports/Cobertura2.1.1.xml +++ b/src/Testprojects/Java/Reports/Cobertura2.1.1.xml @@ -8,9 +8,9 @@ <packages> <package name="test" line-rate="0.7272727272727273" branch-rate="0.25" complexity="1.4615384615384615"> <classes> - <class name="test.AbstractClass" filename="test/AbstractClass.java" line-rate="1.0" branch-rate="1.0" complexity="1.0"> + <class name="test.AbstractClass" filename="test/AbstractClass.java" line-rate="1.0" branch-rate="1.0" complexity="NaN"> <methods> - <method name="<init>" signature="()V" line-rate="1.0" branch-rate="1.0" complexity="0"> + <method name="<init>" signature="()V" line-rate="1.0" branch-rate="1.0" complexity="NaN"> <lines> <line number="3" hits="2" branch="false"/> <line number="4" hits="2" branch="false"/> diff --git a/src/Testprojects/Java/Reports/JaCoCo0.8.3.xml b/src/Testprojects/Java/Reports/JaCoCo0.8.3.xml new file mode 100644 index 00000000..2e8f1a38 --- /dev/null +++ b/src/Testprojects/Java/Reports/JaCoCo0.8.3.xml @@ -0,0 +1,280 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!DOCTYPE report PUBLIC "-//JACOCO//DTD Report 1.1//EN" "report.dtd"> +<report name="Example Project"> + <sessioninfo id="Test" start="1538234462781" dump="1538234463280"/> + <package name="test"> + <class name="test/TestClass$NestedClass" sourcefilename="TestClass.java"> + <method name="<init>" desc="(Ltest/TestClass;)V" line="28"> + <counter type="INSTRUCTION" missed="6" covered="0"/> + <counter type="LINE" missed="1" covered="0"/> + <counter type="COMPLEXITY" missed="1" covered="0"/> + <counter type="METHOD" missed="1" covered="0"/> + </method> + <method name="SampleFunction" desc="()V" line="30"> + <counter type="INSTRUCTION" missed="15" covered="0"/> + <counter type="LINE" missed="2" covered="0"/> + <counter type="COMPLEXITY" missed="1" covered="0"/> + <counter type="METHOD" missed="1" covered="0"/> + </method> + <counter type="INSTRUCTION" missed="21" covered="0"/> + <counter type="LINE" missed="3" covered="0"/> + <counter type="COMPLEXITY" missed="2" covered="0"/> + <counter type="METHOD" missed="2" covered="0"/> + <counter type="CLASS" missed="1" covered="0"/> + </class> + <class name="test/AbstractClass" sourcefilename="AbstractClass.java"> + <method name="<init>" desc="()V" line="3"> + <counter type="INSTRUCTION" missed="0" covered="6"/> + <counter type="LINE" missed="0" covered="3"/> + <counter type="COMPLEXITY" missed="0" covered="1"/> + <counter type="METHOD" missed="0" covered="1"/> + </method> + <counter type="INSTRUCTION" missed="0" covered="6"/> + <counter type="LINE" missed="0" covered="3"/> + <counter type="COMPLEXITY" missed="0" covered="1"/> + <counter type="METHOD" missed="0" covered="1"/> + <counter type="CLASS" missed="0" covered="1"/> + </class> + <class name="test/AbstractClass_SampleImpl1" sourcefilename="AbstractClass_SampleImpl1.java"> + <method name="<init>" desc="()V" line="3"> + <counter type="INSTRUCTION" missed="0" covered="6"/> + <counter type="LINE" missed="0" covered="3"/> + <counter type="COMPLEXITY" missed="0" covered="1"/> + <counter type="METHOD" missed="0" covered="1"/> + </method> + <method name="Method1" desc="()V" line="8"> + <counter type="INSTRUCTION" missed="4" covered="0"/> + <counter type="LINE" missed="1" covered="0"/> + <counter type="COMPLEXITY" missed="1" covered="0"/> + <counter type="METHOD" missed="1" covered="0"/> + </method> + <method name="Method2" desc="()V" line="12"> + <counter type="INSTRUCTION" missed="4" covered="0"/> + <counter type="LINE" missed="1" covered="0"/> + <counter type="COMPLEXITY" missed="1" covered="0"/> + <counter type="METHOD" missed="1" covered="0"/> + </method> + <counter type="INSTRUCTION" missed="8" covered="6"/> + <counter type="LINE" missed="2" covered="3"/> + <counter type="COMPLEXITY" missed="2" covered="1"/> + <counter type="METHOD" missed="2" covered="1"/> + <counter type="CLASS" missed="0" covered="1"/> + </class> + <class name="test/AbstractClass_SampleImpl2" sourcefilename="AbstractClass_SampleImpl2.java"> + <method name="<init>" desc="()V" line="3"> + <counter type="INSTRUCTION" missed="0" covered="6"/> + <counter type="LINE" missed="0" covered="3"/> + <counter type="COMPLEXITY" missed="0" covered="1"/> + <counter type="METHOD" missed="0" covered="1"/> + </method> + <method name="Method1" desc="()V" line="8"> + <counter type="INSTRUCTION" missed="4" covered="0"/> + <counter type="LINE" missed="1" covered="0"/> + <counter type="COMPLEXITY" missed="1" covered="0"/> + <counter type="METHOD" missed="1" covered="0"/> + </method> + <method name="Method2" desc="()V" line="12"> + <counter type="INSTRUCTION" missed="4" covered="0"/> + <counter type="LINE" missed="1" covered="0"/> + <counter type="COMPLEXITY" missed="1" covered="0"/> + <counter type="METHOD" missed="1" covered="0"/> + </method> + <counter type="INSTRUCTION" missed="8" covered="6"/> + <counter type="LINE" missed="2" covered="3"/> + <counter type="COMPLEXITY" missed="2" covered="1"/> + <counter type="METHOD" missed="2" covered="1"/> + <counter type="CLASS" missed="0" covered="1"/> + </class> + <class name="test/GenericClass" sourcefilename="GenericClass.java"> + <method name="<init>" desc="()V" line="2"> + <counter type="INSTRUCTION" missed="0" covered="3"/> + <counter type="LINE" missed="0" covered="1"/> + <counter type="COMPLEXITY" missed="0" covered="1"/> + <counter type="METHOD" missed="0" covered="1"/> + </method> + <method name="Process" desc="(Ljava/lang/Object;Ljava/lang/Object;)V" line="4"> + <counter type="INSTRUCTION" missed="0" covered="4"/> + <counter type="LINE" missed="0" covered="2"/> + <counter type="COMPLEXITY" missed="0" covered="1"/> + <counter type="METHOD" missed="0" covered="1"/> + </method> + <counter type="INSTRUCTION" missed="0" covered="7"/> + <counter type="LINE" missed="0" covered="3"/> + <counter type="COMPLEXITY" missed="0" covered="2"/> + <counter type="METHOD" missed="0" covered="2"/> + <counter type="CLASS" missed="0" covered="1"/> + </class> + <class name="test/TestClass" sourcefilename="TestClass.java"> + <method name="<init>" desc="()V" line="4"> + <counter type="INSTRUCTION" missed="0" covered="3"/> + <counter type="LINE" missed="0" covered="1"/> + <counter type="COMPLEXITY" missed="0" covered="1"/> + <counter type="METHOD" missed="0" covered="1"/> + </method> + <method name="SampleFunction" desc="()V" line="7"> + <counter type="INSTRUCTION" missed="7" covered="45"/> + <counter type="BRANCH" missed="3" covered="1"/> + <counter type="LINE" missed="1" covered="8"/> + <counter type="COMPLEXITY" missed="2" covered="1"/> + <counter type="METHOD" missed="0" covered="1"/> + </method> + <method name="lambda$SampleFunction$0" desc="(Ljava/lang/String;)V" line="25"> + <counter type="INSTRUCTION" missed="0" covered="4"/> + <counter type="LINE" missed="0" covered="1"/> + <counter type="COMPLEXITY" missed="0" covered="1"/> + <counter type="METHOD" missed="0" covered="1"/> + </method> + <counter type="INSTRUCTION" missed="7" covered="52"/> + <counter type="BRANCH" missed="3" covered="1"/> + <counter type="LINE" missed="1" covered="9"/> + <counter type="COMPLEXITY" missed="2" covered="3"/> + <counter type="METHOD" missed="0" covered="3"/> + <counter type="CLASS" missed="0" covered="1"/> + </class> + <class name="test/Program" sourcefilename="Program.java"> + <method name="<init>" desc="()V" line="2"> + <counter type="INSTRUCTION" missed="3" covered="0"/> + <counter type="LINE" missed="1" covered="0"/> + <counter type="COMPLEXITY" missed="1" covered="0"/> + <counter type="METHOD" missed="1" covered="0"/> + </method> + <method name="main" desc="([Ljava/lang/String;)V" line="5"> + <counter type="INSTRUCTION" missed="0" covered="19"/> + <counter type="LINE" missed="0" covered="5"/> + <counter type="COMPLEXITY" missed="0" covered="1"/> + <counter type="METHOD" missed="0" covered="1"/> + </method> + <counter type="INSTRUCTION" missed="3" covered="19"/> + <counter type="LINE" missed="1" covered="5"/> + <counter type="COMPLEXITY" missed="1" covered="1"/> + <counter type="METHOD" missed="1" covered="1"/> + <counter type="CLASS" missed="0" covered="1"/> + </class> + <sourcefile name="Program.java"> + <line nr="2" mi="3" ci="0" mb="0" cb="0"/> + <line nr="5" mi="0" ci="4" mb="0" cb="0"/> + <line nr="7" mi="0" ci="6" mb="0" cb="0"/> + <line nr="9" mi="0" ci="4" mb="0" cb="0"/> + <line nr="10" mi="0" ci="4" mb="0" cb="0"/> + <line nr="11" mi="0" ci="1" mb="0" cb="0"/> + <counter type="INSTRUCTION" missed="3" covered="19"/> + <counter type="LINE" missed="1" covered="5"/> + <counter type="COMPLEXITY" missed="1" covered="1"/> + <counter type="METHOD" missed="1" covered="1"/> + <counter type="CLASS" missed="0" covered="1"/> + </sourcefile> + <sourcefile name="TestClass.java"> + <line nr="4" mi="0" ci="3" mb="0" cb="0"/> + <line nr="7" mi="0" ci="13" mb="0" cb="0"/> + <line nr="12" mi="0" ci="3" mb="0" cb="0"/> + <line nr="13" mi="0" ci="2" mb="0" cb="0"/> + <line nr="15" mi="3" ci="2" mb="3" cb="1"/> + <line nr="17" mi="0" ci="5" mb="0" cb="0"/> + <line nr="20" mi="4" ci="0" mb="0" cb="0"/> + <line nr="24" mi="0" ci="16" mb="0" cb="0"/> + <line nr="25" mi="0" ci="7" mb="0" cb="0"/> + <line nr="26" mi="0" ci="1" mb="0" cb="0"/> + <line nr="28" mi="6" ci="0" mb="0" cb="0"/> + <line nr="30" mi="14" ci="0" mb="0" cb="0"/> + <line nr="34" mi="1" ci="0" mb="0" cb="0"/> + <counter type="INSTRUCTION" missed="28" covered="52"/> + <counter type="BRANCH" missed="3" covered="1"/> + <counter type="LINE" missed="4" covered="9"/> + <counter type="COMPLEXITY" missed="4" covered="3"/> + <counter type="METHOD" missed="2" covered="3"/> + <counter type="CLASS" missed="1" covered="1"/> + </sourcefile> + <sourcefile name="AbstractClass_SampleImpl1.java"> + <line nr="3" mi="0" ci="2" mb="0" cb="0"/> + <line nr="4" mi="0" ci="3" mb="0" cb="0"/> + <line nr="5" mi="0" ci="1" mb="0" cb="0"/> + <line nr="8" mi="4" ci="0" mb="0" cb="0"/> + <line nr="12" mi="4" ci="0" mb="0" cb="0"/> + <counter type="INSTRUCTION" missed="8" covered="6"/> + <counter type="LINE" missed="2" covered="3"/> + <counter type="COMPLEXITY" missed="2" covered="1"/> + <counter type="METHOD" missed="2" covered="1"/> + <counter type="CLASS" missed="0" covered="1"/> + </sourcefile> + <sourcefile name="GenericClass.java"> + <line nr="2" mi="0" ci="3" mb="0" cb="0"/> + <line nr="4" mi="0" ci="3" mb="0" cb="0"/> + <line nr="5" mi="0" ci="1" mb="0" cb="0"/> + <counter type="INSTRUCTION" missed="0" covered="7"/> + <counter type="LINE" missed="0" covered="3"/> + <counter type="COMPLEXITY" missed="0" covered="2"/> + <counter type="METHOD" missed="0" covered="2"/> + <counter type="CLASS" missed="0" covered="1"/> + </sourcefile> + <sourcefile name="AbstractClass.java"> + <line nr="3" mi="0" ci="2" mb="0" cb="0"/> + <line nr="4" mi="0" ci="3" mb="0" cb="0"/> + <line nr="5" mi="0" ci="1" mb="0" cb="0"/> + <counter type="INSTRUCTION" missed="0" covered="6"/> + <counter type="LINE" missed="0" covered="3"/> + <counter type="COMPLEXITY" missed="0" covered="1"/> + <counter type="METHOD" missed="0" covered="1"/> + <counter type="CLASS" missed="0" covered="1"/> + </sourcefile> + <sourcefile name="AbstractClass_SampleImpl2.java"> + <line nr="3" mi="0" ci="2" mb="0" cb="0"/> + <line nr="4" mi="0" ci="3" mb="0" cb="0"/> + <line nr="5" mi="0" ci="1" mb="0" cb="0"/> + <line nr="8" mi="4" ci="0" mb="0" cb="0"/> + <line nr="12" mi="4" ci="0" mb="0" cb="0"/> + <counter type="INSTRUCTION" missed="8" covered="6"/> + <counter type="LINE" missed="2" covered="3"/> + <counter type="COMPLEXITY" missed="2" covered="1"/> + <counter type="METHOD" missed="2" covered="1"/> + <counter type="CLASS" missed="0" covered="1"/> + </sourcefile> + <counter type="INSTRUCTION" missed="47" covered="96"/> + <counter type="BRANCH" missed="3" covered="1"/> + <counter type="LINE" missed="9" covered="26"/> + <counter type="COMPLEXITY" missed="9" covered="9"/> + <counter type="METHOD" missed="7" covered="9"/> + <counter type="CLASS" missed="1" covered="6"/> + </package> + <package name="test/sub"> + <class name="test/sub/Sub" sourcefilename="Sub.java"> + <method name="<init>" desc="()V" line="3"> + <counter type="INSTRUCTION" missed="3" covered="0"/> + <counter type="LINE" missed="1" covered="0"/> + <counter type="COMPLEXITY" missed="1" covered="0"/> + <counter type="METHOD" missed="1" covered="0"/> + </method> + <method name="SampleFunction" desc="()V" line="5"> + <counter type="INSTRUCTION" missed="15" covered="0"/> + <counter type="LINE" missed="2" covered="0"/> + <counter type="COMPLEXITY" missed="1" covered="0"/> + <counter type="METHOD" missed="1" covered="0"/> + </method> + <counter type="INSTRUCTION" missed="18" covered="0"/> + <counter type="LINE" missed="3" covered="0"/> + <counter type="COMPLEXITY" missed="2" covered="0"/> + <counter type="METHOD" missed="2" covered="0"/> + <counter type="CLASS" missed="1" covered="0"/> + </class> + <sourcefile name="Sub.java"> + <line nr="3" mi="3" ci="0" mb="0" cb="0"/> + <line nr="5" mi="14" ci="0" mb="0" cb="0"/> + <line nr="9" mi="1" ci="0" mb="0" cb="0"/> + <counter type="INSTRUCTION" missed="18" covered="0"/> + <counter type="LINE" missed="3" covered="0"/> + <counter type="COMPLEXITY" missed="2" covered="0"/> + <counter type="METHOD" missed="2" covered="0"/> + <counter type="CLASS" missed="1" covered="0"/> + </sourcefile> + <counter type="INSTRUCTION" missed="18" covered="0"/> + <counter type="LINE" missed="3" covered="0"/> + <counter type="COMPLEXITY" missed="2" covered="0"/> + <counter type="METHOD" missed="2" covered="0"/> + <counter type="CLASS" missed="1" covered="0"/> + </package> + <counter type="INSTRUCTION" missed="65" covered="96"/> + <counter type="BRANCH" missed="3" covered="1"/> + <counter type="LINE" missed="12" covered="26"/> + <counter type="COMPLEXITY" missed="11" covered="9"/> + <counter type="METHOD" missed="9" covered="9"/> + <counter type="CLASS" missed="2" covered="6"/> +</report> \ No newline at end of file diff --git a/src/Testprojects/Java/Reports/cobertura-1.9.2.xsd b/src/Testprojects/Java/Reports/cobertura-1.9.2.xsd new file mode 100644 index 00000000..3aa8f0c9 --- /dev/null +++ b/src/Testprojects/Java/Reports/cobertura-1.9.2.xsd @@ -0,0 +1,114 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- The schema for the Cobertura 1.8/1.9 result file --> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://com.github.sanity4j/namespace/cobertura-1.9.2" xmlns:cobertura192="http://com.github.sanity4j/namespace/cobertura-1.9.2"> + <xs:element name="class"> + <xs:complexType> + <xs:sequence> + <xs:element ref="cobertura192:methods"/> + <xs:element ref="cobertura192:lines"/> + </xs:sequence> + <xs:attribute name="name" type="xs:string" use="required"/> + <xs:attribute name="filename" type="xs:string" use="required"/> + <xs:attribute name="line-rate" type="xs:decimal" use="required"/> + <xs:attribute name="branch-rate" type="xs:decimal" use="required"/> + <xs:attribute name="complexity" type="xs:decimal" use="required"/> + </xs:complexType> + </xs:element> + <xs:element name="classes"> + <xs:complexType> + <xs:sequence> + <xs:element ref="cobertura192:class" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="coverage"> + <xs:complexType> + <xs:sequence> + <xs:element ref="cobertura192:sources"/> + <xs:element ref="cobertura192:packages"/> + </xs:sequence> + + <!-- These are optional to allow backward compatability with 1.9 and 1.8 --> + <xs:attribute name="lines-covered" type="xs:long" use="optional"/> + <xs:attribute name="lines-valid" type="xs:long" use="optional"/> + <xs:attribute name="branches-covered" type="xs:long" use="optional"/> + <xs:attribute name="branches-valid" type="xs:long" use="optional"/> + <xs:attribute name="complexity" type="xs:decimal" use="optional"/> + + <xs:attribute name="line-rate" type="xs:decimal" use="required"/> + <xs:attribute name="branch-rate" type="xs:decimal" use="required"/> + <xs:attribute name="version" type="xs:string" use="required"/> + <xs:attribute name="timestamp" type="xs:long" use="required"/> + </xs:complexType> + </xs:element> + <xs:element name="line"> + <xs:complexType> + <xs:choice> + <xs:element ref="cobertura192:conditions" minOccurs="0"/> + </xs:choice> + <xs:attribute name="number" type="xs:short" use="required"/> + <xs:attribute name="hits" type="xs:int" use="required"/> + <xs:attribute name="branch" type="xs:boolean" use="required"/> + <xs:attribute name="condition-coverage" type="xs:string"/> + </xs:complexType> + </xs:element> + <xs:element name="lines"> + <xs:complexType mixed="true"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="cobertura192:line"/> + </xs:choice> + </xs:complexType> + </xs:element> + <xs:element name="condition"> + <xs:complexType> + <xs:attribute name="number" type="xs:short" use="required"/> + <xs:attribute name="type" type="xs:string" use="required"/> + <xs:attribute name="coverage" type="xs:string" use="required"/> + </xs:complexType> + </xs:element> + <xs:element name="conditions"> + <xs:complexType mixed="true"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="cobertura192:condition"/> + </xs:choice> + </xs:complexType> + </xs:element> + <xs:element name="method"> + <xs:complexType> + <xs:sequence> + <xs:element ref="cobertura192:lines"/> + </xs:sequence> + <xs:attribute name="name" type="xs:string" use="required"/> + <xs:attribute name="signature" type="xs:string" use="required"/> + <xs:attribute name="line-rate" type="xs:decimal" use="required"/> + <xs:attribute name="branch-rate" type="xs:NMTOKEN" use="required"/> + </xs:complexType> + </xs:element> + <xs:element name="methods"> + <xs:complexType mixed="true"> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element ref="cobertura192:method"/> + </xs:choice> + </xs:complexType> + </xs:element> + <xs:element name="package"> + <xs:complexType> + <xs:sequence> + <xs:element ref="cobertura192:classes"/> + </xs:sequence> + <xs:attribute name="name" type="xs:string" use="required"/> + <xs:attribute name="line-rate" type="xs:decimal" use="required"/> + <xs:attribute name="branch-rate" type="xs:decimal" use="required"/> + <xs:attribute name="complexity" type="xs:decimal" use="required"/> + </xs:complexType> + </xs:element> + <xs:element name="packages"> + <xs:complexType> + <xs:sequence> + <xs:element ref="cobertura192:package" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="sources" type="xs:string"/> +</xs:schema> diff --git a/src/Testprojects/Java/Reports/coverage-04.dtd b/src/Testprojects/Java/Reports/coverage-04.dtd new file mode 100644 index 00000000..412b9f8c --- /dev/null +++ b/src/Testprojects/Java/Reports/coverage-04.dtd @@ -0,0 +1,61 @@ +<!-- Portions (C) International Organization for Standardization 1986: + Permission to copy in any form is granted for use with + conforming SGML systems and applications as defined in + ISO 8879, provided this notice is included in all copies. +--> + + <!ELEMENT coverage (sources?,packages)> + <!ATTLIST coverage line-rate CDATA #REQUIRED> + <!ATTLIST coverage branch-rate CDATA #REQUIRED> + <!ATTLIST coverage lines-covered CDATA #REQUIRED> + <!ATTLIST coverage lines-valid CDATA #REQUIRED> + <!ATTLIST coverage branches-covered CDATA #REQUIRED> + <!ATTLIST coverage branches-valid CDATA #REQUIRED> + <!ATTLIST coverage complexity CDATA #REQUIRED> + <!ATTLIST coverage version CDATA #REQUIRED> + <!ATTLIST coverage timestamp CDATA #REQUIRED> + + <!ELEMENT sources (source*)> + + <!ELEMENT source (#PCDATA)> + + <!ELEMENT packages (package*)> + + <!ELEMENT package (classes)> + <!ATTLIST package name CDATA #REQUIRED> + <!ATTLIST package line-rate CDATA #REQUIRED> + <!ATTLIST package branch-rate CDATA #REQUIRED> + <!ATTLIST package complexity CDATA #REQUIRED> + + <!ELEMENT classes (class*)> + + <!ELEMENT class (methods,lines)> + <!ATTLIST class name CDATA #REQUIRED> + <!ATTLIST class filename CDATA #REQUIRED> + <!ATTLIST class line-rate CDATA #REQUIRED> + <!ATTLIST class branch-rate CDATA #REQUIRED> + <!ATTLIST class complexity CDATA #REQUIRED> + + <!ELEMENT methods (method*)> + + <!ELEMENT method (lines)> + <!ATTLIST method name CDATA #REQUIRED> + <!ATTLIST method signature CDATA #REQUIRED> + <!ATTLIST method line-rate CDATA #REQUIRED> + <!ATTLIST method branch-rate CDATA #REQUIRED> + <!ATTLIST method complexity CDATA #REQUIRED> + + <!ELEMENT lines (line*)> + + <!ELEMENT line (conditions*)> + <!ATTLIST line number CDATA #REQUIRED> + <!ATTLIST line hits CDATA #REQUIRED> + <!ATTLIST line branch CDATA "false"> + <!ATTLIST line condition-coverage CDATA "100%"> + + <!ELEMENT conditions (condition*)> + + <!ELEMENT condition EMPTY> + <!ATTLIST condition number CDATA #REQUIRED> + <!ATTLIST condition type CDATA #REQUIRED> + <!ATTLIST condition coverage CDATA #REQUIRED> diff --git a/src/Testprojects/altCover.ps1 b/src/Testprojects/altCover.ps1 new file mode 100644 index 00000000..a0dd46c1 --- /dev/null +++ b/src/Testprojects/altCover.ps1 @@ -0,0 +1,11 @@ +dotnet test /p:AltCover=true /p:AltCoverXmlReport=..\..\Reports\OpenCover_altcover.xml /p:AltCoverCobertura=..\..\Reports\Cobertura_altcover.xml /p:AltCoverAssemblyFilter=UnitTests CSharp\Project_DotNetCore\UnitTests\UnitTests.csproj + +$pathToReplace1 = [regex]::Escape((Get-Location).Path + "\CSharp\Project_DotNetCore\Test") +$pathToReplace2 = [regex]::Escape((Get-Location).Path + "\CSharp\Project_DotNetCore\UnitTests\bin\Debug\netcoreapp2.0\__Saved") +$replacement = "C:\temp" + +(gc "CSharp\Reports\OpenCover_altcover.xml") | % { $_ -replace $pathToReplace1, $replacement } | Out-File "CSharp\Reports\OpenCover_altcover.xml" -Encoding UTF8 +(gc "CSharp\Reports\OpenCover_altcover.xml") | % { $_ -replace $pathToReplace2, $replacement } | Out-File "CSharp\Reports\OpenCover_altcover.xml" -Encoding UTF8 + +(gc "CSharp\Reports\Cobertura_altcover.xml") | % { $_ -replace $pathToReplace1, $replacement } | Out-File "CSharp\Reports\Cobertura_altcover.xml" -Encoding UTF8 +(gc "CSharp\Reports\Cobertura_altcover.xml") | % { $_ -replace $pathToReplace2, $replacement } | Out-File "CSharp\Reports\Cobertura_altcover.xml" -Encoding UTF8 \ No newline at end of file diff --git a/src/Testprojects/coverlet.ps1 b/src/Testprojects/coverlet.ps1 new file mode 100644 index 00000000..ad9113bb --- /dev/null +++ b/src/Testprojects/coverlet.ps1 @@ -0,0 +1,9 @@ +dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=..\..\Reports\OpenCover_coverlet.xml CSharp\Project_DotNetCore\UnitTests\UnitTests.csproj +dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura /p:CoverletOutput=..\..\Reports\Cobertura_coverlet.xml CSharp\Project_DotNetCore\UnitTests\UnitTests.csproj + +$pathToReplace = [regex]::Escape((Get-Location).Path + "\CSharp\Project_DotNetCore\Test") +$replacement = "C:\temp" + +(gc "CSharp\Reports\OpenCover_coverlet.xml") | % { $_ -replace $pathToReplace, $replacement } | Out-File "CSharp\Reports\OpenCover_coverlet.xml" -Encoding UTF8 + +(gc "CSharp\Reports\Cobertura_coverlet.xml") | % { $_ -replace $pathToReplace, $replacement } | Out-File "CSharp\Reports\Cobertura_coverlet.xml" -Encoding UTF8 \ No newline at end of file diff --git a/src/build.bat b/src/build.bat index f237d993..9ff64f81 100644 --- a/src/build.bat +++ b/src/build.bat @@ -1,3 +1,3 @@ -msbuild .\Testprojects\CSharp\Project\Test_CSharp.csproj /t:Restore -msbuild .\build.proj /t:Restore -msbuild .\build.proj \ No newline at end of file +msbuild .\Testprojects\CSharp\Project\Test_CSharp.csproj /t:Restore /v:q +msbuild .\build.proj /t:Restore /v:q +msbuild .\build.proj /v:m \ No newline at end of file diff --git a/src/build.proj b/src/build.proj index ebde5db6..29792b42 100644 --- a/src/build.proj +++ b/src/build.proj @@ -2,13 +2,13 @@ <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Deploy"> <ItemGroup> <PackageReference Include="chocolatey"> - <Version>0.10.8</Version> + <Version>0.10.11</Version> </PackageReference> <PackageReference Include="MSBuildTasks"> <Version>1.5.0.235</Version> </PackageReference> <PackageReference Include="NuGet.CommandLine"> - <Version>4.3.0</Version> + <Version>4.7.1</Version> </PackageReference> <PackageReference Include="OpenCover"> <Version>4.6.519</Version> @@ -20,43 +20,41 @@ <!-- Imported MSBuild tasks --> <UsingTask TaskName="ReportGenerator" AssemblyFile="target\bin\Release\ReportGenerator.exe" /> - <Import Project="$(UserProfile)\.nuget\packages\msbuildtasks\1.5.0.235\tools\MSBuild.Community.Tasks.Targets" /> + <UsingTask TaskName="Zip" AssemblyFile="$(UserProfile)\.nuget\packages\msbuildtasks\1.5.0.235\tools\MSBuild.Community.Tasks.dll" /> + <UsingTask TaskName="FileUpdate" AssemblyFile="$(UserProfile)\.nuget\packages\msbuildtasks\1.5.0.235\tools\MSBuild.Community.Tasks.dll" /> <!-- Version, adjust before build --> <PropertyGroup> - <Version>3.1.2.0</Version> - <VersionShort>3.1.2</VersionShort> + <Version>4.0.0.0</Version> + <VersionShort>4.0.0</VersionShort> </PropertyGroup> <!-- Tools --> <PropertyGroup> + <DotNet>C:\Program Files\dotnet\dotnet.exe</DotNet> <OpenCover>$(UserProfile)\.nuget\packages\opencover\4.6.519\tools\OpenCover.Console.exe</OpenCover> - <NuGetCommandLine>$(UserProfile)\.nuget\packages\nuget.commandline\4.3.0\tools\NuGet.exe</NuGetCommandLine> - <ChocolateyCommandLine>$(UserProfile)\.nuget\packages\chocolatey\0.10.8\tools\chocolateyInstall\choco.exe</ChocolateyCommandLine> + <NuGetCommandLine>$(UserProfile)\.nuget\packages\nuget.commandline\4.7.1\tools\NuGet.exe</NuGetCommandLine> + <ChocolateyCommandLine>$(UserProfile)\.nuget\packages\chocolatey\0.10.11\tools\chocolateyInstall\choco.exe</ChocolateyCommandLine> </PropertyGroup> <Target Name="Clean"> <RemoveDir Directories="target\bin" /> <RemoveDir Directories="target\packages" /> <RemoveDir Directories="target\reports\coverage" /> + <RemoveDir Directories="target\samplereports" /> </Target> <Target Name="Compile"> - <MSBuild Projects="ReportGenerator.sln" Properties="Configuration=Release" /> + <MSBuild Projects="ReportGenerator.sln" Targets="Restore;Build" Properties="Configuration=Release" /> + <Exec Command="dotnet publish -c Release" WorkingDirectory="ReportGenerator.Console.NetCore" /> + <Exec Command="dotnet publish -c Release" WorkingDirectory="ReportGenerator.DotnetGlobalTool" /> <RemoveDir Directories="bin" /> <RemoveDir Directories="obj" /> </Target> <Target Name="Test" DependsOnTargets="Clean; Compile"> - <PropertyGroup> - <TestFiles>target\bin\Release\ReportGeneratorTest.dll</TestFiles> - <ReportNamespaces>+[ReportGenerator]*</ReportNamespaces> - <VSTestPath>C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow</VSTestPath> - </PropertyGroup> - <MakeDir Directories="target\reports\coverage" /> - <Exec Command="$(OpenCover) -register:user -target:"$(VSTestPath)\vstest.console.exe" -targetargs:"$(TestFiles) /InIsolation /platform:x64" -filter:$(ReportNamespaces) -output:target\reports\coverage\coverage.xml -returntargetcode -coverbytest:*" /> - <RemoveDir Directories="TestResults" /> + <Exec Command="$(OpenCover) -register:user "-target:$(DotNet)" "-targetargs:test --no-build -c Release" -output:..\target\reports\coverage\coverage.xml -returntargetcode -coverbytest:* -mergebyhash -oldstyle" WorkingDirectory="ReportGenerator.Core.Test" /> </Target> <Target Name="Report" DependsOnTargets="Test"> @@ -64,25 +62,62 @@ <CoverageFiles Include="target\reports\coverage\coverage.xml" /> </ItemGroup> - <ReportGenerator ReportFiles="@(CoverageFiles)" ReportTypes="Html;Badges" TargetDirectory="target\reports\coverage" HistoryDirectory="target\reports\coveragehistory" /> + <ReportGenerator ReportFiles="@(CoverageFiles)" ReportTypes="Html;Badges" TargetDirectory="target\reports\coverage" AssemblyFilters="-Moq" HistoryDirectory="target\reports\coveragehistory" VerbosityLevel="Warning" /> + + <MakeDir Directories="target\reports\coverage" /> + <Exec Command="target\bin\Release\ReportGenerator.exe -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:HTML -targetdir:target\samplereports\HTML_NetFull -historydir:target\samplereports\HTML_NetFull\history -verbosity:Warning" /> + <Exec Command="target\bin\Release\ReportGenerator.exe -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:HTMLSummary -targetdir:target\samplereports\HTMLSummary_NetFull -historydir:target\samplereports\HTMLSummary_NetFull\history -verbosity:Warning" /> + <Exec Command="target\bin\Release\ReportGenerator.exe -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:HTMLInline -targetdir:target\samplereports\HTMLInline_NetFull -historydir:target\samplereports\HTMLInline_NetFull\history -verbosity:Warning" /> + <Exec Command="target\bin\Release\ReportGenerator.exe -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:HTMLChart -targetdir:target\samplereports\HTMLChart_NetFull -historydir:target\samplereports\HTMLChart_NetFull\history -verbosity:Warning" /> + <Exec Command="target\bin\Release\ReportGenerator.exe -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:MHTML -targetdir:target\samplereports\MHTML_NetFull -historydir:target\samplereports\MHTML_NetFull\history -verbosity:Warning" /> + <Exec Command="target\bin\Release\ReportGenerator.exe -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:Cobertura -targetdir:target\samplereports\Cobertura_NetFull -historydir:target\samplereports\Cobertura_NetFull\history -verbosity:Warning" /> + <Exec Command="target\bin\Release\ReportGenerator.exe -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:XML -targetdir:target\samplereports\XML_NetFull -historydir:target\samplereports\XML_NetFull\history -verbosity:Warning" /> + <Exec Command="target\bin\Release\ReportGenerator.exe -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:XMLSummary -targetdir:target\samplereports\XMLSummary_NetFull -historydir:target\samplereports\XMLSummary_NetFull\history -verbosity:Warning" /> + <Exec Command="target\bin\Release\ReportGenerator.exe -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:Latex -targetdir:target\samplereports\Latex_NetFull -historydir:target\samplereports\Latex_NetFull\history -verbosity:Warning" /> + <Exec Command="target\bin\Release\ReportGenerator.exe -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:LatexSummary -targetdir:target\samplereports\LatexSummary_NetFull -historydir:target\samplereports\LatexSummary_NetFull\history -verbosity:Warning" /> + <Exec Command="target\bin\Release\ReportGenerator.exe -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:TextSummary -targetdir:target\samplereports\TextSummary_NetFull -historydir:target\samplereports\TextSummary_NetFull\history -verbosity:Warning" /> + <Exec Command="target\bin\Release\ReportGenerator.exe -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:CsvSummary -targetdir:target\samplereports\CsvSummary_NetFull -historydir:target\samplereports\CsvSummary_NetFull\history -verbosity:Warning" /> + <Exec Command="target\bin\Release\ReportGenerator.exe -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:PngChart -targetdir:target\samplereports\PngChart_NetFull -historydir:target\samplereports\PngChart_NetFull\history -verbosity:Warning" /> + <Exec Command="target\bin\Release\ReportGenerator.exe -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:Badges -targetdir:target\samplereports\Badges_NetFull -historydir:target\samplereports\Badges_NetFull\history -verbosity:Warning" /> + + <Exec Command="dotnet target\bin\Release\netcoreapp2.0\publish\ReportGenerator.dll -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:HTML -targetdir:target\samplereports\HTML_NetCore -historydir:target\samplereports\HTML_NetCore\history -verbosity:Warning" /> + <Exec Command="dotnet target\bin\Release\netcoreapp2.0\publish\ReportGenerator.dll -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:HTMLSummary -targetdir:target\samplereports\HTMLSummary_NetCore -historydir:target\samplereports\HTMLSummary_NetCore\history -verbosity:Warning" /> + <Exec Command="dotnet target\bin\Release\netcoreapp2.0\publish\ReportGenerator.dll -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:HTMLInline -targetdir:target\samplereports\HTMLInline_NetCore -historydir:target\samplereports\HTMLInline_NetCore\history -verbosity:Warning" /> + <Exec Command="dotnet target\bin\Release\netcoreapp2.0\publish\ReportGenerator.dll -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:HTMLChart -targetdir:target\samplereports\HTMLChart_NetCore -historydir:target\samplereports\HTMLChart_NetCore\history -verbosity:Warning" /> + <Exec Command="dotnet target\bin\Release\netcoreapp2.0\publish\ReportGenerator.dll -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:MHTML -targetdir:target\samplereports\MHTML_NetCore -historydir:target\samplereports\MHTML_NetCore\history -verbosity:Warning" /> + <Exec Command="dotnet target\bin\Release\netcoreapp2.0\publish\ReportGenerator.dll -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:Cobertura -targetdir:target\samplereports\Cobertura_NetCore -historydir:target\samplereports\Cobertura_NetCore\history -verbosity:Warning" /> + <Exec Command="dotnet target\bin\Release\netcoreapp2.0\publish\ReportGenerator.dll -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:XML -targetdir:target\samplereports\XML_NetCore -historydir:target\samplereports\XML_NetCore\history -verbosity:Warning" /> + <Exec Command="dotnet target\bin\Release\netcoreapp2.0\publish\ReportGenerator.dll -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:XMLSummary -targetdir:target\samplereports\XMLSummary_NetCore -historydir:target\samplereports\XMLSummary_NetCore\history -verbosity:Warning" /> + <Exec Command="dotnet target\bin\Release\netcoreapp2.0\publish\ReportGenerator.dll -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:Latex -targetdir:target\samplereports\Latex_NetCore -historydir:target\samplereports\Latex_NetCore\history -verbosity:Warning" /> + <Exec Command="dotnet target\bin\Release\netcoreapp2.0\publish\ReportGenerator.dll -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:LatexSummary -targetdir:target\samplereports\LatexSummary_NetCore -historydir:target\samplereports\LatexSummary_NetCore\history -verbosity:Warning" /> + <Exec Command="dotnet target\bin\Release\netcoreapp2.0\publish\ReportGenerator.dll -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:TextSummary -targetdir:target\samplereports\TextSummary_NetCore -historydir:target\samplereports\TextSummary_NetCore\history -verbosity:Warning" /> + <Exec Command="dotnet target\bin\Release\netcoreapp2.0\publish\ReportGenerator.dll -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:CsvSummary -targetdir:target\samplereports\CsvSummary_NetCore -historydir:target\samplereports\CsvSummary_NetCore\history -verbosity:Warning" /> + <Exec Command="dotnet target\bin\Release\netcoreapp2.0\publish\ReportGenerator.dll -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:PngChart -targetdir:target\samplereports\PngChart_NetCore -historydir:target\samplereports\PngChart_NetCore\history -verbosity:Warning" /> + <Exec Command="dotnet target\bin\Release\netcoreapp2.0\publish\ReportGenerator.dll -reports:Testprojects\CSharp\Reports\OpenCoverWithTrackedMethods.xml -reporttypes:Badges -targetdir:target\samplereports\Badges_NetCore -historydir:target\samplereports\Badges_NetCore\history -verbosity:Warning" /> </Target> <Target Name="Deploy" DependsOnTargets="Clean; Compile; Report;"> <ItemGroup> - <ZipFileContent Include="target\bin\Release\ICSharpCode.NRefactory.dll; -target\bin\Release\ICSharpCode.NRefactory.CSharp.dll; -target\bin\Release\ReportGenerator.exe; -target\bin\Release\ReportGenerator.exe.config; -target\bin\Release\ReportGenerator.XML; -target\bin\Release\ReportGenerator.Reporting.dll; -target\bin\Release\ReportGenerator.Reporting.XML; -target\bin\Release\LICENSE.txt; -target\bin\Release\Readme.txt;" /> - </ItemGroup> - - <Zip Files="@(ZipFileContent)" WorkingDirectory="$(MSBuildThisFileDirectory)target\bin\Release" ZipFileName="target\packages\ReportGenerator_$(Version).zip" ZipLevel="9" /> + <ZipFileContentBase Include="target\bin\Release\LICENSE.txt;target\bin\Release\Readme.txt" /> + <ZipFileContentNet47 Include="target\bin\Release\appsettings.json;target\bin\Release\Microsoft.Build.*.dll;target\bin\Release\Microsoft.Extensions*.dll;target\bin\Release\Microsoft.Win32.Primitives.dll;target\bin\Release\Newtonsoft.Json.dll;target\bin\Release\netstandard.dll;target\bin\Release\ReportGenerator.Core.dll;target\bin\Release\ReportGenerator.exe;target\bin\Release\ReportGenerator.exe.config;target\bin\Release\SixLabors.*.dll;target\bin\Release\System.*.dll" /> + <ZipFileContentNetCore Include="target\bin\Release\netcoreapp2.0\publish\**\*.*"/> + </ItemGroup> + <MakeDir Directories="tmpzip" /> + <MakeDir Directories="tmpzip\net47" /> + <MakeDir Directories="tmpzip\netcoreapp2.0" /> + <Copy SourceFiles="@(ZipFileContentBase)" DestinationFolder="tmpzip" /> + <Copy SourceFiles="@(ZipFileContentNet47)" DestinationFolder="tmpzip\net47" /> + <Copy SourceFiles="@(ZipFileContentNetCore)" DestinationFolder="tmpzip\netcoreapp2.0\%(RecursiveDir)" /> + <ItemGroup> + <ZipFileContent Include="tmpzip\**\*.*"/> + </ItemGroup> + <Zip Files="@(ZipFileContent)" WorkingDirectory="$(MSBuildThisFileDirectory)tmpzip" ZipFileName="target\packages\ReportGenerator_$(Version).zip" ZipLevel="9" /> + <RemoveDir Directories="tmpzip" /> <Exec Command="$(NuGetCommandLine) pack Deployment\nuget\ReportGenerator.nuspec -OutputDirectory target\packages -Version $(Version)" /> + <Exec Command="$(NuGetCommandLine) pack Deployment\nuget\ReportGenerator.Core.nuspec -OutputDirectory target\packages -Version $(Version)" /> + <Exec Command="$(NuGetCommandLine) pack Deployment\nuget\dotnet-reportgenerator-cli.nuspec -OutputDirectory target\packages -Version $(Version)" /> + <Exec Command="$(NuGetCommandLine) pack Deployment\nuget\dotnet-reportgenerator-globaltool.nuspec -OutputDirectory target\packages -Version $(Version)" /> <Exec Command="powershell -Command [Environment]::SetEnvironmentVariable('ChecksumOfZip', (Get-FileHash .\target\packages\ReportGenerator_$(Version).zip -Algorithm SHA256).Hash, 'User')" /> <PropertyGroup> @@ -99,5 +134,8 @@ target\bin\Release\Readme.txt;" /> <Target Name="Publish" DependsOnTargets="Deploy"> <Exec Command="$(NuGetCommandLine) push .\target\packages\ReportGenerator.$(VersionShort).nupkg -ApiKey $(NugetApiKey) -Source https://www.nuget.org/api/v2/package" /> + <Exec Command="$(NuGetCommandLine) push .\target\packages\ReportGenerator.Core.$(VersionShort).nupkg -ApiKey $(NugetApiKey) -Source https://www.nuget.org/api/v2/package" /> + <Exec Command="$(NuGetCommandLine) push .\target\packages\dotnet-reportgenerator-cli.$(VersionShort).nupkg -ApiKey $(NugetApiKey) -Source https://www.nuget.org/api/v2/package" /> + <Exec Command="$(NuGetCommandLine) push .\target\packages\dotnet-reportgenerator-globaltool.$(VersionShort).nupkg -ApiKey $(NugetApiKey) -Source https://www.nuget.org/api/v2/package" /> </Target> </Project> \ No newline at end of file