headers: rewrite initializers as members of their structs

This commit is contained in:
aler9
2021-03-20 09:55:04 +01:00
parent 8936db52e4
commit 25772271db
16 changed files with 117 additions and 110 deletions

View File

@@ -12,13 +12,13 @@ var casesAuth = []struct {
name string
vin base.HeaderValue
vout base.HeaderValue
h *Auth
h Auth
}{
{
"basic",
base.HeaderValue{`Basic realm="4419b63f5e51"`},
base.HeaderValue{`Basic realm="4419b63f5e51"`},
&Auth{
Auth{
Method: AuthBasic,
Realm: func() *string {
v := "4419b63f5e51"
@@ -30,7 +30,7 @@ var casesAuth = []struct {
"digest request 1",
base.HeaderValue{`Digest realm="4419b63f5e51", nonce="8b84a3b789283a8bea8da7fa7d41f08b", stale="FALSE"`},
base.HeaderValue{`Digest realm="4419b63f5e51", nonce="8b84a3b789283a8bea8da7fa7d41f08b", stale="FALSE"`},
&Auth{
Auth{
Method: AuthDigest,
Realm: func() *string {
v := "4419b63f5e51"
@@ -50,7 +50,7 @@ var casesAuth = []struct {
"digest request 2",
base.HeaderValue{`Digest realm="4419b63f5e51", nonce="8b84a3b789283a8bea8da7fa7d41f08b", stale=FALSE`},
base.HeaderValue{`Digest realm="4419b63f5e51", nonce="8b84a3b789283a8bea8da7fa7d41f08b", stale="FALSE"`},
&Auth{
Auth{
Method: AuthDigest,
Realm: func() *string {
v := "4419b63f5e51"
@@ -70,7 +70,7 @@ var casesAuth = []struct {
"digest request 3",
base.HeaderValue{`Digest realm="4419b63f5e51",nonce="133767111917411116111311118211673010032", stale="FALSE"`},
base.HeaderValue{`Digest realm="4419b63f5e51", nonce="133767111917411116111311118211673010032", stale="FALSE"`},
&Auth{
Auth{
Method: AuthDigest,
Realm: func() *string {
v := "4419b63f5e51"
@@ -90,7 +90,7 @@ var casesAuth = []struct {
"digest response generic",
base.HeaderValue{`Digest username="aa", realm="bb", nonce="cc", uri="dd", response="ee"`},
base.HeaderValue{`Digest username="aa", realm="bb", nonce="cc", uri="dd", response="ee"`},
&Auth{
Auth{
Method: AuthDigest,
Username: func() *string {
v := "aa"
@@ -118,7 +118,7 @@ var casesAuth = []struct {
"digest response with empty field",
base.HeaderValue{`Digest username="", realm="IPCAM", nonce="5d17cd12b9fa8a85ac5ceef0926ea5a6", uri="rtsp://localhost:8554/mystream", response="c072ae90eb4a27f4cdcb90d62266b2a1"`},
base.HeaderValue{`Digest username="", realm="IPCAM", nonce="5d17cd12b9fa8a85ac5ceef0926ea5a6", uri="rtsp://localhost:8554/mystream", response="c072ae90eb4a27f4cdcb90d62266b2a1"`},
&Auth{
Auth{
Method: AuthDigest,
Username: func() *string {
v := ""
@@ -146,7 +146,7 @@ var casesAuth = []struct {
"digest response with no spaces and additional fields",
base.HeaderValue{`Digest realm="Please log in with a valid username",nonce="752a62306daf32b401a41004555c7663",opaque="",stale=FALSE,algorithm=MD5`},
base.HeaderValue{`Digest realm="Please log in with a valid username", nonce="752a62306daf32b401a41004555c7663", opaque="", stale="FALSE", algorithm="MD5"`},
&Auth{
Auth{
Method: AuthDigest,
Realm: func() *string {
v := "Please log in with a valid username"
@@ -175,9 +175,10 @@ var casesAuth = []struct {
func TestAuthRead(t *testing.T) {
for _, c := range casesAuth {
t.Run(c.name, func(t *testing.T) {
req, err := ReadAuth(c.vin)
var h Auth
err := h.Read(c.vin)
require.NoError(t, err)
require.Equal(t, c.h, req)
require.Equal(t, c.h, h)
})
}
}
@@ -185,8 +186,8 @@ func TestAuthRead(t *testing.T) {
func TestAuthWrite(t *testing.T) {
for _, c := range casesAuth {
t.Run(c.name, func(t *testing.T) {
req := c.h.Write()
require.Equal(t, c.vout, req)
vout := c.h.Write()
require.Equal(t, c.vout, vout)
})
}
}