use require.EqualError() in tests

This commit is contained in:
aler9
2021-11-03 17:52:45 +01:00
parent e3d13be611
commit 78bfa5d6a8
25 changed files with 43 additions and 43 deletions

View File

@@ -1964,10 +1964,10 @@ func TestClientReadErrorTimeout(t *testing.T) {
switch transport { switch transport {
case "udp", "auto": case "udp", "auto":
require.Equal(t, "UDP timeout", err.Error()) require.EqualError(t, err, "UDP timeout")
case "tcp": case "tcp":
require.Equal(t, "TCP timeout", err.Error()) require.EqualError(t, err, "TCP timeout")
} }
}) })
} }

View File

@@ -116,7 +116,7 @@ func TestConfigDecodeErrors(t *testing.T) {
t.Run(ca.name, func(t *testing.T) { t.Run(ca.name, func(t *testing.T) {
var dec MPEG4AudioConfig var dec MPEG4AudioConfig
err := dec.Decode(ca.byts) err := dec.Decode(ca.byts)
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }
@@ -149,7 +149,7 @@ func TestConfigEncodeErrors(t *testing.T) {
} { } {
t.Run(ca.name, func(t *testing.T) { t.Run(ca.name, func(t *testing.T) {
_, err := ca.conf.Encode() _, err := ca.conf.Encode()
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }

View File

@@ -47,7 +47,7 @@ func TestSenderErrors(t *testing.T) {
} { } {
t.Run(ca.name, func(t *testing.T) { t.Run(ca.name, func(t *testing.T) {
_, err := NewSender(ca.hv, "myuser", "mypass") _, err := NewSender(ca.hv, "myuser", "mypass")
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }

View File

@@ -65,7 +65,7 @@ func TestValidatorErrors(t *testing.T) {
"Authorization": ca.hv, "Authorization": ca.hv,
}, },
}) })
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }

View File

@@ -100,7 +100,7 @@ func TestBodyReadErrors(t *testing.T) {
t.Run(ca.name, func(t *testing.T) { t.Run(ca.name, func(t *testing.T) {
var p body var p body
err := p.read(ca.h, bufio.NewReader(bytes.NewReader(ca.byts))) err := p.read(ca.h, bufio.NewReader(bytes.NewReader(ca.byts)))
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }
@@ -108,5 +108,5 @@ func TestBodyReadErrors(t *testing.T) {
func TestBodyWriteErrors(t *testing.T) { func TestBodyWriteErrors(t *testing.T) {
bw := bufio.NewWriterSize(&limitedBuffer{cap: 3}, 1) bw := bufio.NewWriterSize(&limitedBuffer{cap: 3}, 1)
err := body([]byte("1234")).write(bw) err := body([]byte("1234")).write(bw)
require.Equal(t, "capacity reached", err.Error()) require.EqualError(t, err, "capacity reached")
} }

View File

@@ -181,7 +181,7 @@ func TestHeaderReadErrors(t *testing.T) {
t.Run(ca.name, func(t *testing.T) { t.Run(ca.name, func(t *testing.T) {
h := make(Header) h := make(Header)
err := h.read(bufio.NewReader(bytes.NewBuffer(ca.dec))) err := h.read(bufio.NewReader(bytes.NewBuffer(ca.dec)))
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }
@@ -205,7 +205,7 @@ func TestHeaderWriteErrors(t *testing.T) {
err := Header{ err := Header{
"Value": HeaderValue{"key"}, "Value": HeaderValue{"key"},
}.write(bw) }.write(bw)
require.Equal(t, "capacity reached", err.Error()) require.EqualError(t, err, "capacity reached")
}) })
} }
} }

View File

@@ -89,7 +89,7 @@ func TestInterleavedFrameReadErrors(t *testing.T) {
var f InterleavedFrame var f InterleavedFrame
f.Payload = make([]byte, 5) f.Payload = make([]byte, 5)
err := f.Read(bufio.NewReader(bytes.NewBuffer(ca.byts))) err := f.Read(bufio.NewReader(bytes.NewBuffer(ca.byts)))
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }
@@ -114,7 +114,7 @@ func TestInterleavedFrameWriteErrors(t *testing.T) {
Channel: 3, Channel: 3,
Payload: []byte{0x01, 0x02, 0x03, 0x04}, Payload: []byte{0x01, 0x02, 0x03, 0x04},
}.Write(bw) }.Write(bw)
require.Equal(t, "capacity reached", err.Error()) require.EqualError(t, err, "capacity reached")
}) })
} }
} }
@@ -169,7 +169,7 @@ func TestReadInterleavedFrameOrRequestErrors(t *testing.T) {
br := bufio.NewReader(bytes.NewBuffer(ca.byts)) br := bufio.NewReader(bytes.NewBuffer(ca.byts))
_, err := ReadInterleavedFrameOrRequest(&f, &req, br) _, err := ReadInterleavedFrameOrRequest(&f, &req, br)
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }
@@ -224,7 +224,7 @@ func TestReadInterleavedFrameOrResponseErrors(t *testing.T) {
br := bufio.NewReader(bytes.NewBuffer(ca.byts)) br := bufio.NewReader(bytes.NewBuffer(ca.byts))
_, err := ReadInterleavedFrameOrResponse(&f, &res, br) _, err := ReadInterleavedFrameOrResponse(&f, &res, br)
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }

View File

@@ -226,7 +226,7 @@ func TestRequestReadErrors(t *testing.T) {
t.Run(ca.name, func(t *testing.T) { t.Run(ca.name, func(t *testing.T) {
var req Request var req Request
err := req.Read(bufio.NewReader(bytes.NewBuffer(ca.byts))) err := req.Read(bufio.NewReader(bytes.NewBuffer(ca.byts)))
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }
@@ -259,7 +259,7 @@ func TestRequestWriteErrors(t *testing.T) {
}, },
Body: []byte("abc"), Body: []byte("abc"),
}.Write(bw) }.Write(bw)
require.Equal(t, "capacity reached", err.Error()) require.EqualError(t, err, "capacity reached")
}) })
} }
} }
@@ -286,7 +286,7 @@ func TestRequestReadIgnoreFramesErrors(t *testing.T) {
buf := make([]byte, 10) buf := make([]byte, 10)
var req Request var req Request
err := req.ReadIgnoreFrames(rb, buf) err := req.ReadIgnoreFrames(rb, buf)
require.Equal(t, "EOF", err.Error()) require.EqualError(t, err, "EOF")
} }
func TestRequestString(t *testing.T) { func TestRequestString(t *testing.T) {

View File

@@ -183,7 +183,7 @@ func TestResponseReadErrors(t *testing.T) {
t.Run(ca.name, func(t *testing.T) { t.Run(ca.name, func(t *testing.T) {
var res Response var res Response
err := res.Read(bufio.NewReader(bytes.NewBuffer(ca.byts))) err := res.Read(bufio.NewReader(bytes.NewBuffer(ca.byts)))
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }
@@ -216,7 +216,7 @@ func TestResponseWriteErrors(t *testing.T) {
}, },
Body: []byte("abc"), Body: []byte("abc"),
}.Write(bw) }.Write(bw)
require.Equal(t, "capacity reached", err.Error()) require.EqualError(t, err, "capacity reached")
}) })
} }
} }
@@ -271,7 +271,7 @@ func TestResponseReadIgnoreFramesErrors(t *testing.T) {
buf := make([]byte, 10) buf := make([]byte, 10)
var res Response var res Response
err := res.ReadIgnoreFrames(rb, buf) err := res.ReadIgnoreFrames(rb, buf)
require.Equal(t, "EOF", err.Error()) require.EqualError(t, err, "EOF")
} }
func TestResponseString(t *testing.T) { func TestResponseString(t *testing.T) {

View File

@@ -43,7 +43,7 @@ func TestURLParseErrors(t *testing.T) {
} { } {
t.Run(ca.name, func(t *testing.T) { t.Run(ca.name, func(t *testing.T) {
_, err := ParseURL(ca.enc) _, err := ParseURL(ca.enc)
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }

View File

@@ -224,7 +224,7 @@ func TestAutenticatehReadErrors(t *testing.T) {
t.Run(ca.name, func(t *testing.T) { t.Run(ca.name, func(t *testing.T) {
var h Authenticate var h Authenticate
err := h.Read(ca.hv) err := h.Read(ca.hv)
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }

View File

@@ -100,7 +100,7 @@ func TestAuthorizationReadErrors(t *testing.T) {
t.Run(ca.name, func(t *testing.T) { t.Run(ca.name, func(t *testing.T) {
var h Authorization var h Authorization
err := h.Read(ca.hv) err := h.Read(ca.hv)
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }

View File

@@ -99,7 +99,7 @@ func TestKeyValParseErrors(t *testing.T) {
} { } {
t.Run(ca.name, func(t *testing.T) { t.Run(ca.name, func(t *testing.T) {
_, err := keyValParse(ca.s, ',') _, err := keyValParse(ca.s, ',')
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }

View File

@@ -257,7 +257,7 @@ func TestRangeReadErrors(t *testing.T) {
t.Run(ca.name, func(t *testing.T) { t.Run(ca.name, func(t *testing.T) {
var h Range var h Range
err := h.Read(ca.hv) err := h.Read(ca.hv)
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }

View File

@@ -224,7 +224,7 @@ func TestRTPInfoReadErrors(t *testing.T) {
t.Run(ca.name, func(t *testing.T) { t.Run(ca.name, func(t *testing.T) {
var h RTPInfo var h RTPInfo
err := h.Read(ca.hv) err := h.Read(ca.hv)
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }

View File

@@ -89,7 +89,7 @@ func TestSessionReadErrors(t *testing.T) {
t.Run(ca.name, func(t *testing.T) { t.Run(ca.name, func(t *testing.T) {
var h Session var h Session
err := h.Read(ca.hv) err := h.Read(ca.hv)
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }

View File

@@ -258,7 +258,7 @@ func TestTransportReadErrors(t *testing.T) {
t.Run(ca.name, func(t *testing.T) { t.Run(ca.name, func(t *testing.T) {
var h Transport var h Transport
err := h.Read(ca.hv) err := h.Read(ca.hv)
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }

View File

@@ -408,7 +408,7 @@ func TestDecodeErrors(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
_, _, lastErr = d.Decode(&pkt) _, _, lastErr = d.Decode(&pkt)
} }
require.Equal(t, ca.err, lastErr.Error()) require.EqualError(t, lastErr, ca.err)
}) })
} }
} }

View File

@@ -451,7 +451,7 @@ func TestDecodeErrors(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
_, _, lastErr = d.Decode(&pkt) _, _, lastErr = d.Decode(&pkt)
} }
require.Equal(t, ca.err, lastErr.Error()) require.EqualError(t, lastErr, ca.err)
}) })
} }
} }
@@ -560,7 +560,7 @@ func TestReadSPSPPSErrors(t *testing.T) {
} { } {
t.Run(ca.name, func(t *testing.T) { t.Run(ca.name, func(t *testing.T) {
_, _, err := NewDecoder().ReadSPSPPS(&dummyReader{byts: ca.byts}) _, _, err := NewDecoder().ReadSPSPPS(&dummyReader{byts: ca.byts})
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }

View File

@@ -150,7 +150,7 @@ func TestServerPublishErrorAnnounce(t *testing.T) {
s := &Server{ s := &Server{
Handler: &testServerHandler{ Handler: &testServerHandler{
onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) {
require.Equal(t, ca.err, ctx.Error.Error()) require.EqualError(t, ctx.Error, ca.err)
close(connClosed) close(connClosed)
}, },
onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) { onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) {
@@ -403,7 +403,7 @@ func TestServerPublishErrorSetupDifferentPaths(t *testing.T) {
require.Equal(t, base.StatusBadRequest, res.StatusCode) require.Equal(t, base.StatusBadRequest, res.StatusCode)
err = <-serverErr err = <-serverErr
require.Equal(t, "invalid track path (test2stream/trackID=0)", err.Error()) require.EqualError(t, err, "invalid track path (test2stream/trackID=0)")
} }
func TestServerPublishErrorSetupTrackTwice(t *testing.T) { func TestServerPublishErrorSetupTrackTwice(t *testing.T) {
@@ -498,7 +498,7 @@ func TestServerPublishErrorSetupTrackTwice(t *testing.T) {
require.Equal(t, base.StatusBadRequest, res.StatusCode) require.Equal(t, base.StatusBadRequest, res.StatusCode)
err = <-serverErr err = <-serverErr
require.Equal(t, "track 0 has already been setup", err.Error()) require.EqualError(t, err, "track 0 has already been setup")
} }
func TestServerPublishErrorRecordPartialTracks(t *testing.T) { func TestServerPublishErrorRecordPartialTracks(t *testing.T) {
@@ -600,7 +600,7 @@ func TestServerPublishErrorRecordPartialTracks(t *testing.T) {
require.Equal(t, base.StatusBadRequest, res.StatusCode) require.Equal(t, base.StatusBadRequest, res.StatusCode)
err = <-serverErr err = <-serverErr
require.Equal(t, "not all announced tracks have been setup", err.Error()) require.EqualError(t, err, "not all announced tracks have been setup")
} }
func TestServerPublish(t *testing.T) { func TestServerPublish(t *testing.T) {

View File

@@ -157,9 +157,9 @@ func TestServerReadSetupErrors(t *testing.T) {
Handler: &testServerHandler{ Handler: &testServerHandler{
onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) {
if ca == "different paths" { if ca == "different paths" {
require.Equal(t, "can't setup tracks with different paths", ctx.Error.Error()) require.EqualError(t, ctx.Error, "can't setup tracks with different paths")
} else { } else {
require.Equal(t, "track 0 has already been setup", ctx.Error.Error()) require.EqualError(t, ctx.Error, "track 0 has already been setup")
} }
close(connClosed) close(connClosed)
}, },

View File

@@ -603,7 +603,7 @@ func TestServerErrorCSeqMissing(t *testing.T) {
h := &testServerHandler{ h := &testServerHandler{
onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) {
require.Equal(t, "CSeq is missing", ctx.Error.Error()) require.EqualError(t, ctx.Error, "CSeq is missing")
close(connClosed) close(connClosed)
}, },
} }
@@ -635,7 +635,7 @@ func TestServerErrorInvalidMethod(t *testing.T) {
h := &testServerHandler{ h := &testServerHandler{
onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) {
require.Equal(t, "unhandled request (INVALID rtsp://localhost:8554/)", ctx.Error.Error()) require.EqualError(t, ctx.Error, "unhandled request (INVALID rtsp://localhost:8554/)")
close(connClosed) close(connClosed)
}, },
} }
@@ -1101,7 +1101,7 @@ func TestServerErrorInvalidPath(t *testing.T) {
s := &Server{ s := &Server{
Handler: &testServerHandler{ Handler: &testServerHandler{
onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) {
require.Equal(t, "invalid path", ctx.Error.Error()) require.EqualError(t, ctx.Error, "invalid path")
close(connClosed) close(connClosed)
}, },
onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) { onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) {

View File

@@ -280,7 +280,7 @@ func TestTrackConfigAACErrors(t *testing.T) {
} { } {
t.Run(ca.name, func(t *testing.T) { t.Run(ca.name, func(t *testing.T) {
_, err := ca.track.ExtractConfigAAC() _, err := ca.track.ExtractConfigAAC()
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }

View File

@@ -342,7 +342,7 @@ func TestTrackConfigH264Errors(t *testing.T) {
} { } {
t.Run(ca.name, func(t *testing.T) { t.Run(ca.name, func(t *testing.T) {
_, err := ca.track.ExtractConfigH264() _, err := ca.track.ExtractConfigH264()
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }

View File

@@ -151,7 +151,7 @@ func TestTrackConfigOpusErrors(t *testing.T) {
} { } {
t.Run(ca.name, func(t *testing.T) { t.Run(ca.name, func(t *testing.T) {
_, err := ca.track.ExtractConfigOpus() _, err := ca.track.ExtractConfigOpus()
require.Equal(t, ca.err, err.Error()) require.EqualError(t, err, ca.err)
}) })
} }
} }