more tests

Author: vladopajic

pkg/testcoverage/coverage/types.go

@@ -27,7 +27,11 @@ func (s Stats) CoveredPercentage() int {
 }
 
 func (s Stats) CoveredPercentageF() float64 {
-	return coveredPercentageF(s.Total, s.Covered)
+	return coveredPercentageF(s.Total, s.Covered, true)
+}
+
+func (s Stats) CoveredPercentageFNR() float64 {
+	return coveredPercentageF(s.Total, s.Covered, false)
 }
 
 //nolint:mnd // relax
@@ -53,11 +57,11 @@ func StatsSearchMap(stats []Stats) map[string]Stats {
 }
 
 func CoveredPercentage(total, covered int64) int {
-	return int(coveredPercentageF(total, covered))
+	return int(coveredPercentageF(total, covered, true))
 }
 
 //nolint:mnd // relax
-func coveredPercentageF(total, covered int64) float64 {
+func coveredPercentageF(total, covered int64, round bool) float64 {
 	if total == 0 {
 		return 0
 	}
@@ -68,6 +72,10 @@ func coveredPercentageF(total, covered int64) float64 {
 
 	p := float64(covered*100) / float64(total)
 
+	if !round {
+		return p
+	}
+
 	// round to %.1f
 	return float64(int(math.Round(p*10))) / 10
 }

pkg/testcoverage/helpers_test.go

@@ -27,6 +27,10 @@ func mergeStats(a, b []coverage.Stats) []coverage.Stats {
 	return r
 }
 
+func copyStats(s []coverage.Stats) []coverage.Stats {
+	return mergeStats(make([]coverage.Stats, 0), s)
+}
+
 func randStats(localPrefix string, minc, maxc int) []coverage.Stats {
 	const count = 100
 

pkg/testcoverage/report_test.go

@@ -111,7 +111,7 @@ func Test_ReportForHumanDiff(t *testing.T) {
 		t.Parallel()
 
 		stats := randStats(prefix, 10, 100)
-		base := mergeStats(make([]coverage.Stats, 0), stats)
+		base := copyStats(stats)
 
 		stats = append(stats, coverage.Stats{Name: "foo", Total: 9, Covered: 8})
 		stats = append(stats, coverage.Stats{Name: "foo-new", Total: 9, Covered: 8})
@@ -124,16 +124,44 @@ func Test_ReportForHumanDiff(t *testing.T) {
 		ReportForHuman(buf, result)
 
 		assertDiffChange(t, buf.String(), 2)
+		assert.Contains(t, buf.String(), "foo\t\t  1\t\t88.9% (8/9)\t\t100% (10/10)")
+		assert.Contains(t, buf.String(), "foo-new\t  1\t\t88.9% (8/9)\t")
 	})
 
-	t.Run("diff - threshold failed", func(t *testing.T) {
+	t.Run("diff - threshold failed", func(t *testing.T) { //nolit:dupl // relax
 		t.Parallel()
-		// add test
+
+		base := []coverage.Stats{{Name: "foo", Total: 10, Covered: 1}}
+		stats := []coverage.Stats{{Name: "foo", Total: 10, Covered: 8}}
+
+		buf := &bytes.Buffer{}
+		cfg := Config{
+			Diff: Diff{Threshold: ptr(999.0)},
+		}
+		result := Analyze(cfg, stats, base)
+		ReportForHuman(buf, result)
+
+		assertDiffThreshold(t, buf.String(), *cfg.Diff.Threshold, false)
+		assertDiffPercentage(t, buf.String(), 70)
+		assertDiffChange(t, buf.String(), 2)
 	})
 
 	t.Run("diff - threshold pass", func(t *testing.T) {
 		t.Parallel()
-		// add test
+
+		base := []coverage.Stats{{Name: "foo", Total: 10, Covered: 1}}
+		stats := []coverage.Stats{{Name: "foo", Total: 10, Covered: 8}}
+
+		buf := &bytes.Buffer{}
+		cfg := Config{
+			Diff: Diff{Threshold: ptr(70.0)},
+		}
+		result := Analyze(cfg, stats, base)
+		ReportForHuman(buf, result)
+
+		assertDiffThreshold(t, buf.String(), *cfg.Diff.Threshold, true)
+		assertDiffPercentage(t, buf.String(), 70)
+		assertDiffChange(t, buf.String(), 2)
 	})
 }
 

pkg/testcoverage/types.go

@@ -133,8 +133,8 @@ func TotalPercentageDiff(current, base []coverage.Stats) float64 {
 	curretStats := coverage.StatsCalcTotal(current)
 	baseStats := coverage.StatsCalcTotal(base)
 
-	cp := curretStats.CoveredPercentageF()
-	bp := baseStats.CoveredPercentageF()
+	cp := curretStats.CoveredPercentageFNR()
+	bp := baseStats.CoveredPercentageFNR()
 
 	return cp - bp
 }