commit 88b4c29fb318cc0f455d6ebc3fb7865b00353a04
author Dan Willemsen <dwillemsen@google.com> Tue Jun 23 19:45:56 2015 -0700
committer Dan Willemsen <dwillemsen@google.com> Wed Jun 24 10:54:39 2015 -0700
tree e9ffce959595d43fdf90ad052cae56fb06906e68
parent eb05083e277936d0d5fe5d321da5fa0960d86fad

Fix androidmk make_strings_test to use new API

Change-Id: I23eb2df0603dbf76ff829c696cd09fe723efa9d9

androidmk/parser/make_strings_test.go

diff --git a/androidmk/parser/make_strings_test.go b/androidmk/parser/make_strings_test.go
index db5840c..cc3fd0a 100644
--- a/androidmk/parser/make_strings_test.go
+++ b/androidmk/parser/make_strings_test.go
@@ -3,6 +3,7 @@
 import (
 	"strings"
 	"testing"
+	"text/scanner"
 )
 
 var splitNTestCases = []struct {
@@ -13,61 +14,61 @@
 }{
 	{
 		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{})},
 				},
 			},
 		},