diff options
Diffstat (limited to 'src/pkg/bytes/bytes_test.go')
| -rw-r--r-- | src/pkg/bytes/bytes_test.go | 625 | 
1 files changed, 391 insertions, 234 deletions
| diff --git a/src/pkg/bytes/bytes_test.go b/src/pkg/bytes/bytes_test.go index 8197543dc..063686ec5 100644 --- a/src/pkg/bytes/bytes_test.go +++ b/src/pkg/bytes/bytes_test.go @@ -8,6 +8,7 @@ import (  	. "bytes"  	"testing"  	"unicode" +	"utf8"  )  func eq(a, b []string) bool { @@ -45,16 +46,16 @@ type BinOpTest struct {  }  var comparetests = []BinOpTest{ -	BinOpTest{"", "", 0}, -	BinOpTest{"a", "", 1}, -	BinOpTest{"", "a", -1}, -	BinOpTest{"abc", "abc", 0}, -	BinOpTest{"ab", "abc", -1}, -	BinOpTest{"abc", "ab", 1}, -	BinOpTest{"x", "ab", 1}, -	BinOpTest{"ab", "x", -1}, -	BinOpTest{"x", "a", 1}, -	BinOpTest{"b", "x", -1}, +	{"", "", 0}, +	{"a", "", 1}, +	{"", "a", -1}, +	{"abc", "abc", 0}, +	{"ab", "abc", -1}, +	{"abc", "ab", 1}, +	{"x", "ab", 1}, +	{"ab", "x", -1}, +	{"x", "a", 1}, +	{"b", "x", -1},  }  func TestCompare(t *testing.T) { @@ -73,55 +74,81 @@ func TestCompare(t *testing.T) {  }  var indexTests = []BinOpTest{ -	BinOpTest{"", "", 0}, -	BinOpTest{"", "a", -1}, -	BinOpTest{"", "foo", -1}, -	BinOpTest{"fo", "foo", -1}, -	BinOpTest{"foo", "foo", 0}, -	BinOpTest{"oofofoofooo", "f", 2}, -	BinOpTest{"oofofoofooo", "foo", 4}, -	BinOpTest{"barfoobarfoo", "foo", 3}, -	BinOpTest{"foo", "", 0}, -	BinOpTest{"foo", "o", 1}, -	BinOpTest{"abcABCabc", "A", 3}, +	{"", "", 0}, +	{"", "a", -1}, +	{"", "foo", -1}, +	{"fo", "foo", -1}, +	{"foo", "foo", 0}, +	{"oofofoofooo", "f", 2}, +	{"oofofoofooo", "foo", 4}, +	{"barfoobarfoo", "foo", 3}, +	{"foo", "", 0}, +	{"foo", "o", 1}, +	{"abcABCabc", "A", 3},  	// cases with one byte strings - test IndexByte and special case in Index() -	BinOpTest{"", "a", -1}, -	BinOpTest{"x", "a", -1}, -	BinOpTest{"x", "x", 0}, -	BinOpTest{"abc", "a", 0}, -	BinOpTest{"abc", "b", 1}, -	BinOpTest{"abc", "c", 2}, -	BinOpTest{"abc", "x", -1}, +	{"", "a", -1}, +	{"x", "a", -1}, +	{"x", "x", 0}, +	{"abc", "a", 0}, +	{"abc", "b", 1}, +	{"abc", "c", 2}, +	{"abc", "x", -1}, +	{"barfoobarfooyyyzzzyyyzzzyyyzzzyyyxxxzzzyyy", "x", 33}, +	{"foofyfoobarfoobar", "y", 4}, +	{"oooooooooooooooooooooo", "r", -1},  }  var lastIndexTests = []BinOpTest{ -	BinOpTest{"", "", 0}, -	BinOpTest{"", "a", -1}, -	BinOpTest{"", "foo", -1}, -	BinOpTest{"fo", "foo", -1}, -	BinOpTest{"foo", "foo", 0}, -	BinOpTest{"foo", "f", 0}, -	BinOpTest{"oofofoofooo", "f", 7}, -	BinOpTest{"oofofoofooo", "foo", 7}, -	BinOpTest{"barfoobarfoo", "foo", 9}, -	BinOpTest{"foo", "", 3}, -	BinOpTest{"foo", "o", 2}, -	BinOpTest{"abcABCabc", "A", 3}, -	BinOpTest{"abcABCabc", "a", 6}, +	{"", "", 0}, +	{"", "a", -1}, +	{"", "foo", -1}, +	{"fo", "foo", -1}, +	{"foo", "foo", 0}, +	{"foo", "f", 0}, +	{"oofofoofooo", "f", 7}, +	{"oofofoofooo", "foo", 7}, +	{"barfoobarfoo", "foo", 9}, +	{"foo", "", 3}, +	{"foo", "o", 2}, +	{"abcABCabc", "A", 3}, +	{"abcABCabc", "a", 6},  }  var indexAnyTests = []BinOpTest{ -	BinOpTest{"", "", -1}, -	BinOpTest{"", "a", -1}, -	BinOpTest{"", "abc", -1}, -	BinOpTest{"a", "", -1}, -	BinOpTest{"a", "a", 0}, -	BinOpTest{"aaa", "a", 0}, -	BinOpTest{"abc", "xyz", -1}, -	BinOpTest{"abc", "xcz", 2}, -	BinOpTest{"ab☺c", "x☺yz", 2}, -	BinOpTest{"aRegExp*", ".(|)*+?^$[]", 7}, -	BinOpTest{dots + dots + dots, " ", -1}, +	{"", "", -1}, +	{"", "a", -1}, +	{"", "abc", -1}, +	{"a", "", -1}, +	{"a", "a", 0}, +	{"aaa", "a", 0}, +	{"abc", "xyz", -1}, +	{"abc", "xcz", 2}, +	{"ab☺c", "x☺yz", 2}, +	{"aRegExp*", ".(|)*+?^$[]", 7}, +	{dots + dots + dots, " ", -1}, +} + +var lastIndexAnyTests = []BinOpTest{ +	{"", "", -1}, +	{"", "a", -1}, +	{"", "abc", -1}, +	{"a", "", -1}, +	{"a", "a", 0}, +	{"aaa", "a", 2}, +	{"abc", "xyz", -1}, +	{"abc", "ab", 1}, +	{"a☺b☻c☹d", "uvw☻xyz", 2 + len("☺")}, +	{"a.RegExp*", ".(|)*+?^$[]", 8}, +	{dots + dots + dots, " ", -1}, +} + +var indexRuneTests = []BinOpTest{ +	{"", "a", -1}, +	{"", "☺", -1}, +	{"foo", "☹", -1}, +	{"foo", "o", 1}, +	{"foo☺bar", "☺", 3}, +	{"foo☺☻☹bar", "☹", 9},  }  // Execute f on each test case.  funcName should be the name of f; it's used @@ -137,18 +164,23 @@ func runIndexTests(t *testing.T, f func(s, sep []byte) int, funcName string, tes  	}  } -func TestIndex(t *testing.T)     { runIndexTests(t, Index, "Index", indexTests) } -func TestLastIndex(t *testing.T) { runIndexTests(t, LastIndex, "LastIndex", lastIndexTests) } -func TestIndexAny(t *testing.T) { -	for _, test := range indexAnyTests { +func runIndexAnyTests(t *testing.T, f func(s []byte, chars string) int, funcName string, testCases []BinOpTest) { +	for _, test := range testCases {  		a := []byte(test.a) -		actual := IndexAny(a, test.b) +		actual := f(a, test.b)  		if actual != test.i { -			t.Errorf("IndexAny(%q,%q) = %v; want %v", a, test.b, actual, test.i) +			t.Errorf("%s(%q,%q) = %v; want %v", funcName, a, test.b, actual, test.i)  		}  	}  } +func TestIndex(t *testing.T)     { runIndexTests(t, Index, "Index", indexTests) } +func TestLastIndex(t *testing.T) { runIndexTests(t, LastIndex, "LastIndex", lastIndexTests) } +func TestIndexAny(t *testing.T)  { runIndexAnyTests(t, IndexAny, "IndexAny", indexAnyTests) } +func TestLastIndexAny(t *testing.T) { +	runIndexAnyTests(t, LastIndexAny, "LastIndexAny", lastIndexAnyTests) +} +  func TestIndexByte(t *testing.T) {  	for _, tt := range indexTests {  		if len(tt.b) != 1 { @@ -167,6 +199,67 @@ func TestIndexByte(t *testing.T) {  	}  } +// test a larger buffer with different sizes and alignments +func TestIndexByteBig(t *testing.T) { +	const n = 1024 +	b := make([]byte, n) +	for i := 0; i < n; i++ { +		// different start alignments +		b1 := b[i:] +		for j := 0; j < len(b1); j++ { +			b1[j] = 'x' +			pos := IndexByte(b1, 'x') +			if pos != j { +				t.Errorf("IndexByte(%q, 'x') = %v", b1, pos) +			} +			b1[j] = 0 +			pos = IndexByte(b1, 'x') +			if pos != -1 { +				t.Errorf("IndexByte(%q, 'x') = %v", b1, pos) +			} +		} +		// different end alignments +		b1 = b[:i] +		for j := 0; j < len(b1); j++ { +			b1[j] = 'x' +			pos := IndexByte(b1, 'x') +			if pos != j { +				t.Errorf("IndexByte(%q, 'x') = %v", b1, pos) +			} +			b1[j] = 0 +			pos = IndexByte(b1, 'x') +			if pos != -1 { +				t.Errorf("IndexByte(%q, 'x') = %v", b1, pos) +			} +		} +		// different start and end alignments +		b1 = b[i/2 : n-(i+1)/2] +		for j := 0; j < len(b1); j++ { +			b1[j] = 'x' +			pos := IndexByte(b1, 'x') +			if pos != j { +				t.Errorf("IndexByte(%q, 'x') = %v", b1, pos) +			} +			b1[j] = 0 +			pos = IndexByte(b1, 'x') +			if pos != -1 { +				t.Errorf("IndexByte(%q, 'x') = %v", b1, pos) +			} +		} +	} +} + +func TestIndexRune(t *testing.T) { +	for _, tt := range indexRuneTests { +		a := []byte(tt.a) +		r, _ := utf8.DecodeRuneInString(tt.b) +		pos := IndexRune(a, r) +		if pos != tt.i { +			t.Errorf(`IndexRune(%q, '%c') = %v`, tt.a, r, pos) +		} +	} +} +  func BenchmarkIndexByte4K(b *testing.B) { bmIndex(b, IndexByte, 4<<10) }  func BenchmarkIndexByte4M(b *testing.B) { bmIndex(b, IndexByte, 4<<20) } @@ -211,9 +304,10 @@ type ExplodeTest struct {  }  var explodetests = []ExplodeTest{ -	ExplodeTest{abcd, -1, []string{"a", "b", "c", "d"}}, -	ExplodeTest{faces, -1, []string{"☺", "☻", "☹"}}, -	ExplodeTest{abcd, 2, []string{"a", "bcd"}}, +	{"", -1, []string{}}, +	{abcd, -1, []string{"a", "b", "c", "d"}}, +	{faces, -1, []string{"☺", "☻", "☹"}}, +	{abcd, 2, []string{"a", "bcd"}},  }  func TestExplode(t *testing.T) { @@ -240,19 +334,19 @@ type SplitTest struct {  }  var splittests = []SplitTest{ -	SplitTest{abcd, "a", 0, nil}, -	SplitTest{abcd, "a", -1, []string{"", "bcd"}}, -	SplitTest{abcd, "z", -1, []string{"abcd"}}, -	SplitTest{abcd, "", -1, []string{"a", "b", "c", "d"}}, -	SplitTest{commas, ",", -1, []string{"1", "2", "3", "4"}}, -	SplitTest{dots, "...", -1, []string{"1", ".2", ".3", ".4"}}, -	SplitTest{faces, "☹", -1, []string{"☺☻", ""}}, -	SplitTest{faces, "~", -1, []string{faces}}, -	SplitTest{faces, "", -1, []string{"☺", "☻", "☹"}}, -	SplitTest{"1 2 3 4", " ", 3, []string{"1", "2", "3 4"}}, -	SplitTest{"1 2", " ", 3, []string{"1", "2"}}, -	SplitTest{"123", "", 2, []string{"1", "23"}}, -	SplitTest{"123", "", 17, []string{"1", "2", "3"}}, +	{abcd, "a", 0, nil}, +	{abcd, "a", -1, []string{"", "bcd"}}, +	{abcd, "z", -1, []string{"abcd"}}, +	{abcd, "", -1, []string{"a", "b", "c", "d"}}, +	{commas, ",", -1, []string{"1", "2", "3", "4"}}, +	{dots, "...", -1, []string{"1", ".2", ".3", ".4"}}, +	{faces, "☹", -1, []string{"☺☻", ""}}, +	{faces, "~", -1, []string{faces}}, +	{faces, "", -1, []string{"☺", "☻", "☹"}}, +	{"1 2 3 4", " ", 3, []string{"1", "2", "3 4"}}, +	{"1 2", " ", 3, []string{"1", "2"}}, +	{"123", "", 2, []string{"1", "23"}}, +	{"123", "", 17, []string{"1", "2", "3"}},  }  func TestSplit(t *testing.T) { @@ -274,19 +368,19 @@ func TestSplit(t *testing.T) {  }  var splitaftertests = []SplitTest{ -	SplitTest{abcd, "a", -1, []string{"a", "bcd"}}, -	SplitTest{abcd, "z", -1, []string{"abcd"}}, -	SplitTest{abcd, "", -1, []string{"a", "b", "c", "d"}}, -	SplitTest{commas, ",", -1, []string{"1,", "2,", "3,", "4"}}, -	SplitTest{dots, "...", -1, []string{"1...", ".2...", ".3...", ".4"}}, -	SplitTest{faces, "☹", -1, []string{"☺☻☹", ""}}, -	SplitTest{faces, "~", -1, []string{faces}}, -	SplitTest{faces, "", -1, []string{"☺", "☻", "☹"}}, -	SplitTest{"1 2 3 4", " ", 3, []string{"1 ", "2 ", "3 4"}}, -	SplitTest{"1 2 3", " ", 3, []string{"1 ", "2 ", "3"}}, -	SplitTest{"1 2", " ", 3, []string{"1 ", "2"}}, -	SplitTest{"123", "", 2, []string{"1", "23"}}, -	SplitTest{"123", "", 17, []string{"1", "2", "3"}}, +	{abcd, "a", -1, []string{"a", "bcd"}}, +	{abcd, "z", -1, []string{"abcd"}}, +	{abcd, "", -1, []string{"a", "b", "c", "d"}}, +	{commas, ",", -1, []string{"1,", "2,", "3,", "4"}}, +	{dots, "...", -1, []string{"1...", ".2...", ".3...", ".4"}}, +	{faces, "☹", -1, []string{"☺☻☹", ""}}, +	{faces, "~", -1, []string{faces}}, +	{faces, "", -1, []string{"☺", "☻", "☹"}}, +	{"1 2 3 4", " ", 3, []string{"1 ", "2 ", "3 4"}}, +	{"1 2 3", " ", 3, []string{"1 ", "2 ", "3"}}, +	{"1 2", " ", 3, []string{"1 ", "2"}}, +	{"123", "", 2, []string{"1", "23"}}, +	{"123", "", 17, []string{"1", "2", "3"}},  }  func TestSplitAfter(t *testing.T) { @@ -310,17 +404,17 @@ type FieldsTest struct {  }  var fieldstests = []FieldsTest{ -	FieldsTest{"", []string{}}, -	FieldsTest{" ", []string{}}, -	FieldsTest{" \t ", []string{}}, -	FieldsTest{"  abc  ", []string{"abc"}}, -	FieldsTest{"1 2 3 4", []string{"1", "2", "3", "4"}}, -	FieldsTest{"1  2  3  4", []string{"1", "2", "3", "4"}}, -	FieldsTest{"1\t\t2\t\t3\t4", []string{"1", "2", "3", "4"}}, -	FieldsTest{"1\u20002\u20013\u20024", []string{"1", "2", "3", "4"}}, -	FieldsTest{"\u2000\u2001\u2002", []string{}}, -	FieldsTest{"\n™\t™\n", []string{"™", "™"}}, -	FieldsTest{faces, []string{faces}}, +	{"", []string{}}, +	{" ", []string{}}, +	{" \t ", []string{}}, +	{"  abc  ", []string{"abc"}}, +	{"1 2 3 4", []string{"1", "2", "3", "4"}}, +	{"1  2  3  4", []string{"1", "2", "3", "4"}}, +	{"1\t\t2\t\t3\t4", []string{"1", "2", "3", "4"}}, +	{"1\u20002\u20013\u20024", []string{"1", "2", "3", "4"}}, +	{"\u2000\u2001\u2002", []string{}}, +	{"\n™\t™\n", []string{"™", "™"}}, +	{faces, []string{faces}},  }  func TestFields(t *testing.T) { @@ -334,6 +428,23 @@ func TestFields(t *testing.T) {  	}  } +func TestFieldsFunc(t *testing.T) { +	pred := func(c int) bool { return c == 'X' } +	var fieldsFuncTests = []FieldsTest{ +		{"", []string{}}, +		{"XX", []string{}}, +		{"XXhiXXX", []string{"hi"}}, +		{"aXXbXXXcX", []string{"a", "b", "c"}}, +	} +	for _, tt := range fieldsFuncTests { +		a := FieldsFunc([]byte(tt.s), pred) +		result := arrayOfString(a) +		if !eq(result, tt.a) { +			t.Errorf("FieldsFunc(%q) = %v, want %v", tt.s, a, tt.a) +		} +	} +} +  // Test case for any function which accepts and returns a byte array.  // For ease of creation, we write the byte arrays as strings.  type StringTest struct { @@ -341,51 +452,47 @@ type StringTest struct {  }  var upperTests = []StringTest{ -	StringTest{"", ""}, -	StringTest{"abc", "ABC"}, -	StringTest{"AbC123", "ABC123"}, -	StringTest{"azAZ09_", "AZAZ09_"}, -	StringTest{"\u0250\u0250\u0250\u0250\u0250", "\u2C6F\u2C6F\u2C6F\u2C6F\u2C6F"}, // grows one byte per char +	{"", ""}, +	{"abc", "ABC"}, +	{"AbC123", "ABC123"}, +	{"azAZ09_", "AZAZ09_"}, +	{"\u0250\u0250\u0250\u0250\u0250", "\u2C6F\u2C6F\u2C6F\u2C6F\u2C6F"}, // grows one byte per char  }  var lowerTests = []StringTest{ -	StringTest{"", ""}, -	StringTest{"abc", "abc"}, -	StringTest{"AbC123", "abc123"}, -	StringTest{"azAZ09_", "azaz09_"}, -	StringTest{"\u2C6D\u2C6D\u2C6D\u2C6D\u2C6D", "\u0251\u0251\u0251\u0251\u0251"}, // shrinks one byte per char +	{"", ""}, +	{"abc", "abc"}, +	{"AbC123", "abc123"}, +	{"azAZ09_", "azaz09_"}, +	{"\u2C6D\u2C6D\u2C6D\u2C6D\u2C6D", "\u0251\u0251\u0251\u0251\u0251"}, // shrinks one byte per char  }  const space = "\t\v\r\f\n\u0085\u00a0\u2000\u3000"  var trimSpaceTests = []StringTest{ -	StringTest{"", ""}, -	StringTest{"abc", "abc"}, -	StringTest{space + "abc" + space, "abc"}, -	StringTest{" ", ""}, -	StringTest{" \t\r\n \t\t\r\r\n\n ", ""}, -	StringTest{" \t\r\n x\t\t\r\r\n\n ", "x"}, -	StringTest{" \u2000\t\r\n x\t\t\r\r\ny\n \u3000", "x\t\t\r\r\ny"}, -	StringTest{"1 \t\r\n2", "1 \t\r\n2"}, -	StringTest{" x\x80", "x\x80"}, // invalid UTF-8 on end -	StringTest{" x\xc0", "x\xc0"}, // invalid UTF-8 on end -} - -// Bytes returns a new slice containing the bytes in s. -// Borrowed from strings to avoid dependency. -func Bytes(s string) []byte { -	b := make([]byte, len(s)) -	for i := 0; i < len(s); i++ { -		b[i] = s[i] -	} -	return b +	{"", ""}, +	{"abc", "abc"}, +	{space + "abc" + space, "abc"}, +	{" ", ""}, +	{" \t\r\n \t\t\r\r\n\n ", ""}, +	{" \t\r\n x\t\t\r\r\n\n ", "x"}, +	{" \u2000\t\r\n x\t\t\r\r\ny\n \u3000", "x\t\t\r\r\ny"}, +	{"1 \t\r\n2", "1 \t\r\n2"}, +	{" x\x80", "x\x80"}, +	{" x\xc0", "x\xc0"}, +	{"x \xc0\xc0 ", "x \xc0\xc0"}, +	{"x \xc0", "x \xc0"}, +	{"x \xc0 ", "x \xc0"}, +	{"x \xc0\xc0 ", "x \xc0\xc0"}, +	{"x ☺\xc0\xc0 ", "x ☺\xc0\xc0"}, +	{"x ☺ ", "x ☺"},  }  // Execute f on each test case.  funcName should be the name of f; it's used  // in failure reports.  func runStringTests(t *testing.T, f func([]byte) []byte, funcName string, testCases []StringTest) {  	for _, tc := range testCases { -		actual := string(f(Bytes(tc.in))) +		actual := string(f([]byte(tc.in)))  		if actual != tc.out {  			t.Errorf("%s(%q) = %q; want %q", funcName, tc.in, actual, tc.out)  		} @@ -418,7 +525,7 @@ func TestMap(t *testing.T) {  	// 1.  Grow.  This triggers two reallocations in Map.  	maxRune := func(rune int) int { return unicode.MaxRune } -	m := Map(maxRune, Bytes(a)) +	m := Map(maxRune, []byte(a))  	expect := tenRunes(unicode.MaxRune)  	if string(m) != expect {  		t.Errorf("growing: expected %q got %q", expect, m) @@ -426,21 +533,21 @@ func TestMap(t *testing.T) {  	// 2. Shrink  	minRune := func(rune int) int { return 'a' } -	m = Map(minRune, Bytes(tenRunes(unicode.MaxRune))) +	m = Map(minRune, []byte(tenRunes(unicode.MaxRune)))  	expect = a  	if string(m) != expect {  		t.Errorf("shrinking: expected %q got %q", expect, m)  	}  	// 3. Rot13 -	m = Map(rot13, Bytes("a to zed")) +	m = Map(rot13, []byte("a to zed"))  	expect = "n gb mrq"  	if string(m) != expect {  		t.Errorf("rot13: expected %q got %q", expect, m)  	}  	// 4. Rot13^2 -	m = Map(rot13, Map(rot13, Bytes("a to zed"))) +	m = Map(rot13, Map(rot13, []byte("a to zed")))  	expect = "a to zed"  	if string(m) != expect {  		t.Errorf("rot13: expected %q got %q", expect, m) @@ -453,7 +560,7 @@ func TestMap(t *testing.T) {  		}  		return -1  	} -	m = Map(dropNotLatin, Bytes("Hello, 세계")) +	m = Map(dropNotLatin, []byte("Hello, 세계"))  	expect = "Hello"  	if string(m) != expect {  		t.Errorf("drop: expected %q got %q", expect, m) @@ -466,60 +573,19 @@ func TestToLower(t *testing.T) { runStringTests(t, ToLower, "ToLower", lowerTest  func TestTrimSpace(t *testing.T) { runStringTests(t, TrimSpace, "TrimSpace", trimSpaceTests) } -type AddTest struct { -	s, t string -	cap  int -} - -var addtests = []AddTest{ -	AddTest{"", "", 0}, -	AddTest{"a", "", 1}, -	AddTest{"a", "b", 1}, -	AddTest{"abc", "def", 100}, -} - -func TestAdd(t *testing.T) { -	for _, test := range addtests { -		b := make([]byte, len(test.s), test.cap) -		for i := 0; i < len(test.s); i++ { -			b[i] = test.s[i] -		} -		b = Add(b, []byte(test.t)) -		if string(b) != test.s+test.t { -			t.Errorf("Add(%q,%q) = %q", test.s, test.t, string(b)) -		} -	} -} - -func TestAddByte(t *testing.T) { -	const N = 2e5 -	b := make([]byte, 0) -	for i := 0; i < N; i++ { -		b = AddByte(b, byte(i)) -	} -	if len(b) != N { -		t.Errorf("AddByte: too small; expected %d got %d", N, len(b)) -	} -	for i, c := range b { -		if c != byte(i) { -			t.Fatalf("AddByte: b[%d] should be %d is %d", i, c, byte(i)) -		} -	} -} -  type RepeatTest struct {  	in, out string  	count   int  }  var RepeatTests = []RepeatTest{ -	RepeatTest{"", "", 0}, -	RepeatTest{"", "", 1}, -	RepeatTest{"", "", 2}, -	RepeatTest{"-", "", 0}, -	RepeatTest{"-", "-", 1}, -	RepeatTest{"-", "----------", 10}, -	RepeatTest{"abc ", "abc abc abc ", 3}, +	{"", "", 0}, +	{"", "", 1}, +	{"", "", 2}, +	{"-", "", 0}, +	{"-", "-", 1}, +	{"-", "----------", 10}, +	{"abc ", "abc abc abc ", 3},  }  func TestRepeat(t *testing.T) { @@ -553,13 +619,13 @@ type RunesTest struct {  }  var RunesTests = []RunesTest{ -	RunesTest{"", []int{}, false}, -	RunesTest{" ", []int{32}, false}, -	RunesTest{"ABC", []int{65, 66, 67}, false}, -	RunesTest{"abc", []int{97, 98, 99}, false}, -	RunesTest{"\u65e5\u672c\u8a9e", []int{26085, 26412, 35486}, false}, -	RunesTest{"ab\x80c", []int{97, 98, 0xFFFD, 99}, true}, -	RunesTest{"ab\xc0c", []int{97, 98, 0xFFFD, 99}, true}, +	{"", []int{}, false}, +	{" ", []int{32}, false}, +	{"ABC", []int{65, 66, 67}, false}, +	{"abc", []int{97, 98, 99}, false}, +	{"\u65e5\u672c\u8a9e", []int{26085, 26412, 35486}, false}, +	{"ab\x80c", []int{97, 98, 0xFFFD, 99}, true}, +	{"ab\xc0c", []int{97, 98, 0xFFFD, 99}, true},  }  func TestRunes(t *testing.T) { @@ -587,26 +653,27 @@ type TrimTest struct {  }  var trimTests = []TrimTest{ -	TrimTest{Trim, "abba", "a", "bb"}, -	TrimTest{Trim, "abba", "ab", ""}, -	TrimTest{TrimLeft, "abba", "ab", ""}, -	TrimTest{TrimRight, "abba", "ab", ""}, -	TrimTest{TrimLeft, "abba", "a", "bba"}, -	TrimTest{TrimRight, "abba", "a", "abb"}, -	TrimTest{Trim, "<tag>", "<>", "tag"}, -	TrimTest{Trim, "* listitem", " *", "listitem"}, -	TrimTest{Trim, `"quote"`, `"`, "quote"}, -	TrimTest{Trim, "\u2C6F\u2C6F\u0250\u0250\u2C6F\u2C6F", "\u2C6F", "\u0250\u0250"}, +	{Trim, "abba", "a", "bb"}, +	{Trim, "abba", "ab", ""}, +	{TrimLeft, "abba", "ab", ""}, +	{TrimRight, "abba", "ab", ""}, +	{TrimLeft, "abba", "a", "bba"}, +	{TrimRight, "abba", "a", "abb"}, +	{Trim, "<tag>", "<>", "tag"}, +	{Trim, "* listitem", " *", "listitem"}, +	{Trim, `"quote"`, `"`, "quote"}, +	{Trim, "\u2C6F\u2C6F\u0250\u0250\u2C6F\u2C6F", "\u2C6F", "\u0250\u0250"},  	//empty string tests -	TrimTest{Trim, "abba", "", "abba"}, -	TrimTest{Trim, "", "123", ""}, -	TrimTest{Trim, "", "", ""}, -	TrimTest{TrimLeft, "abba", "", "abba"}, -	TrimTest{TrimLeft, "", "123", ""}, -	TrimTest{TrimLeft, "", "", ""}, -	TrimTest{TrimRight, "abba", "", "abba"}, -	TrimTest{TrimRight, "", "123", ""}, -	TrimTest{TrimRight, "", "", ""}, +	{Trim, "abba", "", "abba"}, +	{Trim, "", "123", ""}, +	{Trim, "", "", ""}, +	{TrimLeft, "abba", "", "abba"}, +	{TrimLeft, "", "123", ""}, +	{TrimLeft, "", "", ""}, +	{TrimRight, "abba", "", "abba"}, +	{TrimRight, "", "123", ""}, +	{TrimRight, "", "", ""}, +	{TrimRight, "☺\xc0", "☺", "☺\xc0"},  }  func TestTrim(t *testing.T) { @@ -629,22 +696,90 @@ func TestTrim(t *testing.T) {  	}  } +type predicate struct { +	f    func(r int) bool +	name string +} + +var isSpace = predicate{unicode.IsSpace, "IsSpace"} +var isDigit = predicate{unicode.IsDigit, "IsDigit"} +var isUpper = predicate{unicode.IsUpper, "IsUpper"} +var isValidRune = predicate{ +	func(r int) bool { +		return r != utf8.RuneError +	}, +	"IsValidRune", +} +  type TrimFuncTest struct { -	f             func(r int) bool -	name, in, out string +	f       predicate +	in, out string +} + +func not(p predicate) predicate { +	return predicate{ +		func(r int) bool { +			return !p.f(r) +		}, +		"not " + p.name, +	}  }  var trimFuncTests = []TrimFuncTest{ -	TrimFuncTest{unicode.IsSpace, "IsSpace", space + " hello " + space, "hello"}, -	TrimFuncTest{unicode.IsDigit, "IsDigit", "\u0e50\u0e5212hello34\u0e50\u0e51", "hello"}, -	TrimFuncTest{unicode.IsUpper, "IsUpper", "\u2C6F\u2C6F\u2C6F\u2C6FABCDhelloEF\u2C6F\u2C6FGH\u2C6F\u2C6F", "hello"}, +	{isSpace, space + " hello " + space, "hello"}, +	{isDigit, "\u0e50\u0e5212hello34\u0e50\u0e51", "hello"}, +	{isUpper, "\u2C6F\u2C6F\u2C6F\u2C6FABCDhelloEF\u2C6F\u2C6FGH\u2C6F\u2C6F", "hello"}, +	{not(isSpace), "hello" + space + "hello", space}, +	{not(isDigit), "hello\u0e50\u0e521234\u0e50\u0e51helo", "\u0e50\u0e521234\u0e50\u0e51"}, +	{isValidRune, "ab\xc0a\xc0cd", "\xc0a\xc0"}, +	{not(isValidRune), "\xc0a\xc0", "a"},  }  func TestTrimFunc(t *testing.T) {  	for _, tc := range trimFuncTests { -		actual := string(TrimFunc([]byte(tc.in), tc.f)) +		actual := string(TrimFunc([]byte(tc.in), tc.f.f))  		if actual != tc.out { -			t.Errorf("TrimFunc(%q, %q) = %q; want %q", tc.in, tc.name, actual, tc.out) +			t.Errorf("TrimFunc(%q, %q) = %q; want %q", tc.in, tc.f.name, actual, tc.out) +		} +	} +} + +type IndexFuncTest struct { +	in          string +	f           predicate +	first, last int +} + +var indexFuncTests = []IndexFuncTest{ +	{"", isValidRune, -1, -1}, +	{"abc", isDigit, -1, -1}, +	{"0123", isDigit, 0, 3}, +	{"a1b", isDigit, 1, 1}, +	{space, isSpace, 0, len(space) - 3}, // last rune in space is 3 bytes +	{"\u0e50\u0e5212hello34\u0e50\u0e51", isDigit, 0, 18}, +	{"\u2C6F\u2C6F\u2C6F\u2C6FABCDhelloEF\u2C6F\u2C6FGH\u2C6F\u2C6F", isUpper, 0, 34}, +	{"12\u0e50\u0e52hello34\u0e50\u0e51", not(isDigit), 8, 12}, + +	// tests of invalid UTF-8 +	{"\x801", isDigit, 1, 1}, +	{"\x80abc", isDigit, -1, -1}, +	{"\xc0a\xc0", isValidRune, 1, 1}, +	{"\xc0a\xc0", not(isValidRune), 0, 2}, +	{"\xc0☺\xc0", not(isValidRune), 0, 4}, +	{"\xc0☺\xc0\xc0", not(isValidRune), 0, 5}, +	{"ab\xc0a\xc0cd", not(isValidRune), 2, 4}, +	{"a\xe0\x80cd", not(isValidRune), 1, 2}, +} + +func TestIndexFunc(t *testing.T) { +	for _, tc := range indexFuncTests { +		first := IndexFunc([]byte(tc.in), tc.f.f) +		if first != tc.first { +			t.Errorf("IndexFunc(%q, %s) = %d; want %d", tc.in, tc.f.name, first, tc.first) +		} +		last := LastIndexFunc([]byte(tc.in), tc.f.f) +		if last != tc.last { +			t.Errorf("LastIndexFunc(%q, %s) = %d; want %d", tc.in, tc.f.name, last, tc.last)  		}  	}  } @@ -657,25 +792,25 @@ type ReplaceTest struct {  }  var ReplaceTests = []ReplaceTest{ -	ReplaceTest{"hello", "l", "L", 0, "hello"}, -	ReplaceTest{"hello", "l", "L", -1, "heLLo"}, -	ReplaceTest{"hello", "x", "X", -1, "hello"}, -	ReplaceTest{"", "x", "X", -1, ""}, -	ReplaceTest{"radar", "r", "<r>", -1, "<r>ada<r>"}, -	ReplaceTest{"", "", "<>", -1, "<>"}, -	ReplaceTest{"banana", "a", "<>", -1, "b<>n<>n<>"}, -	ReplaceTest{"banana", "a", "<>", 1, "b<>nana"}, -	ReplaceTest{"banana", "a", "<>", 1000, "b<>n<>n<>"}, -	ReplaceTest{"banana", "an", "<>", -1, "b<><>a"}, -	ReplaceTest{"banana", "ana", "<>", -1, "b<>na"}, -	ReplaceTest{"banana", "", "<>", -1, "<>b<>a<>n<>a<>n<>a<>"}, -	ReplaceTest{"banana", "", "<>", 10, "<>b<>a<>n<>a<>n<>a<>"}, -	ReplaceTest{"banana", "", "<>", 6, "<>b<>a<>n<>a<>n<>a"}, -	ReplaceTest{"banana", "", "<>", 5, "<>b<>a<>n<>a<>na"}, -	ReplaceTest{"banana", "", "<>", 1, "<>banana"}, -	ReplaceTest{"banana", "a", "a", -1, "banana"}, -	ReplaceTest{"banana", "a", "a", 1, "banana"}, -	ReplaceTest{"☺☻☹", "", "<>", -1, "<>☺<>☻<>☹<>"}, +	{"hello", "l", "L", 0, "hello"}, +	{"hello", "l", "L", -1, "heLLo"}, +	{"hello", "x", "X", -1, "hello"}, +	{"", "x", "X", -1, ""}, +	{"radar", "r", "<r>", -1, "<r>ada<r>"}, +	{"", "", "<>", -1, "<>"}, +	{"banana", "a", "<>", -1, "b<>n<>n<>"}, +	{"banana", "a", "<>", 1, "b<>nana"}, +	{"banana", "a", "<>", 1000, "b<>n<>n<>"}, +	{"banana", "an", "<>", -1, "b<><>a"}, +	{"banana", "ana", "<>", -1, "b<>na"}, +	{"banana", "", "<>", -1, "<>b<>a<>n<>a<>n<>a<>"}, +	{"banana", "", "<>", 10, "<>b<>a<>n<>a<>n<>a<>"}, +	{"banana", "", "<>", 6, "<>b<>a<>n<>a<>n<>a"}, +	{"banana", "", "<>", 5, "<>b<>a<>n<>a<>na"}, +	{"banana", "", "<>", 1, "<>banana"}, +	{"banana", "a", "a", -1, "banana"}, +	{"banana", "a", "a", 1, "banana"}, +	{"☺☻☹", "", "<>", -1, "<>☺<>☻<>☹<>"},  }  func TestReplace(t *testing.T) { @@ -685,3 +820,25 @@ func TestReplace(t *testing.T) {  		}  	}  } + +type TitleTest struct { +	in, out string +} + +var TitleTests = []TitleTest{ +	{"", ""}, +	{"a", "A"}, +	{" aaa aaa aaa ", " Aaa Aaa Aaa "}, +	{" Aaa Aaa Aaa ", " Aaa Aaa Aaa "}, +	{"123a456", "123a456"}, +	{"double-blind", "Double-Blind"}, +	{"ÿøû", "Ÿøû"}, +} + +func TestTitle(t *testing.T) { +	for _, tt := range TitleTests { +		if s := string(Title([]byte(tt.in))); s != tt.out { +			t.Errorf("Title(%q) = %q, want %q", tt.in, s, tt.out) +		} +	} +} | 
