Rework DiscSpaceService, Misc Cleanup

This commit is contained in:
Qstick
2017-09-23 00:19:55 -04:00
parent 9b62c0cb75
commit d6efae537f
7 changed files with 56 additions and 96 deletions
@@ -9,7 +9,7 @@ using NzbDrone.Common.Disk;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.DiskSpace;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Tv;
using NzbDrone.Core.Music;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.DiskSpace
@@ -17,16 +17,14 @@ namespace NzbDrone.Core.Test.DiskSpace
[TestFixture]
public class DiskSpaceServiceFixture : CoreTest<DiskSpaceService>
{
private string _seriesFolder;
private string _seriesFolder2;
private string _droneFactoryFolder;
private string _artistFolder;
private string _artostFolder2;
[SetUp]
public void SetUp()
{
_seriesFolder = @"G:\fasdlfsdf\series".AsOsAgnostic();
_seriesFolder2 = @"G:\fasdlfsdf\series2".AsOsAgnostic();
_droneFactoryFolder = @"G:\dronefactory".AsOsAgnostic();
_artistFolder = @"G:\fasdlfsdf\artist".AsOsAgnostic();
_artostFolder2 = @"G:\fasdlfsdf\artist2".AsOsAgnostic();
Mocker.GetMock<IDiskProvider>()
.Setup(v => v.GetMounts())
@@ -44,14 +42,14 @@ namespace NzbDrone.Core.Test.DiskSpace
.Setup(v => v.GetTotalSize(It.IsAny<string>()))
.Returns(0);
GivenSeries();
GivenArtist();
}
private void GivenSeries(params Series[] series)
private void GivenArtist(params Artist[] artist)
{
Mocker.GetMock<ISeriesService>()
.Setup(v => v.GetAllSeries())
.Returns(series.ToList());
Mocker.GetMock<IArtistService>()
.Setup(v => v.GetAllArtists())
.Returns(artist.ToList());
}
private void GivenExistingFolder(string folder)
@@ -62,11 +60,11 @@ namespace NzbDrone.Core.Test.DiskSpace
}
[Test]
public void should_check_diskspace_for_series_folders()
public void should_check_diskspace_for_artist_folders()
{
GivenSeries(new Series { Path = _seriesFolder });
GivenArtist(new Artist { Path = _artistFolder });
GivenExistingFolder(_seriesFolder);
GivenExistingFolder(_artistFolder);
var freeSpace = Subject.GetFreeSpace();
@@ -76,10 +74,10 @@ namespace NzbDrone.Core.Test.DiskSpace
[Test]
public void should_check_diskspace_for_same_root_folder_only_once()
{
GivenSeries(new Series { Path = _seriesFolder }, new Series { Path = _seriesFolder2 });
GivenArtist(new Artist { Path = _artistFolder }, new Artist { Path = _artostFolder2 });
GivenExistingFolder(_seriesFolder);
GivenExistingFolder(_seriesFolder2);
GivenExistingFolder(_artistFolder);
GivenExistingFolder(_artostFolder2);
var freeSpace = Subject.GetFreeSpace();
@@ -90,9 +88,9 @@ namespace NzbDrone.Core.Test.DiskSpace
}
[Test]
public void should_not_check_diskspace_for_missing_series_folders()
public void should_not_check_diskspace_for_missing_artist_folders()
{
GivenSeries(new Series { Path = _seriesFolder });
GivenArtist(new Artist { Path = _artistFolder });
var freeSpace = Subject.GetFreeSpace();