mirror of
https://github.com/restic/restic.git
synced 2025-12-11 18:47:50 +00:00
ui: collect Quote and Truncate helpers
Collect ui formatting helpers in the ui package
This commit is contained in:
@@ -1,9 +1,10 @@
|
||||
package ui
|
||||
|
||||
import (
|
||||
"strconv"
|
||||
"testing"
|
||||
|
||||
"github.com/restic/restic/internal/test"
|
||||
rtest "github.com/restic/restic/internal/test"
|
||||
)
|
||||
|
||||
func TestFormatBytes(t *testing.T) {
|
||||
@@ -61,8 +62,8 @@ func TestParseBytes(t *testing.T) {
|
||||
{"9223372036854775807", 1<<63 - 1},
|
||||
} {
|
||||
actual, err := ParseBytes(tt.in)
|
||||
test.OK(t, err)
|
||||
test.Equals(t, tt.expected, actual)
|
||||
rtest.OK(t, err)
|
||||
rtest.Equals(t, tt.expected, actual)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -81,11 +82,11 @@ func TestParseBytesInvalid(t *testing.T) {
|
||||
if err == nil {
|
||||
t.Errorf("wanted error for invalid value %q, got nil", s)
|
||||
}
|
||||
test.Equals(t, int64(0), v)
|
||||
rtest.Equals(t, int64(0), v)
|
||||
}
|
||||
}
|
||||
|
||||
func TestTerminalDisplayWidth(t *testing.T) {
|
||||
func TestDisplayWidth(t *testing.T) {
|
||||
for _, c := range []struct {
|
||||
input string
|
||||
want int
|
||||
@@ -96,9 +97,94 @@ func TestTerminalDisplayWidth(t *testing.T) {
|
||||
{"a’b", 3},
|
||||
{"aあb", 4},
|
||||
} {
|
||||
if got := TerminalDisplayWidth(c.input); got != c.want {
|
||||
if got := DisplayWidth(c.input); got != c.want {
|
||||
t.Errorf("wrong display width for '%s', want %d, got %d", c.input, c.want, got)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func TestQuote(t *testing.T) {
|
||||
for _, c := range []struct {
|
||||
in string
|
||||
needQuote bool
|
||||
}{
|
||||
{"foo.bar/baz", false},
|
||||
{"föó_bàŕ-bãẑ", false},
|
||||
{" foo ", false},
|
||||
{"foo bar", false},
|
||||
{"foo\nbar", true},
|
||||
{"foo\rbar", true},
|
||||
{"foo\abar", true},
|
||||
{"\xff", true},
|
||||
{`c:\foo\bar`, false},
|
||||
// Issue #2260: terminal control characters.
|
||||
{"\x1bm_red_is_beautiful", true},
|
||||
} {
|
||||
if c.needQuote {
|
||||
rtest.Equals(t, strconv.Quote(c.in), Quote(c.in))
|
||||
} else {
|
||||
rtest.Equals(t, c.in, Quote(c.in))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestTruncate(t *testing.T) {
|
||||
var tests = []struct {
|
||||
input string
|
||||
width int
|
||||
output string
|
||||
}{
|
||||
{"", 80, ""},
|
||||
{"", 0, ""},
|
||||
{"", -1, ""},
|
||||
{"foo", 80, "foo"},
|
||||
{"foo", 4, "foo"},
|
||||
{"foo", 3, "foo"},
|
||||
{"foo", 2, "fo"},
|
||||
{"foo", 1, "f"},
|
||||
{"foo", 0, ""},
|
||||
{"foo", -1, ""},
|
||||
{"Löwen", 4, "Löwe"},
|
||||
{"あああああ/data", 7, "あああ"},
|
||||
{"あああああ/data", 10, "あああああ"},
|
||||
{"あああああ/data", 11, "あああああ/"},
|
||||
}
|
||||
|
||||
for _, test := range tests {
|
||||
t.Run("", func(t *testing.T) {
|
||||
out := Truncate(test.input, test.width)
|
||||
if out != test.output {
|
||||
t.Fatalf("wrong output for input %v, width %d: want %q, got %q",
|
||||
test.input, test.width, test.output, out)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func benchmarkTruncate(b *testing.B, s string, w int) {
|
||||
for i := 0; i < b.N; i++ {
|
||||
Truncate(s, w)
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkTruncateASCII(b *testing.B) {
|
||||
s := "This is an ASCII-only status message...\r\n"
|
||||
benchmarkTruncate(b, s, len(s)-1)
|
||||
}
|
||||
|
||||
func BenchmarkTruncateUnicode(b *testing.B) {
|
||||
s := "Hello World or Καλημέρα κόσμε or こんにちは 世界"
|
||||
w := 0
|
||||
for i := 0; i < len(s); {
|
||||
w++
|
||||
wide, utfsize := wideRune(s[i:])
|
||||
if wide {
|
||||
w++
|
||||
}
|
||||
i += int(utfsize)
|
||||
}
|
||||
b.ResetTimer()
|
||||
|
||||
benchmarkTruncate(b, s, w-1)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user