fix: fix unit test TestJoinPath

Signed-off-by: zongz <zongzhe1024@163.com>
kcl-lang · Dec 4, 2024 · 5d0c935 · 5d0c935
1 parent 8b34ba0
commit 5d0c935
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -560,7 +560,7 @@ func JoinPath(elems ...string) string {
 		}
 		elem = strings.TrimPrefix(elem, "/")
 		elem = strings.TrimSuffix(elem, "/")
-		if i == 0 {
+		if i == 0 || result == "" {
 			result = elem
 		} else {
 			result = result + "/" + elem

diff --git a/pkg/utils/utils_test.go b/pkg/utils/utils_test.go
@@ -173,10 +173,10 @@ func TestJoinPath(t *testing.T) {
 	assert.Equal(t, JoinPath("base", "elem"), "base/elem")
 	assert.Equal(t, JoinPath("base/", "elem"), "base/elem")
 	assert.Equal(t, JoinPath("base", "/elem"), "base/elem")
-	assert.Equal(t, JoinPath("", "/elem"), "/elem")
-	assert.Equal(t, JoinPath("", "elem"), "/elem")
-	assert.Equal(t, JoinPath("base/", ""), "base/")
-	assert.Equal(t, JoinPath("base", ""), "base/")
+	assert.Equal(t, JoinPath("", "elem"), "elem")
+	assert.Equal(t, JoinPath("", "elem"), "elem")
+	assert.Equal(t, JoinPath("base/", ""), "base")
+	assert.Equal(t, JoinPath("base", ""), "base")
 }
 
 func TestIsUrl(t *testing.T) {