From 7920432d0af704dfe0bc68d5d0bed858fb88fe1e Mon Sep 17 00:00:00 2001 From: Rikki Tooley Date: Sat, 3 Jan 2015 23:54:29 +0000 Subject: [PATCH] Fix Apollo project build, change Scrobble constructor again --- .../Commands/TrackScrobbleCommandTests.cs | 3 +-- .../Commands/TrackUpdateNowPlayingCommandTests.cs | 10 ++++------ src/IF.Lastfm.Core/Api/Scrobble.cs | 5 +++-- .../ViewModels/TrackApi/ScrobblingTestViewModel.cs | 5 ++++- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/IF.Lastfm.Core.Tests.Integration/Commands/TrackScrobbleCommandTests.cs b/src/IF.Lastfm.Core.Tests.Integration/Commands/TrackScrobbleCommandTests.cs index 7b1e705..6753d24 100644 --- a/src/IF.Lastfm.Core.Tests.Integration/Commands/TrackScrobbleCommandTests.cs +++ b/src/IF.Lastfm.Core.Tests.Integration/Commands/TrackScrobbleCommandTests.cs @@ -18,10 +18,9 @@ public class TrackScrobbleCommandTests : CommandIntegrationTestsBase public async Task ScrobblesSingle() { var trackPlayed = DateTime.UtcNow.AddMinutes(-1); - var testScrobble = new Scrobble("Hot Chip", "The Warning", "Over and Over") + var testScrobble = new Scrobble("Hot Chip", "The Warning", "Over and Over", trackPlayed) { AlbumArtist = ARTIST_NAME, - TimePlayed = trackPlayed, ChosenByUser = false }; diff --git a/src/IF.Lastfm.Core.Tests.Integration/Commands/TrackUpdateNowPlayingCommandTests.cs b/src/IF.Lastfm.Core.Tests.Integration/Commands/TrackUpdateNowPlayingCommandTests.cs index a9c673b..89d7dcb 100644 --- a/src/IF.Lastfm.Core.Tests.Integration/Commands/TrackUpdateNowPlayingCommandTests.cs +++ b/src/IF.Lastfm.Core.Tests.Integration/Commands/TrackUpdateNowPlayingCommandTests.cs @@ -1,10 +1,9 @@ +using IF.Lastfm.Core.Api; +using IF.Lastfm.Core.Objects; +using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Linq; using System.Threading.Tasks; -using IF.Lastfm.Core.Api; -using IF.Lastfm.Core.Api.Commands.TrackApi; -using IF.Lastfm.Core.Objects; -using Microsoft.VisualStudio.TestTools.UnitTesting; namespace IF.Lastfm.Core.Tests.Integration.Commands { @@ -19,9 +18,8 @@ public class TrackUpdateNowPlayingCommandTests : CommandIntegrationTestsBase public async Task UpdatesNowPlaying() { var trackPlayed = DateTime.UtcNow.AddMinutes(-1); - var testScrobble = new Scrobble(ARTIST_NAME, ALBUM_NAME, TRACK_NAME) + var testScrobble = new Scrobble(ARTIST_NAME, ALBUM_NAME, TRACK_NAME, trackPlayed) { - TimePlayed = trackPlayed, Duration = new TimeSpan(0, 3, 49), AlbumArtist = ARTIST_NAME }; diff --git a/src/IF.Lastfm.Core/Api/Scrobble.cs b/src/IF.Lastfm.Core/Api/Scrobble.cs index 13584e8..83bea20 100644 --- a/src/IF.Lastfm.Core/Api/Scrobble.cs +++ b/src/IF.Lastfm.Core/Api/Scrobble.cs @@ -14,7 +14,7 @@ public class Scrobble public string Track { get; private set; } - public DateTime? TimePlayed { get; set; } + public DateTime TimePlayed { get; private set; } public bool ChosenByUser { get; set; } @@ -22,11 +22,12 @@ public class Scrobble #endregion - public Scrobble(string artist, string album, string track) + public Scrobble(string artist, string album, string track, DateTime timeplayed) { Artist = artist; Album = album; Track = track; + TimePlayed = timeplayed; } } } \ No newline at end of file diff --git a/src/IF.Lastfm.Demo.Apollo/ViewModels/TrackApi/ScrobblingTestViewModel.cs b/src/IF.Lastfm.Demo.Apollo/ViewModels/TrackApi/ScrobblingTestViewModel.cs index 98a1cb3..34fcde0 100644 --- a/src/IF.Lastfm.Demo.Apollo/ViewModels/TrackApi/ScrobblingTestViewModel.cs +++ b/src/IF.Lastfm.Demo.Apollo/ViewModels/TrackApi/ScrobblingTestViewModel.cs @@ -125,7 +125,10 @@ public async Task Scrobble() var trackApi = new Core.Api.TrackApi(auth); - var scrobble = new Scrobble(Artist, Album, Track, DateTime.UtcNow, AlbumArtist); + var scrobble = new Scrobble(Artist, Album, Track, DateTime.UtcNow) + { + AlbumArtist = AlbumArtist + }; var response = await trackApi.ScrobbleAsync(scrobble);