Skip to content

Commit

Permalink
gofmt: Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
decke committed Feb 16, 2021
1 parent 97943c8 commit 7f34fcb
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 40 deletions.
8 changes: 4 additions & 4 deletions auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ var (
)

type AuthUser struct {
username string
passwordHash string
username string
passwordHash string
allowedAddresses []string
}

Expand Down Expand Up @@ -48,8 +48,8 @@ func parseLine(line string) *AuthUser {
}

user := AuthUser{
username: parts[0],
passwordHash: parts[1],
username: parts[0],
passwordHash: parts[1],
allowedAddresses: nil,
}

Expand Down
50 changes: 25 additions & 25 deletions auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ func stringsEqual(a, b []string) bool {
if len(a) != len(b) {
return false
}
for i, _ := range a {
for i := range a {
if a[i] != b[i] {
return false
}
Expand All @@ -18,50 +18,50 @@ func stringsEqual(a, b []string) bool {

func TestParseLine(t *testing.T) {
var tests = []struct {
name string
name string
expectFail bool
line string
username string
addrs []string
line string
username string
addrs []string
}{
{
name: "Empty line",
name: "Empty line",
expectFail: true,
line: "",
line: "",
},
{
name: "Too few fields",
name: "Too few fields",
expectFail: true,
line: "joe",
line: "joe",
},
{
name: "Too many fields",
name: "Too many fields",
expectFail: true,
line: "joe xxx [email protected] whatsthis",
line: "joe xxx [email protected] whatsthis",
},
{
name: "Normal case",
line: "joe xxx [email protected]",
name: "Normal case",
line: "joe xxx [email protected]",
username: "joe",
addrs: []string{"[email protected]"},
addrs: []string{"[email protected]"},
},
{
name: "No allowed addrs given",
line: "joe xxx",
name: "No allowed addrs given",
line: "joe xxx",
username: "joe",
addrs: []string{},
addrs: []string{},
},
{
name: "Trailing comma",
line: "joe xxx [email protected],",
name: "Trailing comma",
line: "joe xxx [email protected],",
username: "joe",
addrs: []string{"[email protected]"},
addrs: []string{"[email protected]"},
},
{
name: "Multiple allowed addrs",
line: "joe xxx [email protected],@foo.example.com",
name: "Multiple allowed addrs",
line: "joe xxx [email protected],@foo.example.com",
username: "joe",
addrs: []string{"[email protected]", "@foo.example.com"},
addrs: []string{"[email protected]", "@foo.example.com"},
},
}

Expand All @@ -77,12 +77,12 @@ func TestParseLine(t *testing.T) {

if user.username != test.username {
t.Errorf("Testcase %d: Incorrect username: expected %v, got %v",
i, test.username, user.username)
i, test.username, user.username)
}

if !stringsEqual(user.allowedAddresses, test.addrs) {
t.Errorf("Testcase %d: Incorrect addresses: expected %v, got %v",
i, test.addrs, user.allowedAddresses)
i, test.addrs, user.allowedAddresses)
}
})
}
Expand Down
22 changes: 11 additions & 11 deletions main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ func TestAddrAllowedSingle(t *testing.T) {

func TestAddrAllowedDifferentCase(t *testing.T) {
allowedAddrs := []string{"[email protected]"}
testAddrs := []string{
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
}
for _, addr := range testAddrs {
if !addrAllowed(addr, allowedAddrs) {
t.Errorf("Address %v not allowed, but should be", addr)
}
}
testAddrs := []string{
"[email protected]",
"[email protected]",
"[email protected]",
"[email protected]",
}
for _, addr := range testAddrs {
if !addrAllowed(addr, allowedAddrs) {
t.Errorf("Address %v not allowed, but should be", addr)
}
}
}

func TestAddrAllowedLocal(t *testing.T) {
Expand Down

0 comments on commit 7f34fcb

Please sign in to comment.