Skip to content

Commit af63907

Browse files
committed
chore: cosmetic naming
1 parent 1b8fd6d commit af63907

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

pkg/testcoverage/check.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func Analyze(cfg Config, current, base []coverage.Stats) AnalyzeResult {
8787
makePackageStats(current), thr.Package, overrideRules,
8888
),
8989
FilesWithUncoveredLines: coverage.StatsFilterWithUncoveredLines(current),
90-
TotalStats: coverage.CalcTotalStats(current),
90+
TotalStats: coverage.StatsCalcTotal(current),
9191
HasBaseBreakdown: len(base) > 0,
9292
Diff: calculateStatsDiff(current, base),
9393
}
@@ -114,7 +114,7 @@ func saveCoverageBreakdown(cfg Config, stats []coverage.Stats) error {
114114
}
115115

116116
//nolint:mnd,wrapcheck,gosec // relax
117-
return os.WriteFile(cfg.BreakdownFileName, coverage.SerializeStats(stats), 0o644)
117+
return os.WriteFile(cfg.BreakdownFileName, coverage.StatsSerialize(stats), 0o644)
118118
}
119119

120120
func loadBaseCoverageBreakdown(cfg Config) ([]coverage.Stats, error) {
@@ -127,7 +127,7 @@ func loadBaseCoverageBreakdown(cfg Config) ([]coverage.Stats, error) {
127127
return nil, fmt.Errorf("reading file content failed: %w", err)
128128
}
129129

130-
stats, err := coverage.DeserializeStats(data)
130+
stats, err := coverage.StatsDeserialize(data)
131131
if err != nil {
132132
return nil, fmt.Errorf("parsing file failed: %w", err)
133133
}

pkg/testcoverage/check_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ func TestCheck(t *testing.T) {
238238

239239
stats, err := GenerateCoverageStats(cfg)
240240
assert.NoError(t, err)
241-
assert.Equal(t, coverage.SerializeStats(stats), contentBytes)
241+
assert.Equal(t, coverage.StatsSerialize(stats), contentBytes)
242242
})
243243

244244
t.Run("valid profile - invalid base breakdown file", func(t *testing.T) {

pkg/testcoverage/coverage/cover_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func Test_GenerateCoverageStats(t *testing.T) {
5656
assert.NoError(t, err)
5757
assert.NotEmpty(t, stats2)
5858
// stats2 should have less total statements because cover.go should have been excluded
59-
assert.Greater(t, CalcTotalStats(stats1).Total, CalcTotalStats(stats2).Total)
59+
assert.Greater(t, StatsCalcTotal(stats1).Total, StatsCalcTotal(stats2).Total)
6060

6161
// should remove prefix from stats
6262
stats3, err := GenerateCoverageStats(Config{
@@ -65,17 +65,17 @@ func Test_GenerateCoverageStats(t *testing.T) {
6565
})
6666
assert.NoError(t, err)
6767
assert.NotEmpty(t, stats3)
68-
assert.Equal(t, CalcTotalStats(stats1), CalcTotalStats(stats3))
68+
assert.Equal(t, StatsCalcTotal(stats1), StatsCalcTotal(stats3))
6969
assert.NotContains(t, stats3[0].Name, prefix)
70-
assert.NotEqual(t, 100, CalcTotalStats(stats3).CoveredPercentage())
70+
assert.NotEqual(t, 100, StatsCalcTotal(stats3).CoveredPercentage())
7171

7272
// should have total coverage because of second profile
7373
stats4, err := GenerateCoverageStats(Config{
7474
Profiles: []string{profileOK, profileOKFull},
7575
})
7676
assert.NoError(t, err)
7777
assert.NotEmpty(t, stats4)
78-
assert.Equal(t, 100, CalcTotalStats(stats4).CoveredPercentage())
78+
assert.Equal(t, 100, StatsCalcTotal(stats4).CoveredPercentage())
7979

8080
// should not have `badge/generate.go` in statistics because it has no statements
8181
stats5, err := GenerateCoverageStats(Config{

pkg/testcoverage/coverage/types.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func compileExcludePathRules(excludePaths []string) []*regexp.Regexp {
108108
return compiled
109109
}
110110

111-
func CalcTotalStats(stats []Stats) Stats {
111+
func StatsCalcTotal(stats []Stats) Stats {
112112
total := Stats{}
113113

114114
for _, s := range stats {
@@ -153,7 +153,7 @@ func filter[T any](slice []T, predicate func(T) bool) []T {
153153
return result
154154
}
155155

156-
func SerializeStats(stats []Stats) []byte {
156+
func StatsSerialize(stats []Stats) []byte {
157157
b := bytes.Buffer{}
158158
sep, nl := []byte(";"), []byte("\n")
159159

@@ -172,7 +172,7 @@ func SerializeStats(stats []Stats) []byte {
172172

173173
var ErrInvalidFormat = errors.New("invalid format")
174174

175-
func DeserializeStats(b []byte) ([]Stats, error) {
175+
func StatsDeserialize(b []byte) ([]Stats, error) {
176176
deserializeLine := func(bl []byte) (Stats, error) {
177177
fields := bytes.Split(bl, []byte(";"))
178178
if len(fields) != 3 { //nolint:mnd // relax

pkg/testcoverage/coverage/types_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,25 +48,25 @@ func TestStatsSerialization(t *testing.T) {
4848
{Name: "bar", Total: 9, Covered: 2},
4949
}
5050

51-
b := SerializeStats(stats)
51+
b := StatsSerialize(stats)
5252
assert.Equal(t, "foo;11;1\nbar;9;2\n", string(b))
5353

54-
ds, err := DeserializeStats(b)
54+
ds, err := StatsDeserialize(b)
5555
assert.NoError(t, err)
5656
assert.Equal(t, stats, ds)
5757

5858
// ignore empty lines
59-
ds, err = DeserializeStats([]byte("\n\n\n\n"))
59+
ds, err = StatsDeserialize([]byte("\n\n\n\n"))
6060
assert.NoError(t, err)
6161
assert.Empty(t, ds)
6262

6363
// invalid formats
64-
_, err = DeserializeStats([]byte("foo;11;"))
64+
_, err = StatsDeserialize([]byte("foo;11;"))
6565
assert.Error(t, err)
6666

67-
_, err = DeserializeStats([]byte("foo;;11"))
67+
_, err = StatsDeserialize([]byte("foo;;11"))
6868
assert.Error(t, err)
6969

70-
_, err = DeserializeStats([]byte("foo;"))
70+
_, err = StatsDeserialize([]byte("foo;"))
7171
assert.Error(t, err)
7272
}

0 commit comments

Comments
 (0)