diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-06-23 19:45:56 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2015-06-24 10:54:39 -0700 |
| commit | 88b4c29fb318cc0f455d6ebc3fb7865b00353a04 (patch) | |
| tree | e9ffce959595d43fdf90ad052cae56fb06906e68 /androidmk | |
| parent | eb05083e277936d0d5fe5d321da5fa0960d86fad (diff) | |
| download | build_soong-88b4c29fb318cc0f455d6ebc3fb7865b00353a04.tar.gz build_soong-88b4c29fb318cc0f455d6ebc3fb7865b00353a04.tar.bz2 build_soong-88b4c29fb318cc0f455d6ebc3fb7865b00353a04.zip | |
Fix androidmk make_strings_test to use new API
Change-Id: I23eb2df0603dbf76ff829c696cd09fe723efa9d9
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/parser/make_strings_test.go | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/androidmk/parser/make_strings_test.go b/androidmk/parser/make_strings_test.go index db5840c6..cc3fd0a8 100644 --- a/androidmk/parser/make_strings_test.go +++ b/androidmk/parser/make_strings_test.go @@ -3,6 +3,7 @@ package parser import ( "strings" "testing" + "text/scanner" ) var splitNTestCases = []struct { @@ -13,61 +14,61 @@ var splitNTestCases = []struct { }{ { in: &MakeString{ - strings: []string{ + Strings: []string{ "a b c", "d e f", " h i j", }, - variables: []Variable{ - variable{name: SimpleMakeString("var1")}, - variable{name: SimpleMakeString("var2")}, + Variables: []Variable{ + Variable{Name: SimpleMakeString("var1", scanner.Position{})}, + Variable{Name: SimpleMakeString("var2", scanner.Position{})}, }, }, sep: " ", n: -1, expected: []*MakeString{ - SimpleMakeString("a"), - SimpleMakeString("b"), + SimpleMakeString("a", scanner.Position{}), + SimpleMakeString("b", scanner.Position{}), &MakeString{ - strings: []string{"c", "d"}, - variables: []Variable{ - variable{name: SimpleMakeString("var1")}, + Strings: []string{"c", "d"}, + Variables: []Variable{ + Variable{Name: SimpleMakeString("var1", scanner.Position{})}, }, }, - SimpleMakeString("e"), + SimpleMakeString("e", scanner.Position{}), &MakeString{ - strings: []string{"f", ""}, - variables: []Variable{ - variable{name: SimpleMakeString("var2")}, + Strings: []string{"f", ""}, + Variables: []Variable{ + Variable{Name: SimpleMakeString("var2", scanner.Position{})}, }, }, - SimpleMakeString("h"), - SimpleMakeString("i"), - SimpleMakeString("j"), + SimpleMakeString("h", scanner.Position{}), + SimpleMakeString("i", scanner.Position{}), + SimpleMakeString("j", scanner.Position{}), }, }, { in: &MakeString{ - strings: []string{ + Strings: []string{ "a b c", "d e f", " h i j", }, - variables: []Variable{ - variable{name: SimpleMakeString("var1")}, - variable{name: SimpleMakeString("var2")}, + Variables: []Variable{ + Variable{Name: SimpleMakeString("var1", scanner.Position{})}, + Variable{Name: SimpleMakeString("var2", scanner.Position{})}, }, }, sep: " ", n: 3, expected: []*MakeString{ - SimpleMakeString("a"), - SimpleMakeString("b"), + SimpleMakeString("a", scanner.Position{}), + SimpleMakeString("b", scanner.Position{}), &MakeString{ - strings: []string{"c", "d e f", " h i j"}, - variables: []Variable{ - variable{name: SimpleMakeString("var1")}, - variable{name: SimpleMakeString("var2")}, + Strings: []string{"c", "d e f", " h i j"}, + Variables: []Variable{ + Variable{Name: SimpleMakeString("var1", scanner.Position{})}, + Variable{Name: SimpleMakeString("var2", scanner.Position{})}, }, }, }, |