aboutsummaryrefslogtreecommitdiffstats
path: root/pkg/covermerger
diff options
context:
space:
mode:
authorTaras Madan <tarasmadan@google.com>2025-01-09 15:45:40 +0100
committerTaras Madan <tarasmadan@google.com>2025-01-27 10:05:21 +0000
commit0868754a9d325ba9011e1cb74510f68d4b627c79 (patch)
treece1f63a84afa095227d308ccfff258e2d1dea225 /pkg/covermerger
parentd99a33ad01eb09190a8680d743f8d520e459ef0f (diff)
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.
Diffstat (limited to 'pkg/covermerger')
-rw-r--r--pkg/covermerger/covermerger.go6
-rw-r--r--pkg/covermerger/file_line_merger.go4
2 files changed, 5 insertions, 5 deletions
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)
}
}