Skip to content

Return non zero exit code for ThresholdStatistic.Minimum even when no coverage #1206

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

Merged
merged 2 commits into from
Aug 5, 2021
Merged

Return non zero exit code for ThresholdStatistic.Minimum even when no coverage #1206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1cdb93
Return ThresholdTypeFlags for ThresholdStatistic.Minimum even when th…
daveMueller Aug 3, 2021
d36e75a
bugfix
daveMueller Aug 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 31 additions & 42 deletions src/coverlet.core/CoverageResult.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,26 +118,16 @@ public ThresholdTypeFlags GetThresholdTypesBelowThreshold(CoverageSummary summar
{
case ThresholdStatistic.Minimum:
{
if (!Modules.Any())
thresholdTypeFlags = CompareThresholdValues(thresholdTypeFlagValues, thresholdTypeFlags, 0, 0, 0);

foreach (var module in Modules)
{
double line = summary.CalculateLineCoverage(module.Value).Percent;
double branch = summary.CalculateBranchCoverage(module.Value).Percent;
double method = summary.CalculateMethodCoverage(module.Value).Percent;

if (thresholdTypeFlagValues.TryGetValue(ThresholdTypeFlags.Line, out var lineThresholdValue) && lineThresholdValue > line)
{
thresholdTypeFlags |= ThresholdTypeFlags.Line;
}

if (thresholdTypeFlagValues.TryGetValue(ThresholdTypeFlags.Branch, out var branchThresholdValue) && branchThresholdValue > branch)
{
thresholdTypeFlags |= ThresholdTypeFlags.Branch;
}

if (thresholdTypeFlagValues.TryGetValue(ThresholdTypeFlags.Method, out var methodThresholdValue) && methodThresholdValue > method)
{
thresholdTypeFlags |= ThresholdTypeFlags.Method;
}
thresholdTypeFlags = CompareThresholdValues(thresholdTypeFlagValues, thresholdTypeFlags, line, branch, method);
}
}
break;
Expand All @@ -146,21 +136,8 @@ public ThresholdTypeFlags GetThresholdTypesBelowThreshold(CoverageSummary summar
double line = summary.CalculateLineCoverage(Modules).AverageModulePercent;
double branch = summary.CalculateBranchCoverage(Modules).AverageModulePercent;
double method = summary.CalculateMethodCoverage(Modules).AverageModulePercent;

if (thresholdTypeFlagValues.TryGetValue(ThresholdTypeFlags.Line, out var lineThresholdValue) && lineThresholdValue > line)
{
thresholdTypeFlags |= ThresholdTypeFlags.Line;
}

if (thresholdTypeFlagValues.TryGetValue(ThresholdTypeFlags.Branch, out var branchThresholdValue) && branchThresholdValue > branch)
{
thresholdTypeFlags |= ThresholdTypeFlags.Branch;
}

if (thresholdTypeFlagValues.TryGetValue(ThresholdTypeFlags.Method, out var methodThresholdValue) && methodThresholdValue > method)
{
thresholdTypeFlags |= ThresholdTypeFlags.Method;
}
thresholdTypeFlags = CompareThresholdValues(thresholdTypeFlagValues, thresholdTypeFlags, line, branch, method);
}
break;
case ThresholdStatistic.Total:
Expand All @@ -169,25 +146,37 @@ public ThresholdTypeFlags GetThresholdTypesBelowThreshold(CoverageSummary summar
double branch = summary.CalculateBranchCoverage(Modules).Percent;
double method = summary.CalculateMethodCoverage(Modules).Percent;

if (thresholdTypeFlagValues.TryGetValue(ThresholdTypeFlags.Line, out var lineThresholdValue) && lineThresholdValue > line)
{
thresholdTypeFlags |= ThresholdTypeFlags.Line;
}

if (thresholdTypeFlagValues.TryGetValue(ThresholdTypeFlags.Branch, out var branchThresholdValue) && branchThresholdValue > branch)
{
thresholdTypeFlags |= ThresholdTypeFlags.Branch;
}

if (thresholdTypeFlagValues.TryGetValue(ThresholdTypeFlags.Method, out var methodThresholdValue) && methodThresholdValue > method)
{
thresholdTypeFlags |= ThresholdTypeFlags.Method;
}
thresholdTypeFlags = CompareThresholdValues(thresholdTypeFlagValues, thresholdTypeFlags, line, branch, method);
}
break;
}

return thresholdTypeFlags;
}

private static ThresholdTypeFlags CompareThresholdValues(
Dictionary<ThresholdTypeFlags, double> thresholdTypeFlagValues, ThresholdTypeFlags thresholdTypeFlags,
double line, double branch, double method)
{
if (thresholdTypeFlagValues.TryGetValue(ThresholdTypeFlags.Line, out var lineThresholdValue) &&
lineThresholdValue > line)
{
thresholdTypeFlags |= ThresholdTypeFlags.Line;
}

if (thresholdTypeFlagValues.TryGetValue(ThresholdTypeFlags.Branch, out var branchThresholdValue) &&
branchThresholdValue > branch)
{
thresholdTypeFlags |= ThresholdTypeFlags.Branch;
}

if (thresholdTypeFlagValues.TryGetValue(ThresholdTypeFlags.Method, out var methodThresholdValue) &&
methodThresholdValue > method)
{
thresholdTypeFlags |= ThresholdTypeFlags.Method;
}

return thresholdTypeFlags;
}
}
}
21 changes: 21 additions & 0 deletions test/coverlet.core.tests/CoverageResultTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,5 +148,26 @@ public void TestGetThresholdTypesBelowThresholdAllFail()
ThresholdTypeFlags resThresholdTypeFlags = result.GetThresholdTypesBelowThreshold(summary, thresholdTypeFlagValues, thresholdStatic);
Assert.Equal(thresholdTypeFlags, resThresholdTypeFlags);
}

[Fact]
public void TestGetThresholdTypesBelowThresholdWhenNoModuleInstrumented()
{
CoverageResult result = new CoverageResult();
result.Modules = new Modules();

CoverageSummary summary = new CoverageSummary();
Dictionary<ThresholdTypeFlags, double> thresholdTypeFlagValues = new Dictionary<ThresholdTypeFlags, double>()
{
{ ThresholdTypeFlags.Line, 80 },
{ ThresholdTypeFlags.Method, 80 },
{ ThresholdTypeFlags.Branch, 80 },
};

ThresholdTypeFlags thresholdTypeFlags = ThresholdTypeFlags.Line | ThresholdTypeFlags.Branch | ThresholdTypeFlags.Method;
ThresholdStatistic thresholdStatic = ThresholdStatistic.Minimum;

ThresholdTypeFlags resThresholdTypeFlags = result.GetThresholdTypesBelowThreshold(summary, thresholdTypeFlagValues, thresholdStatic);
Assert.Equal(thresholdTypeFlags, resThresholdTypeFlags);
}
}
}