Made all unit tests work again.

This commit is contained in:
Maurice Makaay 2019-07-11 14:55:08 +00:00
parent 3c9a678d7a
commit a4eda45d2c
5 changed files with 8 additions and 8 deletions

View File

@ -29,7 +29,7 @@ func Example_dutchPostcodeUsingTokenizer() {
fmt.Printf("[%d] Input: %q Error: %s\n", i, input, err)
} else {
fmt.Printf("[%d] Input: %q Output: %s Tokens:", i, input, result)
for _, t := range result.Tokens() {
for _, t := range result.Tokens {
fmt.Printf(" %s(%s)", t.Type, t.Value)
}
fmt.Printf("\n")

View File

@ -102,11 +102,11 @@ func AssertTokenMaker(t *testing.T, test TokenMakerT) {
if err != nil {
t.Errorf("Test %q failed with error: %s", test.Input, err)
} else {
if len(result.Tokens()) != len(test.Expected) {
t.Errorf("Unexpected number of tokens in output:\nexpected: %d\nactual: %d", len(test.Expected), len(result.Tokens()))
if len(result.Tokens) != len(test.Expected) {
t.Errorf("Unexpected number of tokens in output:\nexpected: %d\nactual: %d", len(test.Expected), len(result.Tokens))
}
for i, expected := range test.Expected {
actual := result.Token(i)
actual := result.Tokens[i]
if expected.Type != actual.Type {
t.Errorf("Unexpected Type in result.Tokens[%d]:\nexpected: (%T) %s\nactual: (%T) %s", i, expected.Type, expected.Type, actual.Type, actual.Type)
}

View File

@ -62,7 +62,7 @@ func ExampleHandler_SeparatedBy() {
csv := t.Int("number", a.Digits).SeparatedBy(a.Comma)
r, _ := csv.Match("123,456,7,8,9")
for i, token := range r.Tokens() {
for i, token := range r.Tokens {
fmt.Printf("[%d] %v\n", i, token)
}
// Output:

View File

@ -460,7 +460,7 @@ func TestTokenGroup_Match(t *testing.T) {
api, err := tokenizer("xxxxx")
AssertTrue(t, err == nil, "Tokenizer result")
tokens := api.Tokens()
tokens := api.Tokens
AssertEqual(t, 1, len(tokens), "Length of tokens slice")
contained := tokens[0].Value.([]tokenize.Token)
AssertEqual(t, 3, len(contained), "Length of contained tokens")
@ -476,7 +476,7 @@ func TestTokenGroup_Mismatch(t *testing.T) {
api, err := tokenizer("12345")
AssertTrue(t, err == nil, "Tokenizer result")
tokens := api.Tokens()
tokens := api.Tokens
AssertEqual(t, 0, len(tokens), "Length of tokens slice")
}

View File

@ -40,7 +40,7 @@ func ExampleNew() {
result, err := tokenizer(input)
if err == nil {
fmt.Printf("Result: %s\n", result.Tokens())
fmt.Printf("Result: %s\n", result.Tokens)
} else {
fmt.Printf("Error: %s\n", err)
}