优化结构
This commit is contained in:
@@ -274,12 +274,22 @@ func parseCompatibleDuration(raw string) (time.Duration, error) {
|
||||
return value, nil
|
||||
}
|
||||
if index := strings.Index(raw, "d"); index >= 0 {
|
||||
days, _ := strconv.Atoi(raw[:index])
|
||||
value := time.Duration(days) * 24 * time.Hour
|
||||
remainder, err := time.ParseDuration(raw[index+1:])
|
||||
if index == 0 {
|
||||
return 0, strconv.ErrSyntax
|
||||
}
|
||||
days, err := strconv.Atoi(raw[:index])
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
value := time.Duration(days) * 24 * time.Hour
|
||||
remainderText := strings.TrimSpace(raw[index+1:])
|
||||
if remainderText == "" {
|
||||
return value, nil
|
||||
}
|
||||
remainder, err := time.ParseDuration(remainderText)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
return value + remainder, nil
|
||||
}
|
||||
nanoseconds, err := strconv.ParseInt(raw, 10, 64)
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
package initialize
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestParseCompatibleDuration(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
raw string
|
||||
want time.Duration
|
||||
wantErr bool
|
||||
}{
|
||||
{name: "days only", raw: "3d", want: 72 * time.Hour},
|
||||
{name: "days and duration", raw: "3d4h", want: 76 * time.Hour},
|
||||
{name: "missing day count", raw: "xd", wantErr: true},
|
||||
{name: "invalid remainder", raw: "3dgarbage", wantErr: true},
|
||||
}
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
got, err := parseCompatibleDuration(test.raw)
|
||||
if test.wantErr {
|
||||
if err == nil {
|
||||
t.Fatalf("parseCompatibleDuration(%q) accepted malformed input", test.raw)
|
||||
}
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
t.Fatalf("parseCompatibleDuration(%q) error = %v", test.raw, err)
|
||||
}
|
||||
if got != test.want {
|
||||
t.Fatalf("parseCompatibleDuration(%q) = %s, want %s", test.raw, got, test.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user