diff options
Diffstat (limited to 'libgo/go/exp/norm/composition_test.go')
-rw-r--r-- | libgo/go/exp/norm/composition_test.go | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/libgo/go/exp/norm/composition_test.go b/libgo/go/exp/norm/composition_test.go index ce9caaf..e32380d 100644 --- a/libgo/go/exp/norm/composition_test.go +++ b/libgo/go/exp/norm/composition_test.go @@ -8,14 +8,14 @@ import "testing" // TestCase is used for most tests. type TestCase struct { - in []int - out []int + in []rune + out []rune } -type insertFunc func(rb *reorderBuffer, rune int) bool +type insertFunc func(rb *reorderBuffer, r rune) bool -func insert(rb *reorderBuffer, rune int) bool { - src := inputString(string(rune)) +func insert(rb *reorderBuffer, r rune) bool { + src := inputString(string(r)) return rb.insert(src, 0, rb.f.info(src, 0)) } @@ -39,7 +39,7 @@ func runTests(t *testing.T, name string, fm Form, f insertFunc, tests []TestCase continue } for j, want := range test.out { - found := int(rb.runeAt(j)) + found := rune(rb.runeAt(j)) if found != want { t.Errorf("%s:%d: runeAt(%d) = %U; want %U", name, i, j, found, want) } @@ -57,7 +57,7 @@ func TestFlush(t *testing.T) { t.Errorf("wrote bytes on flush of empty buffer. (len(out) = %d)", len(out)) } - for _, r := range []int("world!") { + for _, r := range []rune("world!") { insert(&rb, r) } @@ -76,14 +76,14 @@ func TestFlush(t *testing.T) { } var insertTests = []TestCase{ - {[]int{'a'}, []int{'a'}}, - {[]int{0x300}, []int{0x300}}, - {[]int{0x300, 0x316}, []int{0x316, 0x300}}, // CCC(0x300)==230; CCC(0x316)==220 - {[]int{0x316, 0x300}, []int{0x316, 0x300}}, - {[]int{0x41, 0x316, 0x300}, []int{0x41, 0x316, 0x300}}, - {[]int{0x41, 0x300, 0x316}, []int{0x41, 0x316, 0x300}}, - {[]int{0x300, 0x316, 0x41}, []int{0x316, 0x300, 0x41}}, - {[]int{0x41, 0x300, 0x40, 0x316}, []int{0x41, 0x300, 0x40, 0x316}}, + {[]rune{'a'}, []rune{'a'}}, + {[]rune{0x300}, []rune{0x300}}, + {[]rune{0x300, 0x316}, []rune{0x316, 0x300}}, // CCC(0x300)==230; CCC(0x316)==220 + {[]rune{0x316, 0x300}, []rune{0x316, 0x300}}, + {[]rune{0x41, 0x316, 0x300}, []rune{0x41, 0x316, 0x300}}, + {[]rune{0x41, 0x300, 0x316}, []rune{0x41, 0x316, 0x300}}, + {[]rune{0x300, 0x316, 0x41}, []rune{0x316, 0x300, 0x41}}, + {[]rune{0x41, 0x300, 0x40, 0x316}, []rune{0x41, 0x300, 0x40, 0x316}}, } func TestInsert(t *testing.T) { @@ -91,18 +91,18 @@ func TestInsert(t *testing.T) { } var decompositionNFDTest = []TestCase{ - {[]int{0xC0}, []int{0x41, 0x300}}, - {[]int{0xAC00}, []int{0x1100, 0x1161}}, - {[]int{0x01C4}, []int{0x01C4}}, - {[]int{0x320E}, []int{0x320E}}, - {[]int("음ẻ과"), []int{0x110B, 0x1173, 0x11B7, 0x65, 0x309, 0x1100, 0x116A}}, + {[]rune{0xC0}, []rune{0x41, 0x300}}, + {[]rune{0xAC00}, []rune{0x1100, 0x1161}}, + {[]rune{0x01C4}, []rune{0x01C4}}, + {[]rune{0x320E}, []rune{0x320E}}, + {[]rune("음ẻ과"), []rune{0x110B, 0x1173, 0x11B7, 0x65, 0x309, 0x1100, 0x116A}}, } var decompositionNFKDTest = []TestCase{ - {[]int{0xC0}, []int{0x41, 0x300}}, - {[]int{0xAC00}, []int{0x1100, 0x1161}}, - {[]int{0x01C4}, []int{0x44, 0x5A, 0x030C}}, - {[]int{0x320E}, []int{0x28, 0x1100, 0x1161, 0x29}}, + {[]rune{0xC0}, []rune{0x41, 0x300}}, + {[]rune{0xAC00}, []rune{0x1100, 0x1161}}, + {[]rune{0x01C4}, []rune{0x44, 0x5A, 0x030C}}, + {[]rune{0x320E}, []rune{0x28, 0x1100, 0x1161, 0x29}}, } func TestDecomposition(t *testing.T) { @@ -111,15 +111,15 @@ func TestDecomposition(t *testing.T) { } var compositionTest = []TestCase{ - {[]int{0x41, 0x300}, []int{0xC0}}, - {[]int{0x41, 0x316}, []int{0x41, 0x316}}, - {[]int{0x41, 0x300, 0x35D}, []int{0xC0, 0x35D}}, - {[]int{0x41, 0x316, 0x300}, []int{0xC0, 0x316}}, + {[]rune{0x41, 0x300}, []rune{0xC0}}, + {[]rune{0x41, 0x316}, []rune{0x41, 0x316}}, + {[]rune{0x41, 0x300, 0x35D}, []rune{0xC0, 0x35D}}, + {[]rune{0x41, 0x316, 0x300}, []rune{0xC0, 0x316}}, // blocking starter - {[]int{0x41, 0x316, 0x40, 0x300}, []int{0x41, 0x316, 0x40, 0x300}}, - {[]int{0x1100, 0x1161}, []int{0xAC00}}, + {[]rune{0x41, 0x316, 0x40, 0x300}, []rune{0x41, 0x316, 0x40, 0x300}}, + {[]rune{0x1100, 0x1161}, []rune{0xAC00}}, // parenthesized Hangul, alternate between ASCII and Hangul. - {[]int{0x28, 0x1100, 0x1161, 0x29}, []int{0x28, 0xAC00, 0x29}}, + {[]rune{0x28, 0x1100, 0x1161, 0x29}, []rune{0x28, 0xAC00, 0x29}}, } func TestComposition(t *testing.T) { |