Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixing TeamCity Service Messages #493

Merged
merged 1 commit into from Jul 25, 2019
Merged

fixing TeamCity Service Messages #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions Documentation/GlobalTool.md
View file
Open in desktop
Expand Up @@ -99,12 +99,12 @@ The currently supported [TeamCity statistics](https://confluence.jetbrains.com/d
| TeamCity Statistic Key | Description |
| :--- | :--- |
| CodeCoverageL | Line-level code coverage |
| CodeCoverageR | Branch-level code coverage |
| CodeCoverageB | Branch-level code coverage |
| CodeCoverageM | Method-level code coverage |
| CodeCoverageAbsLTotal | The total number of lines |
| CodeCoverageAbsLCovered | The number of covered lines |
| CodeCoverageAbsRTotal | The total number of branches |
| CodeCoverageAbsRCovered | The number of covered branches |
| CodeCoverageAbsBTotal | The total number of branches |
| CodeCoverageAbsBCovered | The number of covered branches |
| CodeCoverageAbsMTotal | The total number of methods |
| CodeCoverageAbsMCovered | The number of covered methods |

Expand Down
6 changes: 3 additions & 3 deletions Documentation/MSBuildIntegration.md
View file
Open in desktop
Expand Up @@ -57,12 +57,12 @@ The currently supported [TeamCity statistics](https://confluence.jetbrains.com/d
| TeamCity Statistic Key | Description |
| :--- | :--- |
| CodeCoverageL | Line-level code coverage |
| CodeCoverageR | Branch-level code coverage |
| CodeCoverageB | Branch-level code coverage |
| CodeCoverageM | Method-level code coverage |
| CodeCoverageAbsLTotal | The total number of lines |
| CodeCoverageAbsLCovered | The number of covered lines |
| CodeCoverageAbsRTotal | The total number of branches |
| CodeCoverageAbsRCovered | The number of covered branches |
| CodeCoverageAbsBTotal | The total number of branches |
| CodeCoverageAbsBCovered | The number of covered branches |
| CodeCoverageAbsMTotal | The total number of methods |
| CodeCoverageAbsMCovered | The number of covered methods |

Expand Down
13 changes: 2 additions & 11 deletions src/coverlet.core/Reporters/TeamCityReporter.cs
View file
Open in desktop
Expand Up @@ -33,9 +33,6 @@ public string Report(CoverageResult result)

private void OutputLineCoverage(CoverageDetails coverageDetails, StringBuilder builder)
{
// The total number of lines
OutputTeamCityServiceMessage("CodeCoverageL", coverageDetails.Percent, builder);

// The number of covered lines
OutputTeamCityServiceMessage("CodeCoverageAbsLCovered", coverageDetails.Covered, builder);

Expand All @@ -45,21 +42,15 @@ private void OutputLineCoverage(CoverageDetails coverageDetails, StringBuilder b

private void OutputBranchCoverage(CoverageDetails coverageDetails, StringBuilder builder)
{
// The total number of branches
OutputTeamCityServiceMessage("CodeCoverageR", coverageDetails.Percent, builder);

// The number of covered branches
OutputTeamCityServiceMessage("CodeCoverageAbsRCovered", coverageDetails.Covered, builder);
OutputTeamCityServiceMessage("CodeCoverageAbsBCovered", coverageDetails.Covered, builder);

// Branch-level code coverage
OutputTeamCityServiceMessage("CodeCoverageAbsRTotal", coverageDetails.Total, builder);
OutputTeamCityServiceMessage("CodeCoverageAbsBTotal", coverageDetails.Total, builder);
}

private void OutputMethodCoverage(CoverageDetails coverageDetails, StringBuilder builder)
{
// The total number of methods
OutputTeamCityServiceMessage("CodeCoverageM", coverageDetails.Percent, builder);

// The number of covered methods
OutputTeamCityServiceMessage("CodeCoverageAbsMCovered", coverageDetails.Covered, builder);

Expand Down
7 changes: 2 additions & 5 deletions test/coverlet.core.tests/Reporters/TeamCityReporter.cs
View file
Open in desktop
Expand Up @@ -99,7 +99,6 @@ public void Report_ReportsLineCoverage()
var output = _reporter.Report(_result);

// Assert
Assert.Contains("##teamcity[buildStatisticValue key='CodeCoverageL' value='50']", output);
Assert.Contains("##teamcity[buildStatisticValue key='CodeCoverageAbsLCovered' value='1']", output);
Assert.Contains("##teamcity[buildStatisticValue key='CodeCoverageAbsLTotal' value='2']", output);
}
Expand All @@ -111,9 +110,8 @@ public void Report_ReportsBranchCoverage()
var output = _reporter.Report(_result);

// Assert
Assert.Contains("##teamcity[buildStatisticValue key='CodeCoverageR' value='33.33']", output);
Assert.Contains("##teamcity[buildStatisticValue key='CodeCoverageAbsRCovered' value='1']", output);
Assert.Contains("##teamcity[buildStatisticValue key='CodeCoverageAbsRTotal' value='3']", output);
Assert.Contains("##teamcity[buildStatisticValue key='CodeCoverageAbsBCovered' value='1']", output);
Assert.Contains("##teamcity[buildStatisticValue key='CodeCoverageAbsBTotal' value='3']", output);
}

[Fact]
Expand All @@ -123,7 +121,6 @@ public void Report_ReportsMethodCoverage()
var output = _reporter.Report(_result);

// Assert
Assert.Contains("##teamcity[buildStatisticValue key='CodeCoverageM' value='100']", output);
Assert.Contains("##teamcity[buildStatisticValue key='CodeCoverageAbsMCovered' value='1']", output);
Assert.Contains("##teamcity[buildStatisticValue key='CodeCoverageAbsMTotal' value='1']", output);
}
Expand Down