From 43e863d91e5035fa38f375387f51eb567ea50b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vlado=20Paji=C4=87?= Date: Sat, 16 Nov 2024 21:45:55 +0100 Subject: [PATCH 1/3] refactoring tests to not use path.go file --- pkg/testcoverage/coverage/cover_test.go | 2 +- pkg/testcoverage/coverage/profile_test.go | 4 +-- pkg/testcoverage/testdata/consts.go | 8 ++--- .../testdata/invalid_data.profile | 6 ++-- .../testdata/invalid_length.profile | 5 +-- pkg/testcoverage/testdata/ok.profile | 17 +--------- pkg/testcoverage/testdata/ok_full.profile | 15 --------- ...ok_no_path.profile => ok_no_badge.profile} | 32 ------------------- .../testdata/ok_no_statements.profile | 3 -- 9 files changed, 14 insertions(+), 78 deletions(-) rename pkg/testcoverage/testdata/{ok_no_path.profile => ok_no_badge.profile} (96%) diff --git a/pkg/testcoverage/coverage/cover_test.go b/pkg/testcoverage/coverage/cover_test.go index 7a32e052..52fe793e 100644 --- a/pkg/testcoverage/coverage/cover_test.go +++ b/pkg/testcoverage/coverage/cover_test.go @@ -15,7 +15,7 @@ const ( testdataDir = "../testdata/" profileOK = testdataDir + testdata.ProfileOK profileOKFull = testdataDir + testdata.ProfileOKFull - profileOKNoPath = testdataDir + testdata.ProfileOKNoPath + profileOKNoBadge = testdataDir + testdata.ProfileOKNoBadge profileOKNoStatements = testdataDir + testdata.ProfileOKNoStatements profileNOK = testdataDir + testdata.ProfileNOK profileNOKInvalidLength = testdataDir + testdata.ProfileNOKInvalidLength diff --git a/pkg/testcoverage/coverage/profile_test.go b/pkg/testcoverage/coverage/profile_test.go index bf02963a..9aadb931 100644 --- a/pkg/testcoverage/coverage/profile_test.go +++ b/pkg/testcoverage/coverage/profile_test.go @@ -36,11 +36,11 @@ func Test_parseProfiles(t *testing.T) { assert.NoError(t, err) assert.NotEmpty(t, p3) - p4, err := ParseProfiles([]string{profileOKNoPath, profileOK}) + p4, err := ParseProfiles([]string{profileOKNoBadge, profileOK}) assert.NoError(t, err) assert.Equal(t, p3, p4) - p5, err := ParseProfiles([]string{profileOK, profileOKNoPath}) + p5, err := ParseProfiles([]string{profileOK, profileOKNoBadge}) assert.NoError(t, err) assert.Equal(t, p4, p5) } diff --git a/pkg/testcoverage/testdata/consts.go b/pkg/testcoverage/testdata/consts.go index cc71c37f..ac842771 100644 --- a/pkg/testcoverage/testdata/consts.go +++ b/pkg/testcoverage/testdata/consts.go @@ -9,8 +9,8 @@ const ( // this profile is synthetically made with full coverage ProfileOKFull = "ok_full.profile" - // just like `ok.profile` but does not have entries for `path/path.go` file - ProfileOKNoPath = "ok_no_path.profile" + // just like `ok.profile` but does not have entries for `badge/generate.go` file + ProfileOKNoBadge = "ok_no_badge.profile" // this profile has no statements for file ProfileOKNoStatements = "ok_no_statements.profile" @@ -18,11 +18,11 @@ const ( // contains profile item with invalid file ProfileNOK = "nok.profile" - // contains profile items for `path/path.go` file, but + // contains profile items for `badge/generate.go` file, but // does not have all profile items ProfileNOKInvalidLength = "invalid_length.profile" - // contains profile items for `path/path.go` file, but + // contains profile items for `badge/generate.go` file, but // does not have correct profile items ProfileNOKInvalidData = "invalid_data.profile" ) diff --git a/pkg/testcoverage/testdata/invalid_data.profile b/pkg/testcoverage/testdata/invalid_data.profile index fccb461e..302603c5 100644 --- a/pkg/testcoverage/testdata/invalid_data.profile +++ b/pkg/testcoverage/testdata/invalid_data.profile @@ -1,4 +1,4 @@ mode: atomic -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:11.3,12.3 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:12.31,14.3 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:16.2,16.58 1 0 \ No newline at end of file +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:15.45,21.2 1 12 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:123.33,25.9 1 15 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:226.23,27.19 1 5 \ No newline at end of file diff --git a/pkg/testcoverage/testdata/invalid_length.profile b/pkg/testcoverage/testdata/invalid_length.profile index b74969c0..4476365d 100644 --- a/pkg/testcoverage/testdata/invalid_length.profile +++ b/pkg/testcoverage/testdata/invalid_length.profile @@ -1,3 +1,4 @@ mode: atomic -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:11.47,12.31 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:12.31,14.3 1 0 \ No newline at end of file +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:15.45,21.2 1 12 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:23.33,25.9 1 15 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:26.23,27.19 1 5 \ No newline at end of file diff --git a/pkg/testcoverage/testdata/ok.profile b/pkg/testcoverage/testdata/ok.profile index 75de939d..7d82275c 100644 --- a/pkg/testcoverage/testdata/ok.profile +++ b/pkg/testcoverage/testdata/ok.profile @@ -1,7 +1,4 @@ mode: atomic -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:11.47,12.31 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:12.31,14.3 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:16.2,16.58 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:13.77,15.16 2 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:15.16,17.3 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:19.2,24.15 3 0 @@ -242,9 +239,6 @@ github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:68. github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:71.50,74.38 2 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:74.38,77.3 2 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:79.2,79.19 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:11.47,12.31 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:12.31,14.3 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:16.2,16.58 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:13.77,15.16 2 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:15.16,17.3 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:19.2,24.15 3 0 @@ -485,9 +479,6 @@ github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:68. github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:71.50,74.38 2 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:74.38,77.3 2 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:79.2,79.19 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:11.47,12.31 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:12.31,14.3 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:16.2,16.58 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:13.77,15.16 2 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:15.16,17.3 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:19.2,24.15 3 0 @@ -728,9 +719,6 @@ github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:68. github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:71.50,74.38 2 4 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:74.38,77.3 2 39 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:79.2,79.19 1 4 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:11.47,12.31 1 1 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:12.31,14.3 1 1 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:16.2,16.58 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:13.77,15.16 2 10 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:15.16,17.3 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:19.2,24.15 3 10 @@ -970,7 +958,4 @@ github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:63. github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:68.2,68.17 1 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:71.50,74.38 2 26 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:74.38,77.3 2 2486 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:79.2,79.19 1 26 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:11.47,12.31 1 6 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:12.31,14.3 1 6 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:16.2,16.58 1 0 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:79.2,79.19 1 26 \ No newline at end of file diff --git a/pkg/testcoverage/testdata/ok_full.profile b/pkg/testcoverage/testdata/ok_full.profile index 4691e2cf..f3dd44d0 100644 --- a/pkg/testcoverage/testdata/ok_full.profile +++ b/pkg/testcoverage/testdata/ok_full.profile @@ -1,7 +1,4 @@ mode: atomic -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:11.47,12.31 1 1 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:12.31,14.3 1 1 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:16.2,16.58 1 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:13.77,15.16 2 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:15.16,17.3 1 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:19.2,24.15 3 1 @@ -242,9 +239,6 @@ github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:68. github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:71.50,74.38 2 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:74.38,77.3 2 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:79.2,79.19 1 1 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:11.47,12.31 1 1 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:12.31,14.3 1 1 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:16.2,16.58 1 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:13.77,15.16 2 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:15.16,17.3 1 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:19.2,24.15 3 1 @@ -485,9 +479,6 @@ github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:68. github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:71.50,74.38 2 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:74.38,77.3 2 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:79.2,79.19 1 1 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:11.47,12.31 1 1 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:12.31,14.3 1 1 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:16.2,16.58 1 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:13.77,15.16 2 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:15.16,17.3 1 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:19.2,24.15 3 1 @@ -728,9 +719,6 @@ github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:68. github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:71.50,74.38 2 4 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:74.38,77.3 2 39 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:79.2,79.19 1 4 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:11.47,12.31 1 1 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:12.31,14.3 1 1 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:16.2,16.58 1 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:13.77,15.16 2 10 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:15.16,17.3 1 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:19.2,24.15 3 10 @@ -971,6 +959,3 @@ github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:68. github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:71.50,74.38 2 26 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:74.38,77.3 2 2486 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage/types.go:79.2,79.19 1 26 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:11.47,12.31 1 6 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:12.31,14.3 1 6 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:16.2,16.58 1 1 diff --git a/pkg/testcoverage/testdata/ok_no_path.profile b/pkg/testcoverage/testdata/ok_no_badge.profile similarity index 96% rename from pkg/testcoverage/testdata/ok_no_path.profile rename to pkg/testcoverage/testdata/ok_no_badge.profile index ce0c375f..e5429bf6 100644 --- a/pkg/testcoverage/testdata/ok_no_path.profile +++ b/pkg/testcoverage/testdata/ok_no_badge.profile @@ -128,14 +128,6 @@ github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/utils.go:25.28,27.3 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/utils.go:29.2,31.33 2 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/utils.go:31.33,37.3 2 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/utils.go:39.2,39.17 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:15.45,21.2 1 102 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:23.33,25.9 1 304 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:26.23,27.19 1 4 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:28.22,29.19 1 30 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:30.22,31.19 1 30 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:32.22,33.19 1 30 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:34.22,35.19 1 60 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:36.10,37.19 1 150 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badgestorer/cdn.go:30.29,32.2 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badgestorer/cdn.go:34.54,36.16 2 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badgestorer/cdn.go:36.16,38.3 1 0 @@ -368,14 +360,6 @@ github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/utils.go:25.28,27.3 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/utils.go:29.2,31.33 2 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/utils.go:31.33,37.3 2 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/utils.go:39.2,39.17 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:15.45,21.2 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:23.33,25.9 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:26.23,27.19 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:28.22,29.19 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:30.22,31.19 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:32.22,33.19 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:34.22,35.19 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:36.10,37.19 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badgestorer/cdn.go:30.29,32.2 1 2 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badgestorer/cdn.go:34.54,36.16 2 5 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badgestorer/cdn.go:36.16,38.3 1 0 @@ -608,14 +592,6 @@ github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/utils.go:25.28,27.3 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/utils.go:29.2,31.33 2 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/utils.go:31.33,37.3 2 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/utils.go:39.2,39.17 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:15.45,21.2 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:23.33,25.9 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:26.23,27.19 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:28.22,29.19 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:30.22,31.19 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:32.22,33.19 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:34.22,35.19 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:36.10,37.19 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badgestorer/cdn.go:30.29,32.2 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badgestorer/cdn.go:34.54,36.16 2 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badgestorer/cdn.go:36.16,38.3 1 0 @@ -848,14 +824,6 @@ github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/utils.go:25.28,27.3 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/utils.go:29.2,31.33 2 2 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/utils.go:31.33,37.3 2 2 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/utils.go:39.2,39.17 1 2 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:15.45,21.2 1 12 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:23.33,25.9 1 15 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:26.23,27.19 1 5 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:28.22,29.19 1 9 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:30.22,31.19 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:32.22,33.19 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:34.22,35.19 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:36.10,37.19 1 1 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badgestorer/cdn.go:30.29,32.2 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badgestorer/cdn.go:34.54,36.16 2 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badgestorer/cdn.go:36.16,38.3 1 0 diff --git a/pkg/testcoverage/testdata/ok_no_statements.profile b/pkg/testcoverage/testdata/ok_no_statements.profile index d5b4ab37..f41b6aac 100644 --- a/pkg/testcoverage/testdata/ok_no_statements.profile +++ b/pkg/testcoverage/testdata/ok_no_statements.profile @@ -1,7 +1,4 @@ mode: atomic -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:11.47,12.31 0 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:12.31,14.3 0 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path/path.go:16.2,16.58 0 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:13.77,15.16 2 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:15.16,17.3 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge.go:19.2,24.15 3 0 \ No newline at end of file From 36eb73ff1b56f12ab7df6658ab6cce592310475f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vlado=20Paji=C4=87?= Date: Sat, 16 Nov 2024 22:02:34 +0100 Subject: [PATCH 2/3] fix test coverage --- pkg/testcoverage/coverage/cover_test.go | 4 +-- .../testdata/invalid_data.profile | 33 +++++++++++++++++-- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/pkg/testcoverage/coverage/cover_test.go b/pkg/testcoverage/coverage/cover_test.go index 52fe793e..39e9778a 100644 --- a/pkg/testcoverage/coverage/cover_test.go +++ b/pkg/testcoverage/coverage/cover_test.go @@ -76,13 +76,13 @@ func Test_GenerateCoverageStats(t *testing.T) { assert.NotEmpty(t, stats4) assert.Equal(t, 100, CalcTotalStats(stats4).CoveredPercentage()) - // should not have `path/path.go` in statistics because it has no statements + // should not have `badge/generate.go` in statistics because it has no statements stats5, err := GenerateCoverageStats(Config{ Profiles: []string{profileOKNoStatements}, }) assert.NoError(t, err) assert.Len(t, stats5, 1) - assert.NotContains(t, `path/path.go`, stats5[0].Name) + assert.NotContains(t, `badge/generate.go`, stats5[0].Name) } func Test_findFile(t *testing.T) { diff --git a/pkg/testcoverage/testdata/invalid_data.profile b/pkg/testcoverage/testdata/invalid_data.profile index 302603c5..e5bd9ad8 100644 --- a/pkg/testcoverage/testdata/invalid_data.profile +++ b/pkg/testcoverage/testdata/invalid_data.profile @@ -1,4 +1,33 @@ mode: atomic +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:115.45,21.2 1 102 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:23.33,25.9 1 304 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:26.23,27.19 1 4 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:28.22,29.19 1 30 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:30.22,31.19 1 30 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:32.22,33.19 1 30 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:34.22,35.19 1 60 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:36.10,37.19 1 150 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:15.45,21.2 1 0 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:23.33,25.9 1 0 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:26.23,27.19 1 0 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:28.22,29.19 1 0 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:30.22,31.19 1 0 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:32.22,33.19 1 0 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:34.22,35.19 1 0 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:36.10,37.19 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:15.45,21.2 1 12 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:123.33,25.9 1 15 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:226.23,27.19 1 5 \ No newline at end of file +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:23.33,25.9 1 15 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:26.23,27.19 1 5 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:28.22,29.19 1 9 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:30.22,31.19 1 0 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:32.22,33.19 1 0 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:34.22,35.19 1 0 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:36.10,37.19 1 1 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:15.45,21.2 1 12 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:23.33,25.9 1 15 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:26.23,27.19 1 5 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:28.22,29.19 1 9 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:30.22,31.19 1 0 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:32.22,33.19 1 0 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:34.22,35.19 1 0 +github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:36.10,37.19 1 1 \ No newline at end of file From 62f789946a1047680ae17427ca4fb87cac6b0ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vlado=20Paji=C4=87?= Date: Sat, 16 Nov 2024 22:12:42 +0100 Subject: [PATCH 3/3] fix test data --- pkg/testcoverage/testdata/invalid_data.profile | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkg/testcoverage/testdata/invalid_data.profile b/pkg/testcoverage/testdata/invalid_data.profile index e5bd9ad8..3cf98056 100644 --- a/pkg/testcoverage/testdata/invalid_data.profile +++ b/pkg/testcoverage/testdata/invalid_data.profile @@ -7,7 +7,6 @@ github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:30. github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:32.22,33.19 1 30 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:34.22,35.19 1 60 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:36.10,37.19 1 150 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:15.45,21.2 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:23.33,25.9 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:26.23,27.19 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:28.22,29.19 1 0 @@ -15,7 +14,6 @@ github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:30. github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:32.22,33.19 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:34.22,35.19 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:36.10,37.19 1 0 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:15.45,21.2 1 12 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:23.33,25.9 1 15 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:26.23,27.19 1 5 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:28.22,29.19 1 9 @@ -23,7 +21,6 @@ github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:30. github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:32.22,33.19 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:34.22,35.19 1 0 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:36.10,37.19 1 1 -github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:15.45,21.2 1 12 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:23.33,25.9 1 15 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:26.23,27.19 1 5 github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/badge/generate.go:28.22,29.19 1 9