fix windows path

Author: vladopajic

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
       - name: checkout

pkg/testcoverage/coverage/cover.go

@@ -10,6 +10,8 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path"
+
 	"golang.org/x/tools/cover"
 )
 
@@ -81,7 +83,7 @@ func findFile(file, prefix string) (string, string, error) {
 
 	dir, file := filepath.Split(file)
 
-	pkg, err := build.Import(dir, ".", build.FindOnly)
+	pkg, err := build.Import(path.Normalize(dir), ".", build.FindOnly)
 	if err != nil {
 		return "", "", fmt.Errorf("can't find file %q: %w", profileFile, err)
 	}

pkg/testcoverage/coverage/cover_test.go

@@ -1,6 +1,7 @@
 package coverage_test
 
 import (
+	"runtime"
 	"strings"
 	"testing"
 
@@ -20,11 +21,16 @@ const (
 	profileNOK              = testdataDir + testdata.ProfileNOK
 	profileNOKInvalidLength = testdataDir + testdata.ProfileNOKInvalidLength
 	profileNOKInvalidData   = testdataDir + testdata.ProfileNOKInvalidData
-
-	prefix        = "github.com/vladopajic/go-test-coverage/v2"
-	coverFilename = "pkg/testcoverage/coverage/cover.go"
 )
 
+var prefix = func() string { //nolint:gochecknoglobals // relax
+	if runtime.GOOS == "windows" {
+		return "go-test-coverage/go-test-coverage"
+	}
+
+	return "github.com/vladopajic/go-test-coverage/v2"
+}()
+
 func Test_GenerateCoverageStats(t *testing.T) {
 	t.Parallel()
 
@@ -92,7 +98,7 @@ func Test_findFile(t *testing.T) {
 		return
 	}
 
-	const filename = "pkg/testcoverage/coverage/cover.go"
+	filename := "pkg/testcoverage/coverage/cover.go"
 
 	file, noPrefixName, err := FindFile(prefix+"/"+filename, "")
 	assert.NoError(t, err)

pkg/testcoverage/coverage/export_test.go

@@ -6,6 +6,7 @@ var (
 	FindFuncsAndBlocks = findFuncsAndBlocks
 	ParseProfiles      = parseProfiles
 	CoverageForFile    = coverageForFile
+	StripPrefix        = stripPrefix
 )
 
 type Extent = extent

pkg/testcoverage/coverage/types.go

@@ -40,7 +40,13 @@ func stripPrefix(name, prefix string) string {
 		prefix += "/"
 	}
 
-	return strings.Replace(name, prefix, "", 1)
+	prefix = path.Normalize(prefix)
+
+	if i := strings.Index(name, prefix); i >= 0 {
+		return name[i+len(prefix):]
+	}
+
+	return name
 }
 
 func matches(regexps []*regexp.Regexp, str string) bool {
@@ -61,7 +67,6 @@ func compileExcludePathRules(excludePaths []string) []*regexp.Regexp {
 	compiled := make([]*regexp.Regexp, len(excludePaths))
 
 	for i, pattern := range excludePaths {
-		pattern = path.NormalizePathInRegex(pattern)
 		compiled[i] = regexp.MustCompile(pattern)
 	}
 

pkg/testcoverage/coverage/types_test.go

@@ -6,6 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	. "github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/coverage"
+	"github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path"
 )
 
 func TestCoveredPercentage(t *testing.T) {
@@ -28,3 +29,39 @@ func TestCoveredPercentage(t *testing.T) {
 		assert.Equal(t, tc.percentage, CoveredPercentage(tc.total, tc.covered))
 	}
 }
+
+func TestStripPrefix(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		file     string
+		prefix   string
+		noPrefix string
+	}{
+		{
+			file:     path.Normalize("github.com/example/foo/bar.go"),
+			prefix:   "github.com/example",
+			noPrefix: path.Normalize("foo/bar.go"),
+		},
+		{
+			file:     path.Normalize("github.com/example/foo/bar.go"),
+			prefix:   "github.com/example/",
+			noPrefix: path.Normalize("foo/bar.go"),
+		},
+		{
+			file:     path.Normalize("github.com/example/foo/bar.go"),
+			prefix:   "example/foo",
+			noPrefix: path.Normalize("bar.go"),
+		},
+		{
+			file:     path.Normalize("github.com/example/foo/bar.go"),
+			prefix:   "github.com/example1/",
+			noPrefix: path.Normalize("github.com/example/foo/bar.go"),
+		},
+	}
+
+	for _, tc := range tests {
+		name := StripPrefix(tc.file, tc.prefix)
+		assert.Equal(t, tc.noPrefix, name)
+	}
+}

pkg/testcoverage/path/path.go

@@ -8,7 +8,7 @@ import (
 
 const separatorToReplace = string(filepath.Separator)
 
-func NormalizePathInRegex(path string) string {
+func Normalize(path string) string {
 	if runtime.GOOS != "windows" {
 		return path
 	}

pkg/testcoverage/path/path_test.go

@@ -0,0 +1,53 @@
+package path_test
+
+import (
+	"runtime"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	. "github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path"
+)
+
+type testCase struct {
+	input  string
+	output string
+}
+
+func Test_NormalizePath_NoWin(t *testing.T) {
+	t.Parallel()
+
+	if runtime.GOOS == "windows" {
+		return
+	}
+
+	tests := []testCase{
+		{
+			input:  "foo/bar",
+			output: "foo/bar",
+		},
+	}
+
+	for _, tc := range tests {
+		assert.Equal(t, tc.output, Normalize(tc.input))
+	}
+}
+
+func Test_NormalizePath_Win(t *testing.T) {
+	t.Parallel()
+
+	if runtime.GOOS != "windows" {
+		return
+	}
+
+	tests := []testCase{
+		{
+			input:  "foo/bar",
+			output: "foo\\bar",
+		},
+	}
+
+	for _, tc := range tests {
+		assert.Equal(t, tc.output, Normalize(tc.input))
+	}
+}

pkg/testcoverage/utils.go

@@ -2,8 +2,6 @@ package testcoverage
 
 import (
 	"regexp"
-
-	"github.com/vladopajic/go-test-coverage/v2/pkg/testcoverage/path"
 )
 
 type regRule struct {
@@ -29,9 +27,8 @@ func compileOverridePathRules(cfg Config) []regRule {
 	compiled := make([]regRule, len(cfg.Override))
 
 	for i, o := range cfg.Override {
-		pattern := path.NormalizePathInRegex(o.Path)
 		compiled[i] = regRule{
-			reg:       regexp.MustCompile(pattern),
+			reg:       regexp.MustCompile(o.Path),
 			threshold: o.Threshold,
 		}
 	}