1- // Copyright (c) 2017 Uber Technologies, Inc.
1+ // Copyright (c) 2019 Uber Technologies, Inc.
22//
33// Permission is hereby granted, free of charge, to any person obtaining a copy
44// of this software and associated documentation files (the "Software"), to deal
@@ -47,12 +47,12 @@ const expected = `This is a test$. $ This is a $test.
4747 $$$$
4848${parti`
4949
50- const ends_in_dollar = `There is a dollar at the end$`
51- const ends_in_ddollar = `There is a dollar at the end$$`
52- const many_dollars_orig = `$$$$$$$`
53- const many_dollars_expect = `$$$$`
54- const ends_in_var = `There is a test at the end: $t3sT`
55- const ends_in_var_expect = `There is a test at the end: test`
50+ const endsInDollar = `There is a dollar at the end$`
51+ const endsInDoubleDollar = `There is a dollar at the end$$`
52+ const manyDollarsOrig = `$$$$$$$`
53+ const manyDollarsExpect = `$$$$`
54+ const endsInVar = `There is a test at the end: $t3sT`
55+ const endsInVarExpect = `There is a test at the end: test`
5656
5757type oneByteReader struct {
5858 r io.Reader
@@ -89,7 +89,7 @@ func (e *bufReader) Read(buf []byte) (int, error) {
8989func TestExpander (t * testing.T ) {
9090 r := bytes .NewReader ([]byte (orig ))
9191
92- expand_func := func (s string ) (string , error ) {
92+ expandFunc := func (s string ) (string , error ) {
9393 switch s {
9494 case "t3sT" :
9595 return "test" , nil
@@ -101,7 +101,7 @@ func TestExpander(t *testing.T) {
101101 }
102102
103103 // Parse whole string
104- tr := transform .NewReader (r , & expandTransformer {expand : expand_func })
104+ tr := transform .NewReader (r , & expandTransformer {expand : expandFunc })
105105 actual , err := ioutil .ReadAll (tr )
106106 require .NoError (t , err )
107107 assert .Exactly (t , expected , string (actual ))
@@ -111,15 +111,15 @@ func TestExpander(t *testing.T) {
111111
112112 // Partial parse
113113 var partial [11 ]byte
114- tr = transform .NewReader (r , & expandTransformer {expand : expand_func })
114+ tr = transform .NewReader (r , & expandTransformer {expand : expandFunc })
115115 n , err := tr .Read (partial [:])
116116 require .NoError (t , err )
117117 assert .Exactly (t , n , len (partial ))
118118 assert .Exactly (t , expected [:n ], string (partial [:]))
119119
120120 // Empty string
121121 r = bytes .NewReader ([]byte {})
122- tr = transform .NewReader (r , & expandTransformer {expand : expand_func })
122+ tr = transform .NewReader (r , & expandTransformer {expand : expandFunc })
123123 actual , err = ioutil .ReadAll (tr )
124124 require .NoError (t , err )
125125 assert .Exactly (t , "" , string (actual ))
@@ -129,7 +129,7 @@ func TestExpanderOneByteAtATime(t *testing.T) {
129129 r := bytes .NewReader ([]byte (orig ))
130130 rr := & oneByteReader {r : r }
131131
132- expand_func := func (s string ) (string , error ) {
132+ expandFunc := func (s string ) (string , error ) {
133133 switch s {
134134 case "t3sT" :
135135 return "test" , nil
@@ -140,7 +140,7 @@ func TestExpanderOneByteAtATime(t *testing.T) {
140140 return "NOMATCH" , errors .New ("No Match" )
141141 }
142142
143- tr := transform .NewReader (rr , & expandTransformer {expand : expand_func })
143+ tr := transform .NewReader (rr , & expandTransformer {expand : expandFunc })
144144 actual , err := ioutil .ReadAll (tr )
145145 require .NoError (t , err )
146146 assert .Exactly (t , expected , string (actual ))
@@ -149,7 +149,7 @@ func TestExpanderOneByteAtATime(t *testing.T) {
149149func TestExpanderFailingTransform (t * testing.T ) {
150150 r := bytes .NewReader ([]byte (orig ))
151151
152- expand_func := func (s string ) (string , error ) {
152+ expandFunc := func (s string ) (string , error ) {
153153 switch s {
154154 case "t3sT" :
155155 return "test" , nil
@@ -159,7 +159,7 @@ func TestExpanderFailingTransform(t *testing.T) {
159159 return "NOMATCH" , errors .New ("No Match" )
160160 }
161161
162- tr := transform .NewReader (r , & expandTransformer {expand : expand_func })
162+ tr := transform .NewReader (r , & expandTransformer {expand : expandFunc })
163163 _ , err := ioutil .ReadAll (tr )
164164 require .Error (t , err )
165165}
@@ -169,13 +169,13 @@ func TestExpanderMisc(t *testing.T) {
169169 orig string
170170 expect string
171171 }{
172- {ends_in_dollar , ends_in_dollar },
173- {ends_in_ddollar , ends_in_dollar },
174- {ends_in_var , ends_in_var_expect },
175- {many_dollars_orig , many_dollars_expect },
172+ {endsInDollar , endsInDollar },
173+ {endsInDoubleDollar , endsInDollar },
174+ {endsInVar , endsInVarExpect },
175+ {manyDollarsOrig , manyDollarsExpect },
176176 }
177177
178- expand_func := func (s string ) (string , error ) {
178+ expandFunc := func (s string ) (string , error ) {
179179 switch s {
180180 case "t3sT" :
181181 return "test" , nil
@@ -191,7 +191,7 @@ func TestExpanderMisc(t *testing.T) {
191191 func (t * testing.T ) {
192192 tr := transform .NewReader (
193193 bytes .NewReader ([]byte (tst .orig )),
194- & expandTransformer {expand : expand_func },
194+ & expandTransformer {expand : expandFunc },
195195 )
196196 actual , err := ioutil .ReadAll (tr )
197197 require .NoError (t , err )
@@ -213,7 +213,7 @@ func TestExpanderLongSrc(t *testing.T) {
213213 {"$a${" , a + "${" },
214214 }
215215
216- expand_func := func (s string ) (string , error ) {
216+ expandFunc := func (s string ) (string , error ) {
217217 switch s {
218218 case "a" :
219219 return a , nil
@@ -228,7 +228,7 @@ func TestExpanderLongSrc(t *testing.T) {
228228 func (t * testing.T ) {
229229 tr := transform .NewReader (
230230 & bufReader {buf : []byte (tst .orig )},
231- & expandTransformer {expand : expand_func },
231+ & expandTransformer {expand : expandFunc },
232232 )
233233 actual , err := ioutil .ReadAll (tr )
234234 require .NoError (t , err )
@@ -253,7 +253,7 @@ func TestTransformLimit(t *testing.T) {
253253 {"$" + a , transform .ErrShortSrc },
254254 }
255255
256- expand_func := func (s string ) (string , error ) {
256+ expandFunc := func (s string ) (string , error ) {
257257 switch s {
258258 case "a" :
259259 return a + "aa" , nil
@@ -270,7 +270,7 @@ func TestTransformLimit(t *testing.T) {
270270 func (t * testing.T ) {
271271 tr := transform .NewReader (
272272 bytes .NewReader ([]byte (tst .orig )),
273- & expandTransformer {expand : expand_func },
273+ & expandTransformer {expand : expandFunc },
274274 )
275275 _ , err := ioutil .ReadAll (tr )
276276 require .EqualError (t , err , tst .err .Error ())
0 commit comments