OrgGo
/
caddy
mirror of https://github.com/caddyserver/caddy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

caddyfile: Export NewTestDispenser() (close #2930) 

This allows modules to test their UnmarshalCaddyfile methods.
This commit is contained in:
Matthew Holt 2020-04-01 16:34:54 -06:00
parent 19b45546a7
commit 6fe04a30b1
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
caddyconfig/caddyfile/dispenser_test.go
View File

@ -27,7 +27,7 @@ func TestDispenser_Val_Next(t *testing.T) {
dir1 arg1
dir2 arg2 arg3
dir3`
d := newTestDispenser(input)
d := NewTestDispenser(input)
if val := d.Val(); val != "" {
t.Fatalf("Val(): Should return empty string when no token loaded; got '%s'", val)
@ -65,7 +65,7 @@ func TestDispenser_NextArg(t *testing.T) {
input := `dir1 arg1
dir2 arg2 arg3
dir3`
d := newTestDispenser(input)
d := NewTestDispenser(input)
assertNext := func(shouldLoad bool, expectedVal string, expectedCursor int) {
if d.Next() != shouldLoad {
@ -112,7 +112,7 @@ func TestDispenser_NextLine(t *testing.T) {
input := `host:port
dir1 arg1
dir2 arg2 arg3`
d := newTestDispenser(input)
d := NewTestDispenser(input)
assertNextLine := func(shouldLoad bool, expectedVal string, expectedCursor int) {
if d.NextLine() != shouldLoad {
@ -145,7 +145,7 @@ func TestDispenser_NextBlock(t *testing.T) {
}
foobar2 {
}`
d := newTestDispenser(input)
d := NewTestDispenser(input)
assertNextBlock := func(shouldLoad bool, expectedCursor, expectedNesting int) {
if loaded := d.NextBlock(0); loaded != shouldLoad {
@ -175,7 +175,7 @@ func TestDispenser_Args(t *testing.T) {
dir2 arg4 arg5
dir3 arg6 arg7
dir4`
d := newTestDispenser(input)
d := NewTestDispenser(input)
d.Next() // dir1
@ -242,7 +242,7 @@ func TestDispenser_RemainingArgs(t *testing.T) {
dir2 arg4 arg5
dir3 arg6 { arg7
dir4`
d := newTestDispenser(input)
d := NewTestDispenser(input)
d.Next() // dir1
@ -279,7 +279,7 @@ func TestDispenser_ArgErr_Err(t *testing.T) {
input := `dir1 {
}
dir2 arg1 arg2`
d := newTestDispenser(input)
d := NewTestDispenser(input)
d.cursor = 1 // {
@ -307,7 +307,9 @@ func TestDispenser_ArgErr_Err(t *testing.T) {
}
}
func newTestDispenser(input string) *Dispenser {
// NewTestDispenser parses input into tokens and creates a new
// Disenser for test purposes only; any errors are fatal.
func NewTestDispenser(input string) *Dispenser {
tokens, err := allTokens("Testfile", []byte(input))
if err != nil && err != io.EOF {
log.Fatalf("getting all tokens from input: %v", err)

2
caddyconfig/caddyfile/parse_test.go
View File

@ -670,5 +670,5 @@ func TestSnippetAcrossMultipleFiles(t *testing.T) {
}
func testParser(input string) parser {
return parser{Dispenser: newTestDispenser(input)}
return parser{Dispenser: NewTestDispenser(input)}
}