mirror/Lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/Lidarr synced 2025-02-26 15:52:42 +00:00
Code Issues Releases Wiki Activity

Fixed: Skyhook Tests, Validate GUID before sending to metadata api

Browse source
This commit is contained in:
Qstick 2017-12-28 22:47:19 -05:00
parent bc8bd9995a
commit 9cd60bc986
3 changed files with 74 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxyFixture.cs
View file

@ -9,6 +9,8 @@
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Music;
using NzbDrone.Test.Common.Categories;
using Moq;
using NzbDrone.Core.Profiles.Metadata;
namespace NzbDrone.Core.Test.MetadataSource.SkyHook
{
@ -20,13 +22,38 @@ public class SkyHookProxyFixture : CoreTest<SkyHookProxy>
public void Setup()
{
UseRealHttp();
var _metadataProfile = new MetadataProfile
{
PrimaryAlbumTypes = new List<ProfilePrimaryAlbumTypeItem>
{
new ProfilePrimaryAlbumTypeItem
{
PrimaryAlbumType = PrimaryAlbumType.Album,
Allowed = true
}
},
SecondaryAlbumTypes = new List<ProfileSecondaryAlbumTypeItem>
{
new ProfileSecondaryAlbumTypeItem()
{
SecondaryAlbumType = SecondaryAlbumType.Studio,
Allowed = true
}
},
};
Mocker.GetMock<IMetadataProfileService>()
.Setup(s => s.Get(It.IsAny<int>()))
.Returns(_metadataProfile);
}
[TestCase("f59c5520-5f46-4d2c-b2c4-822eabf53419", "Linkin Park")]
[TestCase("66c662b6-6e2f-4930-8610-912e24c63ed1", "AC/DC")]
public void should_be_able_to_get_artist_detail(string mbId, string name)
{
var details = Subject.GetArtistInfo(mbId, 0);
var details = Subject.GetArtistInfo(mbId, 1);
ValidateArtist(details.Item1);
ValidateAlbums(details.Item2);
@ -37,13 +64,14 @@ public void should_be_able_to_get_artist_detail(string mbId, string name)
[Test]
public void getting_details_of_invalid_artist()
{
Assert.Throws<ArtistNotFoundException>(() => Subject.GetArtistInfo("aaaaaa-aaa-aaaa-aaaa", 0));
Assert.Throws<BadRequestException>(() => Subject.GetArtistInfo("aaaaaa-aaa-aaaa-aaaa", 1));
}
[Test]
[Ignore("We don't return a dothack from Metadata")]
public void should_not_have_period_at_start_of_name_slug()
{
var details = Subject.GetArtistInfo("b6db95cd-88d9-492f-bbf6-a34e0e89b2e5", 0);
var details = Subject.GetArtistInfo("b6db95cd-88d9-492f-bbf6-a34e0e89b2e5", 1);
details.Item1.NameSlug.Should().Be("dothack");
}

36
src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxySearchFixture.cs
View file

@ -1,9 +1,13 @@
using FluentAssertions;
using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Core.MetadataSource.SkyHook;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;
using NzbDrone.Test.Common.Categories;
using Moq;
using NzbDrone.Core.Profiles.Metadata;
using NzbDrone.Core.Music;
using System.Collections.Generic;
namespace NzbDrone.Core.Test.MetadataSource.SkyHook
{
@ -15,6 +19,36 @@ public class SkyHookProxySearchFixture : CoreTest<SkyHookProxy>
public void Setup()
{
UseRealHttp();
var _metadataProfile = new MetadataProfile
{
Id = 1,
PrimaryAlbumTypes = new List<ProfilePrimaryAlbumTypeItem>
{
new ProfilePrimaryAlbumTypeItem
{
PrimaryAlbumType = PrimaryAlbumType.Album,
Allowed = true
}
},
SecondaryAlbumTypes = new List<ProfileSecondaryAlbumTypeItem>
{
new ProfileSecondaryAlbumTypeItem()
{
SecondaryAlbumType = SecondaryAlbumType.Studio,
Allowed = true
}
},
};
Mocker.GetMock<IMetadataProfileService>()
.Setup(s => s.All())
.Returns(new List<MetadataProfile>{_metadataProfile});
Mocker.GetMock<IMetadataProfileService>()
.Setup(s => s.Get(It.IsAny<int>()))
.Returns(_metadataProfile);
}
[TestCase("Coldplay", "Coldplay")]

10
src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs
View file

@ -70,6 +70,10 @@ public Tuple<Artist, List<Album>> GetArtistInfo(string foreignArtistId, int meta
{
throw new ArtistNotFoundException(foreignArtistId);
}
else if (httpResponse.StatusCode == HttpStatusCode.BadRequest)
{
throw new BadRequestException(foreignArtistId);
}
else
{
throw new HttpException(httpRequest, httpResponse);
@ -93,7 +97,9 @@ public List<Artist> SearchForNewArtist(string title)
{
var slug = lowerTitle.Split(':')[1].Trim();
if (slug.IsNullOrWhiteSpace() || slug.Any(char.IsWhiteSpace))
bool isValid = Guid.TryParse(slug, out var searchGuid);
if (slug.IsNullOrWhiteSpace() || slug.Any(char.IsWhiteSpace) || isValid == false)
{
return new List<Artist>();
}
@ -101,7 +107,7 @@ public List<Artist> SearchForNewArtist(string title)
try
{
var metadataProfile = _metadataProfileService.All().First().Id; //Change this to Use last Used profile?
return new List<Artist> { GetArtistInfo(slug, metadataProfile).Item1 };
return new List<Artist> { GetArtistInfo(searchGuid.ToString(), metadataProfile).Item1 };
}
catch (ArtistNotFoundException)
{