sarsoo/IF.Lastfm
1
0
Fork 0
mirror of https://github.com/Sarsoo/IF.Lastfm.git synced 2024-10-16 23:13:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into scrobbler

Browse Source
This commit is contained in:
Rikki Tooley 2015-04-04 14:57:41 +01:00
commit 0e074ec1bf
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/IF.Lastfm.Core.Tests/LastFmTests.cs
View File

@ -1,5 +1,8 @@
using System;
using System.Collections.Generic;
using System.Text;
using IF.Lastfm.Core.Api.Enums;
using IF.Lastfm.Core.Tests.Resources;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
@ -21,5 +24,22 @@ public void ApiUrlFormatReturnsCorrectly()
Assert.AreEqual(expected, actual);
}
[TestMethod]
public void IsResponseValid()
{
LastResponseStatus status;
Assert.IsFalse(LastFm.IsResponseValid(null, out status));
Assert.IsFalse(LastFm.IsResponseValid("{invalid json", out status));
var error6 = Encoding.UTF8.GetString(ArtistApiResponses.ArtistGetTagsError);
Assert.IsFalse(LastFm.IsResponseValid(error6, out status));
Assert.AreEqual(LastResponseStatus.MissingParameters, status);
var goodResponse = Encoding.UTF8.GetString(ArtistApiResponses.ArtistGetInfoSuccess);
Assert.IsTrue(LastFm.IsResponseValid(goodResponse, out status));
Assert.AreEqual(LastResponseStatus.Successful, status);
}
}
}

1
src/IF.Lastfm.Core/Api/Commands/Album/GetInfoCommand.cs
View File

@ -67,5 +67,4 @@ public async override Task<LastResponse<LastAlbum>> HandleResponse(HttpResponseM
}
}
}
}

2
src/IF.Lastfm.Core/LastFm.cs
View File

@ -103,7 +103,7 @@ public static bool IsResponseValid(string json, out LastResponseStatus status)
return false;
}
var codeString = jo.Value<string>("Status");
var codeString = jo.Value<string>("error");
if (string.IsNullOrWhiteSpace(codeString) && json.Length > 1)
{
status = LastResponseStatus.Successful;