diff --git a/helper/helper_test.go b/helper/helper_test.go index 4e5c4af..3b8309b 100644 --- a/helper/helper_test.go +++ b/helper/helper_test.go @@ -8,6 +8,8 @@ import ( ) func TestDetermineProjectName(t *testing.T) { + t.Parallel() + type args struct { projectName string filePath string @@ -25,7 +27,7 @@ func TestDetermineProjectName(t *testing.T) { filePath: func() string { dir, err := os.Getwd() if err != nil { - panic(err) + t.Fatal(err) } return dir @@ -47,7 +49,10 @@ func TestDetermineProjectName(t *testing.T) { }, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { + t.Parallel() + got, err := DetermineProjectName(tt.args.projectName, tt.args.filePath) if (err != nil) != tt.wantErr { t.Errorf("DetermineProjectName() error = %v, wantErr %v", err, tt.wantErr) diff --git a/pkg/astutil/astutil_test.go b/pkg/astutil/astutil_test.go index 06ed8dc..e232266 100644 --- a/pkg/astutil/astutil_test.go +++ b/pkg/astutil/astutil_test.go @@ -11,6 +11,8 @@ import ( ) func TestUsesImport(t *testing.T) { + t.Parallel() + type args struct { fileData string path string @@ -146,10 +148,12 @@ func main(){ }, } for _, tt := range tests { - + tt := tt fileData := tt.args.fileData t.Run(tt.name, func(t *testing.T) { + t.Parallel() + fset := token.NewFileSet() f, err := parser.ParseFile(fset, "", []byte(fileData), parser.ParseComments) require.NoError(t, err) @@ -162,6 +166,8 @@ func main(){ } func TestLoadPackageDeps(t *testing.T) { + t.Parallel() + type args struct { dir string filename string @@ -200,7 +206,10 @@ func TestLoadPackageDeps(t *testing.T) { } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { + t.Parallel() + f, err := parser.ParseFile( token.NewFileSet(), fmt.Sprintf("%s/%s", tt.args.dir, tt.args.filename), diff --git a/pkg/module/error_test.go b/pkg/module/error_test.go index 86228d5..693057b 100644 --- a/pkg/module/error_test.go +++ b/pkg/module/error_test.go @@ -3,6 +3,8 @@ package module import "testing" func TestPathIsNotSetError_Error(t *testing.T) { + t.Parallel() + tests := []struct { name string want string @@ -24,6 +26,8 @@ func TestPathIsNotSetError_Error(t *testing.T) { } func TestUndefinedModuleError_Error(t *testing.T) { + t.Parallel() + tests := []struct { name string want string diff --git a/pkg/module/module_test.go b/pkg/module/module_test.go index f9926b6..32c171d 100644 --- a/pkg/module/module_test.go +++ b/pkg/module/module_test.go @@ -2,10 +2,13 @@ package module import ( "os" + "path/filepath" "testing" ) func TestGoModRootPathAndName(t *testing.T) { + t.Parallel() + type args struct { dir string } @@ -21,9 +24,8 @@ func TestGoModRootPathAndName(t *testing.T) { dir: func() string { dir, err := os.Getwd() if err != nil { - panic(err) + t.Fatal(err) } - return dir }(), }, @@ -49,7 +51,10 @@ func TestGoModRootPathAndName(t *testing.T) { } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { + t.Parallel() + goModRootPath, err := GoModRootPath(tt.args.dir) if err != nil && !tt.wantErr { t.Errorf("GoModRootPath() error = %v, wantErr %v", err, tt.wantErr) @@ -70,71 +75,52 @@ func TestGoModRootPathAndName(t *testing.T) { } func TestName(t *testing.T) { - type args struct { - goModRootPath string - } + t.Parallel() + tests := []struct { name string - prepareFn func() - args args + prepareFn func() string want string wantErr bool }{ { name: "read empty go.mod", - prepareFn: func() { - const f = "/tmp/go.mod" - - if _, err := os.Stat(f); os.IsExist(err) { - if err := os.Remove(f); err != nil { - panic(err) - } - } - - _, err := os.Create(f) + prepareFn: func() string { + dir := t.TempDir() + _, err := os.Create(filepath.Join(dir, "go.mod")) if err != nil { - panic(err) + t.Fatal(err) } - }, - args: args{ - goModRootPath: "/tmp", + return dir }, want: "", wantErr: true, }, { name: "check failed parsing of go.mod", - prepareFn: func() { - const f = "/tmp/go.mod" - - if _, err := os.Stat(f); os.IsExist(err) { - if err := os.Remove(f); err != nil { - panic(err) - } - } - - file, err := os.Create(f) + prepareFn: func() string { + dir := t.TempDir() + file, err := os.Create(filepath.Join(dir, "go.mod")) if err != nil { - panic(err) + t.Fatal(err) } if _, err := file.WriteString("mod test"); err != nil { - panic(err) + t.Fatal(err) } - }, - args: args{ - goModRootPath: "/tmp", + return dir }, want: "", wantErr: true, }, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { + t.Parallel() - tt.prepareFn() - - got, err := Name(tt.args.goModRootPath) + goModRootPath := tt.prepareFn() + got, err := Name(goModRootPath) if (err != nil) != tt.wantErr { t.Errorf("Name() error = %v, wantErr %v", err, tt.wantErr) return @@ -147,6 +133,8 @@ func TestName(t *testing.T) { } func TestDetermineProjectName(t *testing.T) { + t.Parallel() + type args struct { projectName string filePath string @@ -164,9 +152,9 @@ func TestDetermineProjectName(t *testing.T) { filePath: func() string { dir, err := os.Getwd() if err != nil { - panic(err) + t.Fatal(err) } - return dir + "/module.go" + return filepath.Join(dir, "module.go") }(), }, want: "github.com/incu6us/goimports-reviser/v3", @@ -184,7 +172,10 @@ func TestDetermineProjectName(t *testing.T) { }, } for _, tt := range tests { + tt := tt t.Run(tt.name, func(t *testing.T) { + t.Parallel() + got, err := DetermineProjectName(tt.args.projectName, tt.args.filePath) if (err != nil) != tt.wantErr { t.Errorf("DetermineProjectName() error = %v, wantErr %v", err, tt.wantErr)