Fix path for Windows

k1LoW · Jan 24, 2024 · c7b5fde · c7b5fde
1 parent 082e500
commit c7b5fde
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 deletions.
diff --git a/datastore/datastore_unix_test.go b/datastore/datastore_unix_test.go
@@ -1,3 +1,5 @@
+//go:build !windows
+
 package datastore
 
 import (

diff --git a/datastore/datastore_windows_test.go b/datastore/datastore_windows_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 )
 
-func TestParseUNIX(t *testing.T) {
+func TestParseWindows(t *testing.T) {
 	var tests = []struct {
 		in        string
 		wantType  Type
@@ -21,8 +21,8 @@ func TestParseUNIX(t *testing.T) {
 		{"local://reports", Local, []string{filepath.Join(testdataDir(t), "reports")}, false},
 		{"local://./reports", Local, []string{filepath.Join(testdataDir(t), "reports")}, false},
 		{"local:///reports", UnknownType, nil, true},
-		{"local://C:/reports", Local, []string{"C:\reports"}, false},
-		{"local://C:\reports", Local, []string{"C:\reports"}, false},
+		{"local://C:/reports", Local, []string{"C:\\reports"}, false},
+		{"local://C:\\reports", Local, []string{"C:\\reports"}, false},
 	}
 	for _, tt := range tests {
 		t.Run(tt.in, func(t *testing.T) {

diff --git a/internal/path.go b/internal/path.go
@@ -25,7 +25,8 @@ func RootPath(base string) (string, error) {
 		if fi, err := os.Stat(gitConfig); err == nil && !fi.IsDir() {
 			return p, nil
 		}
-		if p == "/" {
+		if filepath.Dir(p) == p {
+			// root directory
 			break
 		}
 		p = filepath.Dir(p)
@@ -36,15 +37,14 @@ func RootPath(base string) (string, error) {
 func DetectPrefix(gitRoot, wd string, files, cfiles []string) string {
 	var rcfiles [][]string
 	for _, f := range cfiles {
-		s := strings.Split(f, "/")
+		s := strings.Split(filepath.FromSlash(f), string(filepath.Separator))
 		reverse(s)
 		rcfiles = append(rcfiles, s)
 	}
 
 	var rfiles [][]string
 	for _, f := range files {
-		s := strings.Split(f, "/")
-		// reverse slice
+		s := strings.Split(filepath.FromSlash(f), string(filepath.Separator))
 		reverse(s)
 		rfiles = append(rfiles, s)
 	}

diff --git a/internal/path_test.go b/internal/path_test.go
@@ -1,6 +1,7 @@
 package internal
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 	"testing"
@@ -68,10 +69,15 @@ func TestDetectPrefix(t *testing.T) {
 		{"/path/to", "/path/to", []string{"/path/to/foo/file.txt"}, []string{"./foo/file.txt"}, ""},
 		// {"/path/a/b/c/github.com/owner/repo/", "/path/a/b/c/github.com/owner/repo/foo", []string{"/path/a/b/c/github.com/owner/repo/bar/config/config.go", "/path/a/b/c/github.com/owner/repo/foo/config/config.go", "/path/a/b/c/github.com/owner/repo/foo/entity/hello.go"}, []string{"github.com/owner/repo/foo/config/config.go", "github.com/owner/repo/foo/entity/hello.go"}, "github.com/owner/repo/foo"},
 	}
-	for _, tt := range tests {
-		got := DetectPrefix(tt.gitRoot, tt.wd, tt.files, tt.cfiles)
-		if got != tt.want {
-			t.Errorf("got %v\nwant %v", got, tt.want)
-		}
+	for i, tt := range tests {
+		tt := tt
+		t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
+			t.Parallel()
+			got := DetectPrefix(tt.gitRoot, tt.wd, tt.files, tt.cfiles)
+			want := filepath.FromSlash(tt.want)
+			if got != want {
+				t.Errorf("got %v\nwant %v", got, want)
+			}
+		})
 	}
 }
diff --git a/ratio/ratio_test.go b/ratio/ratio_test.go
@@ -103,7 +103,7 @@ func TestPathMatch(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		want := "ratio/ratio_test.go"
+		want := filepath.FromSlash("ratio/ratio_test.go")
 		ok := false
 		for _, f := range got.CodeFiles {
 			if f.Path == want {
@@ -124,7 +124,7 @@ func TestPathMatch(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		want := "ratio/ratio_test.go"
+		want := filepath.FromSlash("ratio/ratio_test.go")
 		ok := false
 		for _, f := range got.CodeFiles {
 			if f.Path == want {