fs: Implement Scan method for SizeSuffix and Duration

fs/parseduration_test.go

@@ -1,6 +1,7 @@
 package fs
 
 import (
+	"fmt"
 	"testing"
 	"time"
 
@@ -23,6 +24,7 @@ func TestParseDuration(t *testing.T) {
 		{"1ms", time.Millisecond, false},
 		{"1s", time.Second, false},
 		{"1m", time.Minute, false},
+		{"1.5m", (3 * time.Minute) / 2, false},
 		{"1h", time.Hour, false},
 		{"1d", time.Hour * 24, false},
 		{"1w", time.Hour * 24 * 7, false},
@@ -33,6 +35,7 @@ func TestParseDuration(t *testing.T) {
 		{"1.s", time.Second, false},
 		{"1x", 0, true},
 		{"off", time.Duration(DurationOff), false},
+		{"1h2m3s", time.Hour + 2*time.Minute + 3*time.Second, false},
 	} {
 		duration, err := ParseDuration(test.in)
 		if test.err {
@@ -52,9 +55,39 @@ func TestDurationString(t *testing.T) {
 		{time.Duration(0), "0s"},
 		{time.Second, "1s"},
 		{time.Minute, "1m0s"},
+		{time.Millisecond, "1ms"},
+		{time.Second, "1s"},
+		{(3 * time.Minute) / 2, "1m30s"},
+		{time.Hour, "1h0m0s"},
+		{time.Hour * 24, "1d"},
+		{time.Hour * 24 * 7, "1w"},
+		{time.Hour * 24 * 30, "1M"},
+		{time.Hour * 24 * 365, "1y"},
+		{time.Hour * 24 * 365 * 3 / 2, "1.5y"},
+		{-time.Second, "-1s"},
+		{time.Second, "1s"},
 		{time.Duration(DurationOff), "off"},
+		{time.Hour + 2*time.Minute + 3*time.Second, "1h2m3s"},
+		{time.Hour * 24, "1d"},
+		{time.Hour * 24 * 7, "1w"},
+		{time.Hour * 24 * 30, "1M"},
+		{time.Hour * 24 * 365, "1y"},
+		{time.Hour * 24 * 365 * 3 / 2, "1.5y"},
+		{-time.Hour * 24 * 365 * 3 / 2, "-1.5y"},
 	} {
 		got := Duration(test.in).String()
 		assert.Equal(t, test.want, got)
+		// Test the reverse
+		reverse, err := ParseDuration(test.want)
+		assert.NoError(t, err)
+		assert.Equal(t, test.in, reverse)
 	}
 }
+
+func TestDurationScan(t *testing.T) {
+	var v Duration
+	n, err := fmt.Sscan(" 17m ", &v)
+	require.NoError(t, err)
+	assert.Equal(t, 1, n)
+	assert.Equal(t, Duration(17*60*time.Second), v)
+}