diff --git a/src/IF.Lastfm.Core.Tests.Integration/Commands/TrackScrobbleCommandTests.cs b/src/IF.Lastfm.Core.Tests.Integration/Commands/TrackScrobbleCommandTests.cs index 271368d1..c2c1a866 100644 --- a/src/IF.Lastfm.Core.Tests.Integration/Commands/TrackScrobbleCommandTests.cs +++ b/src/IF.Lastfm.Core.Tests.Integration/Commands/TrackScrobbleCommandTests.cs @@ -1,15 +1,13 @@ -using IF.Lastfm.Core.Api; -using IF.Lastfm.Core.Objects; -using NUnit.Framework; -using System; -using System.Collections; +using System; using System.Collections.Generic; using System.Linq; using System.Net.Http; using System.Threading.Tasks; using IF.Lastfm.Core.Api.Enums; using IF.Lastfm.Core.Helpers; +using IF.Lastfm.Core.Objects; using IF.Lastfm.Core.Scrobblers; +using NUnit.Framework; namespace IF.Lastfm.Core.Tests.Integration.Commands { @@ -36,18 +34,17 @@ public async Task ScrobblesSingle() var response = await Lastfm.Scrobbler.ScrobbleAsync(testScrobble); Assert.IsTrue(response.Success); - + var expectedTrack = new LastTrack { Name = TRACK_NAME, ArtistName = ARTIST_NAME, - AlbumName = ALBUM_NAME + AlbumName = ALBUM_NAME, }; var expectedJson = expectedTrack.TestSerialise(); var tracks = await Lastfm.User.GetRecentScrobbles(Lastfm.Auth.UserSession.Username, null, null, false, 1, 1); var scrobbledTrack = tracks.Single(x => !x.IsNowPlaying.GetValueOrDefault(false)); - TestHelper.AssertSerialiseEqual(trackPlayed, scrobbledTrack.TimePlayed); scrobbledTrack.TimePlayed = null; @@ -57,6 +54,9 @@ public async Task ScrobblesSingle() scrobbledTrack.ArtistMbid = null; scrobbledTrack.Images = null; scrobbledTrack.Url = null; + scrobbledTrack.ArtistImages = null; + scrobbledTrack.ArtistUrl = null; + scrobbledTrack.IsLoved = null; var actualJson = scrobbledTrack.TestSerialise(); @@ -75,7 +75,7 @@ public async Task ScrobblesMultiple() MaxBatchSize = 2 }; var response = await scrobbler.ScrobbleAsync(scrobbles); - + Assert.AreEqual(2, countingHandler.Count); Assert.AreEqual(LastResponseStatus.Successful, response.Status); Assert.IsTrue(response.Success); @@ -100,4 +100,4 @@ private IList GenerateScrobbles(int amount) }).ToList(); } } -} +} \ No newline at end of file diff --git a/src/IF.Lastfm.Core.Tests.Integration/Commands/TrackUpdateNowPlayingCommandTests.cs b/src/IF.Lastfm.Core.Tests.Integration/Commands/TrackUpdateNowPlayingCommandTests.cs index d596217c..21d5a3f0 100644 --- a/src/IF.Lastfm.Core.Tests.Integration/Commands/TrackUpdateNowPlayingCommandTests.cs +++ b/src/IF.Lastfm.Core.Tests.Integration/Commands/TrackUpdateNowPlayingCommandTests.cs @@ -1,13 +1,11 @@ -using IF.Lastfm.Core.Api; -using IF.Lastfm.Core.Objects; -using NUnit.Framework; using System; using System.Linq; using System.Threading.Tasks; +using IF.Lastfm.Core.Objects; +using NUnit.Framework; namespace IF.Lastfm.Core.Tests.Integration.Commands { - public class TrackUpdateNowPlayingCommandTests : CommandIntegrationTestsBase { private const string ARTIST_NAME = "Crystal Castles"; @@ -47,6 +45,9 @@ public async Task UpdatesNowPlaying() actual.ArtistMbid = null; actual.Images = null; actual.Url = null; + actual.ArtistImages = null; + actual.ArtistUrl = null; + actual.IsLoved = null; var expectedJson = expectedTrack.TestSerialise(); var actualJson = actual.TestSerialise(); diff --git a/src/IF.Lastfm.Core.Tests.Integration/Commands/UserGetWeeklyAlbumChartTests.cs b/src/IF.Lastfm.Core.Tests.Integration/Commands/UserGetWeeklyAlbumChartTests.cs index c3409724..11da920c 100644 --- a/src/IF.Lastfm.Core.Tests.Integration/Commands/UserGetWeeklyAlbumChartTests.cs +++ b/src/IF.Lastfm.Core.Tests.Integration/Commands/UserGetWeeklyAlbumChartTests.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; using System.Linq; -using System.Text; using System.Threading.Tasks; using NUnit.Framework; @@ -15,13 +12,13 @@ public async Task GetAlbumChart_Success() //call GetWeeklyChartList to get available weeks var weekList = await Lastfm.User.GetWeeklyChartListAsync(INTEGRATION_TEST_USER); var from = weekList.Content.Last().From; - var to = weekList.Content.Last().To; + //var to = weekList.Content.Last().To; //use the from and to params to call GetWeeklyArtistChart for the last week - var response = await Lastfm.User.GetWeeklyAlbumChartAsync(INTEGRATION_TEST_USER, from, to); + var response = await Lastfm.User.GetWeeklyAlbumChartAsync(INTEGRATION_TEST_USER, from); var artistChart = response.Content; - + Assert.IsTrue(response.Success); - + //Values will vary from week to week so just checking that we got some values back Assert.IsNotEmpty(artistChart); Assert.IsNotEmpty(artistChart.First().Name); diff --git a/src/IF.Lastfm.Core.Tests.Integration/Commands/UserGetWeeklyArtistChartTests.cs b/src/IF.Lastfm.Core.Tests.Integration/Commands/UserGetWeeklyArtistChartTests.cs index 598e3350..91141433 100644 --- a/src/IF.Lastfm.Core.Tests.Integration/Commands/UserGetWeeklyArtistChartTests.cs +++ b/src/IF.Lastfm.Core.Tests.Integration/Commands/UserGetWeeklyArtistChartTests.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; using System.Linq; -using System.Text; using System.Threading.Tasks; using NUnit.Framework; @@ -15,13 +12,13 @@ public async Task GetChartList_Success() //call GetWeeklyChartList to get available weeks var weekList = await Lastfm.User.GetWeeklyChartListAsync(INTEGRATION_TEST_USER); var from = weekList.Content.Last().From; - var to = weekList.Content.Last().To; + //var to = weekList.Content.Last().To; //use the from and to params to call GetWeeklyArtistChart for the last week - var response = await Lastfm.User.GetWeeklyArtistChartAsync(INTEGRATION_TEST_USER, from, to); + var response = await Lastfm.User.GetWeeklyArtistChartAsync(INTEGRATION_TEST_USER, from); var artistChart = response.Content; - + Assert.IsTrue(response.Success); - + //Values will vary from week to week so just checking that we got some values back Assert.IsNotEmpty(artistChart); Assert.IsNotEmpty(artistChart.First().Name); diff --git a/src/IF.Lastfm.Core.Tests.Integration/Commands/UserGetWeeklyTrackChartTests.cs b/src/IF.Lastfm.Core.Tests.Integration/Commands/UserGetWeeklyTrackChartTests.cs index 8eb236a9..476488a7 100644 --- a/src/IF.Lastfm.Core.Tests.Integration/Commands/UserGetWeeklyTrackChartTests.cs +++ b/src/IF.Lastfm.Core.Tests.Integration/Commands/UserGetWeeklyTrackChartTests.cs @@ -1,16 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using NUnit.Framework; - namespace IF.Lastfm.Core.Tests.Integration.Commands { + /* + * Sorry, but this is a bad test! + * It is based on expectation, that there is some activity in the Last.fm users profile and will fail when there were no scrobles for last three weeks. + * The tests should not expect any data input outside! + public class UserGetWeeklyTrackChartTests : CommandIntegrationTestsBase { - - [Test] + [Test] public async Task GetTrackChart_Success() { //call GetWeeklyChartList to get available weeks @@ -26,16 +23,17 @@ public async Task GetTrackChart_Success() //get weekly chart for the week before var responsePrev = await Lastfm.User.GetWeeklyTrackChartAsync(INTEGRATION_TEST_USER, fromPrevWeek, toPrevWeek); var trackChartPrev = responsePrev.Content; - + Assert.IsTrue(response.Success, "User.GetWeeklyChartListAsync - response.Success was not true"); - + //Values will vary from week to week so just checking that we got some values back Assert.IsNotEmpty(trackChart, "User.GetWeeklyChartListAsync - response.Content was empty"); Assert.IsNotEmpty(trackChart.First().Name); Assert.IsNotEmpty(trackChart.First().ArtistName); - + //check that the two different weekly charts are not the same Assert.IsFalse(trackChart.First().Name == trackChartPrev.First().Name); } } + */ } \ No newline at end of file