From 0868754a9d325ba9011e1cb74510f68d4b627c79 Mon Sep 17 00:00:00 2001 From: Taras Madan Date: Thu, 9 Jan 2025 15:45:40 +0100 Subject: dashboard/app: show manager unique coverage 1. Make heatmap testable, move out the spanner client instantiation. 2. Generate spannerdb.ReadOnlyTransaction mocks. 3. Generate spannerdb.RowIterator mocks. 4. Generate spannerdb.Row mocks. 5. Prepare spannerdb fixture. 6. Fixed html control name + value. 7. Added multiple tests. 8. Show line coverage from selected manager. 9. Propagate coverage url params to file coverage url. --- pkg/covermerger/covermerger.go | 6 +++--- pkg/covermerger/file_line_merger.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'pkg/covermerger') diff --git a/pkg/covermerger/covermerger.go b/pkg/covermerger/covermerger.go index 11ed5c043..34b534593 100644 --- a/pkg/covermerger/covermerger.go +++ b/pkg/covermerger/covermerger.go @@ -44,7 +44,7 @@ type RepoCommit struct { } type MergeResult struct { - HitCounts map[int]int + HitCounts map[int]int64 FileExists bool LineDetails map[int][]*FileRecord } @@ -118,10 +118,10 @@ func mergedCoverageRecords(fmr *FileMergeResult) []*coveragedb.MergedCoverageRec for _, line := range lines { mgrStat[allManagers].AddLineHitCount(line, fmr.HitCounts[line]) - managerHitCounts := map[string]int{} + managerHitCounts := map[string]int64{} for _, lineDetail := range fmr.LineDetails[line] { manager := lineDetail.Manager - managerHitCounts[manager] += lineDetail.HitCount + managerHitCounts[manager] += int64(lineDetail.HitCount) } for manager, managerHitCount := range managerHitCounts { if _, ok := mgrStat[manager]; !ok { diff --git a/pkg/covermerger/file_line_merger.go b/pkg/covermerger/file_line_merger.go index 5d9c0ab7a..ebc747f47 100644 --- a/pkg/covermerger/file_line_merger.go +++ b/pkg/covermerger/file_line_merger.go @@ -20,7 +20,7 @@ func makeFileLineCoverMerger(fvs fileVersions, base RepoCommit) FileCoverageMerg } a := &FileLineCoverMerger{ MergeResult: &MergeResult{ - HitCounts: make(map[int]int), + HitCounts: make(map[int]int64), FileExists: true, LineDetails: make(map[int][]*FileRecord), }, @@ -49,7 +49,7 @@ func (a *FileLineCoverMerger) Add(record *FileRecord) { return } if targetLine := a.matchers[record.RepoCommit].SameLinePos(record.StartLine); targetLine != -1 { - a.HitCounts[targetLine] += record.HitCount + a.HitCounts[targetLine] += int64(record.HitCount) a.LineDetails[targetLine] = append(a.LineDetails[targetLine], record) } } -- cgit mrf-deployment