From 719ef5b84b3f0530a55e920d24ed72e744a3ec38 Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Mon, 13 Nov 2023 09:23:35 +0100 Subject: [PATCH] Minor simplification of test cases --- backends/funkwhale/funkwhale_test.go | 55 +++++++++++++++------------- backends/maloja/maloja_test.go | 13 ++++--- backends/subsonic/subsonic_test.go | 17 +++++---- 3 files changed, 46 insertions(+), 39 deletions(-) diff --git a/backends/funkwhale/funkwhale_test.go b/backends/funkwhale/funkwhale_test.go index fbc3d98..6b6520e 100644 --- a/backends/funkwhale/funkwhale_test.go +++ b/backends/funkwhale/funkwhale_test.go @@ -27,6 +27,7 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "go.uploadedlobster.com/scotty/backends/funkwhale" "go.uploadedlobster.com/scotty/models" ) @@ -66,19 +67,20 @@ func TestFunkwhaleListeningToListen(t *testing.T) { }, } listen := fwListen.ToListen() - assert.Equal(t, time.Unix(1699574369, 0).Unix(), listen.ListenedAt.Unix()) - assert.Equal(t, fwListen.User.UserName, listen.UserName) - assert.Equal(t, time.Duration(414*time.Second), listen.Duration) - assert.Equal(t, fwListen.Track.Title, listen.TrackName) - assert.Equal(t, fwListen.Track.Album.Title, listen.ReleaseName) - assert.Equal(t, []string{fwListen.Track.Artist.Name}, listen.ArtistNames) - assert.Equal(t, fwListen.Track.Position, listen.Track.TrackNumber) - assert.Equal(t, fwListen.Track.Tags, listen.Track.Tags) - // assert.Equal(t, backends.FunkwhaleClientName, listen.AdditionalInfo["disc_number"]) - assert.Equal(t, models.MBID(fwListen.Track.RecordingMbid), listen.RecordingMbid) - assert.Equal(t, models.MBID(fwListen.Track.Album.ReleaseMbid), listen.ReleaseMbid) - assert.Equal(t, models.MBID(fwListen.Track.Artist.ArtistMbid), listen.ArtistMbids[0]) - assert.Equal(t, funkwhale.FunkwhaleClientName, listen.AdditionalInfo["media_player"]) + assert := assert.New(t) + assert.Equal(time.Unix(1699574369, 0).Unix(), listen.ListenedAt.Unix()) + assert.Equal(fwListen.User.UserName, listen.UserName) + assert.Equal(time.Duration(414*time.Second), listen.Duration) + assert.Equal(fwListen.Track.Title, listen.TrackName) + assert.Equal(fwListen.Track.Album.Title, listen.ReleaseName) + assert.Equal([]string{fwListen.Track.Artist.Name}, listen.ArtistNames) + assert.Equal(fwListen.Track.Position, listen.Track.TrackNumber) + assert.Equal(fwListen.Track.Tags, listen.Track.Tags) + // assert.Equal(backends.FunkwhaleClientName, listen.AdditionalInfo["disc_number"]) + assert.Equal(models.MBID(fwListen.Track.RecordingMbid), listen.RecordingMbid) + assert.Equal(models.MBID(fwListen.Track.Album.ReleaseMbid), listen.ReleaseMbid) + assert.Equal(models.MBID(fwListen.Track.Artist.ArtistMbid), listen.ArtistMbids[0]) + assert.Equal(funkwhale.FunkwhaleClientName, listen.AdditionalInfo["media_player"]) } func TestFunkwhaleFavoriteTrackToLove(t *testing.T) { @@ -109,16 +111,19 @@ func TestFunkwhaleFavoriteTrackToLove(t *testing.T) { }, } love := favorite.ToLove() - assert.Equal(t, time.Unix(1699574369, 0).Unix(), love.Created.Unix()) - assert.Equal(t, favorite.User.UserName, love.UserName) - assert.Equal(t, time.Duration(414*time.Second), love.Duration) - assert.Equal(t, favorite.Track.Title, love.TrackName) - assert.Equal(t, favorite.Track.Album.Title, love.ReleaseName) - assert.Equal(t, []string{favorite.Track.Artist.Name}, love.ArtistNames) - assert.Equal(t, favorite.Track.Position, love.Track.TrackNumber) - assert.Equal(t, favorite.Track.Tags, love.Track.Tags) - assert.Equal(t, models.MBID(favorite.Track.RecordingMbid), love.RecordingMbid) - assert.Equal(t, models.MBID(favorite.Track.Album.ReleaseMbid), love.ReleaseMbid) - assert.Equal(t, models.MBID(favorite.Track.Artist.ArtistMbid), love.ArtistMbids[0]) - assert.Equal(t, funkwhale.FunkwhaleClientName, love.AdditionalInfo["media_player"]) + assert := assert.New(t) + assert.Equal(time.Unix(1699574369, 0).Unix(), love.Created.Unix()) + assert.Equal(favorite.User.UserName, love.UserName) + assert.Equal(time.Duration(414*time.Second), love.Duration) + assert.Equal(favorite.Track.Title, love.TrackName) + assert.Equal(favorite.Track.Album.Title, love.ReleaseName) + assert.Equal([]string{favorite.Track.Artist.Name}, love.ArtistNames) + assert.Equal(favorite.Track.Position, love.Track.TrackNumber) + assert.Equal(favorite.Track.Tags, love.Track.Tags) + assert.Equal(models.MBID(favorite.Track.RecordingMbid), love.RecordingMbid) + assert.Equal(models.MBID(favorite.Track.RecordingMbid), love.Track.RecordingMbid) + assert.Equal(models.MBID(favorite.Track.Album.ReleaseMbid), love.ReleaseMbid) + require.Len(t, love.Track.ArtistMbids, 1) + assert.Equal(models.MBID(favorite.Track.Artist.ArtistMbid), love.ArtistMbids[0]) + assert.Equal(funkwhale.FunkwhaleClientName, love.AdditionalInfo["media_player"]) } diff --git a/backends/maloja/maloja_test.go b/backends/maloja/maloja_test.go index 1485f9b..3860e94 100644 --- a/backends/maloja/maloja_test.go +++ b/backends/maloja/maloja_test.go @@ -51,10 +51,11 @@ func TestScrobbleToListen(t *testing.T) { Origin: "client:Funkwhale", } listen := scrobble.ToListen() - assert.Equal(t, time.Unix(1699289873, 0), listen.ListenedAt) - assert.Equal(t, time.Duration(414*time.Second), listen.Duration) - assert.Equal(t, scrobble.Track.Title, listen.TrackName) - assert.Equal(t, scrobble.Track.Album.Title, listen.ReleaseName) - assert.Equal(t, scrobble.Track.Artists, listen.ArtistNames) - assert.Equal(t, "Funkwhale", listen.AdditionalInfo["media_player"]) + assert := assert.New(t) + assert.Equal(time.Unix(1699289873, 0), listen.ListenedAt) + assert.Equal(time.Duration(414*time.Second), listen.Duration) + assert.Equal(scrobble.Track.Title, listen.TrackName) + assert.Equal(scrobble.Track.Album.Title, listen.ReleaseName) + assert.Equal(scrobble.Track.Artists, listen.ArtistNames) + assert.Equal("Funkwhale", listen.AdditionalInfo["media_player"]) } diff --git a/backends/subsonic/subsonic_test.go b/backends/subsonic/subsonic_test.go index b7b8d76..86b410c 100644 --- a/backends/subsonic/subsonic_test.go +++ b/backends/subsonic/subsonic_test.go @@ -52,12 +52,13 @@ func TestSongToLove(t *testing.T) { Track: 5, } love := subsonic.SongToLove(song, user) - assert.Equal(t, time.Unix(1699574369, 0).Unix(), love.Created.Unix()) - assert.Equal(t, user, love.UserName) - assert.Equal(t, time.Duration(414*time.Second), love.Duration) - assert.Equal(t, song.Title, love.TrackName) - assert.Equal(t, song.Album, love.ReleaseName) - assert.Equal(t, []string{song.Artist}, love.ArtistNames) - assert.Equal(t, song.Track, love.Track.TrackNumber) - assert.Equal(t, []string{song.Genre}, love.Track.Tags) + assert := assert.New(t) + assert.Equal(time.Unix(1699574369, 0).Unix(), love.Created.Unix()) + assert.Equal(user, love.UserName) + assert.Equal(time.Duration(414*time.Second), love.Duration) + assert.Equal(song.Title, love.TrackName) + assert.Equal(song.Album, love.ReleaseName) + assert.Equal([]string{song.Artist}, love.ArtistNames) + assert.Equal(song.Track, love.Track.TrackNumber) + assert.Equal([]string{song.Genre}, love.Track.Tags) }