Adjust test, cleanup

dim13 · Jul 21, 2021 · f77dbc0 · f77dbc0
1 parent 2181b29
commit f77dbc0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/migration/cleanname.go b/migration/cleanname.go
@@ -1,7 +1,7 @@
 package migration
 
 import (
-	"path/filepath"
+	"os"
 	"strings"
 
 	"github.com/google/uuid"
@@ -10,11 +10,13 @@ import (
 // FileName returns sanitized filename without path delimiters
 func (op *Payload_OtpParameters) FileName() string {
 	return strings.Map(func(r rune) rune {
-		if r == filepath.Separator || r == filepath.PathListSeparator {
+		switch r {
+		case os.PathSeparator, os.PathListSeparator:
 			return '_'
+		default:
+			return r
 		}
-		return r
-	}, op.Name + "_" + op.Issuer)
+	}, op.Name+"_"+op.Issuer)
 }
 
 // UUID of OTP parameter

diff --git a/migration/cleanname_test.go b/migration/cleanname_test.go
@@ -19,14 +19,14 @@ func TestFileName(t *testing.T) {
 				Name:   "A/B:C.d",
 				Issuer: "Issuer",
 			},
-			want: "A_B:C.d_Issuer",
+			want: "A_B_C.d_Issuer",
 		},
 		{
 			op: &Payload_OtpParameters{
 				Name:   "A/../B:C.d",
 				Issuer: "Issuer",
 			},
-			want: "A_.._B:C.d_Issuer",
+			want: "A_.._B_C.d_Issuer",
 		},
 	}