tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix androidmk make_strings_test to use new API

Browse source 
Change-Id: I23eb2df0603dbf76ff829c696cd09fe723efa9d9
This commit is contained in:
Dan Willemsen 2015-06-23 19:45:56 -07:00
parent eb05083e27
commit 88b4c29fb3
1 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
androidmk/parser/make_strings_test.go
View file

@ -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{})},
},
},
},