From 78bfa5d6a80a65f4fc75d61f6223b79b8e4e14c9 Mon Sep 17 00:00:00 2001 From: aler9 <46489434+aler9@users.noreply.github.com> Date: Wed, 3 Nov 2021 17:52:45 +0100 Subject: [PATCH] use require.EqualError() in tests --- client_read_test.go | 4 ++-- pkg/aac/mpeg4audioconfig_test.go | 4 ++-- pkg/auth/sender_test.go | 2 +- pkg/auth/validator_test.go | 2 +- pkg/base/body_test.go | 4 ++-- pkg/base/header_test.go | 4 ++-- pkg/base/interleavedframe_test.go | 8 ++++---- pkg/base/request_test.go | 6 +++--- pkg/base/response_test.go | 6 +++--- pkg/base/url_test.go | 2 +- pkg/headers/authenticate_test.go | 2 +- pkg/headers/authorization_test.go | 2 +- pkg/headers/keyval_test.go | 2 +- pkg/headers/range_test.go | 2 +- pkg/headers/rtpinfo_test.go | 2 +- pkg/headers/session_test.go | 2 +- pkg/headers/transport_test.go | 2 +- pkg/rtpaac/rtpaac_test.go | 2 +- pkg/rtph264/rtph264_test.go | 4 ++-- server_publish_test.go | 8 ++++---- server_read_test.go | 4 ++-- server_test.go | 6 +++--- track_aac_test.go | 2 +- track_h264_test.go | 2 +- track_opus_test.go | 2 +- 25 files changed, 43 insertions(+), 43 deletions(-) diff --git a/client_read_test.go b/client_read_test.go index f9ebffce..a1808ee9 100644 --- a/client_read_test.go +++ b/client_read_test.go @@ -1964,10 +1964,10 @@ func TestClientReadErrorTimeout(t *testing.T) { switch transport { case "udp", "auto": - require.Equal(t, "UDP timeout", err.Error()) + require.EqualError(t, err, "UDP timeout") case "tcp": - require.Equal(t, "TCP timeout", err.Error()) + require.EqualError(t, err, "TCP timeout") } }) } diff --git a/pkg/aac/mpeg4audioconfig_test.go b/pkg/aac/mpeg4audioconfig_test.go index 0d0ada24..ede218d1 100644 --- a/pkg/aac/mpeg4audioconfig_test.go +++ b/pkg/aac/mpeg4audioconfig_test.go @@ -116,7 +116,7 @@ func TestConfigDecodeErrors(t *testing.T) { t.Run(ca.name, func(t *testing.T) { var dec MPEG4AudioConfig 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) { _, err := ca.conf.Encode() - require.Equal(t, ca.err, err.Error()) + require.EqualError(t, err, ca.err) }) } } diff --git a/pkg/auth/sender_test.go b/pkg/auth/sender_test.go index 31599850..b3c5d331 100644 --- a/pkg/auth/sender_test.go +++ b/pkg/auth/sender_test.go @@ -47,7 +47,7 @@ func TestSenderErrors(t *testing.T) { } { t.Run(ca.name, func(t *testing.T) { _, err := NewSender(ca.hv, "myuser", "mypass") - require.Equal(t, ca.err, err.Error()) + require.EqualError(t, err, ca.err) }) } } diff --git a/pkg/auth/validator_test.go b/pkg/auth/validator_test.go index 605ea3c1..3a18e2f4 100644 --- a/pkg/auth/validator_test.go +++ b/pkg/auth/validator_test.go @@ -65,7 +65,7 @@ func TestValidatorErrors(t *testing.T) { "Authorization": ca.hv, }, }) - require.Equal(t, ca.err, err.Error()) + require.EqualError(t, err, ca.err) }) } } diff --git a/pkg/base/body_test.go b/pkg/base/body_test.go index cd6a7d3c..f31614d1 100644 --- a/pkg/base/body_test.go +++ b/pkg/base/body_test.go @@ -100,7 +100,7 @@ func TestBodyReadErrors(t *testing.T) { t.Run(ca.name, func(t *testing.T) { var p body 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) { bw := bufio.NewWriterSize(&limitedBuffer{cap: 3}, 1) err := body([]byte("1234")).write(bw) - require.Equal(t, "capacity reached", err.Error()) + require.EqualError(t, err, "capacity reached") } diff --git a/pkg/base/header_test.go b/pkg/base/header_test.go index c7a5d768..214d4445 100644 --- a/pkg/base/header_test.go +++ b/pkg/base/header_test.go @@ -181,7 +181,7 @@ func TestHeaderReadErrors(t *testing.T) { t.Run(ca.name, func(t *testing.T) { h := make(Header) 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{ "Value": HeaderValue{"key"}, }.write(bw) - require.Equal(t, "capacity reached", err.Error()) + require.EqualError(t, err, "capacity reached") }) } } diff --git a/pkg/base/interleavedframe_test.go b/pkg/base/interleavedframe_test.go index ffe0d3a4..86d31ac0 100644 --- a/pkg/base/interleavedframe_test.go +++ b/pkg/base/interleavedframe_test.go @@ -89,7 +89,7 @@ func TestInterleavedFrameReadErrors(t *testing.T) { var f InterleavedFrame f.Payload = make([]byte, 5) 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, Payload: []byte{0x01, 0x02, 0x03, 0x04}, }.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)) _, 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)) _, err := ReadInterleavedFrameOrResponse(&f, &res, br) - require.Equal(t, ca.err, err.Error()) + require.EqualError(t, err, ca.err) }) } } diff --git a/pkg/base/request_test.go b/pkg/base/request_test.go index cfc7b8e7..41472ef1 100644 --- a/pkg/base/request_test.go +++ b/pkg/base/request_test.go @@ -226,7 +226,7 @@ func TestRequestReadErrors(t *testing.T) { t.Run(ca.name, func(t *testing.T) { var req Request 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"), }.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) var req Request err := req.ReadIgnoreFrames(rb, buf) - require.Equal(t, "EOF", err.Error()) + require.EqualError(t, err, "EOF") } func TestRequestString(t *testing.T) { diff --git a/pkg/base/response_test.go b/pkg/base/response_test.go index e9e24004..8ee89125 100644 --- a/pkg/base/response_test.go +++ b/pkg/base/response_test.go @@ -183,7 +183,7 @@ func TestResponseReadErrors(t *testing.T) { t.Run(ca.name, func(t *testing.T) { var res Response 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"), }.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) var res Response err := res.ReadIgnoreFrames(rb, buf) - require.Equal(t, "EOF", err.Error()) + require.EqualError(t, err, "EOF") } func TestResponseString(t *testing.T) { diff --git a/pkg/base/url_test.go b/pkg/base/url_test.go index 590e71bb..81074d7f 100644 --- a/pkg/base/url_test.go +++ b/pkg/base/url_test.go @@ -43,7 +43,7 @@ func TestURLParseErrors(t *testing.T) { } { t.Run(ca.name, func(t *testing.T) { _, err := ParseURL(ca.enc) - require.Equal(t, ca.err, err.Error()) + require.EqualError(t, err, ca.err) }) } } diff --git a/pkg/headers/authenticate_test.go b/pkg/headers/authenticate_test.go index 44b532a7..38a64ee2 100644 --- a/pkg/headers/authenticate_test.go +++ b/pkg/headers/authenticate_test.go @@ -224,7 +224,7 @@ func TestAutenticatehReadErrors(t *testing.T) { t.Run(ca.name, func(t *testing.T) { var h Authenticate err := h.Read(ca.hv) - require.Equal(t, ca.err, err.Error()) + require.EqualError(t, err, ca.err) }) } } diff --git a/pkg/headers/authorization_test.go b/pkg/headers/authorization_test.go index d7d89ecc..3c415079 100644 --- a/pkg/headers/authorization_test.go +++ b/pkg/headers/authorization_test.go @@ -100,7 +100,7 @@ func TestAuthorizationReadErrors(t *testing.T) { t.Run(ca.name, func(t *testing.T) { var h Authorization err := h.Read(ca.hv) - require.Equal(t, ca.err, err.Error()) + require.EqualError(t, err, ca.err) }) } } diff --git a/pkg/headers/keyval_test.go b/pkg/headers/keyval_test.go index 410b22da..1408ce93 100644 --- a/pkg/headers/keyval_test.go +++ b/pkg/headers/keyval_test.go @@ -99,7 +99,7 @@ func TestKeyValParseErrors(t *testing.T) { } { t.Run(ca.name, func(t *testing.T) { _, err := keyValParse(ca.s, ',') - require.Equal(t, ca.err, err.Error()) + require.EqualError(t, err, ca.err) }) } } diff --git a/pkg/headers/range_test.go b/pkg/headers/range_test.go index 99ddf7eb..cdaad303 100644 --- a/pkg/headers/range_test.go +++ b/pkg/headers/range_test.go @@ -257,7 +257,7 @@ func TestRangeReadErrors(t *testing.T) { t.Run(ca.name, func(t *testing.T) { var h Range err := h.Read(ca.hv) - require.Equal(t, ca.err, err.Error()) + require.EqualError(t, err, ca.err) }) } } diff --git a/pkg/headers/rtpinfo_test.go b/pkg/headers/rtpinfo_test.go index 3c4ee10b..b601333b 100644 --- a/pkg/headers/rtpinfo_test.go +++ b/pkg/headers/rtpinfo_test.go @@ -224,7 +224,7 @@ func TestRTPInfoReadErrors(t *testing.T) { t.Run(ca.name, func(t *testing.T) { var h RTPInfo err := h.Read(ca.hv) - require.Equal(t, ca.err, err.Error()) + require.EqualError(t, err, ca.err) }) } } diff --git a/pkg/headers/session_test.go b/pkg/headers/session_test.go index 799a81a7..6cd47e67 100644 --- a/pkg/headers/session_test.go +++ b/pkg/headers/session_test.go @@ -89,7 +89,7 @@ func TestSessionReadErrors(t *testing.T) { t.Run(ca.name, func(t *testing.T) { var h Session err := h.Read(ca.hv) - require.Equal(t, ca.err, err.Error()) + require.EqualError(t, err, ca.err) }) } } diff --git a/pkg/headers/transport_test.go b/pkg/headers/transport_test.go index c77d5028..10a89076 100644 --- a/pkg/headers/transport_test.go +++ b/pkg/headers/transport_test.go @@ -258,7 +258,7 @@ func TestTransportReadErrors(t *testing.T) { t.Run(ca.name, func(t *testing.T) { var h Transport err := h.Read(ca.hv) - require.Equal(t, ca.err, err.Error()) + require.EqualError(t, err, ca.err) }) } } diff --git a/pkg/rtpaac/rtpaac_test.go b/pkg/rtpaac/rtpaac_test.go index 990e1eb7..c71a2bcb 100644 --- a/pkg/rtpaac/rtpaac_test.go +++ b/pkg/rtpaac/rtpaac_test.go @@ -408,7 +408,7 @@ func TestDecodeErrors(t *testing.T) { require.NoError(t, err) _, _, lastErr = d.Decode(&pkt) } - require.Equal(t, ca.err, lastErr.Error()) + require.EqualError(t, lastErr, ca.err) }) } } diff --git a/pkg/rtph264/rtph264_test.go b/pkg/rtph264/rtph264_test.go index cc9ed046..8fd47618 100644 --- a/pkg/rtph264/rtph264_test.go +++ b/pkg/rtph264/rtph264_test.go @@ -451,7 +451,7 @@ func TestDecodeErrors(t *testing.T) { require.NoError(t, err) _, _, 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) { _, _, err := NewDecoder().ReadSPSPPS(&dummyReader{byts: ca.byts}) - require.Equal(t, ca.err, err.Error()) + require.EqualError(t, err, ca.err) }) } } diff --git a/server_publish_test.go b/server_publish_test.go index c904dc1c..b5f70cea 100644 --- a/server_publish_test.go +++ b/server_publish_test.go @@ -150,7 +150,7 @@ func TestServerPublishErrorAnnounce(t *testing.T) { s := &Server{ Handler: &testServerHandler{ onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { - require.Equal(t, ca.err, ctx.Error.Error()) + require.EqualError(t, ctx.Error, ca.err) close(connClosed) }, onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) { @@ -403,7 +403,7 @@ func TestServerPublishErrorSetupDifferentPaths(t *testing.T) { require.Equal(t, base.StatusBadRequest, res.StatusCode) 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) { @@ -498,7 +498,7 @@ func TestServerPublishErrorSetupTrackTwice(t *testing.T) { require.Equal(t, base.StatusBadRequest, res.StatusCode) 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) { @@ -600,7 +600,7 @@ func TestServerPublishErrorRecordPartialTracks(t *testing.T) { require.Equal(t, base.StatusBadRequest, res.StatusCode) 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) { diff --git a/server_read_test.go b/server_read_test.go index 7c544079..a45461ad 100644 --- a/server_read_test.go +++ b/server_read_test.go @@ -157,9 +157,9 @@ func TestServerReadSetupErrors(t *testing.T) { Handler: &testServerHandler{ onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { 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 { - 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) }, diff --git a/server_test.go b/server_test.go index 7198734e..7abed063 100644 --- a/server_test.go +++ b/server_test.go @@ -603,7 +603,7 @@ func TestServerErrorCSeqMissing(t *testing.T) { h := &testServerHandler{ onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { - require.Equal(t, "CSeq is missing", ctx.Error.Error()) + require.EqualError(t, ctx.Error, "CSeq is missing") close(connClosed) }, } @@ -635,7 +635,7 @@ func TestServerErrorInvalidMethod(t *testing.T) { h := &testServerHandler{ 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) }, } @@ -1101,7 +1101,7 @@ func TestServerErrorInvalidPath(t *testing.T) { s := &Server{ Handler: &testServerHandler{ onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) { - require.Equal(t, "invalid path", ctx.Error.Error()) + require.EqualError(t, ctx.Error, "invalid path") close(connClosed) }, onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) { diff --git a/track_aac_test.go b/track_aac_test.go index 8d3d1106..7ab5f08d 100644 --- a/track_aac_test.go +++ b/track_aac_test.go @@ -280,7 +280,7 @@ func TestTrackConfigAACErrors(t *testing.T) { } { t.Run(ca.name, func(t *testing.T) { _, err := ca.track.ExtractConfigAAC() - require.Equal(t, ca.err, err.Error()) + require.EqualError(t, err, ca.err) }) } } diff --git a/track_h264_test.go b/track_h264_test.go index 08a62cb2..d0d82967 100644 --- a/track_h264_test.go +++ b/track_h264_test.go @@ -342,7 +342,7 @@ func TestTrackConfigH264Errors(t *testing.T) { } { t.Run(ca.name, func(t *testing.T) { _, err := ca.track.ExtractConfigH264() - require.Equal(t, ca.err, err.Error()) + require.EqualError(t, err, ca.err) }) } } diff --git a/track_opus_test.go b/track_opus_test.go index 731ebf8b..fb77fe15 100644 --- a/track_opus_test.go +++ b/track_opus_test.go @@ -151,7 +151,7 @@ func TestTrackConfigOpusErrors(t *testing.T) { } { t.Run(ca.name, func(t *testing.T) { _, err := ca.track.ExtractConfigOpus() - require.Equal(t, ca.err, err.Error()) + require.EqualError(t, err, ca.err) }) } }