serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-02-03 07:38:23 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made style adjustments to browse and redir tests

Browse source
This commit is contained in:
Dipen Patel 2015-11-07 22:17:26 -05:00
parent 2b1cc77f4b
commit 1017142d9b
2 changed files with 24 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
caddy/setup/browse_test.go
View file

@ -5,13 +5,10 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"strconv" "strconv"
"strings"
"testing" "testing"
"time" "time"
"github.com/mholt/caddy/caddy/parse"
"github.com/mholt/caddy/middleware/browse" "github.com/mholt/caddy/middleware/browse"
"github.com/mholt/caddy/server"
) )
func TestBrowse(t *testing.T) { func TestBrowse(t *testing.T) {
@ -30,45 +27,37 @@ func TestBrowse(t *testing.T) {
tempTemplatePath := filepath.Join(".", tempTemplate.Name()) tempTemplatePath := filepath.Join(".", tempTemplate.Name())
testTokens := []string{ for i, test := range []struct {
"browse " + tempDirPath + "\n browse .", input string
"browse /",
"browse . " + tempTemplatePath,
"browse . " + nonExistantDirPath,
"browse " + tempDirPath + "\n browse " + tempDirPath,
}
tests := []struct {
expectedPathScope []string expectedPathScope []string
shouldErr bool shouldErr bool
}{ }{
// test case #0 tests handling of multiple pathscopes // test case #0 tests handling of multiple pathscopes
{[]string{tempDirPath, "."}, false}, {"browse " + tempDirPath + "\n browse .", []string{tempDirPath, "."}, false},
// test case #1 tests instantiation of browse.Config with default values // test case #1 tests instantiation of browse.Config with default values
{[]string{"/"}, false}, {"browse /", []string{"/"}, false},
// test case #2 tests detectaction of custom template // test case #2 tests detectaction of custom template
{[]string{"."}, false}, {"browse . " + tempTemplatePath, []string{"."}, false},
// test case #3 tests detection of non-existant template // test case #3 tests detection of non-existant template
{nil, true}, {"browse . " + nonExistantDirPath, nil, true},
// test case #4 tests detection of duplicate pathscopes // test case #4 tests detection of duplicate pathscopes
{nil, true}, {"browse " + tempDirPath + "\n browse " + tempDirPath, nil, true},
} } {
for i, test := range tests { // c := &Controller{Config: &server.Config{Root: "."}, Dispenser: parse.NewDispenser("", strings.NewReader(testTokens[i]))}
c := &Controller{Config: &server.Config{Root: "."}, Dispenser: parse.NewDispenser("", strings.NewReader(testTokens[i]))} recievedFunc, err := Browse(NewTestController(test.input))
retrievedFunc, err := Browse(c)
if err != nil && !test.shouldErr { if err != nil && !test.shouldErr {
t.Errorf("Test case #%d recieved an error of %v", i, err) t.Errorf("Test case #%d recieved an error of %v", i, err)
} }
if test.expectedPathScope == nil { if test.expectedPathScope == nil {
continue continue
} }
retrievedConfigs := retrievedFunc(nil).(browse.Browse).Configs recievedConfigs := recievedFunc(nil).(browse.Browse).Configs
for j, config := range retrievedConfigs { for j, config := range recievedConfigs {
if config.PathScope != test.expectedPathScope[j] { if config.PathScope != test.expectedPathScope[j] {
t.Errorf("Test case #%d expected a pathscope of %v, but got %v", i, test.expectedPathScope, config.PathScope) t.Errorf("Test case #%d expected a pathscope of %v, but got %v", i, test.expectedPathScope, config.PathScope)
} }

27
caddy/setup/redir_test.go
View file

@ -8,8 +8,8 @@ import (
func TestRedir(t *testing.T) { func TestRedir(t *testing.T) {
tests := []struct { for j, test := range []struct {
testToken string input string
shouldErr bool shouldErr bool
expectedRules []redirect.Rule expectedRules []redirect.Rule
}{ }{
@ -42,27 +42,24 @@ func TestRedir(t *testing.T) {
// test case #9 tests the detection of duplicate redirections // test case #9 tests the detection of duplicate redirections
{"redir {\n /bar /foo 304 \n} redir {\n /bar /foo 304 \n}", true, []redirect.Rule{redirect.Rule{}}}, {"redir {\n /bar /foo 304 \n} redir {\n /bar /foo 304 \n}", true, []redirect.Rule{redirect.Rule{}}},
} } {
recievedFunc, err := Redir(NewTestController(test.input))
for j, test := range tests {
c := NewTestController(test.testToken)
retrievedFunc, err := Redir(c)
if err != nil && !test.shouldErr { if err != nil && !test.shouldErr {
t.Errorf("Test case #%d recieved an error of %v", j, err) t.Errorf("Test case #%d recieved an error of %v", j, err)
} else if test.shouldErr { } else if test.shouldErr {
continue continue
} }
retrievedRules := retrievedFunc(nil).(redirect.Redirect).Rules recievedRules := recievedFunc(nil).(redirect.Redirect).Rules
for i, retrievedRule := range retrievedRules { for i, recievedRule := range recievedRules {
if retrievedRule.FromPath != test.expectedRules[i].FromPath { if recievedRule.FromPath != test.expectedRules[i].FromPath {
t.Errorf("Test case #%d.%d expected a from path of %s, but recieved a from path of %s", j, i, test.expectedRules[i].FromPath, retrievedRule.FromPath) t.Errorf("Test case #%d.%d expected a from path of %s, but recieved a from path of %s", j, i, test.expectedRules[i].FromPath, recievedRule.FromPath)
} }
if retrievedRule.To != test.expectedRules[i].To { if recievedRule.To != test.expectedRules[i].To {
t.Errorf("Test case #%d.%d expected a TO path of %s, but recieved a TO path of %s", j, i, test.expectedRules[i].To, retrievedRule.To) t.Errorf("Test case #%d.%d expected a TO path of %s, but recieved a TO path of %s", j, i, test.expectedRules[i].To, recievedRule.To)
} }
if retrievedRule.Code != test.expectedRules[i].Code { if recievedRule.Code != test.expectedRules[i].Code {
t.Errorf("Test case #%d.%d expected a HTTP status code of %d, but recieved a code of %d", j, i, test.expectedRules[i].Code, retrievedRule.Code) t.Errorf("Test case #%d.%d expected a HTTP status code of %d, but recieved a code of %d", j, i, test.expectedRules[i].Code, recievedRule.Code)
} }
} }
} }