mirror of
https://github.com/Sarsoo/IF.Lastfm.git
synced 2024-10-16 23:13:07 +01:00
Merge branch 'master' into scrobbler
This commit is contained in:
commit
0e074ec1bf
@ -1,5 +1,8 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
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 Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||||
using Moq;
|
using Moq;
|
||||||
|
|
||||||
@ -21,5 +24,22 @@ public void ApiUrlFormatReturnsCorrectly()
|
|||||||
|
|
||||||
Assert.AreEqual(expected, actual);
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -67,5 +67,4 @@ public async override Task<LastResponse<LastAlbum>> HandleResponse(HttpResponseM
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -103,7 +103,7 @@ public static bool IsResponseValid(string json, out LastResponseStatus status)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
var codeString = jo.Value<string>("Status");
|
var codeString = jo.Value<string>("error");
|
||||||
if (string.IsNullOrWhiteSpace(codeString) && json.Length > 1)
|
if (string.IsNullOrWhiteSpace(codeString) && json.Length > 1)
|
||||||
{
|
{
|
||||||
status = LastResponseStatus.Successful;
|
status = LastResponseStatus.Successful;
|
||||||
|
Loading…
Reference in New Issue
Block a user