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

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

Author: daveMueller

src/coverlet.core/CoverageResult.cs

@@ -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;
@@ -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:
@@ -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;
+        }
     }
 }

test/coverlet.core.tests/CoverageResultTests.cs

@@ -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);
+        }
     }
 }