From 143d2083b07f1303276d45bea2d11d9985449a62 Mon Sep 17 00:00:00 2001 From: Eng Zer Jun Date: Mon, 16 May 2022 06:28:42 +0800 Subject: [PATCH] refactor: replace strings.Replace with strings.ReplaceAll (#978) --- ginkgo/generators/generate_command.go | 6 +++--- ginkgo/generators/generators_common.go | 10 +++++----- ginkgo/internal/run.go | 4 ++-- reporters/teamcity_report.go | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ginkgo/generators/generate_command.go b/ginkgo/generators/generate_command.go index 33a1b6798..93b0b4b25 100644 --- a/ginkgo/generators/generate_command.go +++ b/ginkgo/generators/generate_command.go @@ -136,8 +136,8 @@ func generateTestFileForSubject(subject string, conf GeneratorsConfig) { } func formatSubject(name string) string { - name = strings.Replace(name, "-", "_", -1) - name = strings.Replace(name, " ", "_", -1) + name = strings.ReplaceAll(name, "-", "_") + name = strings.ReplaceAll(name, " ", "_") name = strings.Split(name, ".go")[0] name = strings.Split(name, "_test")[0] return name @@ -223,7 +223,7 @@ func getPackageImportPath() string { if modRoot != "" { modName := moduleName(modRoot) if modName != "" { - cd := strings.Replace(workingDir, modRoot, "", -1) + cd := strings.ReplaceAll(workingDir, modRoot, "") cd = strings.ReplaceAll(cd, sep, "/") return modName + cd } diff --git a/ginkgo/generators/generators_common.go b/ginkgo/generators/generators_common.go index 9da13a0d3..3086e6056 100644 --- a/ginkgo/generators/generators_common.go +++ b/ginkgo/generators/generators_common.go @@ -19,8 +19,8 @@ func getPackageAndFormattedName() (string, string, string) { path, err := os.Getwd() command.AbortIfError("Could not get current working directory:", err) - dirName := strings.Replace(filepath.Base(path), "-", "_", -1) - dirName = strings.Replace(dirName, " ", "_", -1) + dirName := strings.ReplaceAll(filepath.Base(path), "-", "_") + dirName = strings.ReplaceAll(dirName, " ", "_") pkg, err := build.ImportDir(path, 0) packageName := pkg.Name @@ -47,10 +47,10 @@ func ensureLegalPackageName(name string) string { } func prettifyName(name string) string { - name = strings.Replace(name, "-", " ", -1) - name = strings.Replace(name, "_", " ", -1) + name = strings.ReplaceAll(name, "-", " ") + name = strings.ReplaceAll(name, "_", " ") name = strings.Title(name) - name = strings.Replace(name, " ", "", -1) + name = strings.ReplaceAll(name, " ", "") return name } diff --git a/ginkgo/internal/run.go b/ginkgo/internal/run.go index 10058393b..cad238671 100644 --- a/ginkgo/internal/run.go +++ b/ginkgo/internal/run.go @@ -330,8 +330,8 @@ func runAfterRunHook(command string, noColor bool, suite TestSuite) { if suite.State.Is(TestSuiteStatePassed) { passed = "[PASS]" } - command = strings.Replace(command, "(ginkgo-suite-passed)", passed, -1) - command = strings.Replace(command, "(ginkgo-suite-name)", suite.PackageName, -1) + command = strings.ReplaceAll(command, "(ginkgo-suite-passed)", passed) + command = strings.ReplaceAll(command, "(ginkgo-suite-name)", suite.PackageName) // Must break command into parts splitArgs := regexp.MustCompile(`'.+'|".+"|\S+`) diff --git a/reporters/teamcity_report.go b/reporters/teamcity_report.go index 2aa2f1845..f9b1117ca 100644 --- a/reporters/teamcity_report.go +++ b/reporters/teamcity_report.go @@ -17,12 +17,12 @@ import ( ) func tcEscape(s string) string { - s = strings.Replace(s, "|", "||", -1) - s = strings.Replace(s, "'", "|'", -1) - s = strings.Replace(s, "\n", "|n", -1) - s = strings.Replace(s, "\r", "|r", -1) - s = strings.Replace(s, "[", "|[", -1) - s = strings.Replace(s, "]", "|]", -1) + s = strings.ReplaceAll(s, "|", "||") + s = strings.ReplaceAll(s, "'", "|'") + s = strings.ReplaceAll(s, "\n", "|n") + s = strings.ReplaceAll(s, "\r", "|r") + s = strings.ReplaceAll(s, "[", "|[") + s = strings.ReplaceAll(s, "]", "|]") return s }