From 739fb68095982651530484a3b64560a43b09b5ee Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Tue, 24 Sep 2019 15:51:08 +1000 Subject: [PATCH] Update the magnet tests These must have been very old, the style is appalling. --- metainfo/magnet_test.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/metainfo/magnet_test.go b/metainfo/magnet_test.go index c90713f3..2cb590b9 100644 --- a/metainfo/magnet_test.go +++ b/metainfo/magnet_test.go @@ -2,7 +2,6 @@ package metainfo import ( "encoding/hex" - "reflect" "testing" "github.com/stretchr/testify/assert" @@ -20,13 +19,15 @@ var ( } ) +func init() { + hex.Decode(exampleMagnet.InfoHash[:], []byte("51340689c960f0778a4387aef9b4b52fd08390cd")) +} + // Converting from our Magnet type to URL string. func TestMagnetString(t *testing.T) { - hex.Decode(exampleMagnet.InfoHash[:], []byte("51340689c960f0778a4387aef9b4b52fd08390cd")) - s := exampleMagnet.String() - if s != exampleMagnetURI { - t.Fatalf("\nexpected:\n\t%q\nactual\n\t%q", exampleMagnetURI, s) - } + m, err := ParseMagnetURI(exampleMagnet.String()) + require.NoError(t, err) + assert.EqualValues(t, exampleMagnet, m) } func TestParseMagnetURI(t *testing.T) { @@ -43,9 +44,7 @@ func TestParseMagnetURI(t *testing.T) { // Checking if the magnet instance struct is built correctly from parsing m, err = ParseMagnetURI(exampleMagnetURI) - if err != nil || !reflect.DeepEqual(exampleMagnet, m) { - t.Errorf("ParseMagnetURI(%s) returned %v, expected %v", uri, m, exampleMagnet) - } + assert.EqualValues(t, exampleMagnet, m) // empty string URI case _, err = ParseMagnetURI("") -- 2.44.0