From 031188b4553bd0b6201607cc22e6f3fdf7fa71a4 Mon Sep 17 00:00:00 2001 From: Taras Madan Date: Thu, 13 Feb 2025 15:39:00 +0100 Subject: pkg/cover: reuse cover.html percent function in /ns/coverage page --- pkg/cover/heatmap.go | 2 +- pkg/cover/html.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkg') diff --git a/pkg/cover/heatmap.go b/pkg/cover/heatmap.go index 375817b7d..20c7ac4c1 100644 --- a/pkg/cover/heatmap.go +++ b/pkg/cover/heatmap.go @@ -91,7 +91,7 @@ func (thm *templateHeatmapRow) prepareDataFor(pageColumns []pageColumnTarget, sk var dateCoverage int64 tp := pageColumn.TimePeriod if thm.instrumented[tp] != 0 { - dateCoverage = 100 * thm.covered[tp] / thm.instrumented[tp] + dateCoverage = percent(thm.covered[tp], thm.instrumented[tp]) } thm.Coverage = append(thm.Coverage, dateCoverage) thm.Tooltips = append(thm.Tooltips, fmt.Sprintf("Instrumented:\t%d blocks\nCovered:\t%d blocks", diff --git a/pkg/cover/html.go b/pkg/cover/html.go index 2c8a1281e..a202b0ee6 100644 --- a/pkg/cover/html.go +++ b/pkg/cover/html.go @@ -813,12 +813,12 @@ func processDir(dir *templateDir) { } } -func percent(covered, total int) int { +func percent[T int | int64](covered, total T) T { f := math.Ceil(float64(covered) / float64(total) * 100) if f == 100 && covered < total { f = 99 } - return int(f) + return T(f) } func parseFile(fn string) ([][]byte, error) { -- cgit mrf-deployment