Adjust tests for GO 1.20

Updates #10691

diff --git a/common/paths/path.go b/common/paths/path.go
index 11d221bb153ff94d03118f0247b1d464844c1b13..f1992f196cd638739a14f666e1ea21ac4fa7e200 100644 (file)
--- a/common/paths/path.go
+++ b/common/paths/path.go
@@ -100,25 +100,25 @@ var isFileRe = regexp.MustCompile(`.*\..{1,6}$`)
 // GetDottedRelativePath expects a relative path starting after the content directory.
 // It returns a relative path with dots ("..") navigating up the path structure.
 func GetDottedRelativePath(inPath string) string {
-       inPath = filepath.Clean(filepath.FromSlash(inPath))
+       inPath = path.Clean(filepath.ToSlash(inPath))
 
        if inPath == "." {
                return "./"
        }
 
-       if !isFileRe.MatchString(inPath) && !strings.HasSuffix(inPath, FilePathSeparator) {
-               inPath += FilePathSeparator
+       if !isFileRe.MatchString(inPath) && !strings.HasSuffix(inPath, "/") {
+               inPath += "/"
        }
 
-       if !strings.HasPrefix(inPath, FilePathSeparator) {
-               inPath = FilePathSeparator + inPath
+       if !strings.HasPrefix(inPath, "/") {
+               inPath = "/" + inPath
        }
 
        dir, _ := filepath.Split(inPath)
 
-       sectionCount := strings.Count(dir, FilePathSeparator)
+       sectionCount := strings.Count(dir, "/")
 
-       if sectionCount == 0 || dir == FilePathSeparator {
+       if sectionCount == 0 || dir == "/" {
                return "./"
        }
 

diff --git a/helpers/path.go b/helpers/path.go
index b3f69ff90c64c25a8bac4809336be38bcd4e16ce..7bc216ec813d2e3f2fea1545bd9b5cdc6f64df05 100644 (file)
--- a/helpers/path.go
+++ b/helpers/path.go
@@ -18,6 +18,7 @@ import (
        "fmt"
        "io"
        "os"
+       "path"
        "path/filepath"
        "regexp"
        "sort"
@@ -142,25 +143,25 @@ var isFileRe = regexp.MustCompile(`.*\..{1,6}$`)
 // GetDottedRelativePath expects a relative path starting after the content directory.
 // It returns a relative path with dots ("..") navigating up the path structure.
 func GetDottedRelativePath(inPath string) string {
-       inPath = filepath.Clean(filepath.FromSlash(inPath))
+       inPath = path.Clean(filepath.ToSlash(inPath))
 
        if inPath == "." {
                return "./"
        }
 
-       if !isFileRe.MatchString(inPath) && !strings.HasSuffix(inPath, FilePathSeparator) {
-               inPath += FilePathSeparator
+       if !isFileRe.MatchString(inPath) && !strings.HasSuffix(inPath, "/") {
+               inPath += "/"
        }
 
-       if !strings.HasPrefix(inPath, FilePathSeparator) {
-               inPath = FilePathSeparator + inPath
+       if !strings.HasPrefix(inPath, "/") {
+               inPath = "/" + inPath
        }
 
-       dir, _ := filepath.Split(inPath)
+       dir, _ := path.Split(inPath)
 
-       sectionCount := strings.Count(dir, FilePathSeparator)
+       sectionCount := strings.Count(dir, "/")
 
-       if sectionCount == 0 || dir == FilePathSeparator {
+       if sectionCount == 0 || dir == "/" {
                return "./"
        }