tedkulp/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr.git synced 2026-04-25 22:36:59 -04:00
Code Issues Projects Releases Wiki Activity

StyleCop (#1058)

Browse Source 
* Stylecop Rules and Fixes
This commit is contained in:
Qstick
2020-01-03 07:49:24 -05:00
committed by GitHub
parent 63d669178d
commit f77a2feeef
1307 changed files with 8704 additions and 7404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core.Test/Download/CompletedDownloadServiceFixture.cs
+35 -39
View File
@@ -4,20 +4,19 @@ using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Common.Disk;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.DecisionEngine;
using NzbDrone.Core.Download;
using NzbDrone.Core.Download.TrackedDownloads;
using NzbDrone.Core.History;
using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.MediaFiles.Events;
using NzbDrone.Core.MediaFiles.TrackImport;
using NzbDrone.Core.Messaging.Events;
using NzbDrone.Core.Music;
using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Music;
using NzbDrone.Test.Common;
using NzbDrone.Core.MediaFiles.Events;
namespace NzbDrone.Core.Test.Download
{
@@ -43,7 +42,6 @@ namespace NzbDrone.Core.Test.Download
.With(c => c.RemoteAlbum = remoteAlbum)
.Build();
Mocker.GetMock<IDownloadClient>()
.SetupGet(c => c.Definition)
.Returns(new DownloadClientDefinition { Id = 1, Name = "testClient" });
@@ -59,15 +57,17 @@ namespace NzbDrone.Core.Test.Download
Mocker.GetMock<IParsingService>()
.Setup(s => s.GetArtist("Drone.S01E01.HDTV"))
.Returns(remoteAlbum.Artist);
}
private Album CreateAlbum(int id, int trackCount)
{
return new Album {
return new Album
{
Id = id,
AlbumReleases = new List<AlbumRelease> {
new AlbumRelease {
AlbumReleases = new List<AlbumRelease>
{
new AlbumRelease
{
Monitored = true,
TrackCount = trackCount
}
@@ -84,7 +84,6 @@ namespace NzbDrone.Core.Test.Download
};
}
private void GivenNoGrabbedHistory()
{
Mocker.GetMock<IHistoryService>()
@@ -102,7 +101,6 @@ namespace NzbDrone.Core.Test.Download
});
}
private void GivenABadlyNamedDownload()
{
_trackedDownload.RemoteAlbum.Artist = null;
@@ -169,7 +167,7 @@ namespace NzbDrone.Core.Test.Download
[Test]
public void should_not_process_if_output_path_is_empty()
{
_trackedDownload.DownloadItem.OutputPath = new OsPath();
_trackedDownload.DownloadItem.OutputPath = default(OsPath);
Subject.Process(_trackedDownload);
@@ -200,11 +198,11 @@ namespace NzbDrone.Core.Test.Download
{
new ImportResult(
new ImportDecision<LocalTrack>(
new LocalTrack {Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic()})),
new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() })),
new ImportResult(
new ImportResult(
new ImportDecision<LocalTrack>(
new LocalTrack {Path = @"C:\TestPath\Droned.S01E02.mkv".AsOsAgnostic()}))
new LocalTrack { Path = @"C:\TestPath\Droned.S01E02.mkv".AsOsAgnostic() }))
});
Subject.Process(_trackedDownload);
@@ -226,11 +224,11 @@ namespace NzbDrone.Core.Test.Download
{
new ImportResult(
new ImportDecision<LocalTrack>(
new LocalTrack {Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic()})),
new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() })),
new ImportResult(
new ImportResult(
new ImportDecision<LocalTrack>(
new LocalTrack {Path = @"C:\TestPath\Droned.S01E02.mkv".AsOsAgnostic()}))
new LocalTrack { Path = @"C:\TestPath\Droned.S01E02.mkv".AsOsAgnostic() }))
});
Subject.Process(_trackedDownload);
@@ -247,11 +245,11 @@ namespace NzbDrone.Core.Test.Download
{
new ImportResult(
new ImportDecision<LocalTrack>(
new LocalTrack {Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic()}, new Rejection("Rejected!")), "Test Failure"),
new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() }, new Rejection("Rejected!")), "Test Failure"),
new ImportResult(
new ImportResult(
new ImportDecision<LocalTrack>(
new LocalTrack {Path = @"C:\TestPath\Droned.S01E02.mkv".AsOsAgnostic()},new Rejection("Rejected!")), "Test Failure")
new LocalTrack { Path = @"C:\TestPath\Droned.S01E02.mkv".AsOsAgnostic() }, new Rejection("Rejected!")), "Test Failure")
});
Subject.Process(_trackedDownload);
@@ -271,11 +269,11 @@ namespace NzbDrone.Core.Test.Download
{
new ImportResult(
new ImportDecision<LocalTrack>(
new LocalTrack {Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic()}, new Rejection("Rejected!")), "Test Failure"),
new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() }, new Rejection("Rejected!")), "Test Failure"),
new ImportResult(
new ImportResult(
new ImportDecision<LocalTrack>(
new LocalTrack {Path = @"C:\TestPath\Droned.S01E02.mkv".AsOsAgnostic()},new Rejection("Rejected!")), "Test Failure")
new LocalTrack { Path = @"C:\TestPath\Droned.S01E02.mkv".AsOsAgnostic() }, new Rejection("Rejected!")), "Test Failure")
});
_trackedDownload.RemoteAlbum.Albums.Clear();
@@ -292,11 +290,10 @@ namespace NzbDrone.Core.Test.Download
.Setup(v => v.ProcessPath(It.IsAny<string>(), It.IsAny<ImportMode>(), It.IsAny<Artist>(), It.IsAny<DownloadClientItem>()))
.Returns(new List<ImportResult>
{
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack {Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic()}),"Test Failure"),
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack {Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic()}),"Test Failure")
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() }), "Test Failure"),
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() }), "Test Failure")
});
Subject.Process(_trackedDownload);
AssertImportIncomplete();
@@ -316,10 +313,10 @@ namespace NzbDrone.Core.Test.Download
.Setup(v => v.ProcessPath(It.IsAny<string>(), It.IsAny<ImportMode>(), It.IsAny<Artist>(), It.IsAny<DownloadClientItem>()))
.Returns(new List<ImportResult>
{
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack {Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic()})),
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack {Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic()})),
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack {Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic()})),
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack {Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic()}), "Test Failure")
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() })),
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() })),
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() })),
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() }), "Test Failure")
});
Subject.Process(_trackedDownload);
@@ -341,14 +338,13 @@ namespace NzbDrone.Core.Test.Download
.Setup(v => v.ProcessPath(It.IsAny<string>(), It.IsAny<ImportMode>(), It.IsAny<Artist>(), It.IsAny<DownloadClientItem>()))
.Returns(new List<ImportResult>
{
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack {Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic()})),
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack {Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic()})),
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack {Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic()})),
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack {Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic()}), "Test Failure"),
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack {Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic()}), "Test Failure")
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() })),
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() })),
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() })),
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() }), "Test Failure"),
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() }), "Test Failure")
});
Subject.Process(_trackedDownload);
AssertImportIncomplete();
@@ -363,7 +359,7 @@ namespace NzbDrone.Core.Test.Download
.Setup(v => v.ProcessPath(It.IsAny<string>(), It.IsAny<ImportMode>(), It.IsAny<Artist>(), It.IsAny<DownloadClientItem>()))
.Returns(new List<ImportResult>
{
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack {Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic()}))
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() }))
});
Mocker.GetMock<IArtistService>()
@@ -384,7 +380,7 @@ namespace NzbDrone.Core.Test.Download
.Setup(v => v.ProcessPath(It.IsAny<string>(), It.IsAny<ImportMode>(), It.IsAny<Artist>(), It.IsAny<DownloadClientItem>()))
.Returns(new List<ImportResult>
{
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack {Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic()}))
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() }))
});
Mocker.GetMock<IHistoryService>()
@@ -420,7 +416,7 @@ namespace NzbDrone.Core.Test.Download
.Setup(v => v.ProcessPath(It.IsAny<string>(), It.IsAny<ImportMode>(), It.IsAny<Artist>(), It.IsAny<DownloadClientItem>()))
.Returns(new List<ImportResult>
{
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack {Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic()}))
new ImportResult(new ImportDecision<LocalTrack>(new LocalTrack { Path = @"C:\TestPath\Droned.S01E01.mkv".AsOsAgnostic() }))
});
Subject.Process(_trackedDownload, true);
src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs
+8 -15
View File
@@ -10,11 +10,11 @@ using NzbDrone.Core.Download.Clients;
using NzbDrone.Core.Download.Pending;
using NzbDrone.Core.Exceptions;
using NzbDrone.Core.Indexers;
using NzbDrone.Core.Music;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Profiles.Qualities;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Music;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
@@ -89,13 +89,11 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
{
var remoteAlbum1 = GetRemoteAlbum(
new List<Album> { GetAlbum(1) },
new QualityModel(Quality.MP3_192)
);
new QualityModel(Quality.MP3_192));
var remoteAlbum2 = GetRemoteAlbum(
new List<Album> { GetAlbum(1), GetAlbum(2) },
new QualityModel(Quality.MP3_192)
);
new QualityModel(Quality.MP3_192));
var decisions = new List<DownloadDecision>();
decisions.Add(new DownloadDecision(remoteAlbum1));
@@ -122,13 +120,11 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
{
var remoteAlbum1 = GetRemoteAlbum(
new List<Album> { GetAlbum(1) },
new QualityModel(Quality.MP3_192)
);
new QualityModel(Quality.MP3_192));
var remoteAlbum2 = GetRemoteAlbum(
new List<Album> { GetAlbum(2) },
new QualityModel(Quality.MP3_192)
);
new QualityModel(Quality.MP3_192));
var decisions = new List<DownloadDecision>();
decisions.Add(new DownloadDecision(remoteAlbum1));
@@ -142,18 +138,15 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
{
var remoteAlbum1 = GetRemoteAlbum(
new List<Album> { GetAlbum(1) },
new QualityModel(Quality.MP3_192)
);
new QualityModel(Quality.MP3_192));
var remoteAlbum2 = GetRemoteAlbum(
new List<Album> { GetAlbum(2) },
new QualityModel(Quality.MP3_192)
);
new QualityModel(Quality.MP3_192));
var remoteAlbum3 = GetRemoteAlbum(
new List<Album> { GetAlbum(2) },
new QualityModel(Quality.MP3_192)
);
new QualityModel(Quality.MP3_192));
var decisions = new List<DownloadDecision>();
decisions.Add(new DownloadDecision(remoteAlbum1));
src/NzbDrone.Core.Test/Download/DownloadClientProviderFixture.cs
-2
View File
@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using FizzWare.NBuilder;
using FluentAssertions;
using Moq;
src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/ScanWatchFolderFixture.cs
+3 -3
View File
@@ -21,7 +21,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
{
protected readonly string _title = "Radiohead - Scotch Mist [2008-FLAC-Lossless]";
protected string _completedDownloadFolder = @"c:\blackhole\completed".AsOsAgnostic();
protected void GivenCompletedItem()
{
var targetDir = Path.Combine(_completedDownloadFolder, _title);
@@ -39,7 +39,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
Mocker.GetMock<IDiskScanService>().Setup(c => c.FilterFiles(It.IsAny<string>(), It.IsAny<IEnumerable<string>>()))
.Returns<string, IEnumerable<string>>((b, s) => s.ToList());
Mocker.GetMock<IDiskScanService>().Setup(c => c.FilterFiles(It.IsAny<string>(), It.IsAny<IEnumerable<IFileInfo>>()))
.Returns<string, IEnumerable<IFileInfo>>((b, s) => s.ToList());
}
@@ -52,7 +52,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
.Setup(c => c.GetFileSize(It.IsAny<string>()))
.Returns(currentSize + 1);
}
private void VerifySingleItem(DownloadItemStatus status)
{
var items = Subject.GetItems(_completedDownloadFolder, TimeSpan.FromMilliseconds(50)).ToList();
src/NzbDrone.Core.Test/Download/DownloadClientTests/Blackhole/UsenetBlackholeFixture.cs
-3
View File
@@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.IO;
@@ -17,7 +16,6 @@ using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
{
[TestFixture]
public class UsenetBlackholeFixture : DownloadClientFixtureBase<UsenetBlackhole>
{
@@ -101,7 +99,6 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.Blackhole
VerifyPostprocessing(result);
}
[Test]
public void should_return_category()
{
src/NzbDrone.Core.Test/Download/DownloadClientTests/DelugeTests/DelugeFixture.cs
+50 -50
View File
@@ -1,13 +1,13 @@
using System;
using System.Linq;
using System.Collections.Generic;
using System.Linq;
using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Common.Http;
using NzbDrone.Core.MediaFiles.TorrentInfo;
using NzbDrone.Core.Download;
using NzbDrone.Core.Download.Clients.Deluge;
using NzbDrone.Core.MediaFiles.TorrentInfo;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
@@ -31,56 +31,56 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
};
_queued = new DelugeTorrent
{
Hash = "HASH",
IsFinished = false,
State = DelugeTorrentStatus.Queued,
Name = _title,
Size = 1000,
BytesDownloaded = 0,
Progress = 0.0,
DownloadPath = "somepath"
};
{
Hash = "HASH",
IsFinished = false,
State = DelugeTorrentStatus.Queued,
Name = _title,
Size = 1000,
BytesDownloaded = 0,
Progress = 0.0,
DownloadPath = "somepath"
};
_downloading = new DelugeTorrent
{
Hash = "HASH",
IsFinished = false,
State = DelugeTorrentStatus.Downloading,
Name = _title,
Size = 1000,
BytesDownloaded = 100,
Progress = 10.0,
DownloadPath = "somepath"
};
{
Hash = "HASH",
IsFinished = false,
State = DelugeTorrentStatus.Downloading,
Name = _title,
Size = 1000,
BytesDownloaded = 100,
Progress = 10.0,
DownloadPath = "somepath"
};
_failed = new DelugeTorrent
{
Hash = "HASH",
IsFinished = false,
State = DelugeTorrentStatus.Error,
Name = _title,
Size = 1000,
BytesDownloaded = 100,
Progress = 10.0,
Message = "Error",
DownloadPath = "somepath"
};
{
Hash = "HASH",
IsFinished = false,
State = DelugeTorrentStatus.Error,
Name = _title,
Size = 1000,
BytesDownloaded = 100,
Progress = 10.0,
Message = "Error",
DownloadPath = "somepath"
};
_completed = new DelugeTorrent
{
Hash = "HASH",
IsFinished = true,
State = DelugeTorrentStatus.Paused,
Name = _title,
Size = 1000,
BytesDownloaded = 1000,
Progress = 100.0,
DownloadPath = "somepath",
IsAutoManaged = true,
StopAtRatio = true,
StopRatio = 1.0,
Ratio = 1.5
{
Hash = "HASH",
IsFinished = true,
State = DelugeTorrentStatus.Paused,
Name = _title,
Size = 1000,
BytesDownloaded = 1000,
Progress = 100.0,
DownloadPath = "somepath",
IsAutoManaged = true,
StopAtRatio = true,
StopRatio = 1.0,
Ratio = 1.5
};
Mocker.GetMock<ITorrentFileInfoReader>()
@@ -119,7 +119,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
.Returns("CBC2F069FE8BB2F544EAE707D75BCD3DE9DCF951".ToLower())
.Callback(PrepareClientToReturnQueuedItem);
}
protected virtual void GivenTorrents(List<DelugeTorrent> torrents)
{
if (torrents == null)
@@ -134,7 +134,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
protected void PrepareClientToReturnQueuedItem()
{
GivenTorrents(new List<DelugeTorrent>
GivenTorrents(new List<DelugeTorrent>
{
_queued
});
@@ -142,7 +142,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
protected void PrepareClientToReturnDownloadingItem()
{
GivenTorrents(new List<DelugeTorrent>
GivenTorrents(new List<DelugeTorrent>
{
_downloading
});
@@ -150,7 +150,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DelugeTests
protected void PrepareClientToReturnFailedItem()
{
GivenTorrents(new List<DelugeTorrent>
GivenTorrents(new List<DelugeTorrent>
{
_failed
});
src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadClientFixtureBase.cs
+15 -11
View File
@@ -1,18 +1,18 @@
using System;
using System.Collections.Generic;
using FluentAssertions;
using Moq;
using NUnit.Framework;
using FluentAssertions;
using NzbDrone.Common.Http;
using NzbDrone.Core.IndexerSearch.Definitions;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Parser;
using NzbDrone.Core.Music;
using NzbDrone.Core.Download;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.RemotePathMappings;
using NzbDrone.Common.Disk;
using NzbDrone.Common.Http;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Download;
using NzbDrone.Core.IndexerSearch.Definitions;
using NzbDrone.Core.Music;
using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.RemotePathMappings;
using NzbDrone.Core.Test.Framework;
namespace NzbDrone.Core.Test.Download.DownloadClientTests
{
@@ -30,7 +30,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests
.Returns(30);
Mocker.GetMock<IParsingService>()
.Setup(s => s.Map(It.IsAny<ParsedAlbumInfo>(), (SearchCriteriaBase)null))
.Setup(s => s.Map(It.IsAny<ParsedAlbumInfo>(), null))
.Returns(() => CreateRemoteAlbum());
Mocker.GetMock<IHttpClient>()
@@ -70,6 +70,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests
{
VerifyIdentifiable(downloadClientItem);
downloadClientItem.RemainingSize.Should().NotBe(0);
//downloadClientItem.RemainingTime.Should().NotBe(TimeSpan.Zero);
//downloadClientItem.OutputPath.Should().NotBeNullOrEmpty();
downloadClientItem.Status.Should().Be(DownloadItemStatus.Queued);
@@ -80,6 +81,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests
VerifyIdentifiable(downloadClientItem);
downloadClientItem.RemainingSize.Should().NotBe(0);
//downloadClientItem.RemainingTime.Should().NotBe(TimeSpan.Zero);
//downloadClientItem.OutputPath.Should().NotBeNullOrEmpty();
downloadClientItem.Status.Should().Be(DownloadItemStatus.Paused);
@@ -90,6 +92,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests
VerifyIdentifiable(downloadClientItem);
downloadClientItem.RemainingSize.Should().NotBe(0);
//downloadClientItem.RemainingTime.Should().NotBe(TimeSpan.Zero);
//downloadClientItem.OutputPath.Should().NotBeNullOrEmpty();
downloadClientItem.Status.Should().Be(DownloadItemStatus.Downloading);
@@ -111,6 +114,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests
downloadClientItem.Title.Should().NotBeNullOrEmpty();
downloadClientItem.RemainingSize.Should().Be(0);
downloadClientItem.RemainingTime.Should().Be(TimeSpan.Zero);
//downloadClientItem.OutputPath.Should().NotBeNullOrEmpty();
downloadClientItem.Status.Should().Be(DownloadItemStatus.Completed);
}
src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/TorrentDownloadStationFixture.cs
+29 -29
View File
@@ -33,7 +33,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
protected DownloadStationTask _multipleFilesCompleted;
protected string _serialNumber = "SERIALNUMBER";
protected string _category ="lidarr";
protected string _category = "lidarr";
protected string _musicDirectory = @"music/Artist";
protected string _defaultDestination = "somepath";
protected OsPath _physicalPath = new OsPath("/mnt/sdb1/mydata");
@@ -68,13 +68,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
{
Detail = new Dictionary<string, string>
{
{ "destination","shared/folder" },
{ "destination", "shared/folder" },
{ "uri", DownloadURL }
},
Transfer = new Dictionary<string, string>
{
{ "size_downloaded", "0"},
{ "size_uploaded", "0"},
{ "size_downloaded", "0" },
{ "size_uploaded", "0" },
{ "speed_download", "0" }
}
}
@@ -92,13 +92,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
{
Detail = new Dictionary<string, string>
{
{ "destination","shared/folder" },
{ "destination", "shared/folder" },
{ "uri", DownloadURL }
},
Transfer = new Dictionary<string, string>
{
{ "size_downloaded", "1000"},
{ "size_uploaded", "100"},
{ "size_downloaded", "1000" },
{ "size_uploaded", "100" },
{ "speed_download", "0" }
},
}
@@ -116,13 +116,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
{
Detail = new Dictionary<string, string>
{
{ "destination","shared/folder" },
{ "destination", "shared/folder" },
{ "uri", DownloadURL }
},
Transfer = new Dictionary<string, string>
{
{ "size_downloaded", "1000"},
{ "size_uploaded", "100"},
{ "size_downloaded", "1000" },
{ "size_uploaded", "100" },
{ "speed_download", "0" }
}
}
@@ -140,13 +140,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
{
Detail = new Dictionary<string, string>
{
{ "destination","shared/folder" },
{ "destination", "shared/folder" },
{ "uri", DownloadURL }
},
Transfer = new Dictionary<string, string>
{
{ "size_downloaded", "100"},
{ "size_uploaded", "10"},
{ "size_downloaded", "100" },
{ "size_uploaded", "10" },
{ "speed_download", "50" }
}
}
@@ -164,13 +164,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
{
Detail = new Dictionary<string, string>
{
{ "destination","shared/folder" },
{ "destination", "shared/folder" },
{ "uri", DownloadURL }
},
Transfer = new Dictionary<string, string>
{
{ "size_downloaded", "10"},
{ "size_uploaded", "1"},
{ "size_downloaded", "10" },
{ "size_uploaded", "1" },
{ "speed_download", "0" }
}
}
@@ -188,13 +188,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
{
Detail = new Dictionary<string, string>
{
{ "destination","shared/folder" },
{ "destination", "shared/folder" },
{ "uri", DownloadURL }
},
Transfer = new Dictionary<string, string>
{
{ "size_downloaded", "1000"},
{ "size_uploaded", "100"},
{ "size_downloaded", "1000" },
{ "size_uploaded", "100" },
{ "speed_download", "0" }
}
}
@@ -212,13 +212,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
{
Detail = new Dictionary<string, string>
{
{ "destination","shared/folder" },
{ "destination", "shared/folder" },
{ "uri", DownloadURL }
},
Transfer = new Dictionary<string, string>
{
{ "size_downloaded", "1000"},
{ "size_uploaded", "100"},
{ "size_downloaded", "1000" },
{ "size_uploaded", "100" },
{ "speed_download", "0" }
}
}
@@ -236,13 +236,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
{
Detail = new Dictionary<string, string>
{
{ "destination","shared/folder" },
{ "destination", "shared/folder" },
{ "uri", DownloadURL }
},
Transfer = new Dictionary<string, string>
{
{ "size_downloaded", "1000"},
{ "size_uploaded", "100"},
{ "size_downloaded", "1000" },
{ "size_uploaded", "100" },
{ "speed_download", "0" }
}
}
@@ -260,13 +260,13 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
{
Detail = new Dictionary<string, string>
{
{ "destination","shared/folder" },
{ "destination", "shared/folder" },
{ "uri", DownloadURL }
},
Transfer = new Dictionary<string, string>
{
{ "size_downloaded", "1000"},
{ "size_uploaded", "100"},
{ "size_downloaded", "1000" },
{ "size_uploaded", "100" },
{ "speed_download", "0" }
}
}
@@ -649,7 +649,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
items.Should().HaveCount(1);
var item = items.First();
item.CanBeRemoved.Should().Be(canBeRemovedExpected);
item.CanMoveFiles.Should().Be(canMoveFilesExpected);
}
src/NzbDrone.Core.Test/Download/DownloadClientTests/DownloadStationTests/UsenetDownloadStationFixture.cs
+13 -15
View File
@@ -7,12 +7,12 @@ using NUnit.Framework;
using NzbDrone.Common.Disk;
using NzbDrone.Common.Http;
using NzbDrone.Core.Download;
using NzbDrone.Core.Download.Clients;
using NzbDrone.Core.Download.Clients.DownloadStation;
using NzbDrone.Core.Download.Clients.DownloadStation.Proxies;
using NzbDrone.Core.Organizer;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Test.Common;
using NzbDrone.Core.Organizer;
using NzbDrone.Core.Download.Clients;
namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
{
@@ -65,12 +65,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
{
Detail = new Dictionary<string, string>
{
{ "destination","shared/folder" },
{ "destination", "shared/folder" },
{ "uri", FileNameBuilder.CleanFileName(_remoteAlbum.Release.Title) + ".nzb" }
},
Transfer = new Dictionary<string, string>
{
{ "size_downloaded", "0"},
{ "size_downloaded", "0" },
{ "speed_download", "0" }
}
}
@@ -88,12 +88,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
{
Detail = new Dictionary<string, string>
{
{ "destination","shared/folder" },
{ "destination", "shared/folder" },
{ "uri", FileNameBuilder.CleanFileName(_remoteAlbum.Release.Title) + ".nzb" }
},
Transfer = new Dictionary<string, string>
{
{ "size_downloaded", "1000"},
{ "size_downloaded", "1000" },
{ "speed_download", "0" }
},
}
@@ -111,12 +111,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
{
Detail = new Dictionary<string, string>
{
{ "destination","shared/folder" },
{ "destination", "shared/folder" },
{ "uri", FileNameBuilder.CleanFileName(_remoteAlbum.Release.Title) + ".nzb" }
},
Transfer = new Dictionary<string, string>
{
{ "size_downloaded", "1000"},
{ "size_downloaded", "1000" },
{ "speed_download", "0" }
}
}
@@ -134,12 +134,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
{
Detail = new Dictionary<string, string>
{
{ "destination","shared/folder" },
{ "destination", "shared/folder" },
{ "uri", FileNameBuilder.CleanFileName(_remoteAlbum.Release.Title) + ".nzb" }
},
Transfer = new Dictionary<string, string>
{
{ "size_downloaded", "100"},
{ "size_downloaded", "100" },
{ "speed_download", "50" }
}
}
@@ -157,12 +157,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
{
Detail = new Dictionary<string, string>
{
{ "destination","shared/folder" },
{ "destination", "shared/folder" },
{ "uri", FileNameBuilder.CleanFileName(_remoteAlbum.Release.Title) + ".nzb" }
},
Transfer = new Dictionary<string, string>
{
{ "size_downloaded", "10"},
{ "size_downloaded", "10" },
{ "speed_download", "0" }
}
}
@@ -200,7 +200,6 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
.Returns<OsPath, DownloadStationSettings, string>((path, setttings, serial) => _physicalPath);
}
protected void GivenSerialNumber()
{
Mocker.GetMock<ISerialNumberProvider>()
@@ -244,7 +243,6 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
.Setup(s => s.Get(It.IsAny<HttpRequest>()))
.Returns<HttpRequest>(r => new HttpResponse(r, new HttpHeader(), new byte[1000]));
*/
Mocker.GetMock<IDownloadStationTaskProxy>()
.Setup(s => s.AddTaskFromData(It.IsAny<byte[]>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<DownloadStationSettings>()))
.Callback(PrepareClientToReturnQueuedItem);
@@ -385,7 +383,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.DownloadStationTests
Mocker.GetMock<IDownloadStationTaskProxy>()
.Verify(v => v.AddTaskFromUrl(It.IsAny<string>(), null, _settings), Times.Never());
}
[Test]
public void GetStatus_should_map_outputpath_when_using_default()
{
src/NzbDrone.Core.Test/Download/DownloadClientTests/HadoukenTests/HadoukenFixture.cs
+7 -7
View File
@@ -1,3 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Common.Http;
@@ -5,10 +9,6 @@ using NzbDrone.Core.Download;
using NzbDrone.Core.Download.Clients.Hadouken;
using NzbDrone.Core.Download.Clients.Hadouken.Models;
using NzbDrone.Core.MediaFiles.TorrentInfo;
using System;
using System.Collections.Generic;
using System.Linq;
using FluentAssertions;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.Download.DownloadClientTests.HadoukenTests
@@ -81,7 +81,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.HadoukenTests
};
Mocker.GetMock<ITorrentFileInfoReader>()
.Setup(s => s.GetHashFromTorrentFile(It.IsAny<Byte[]>()))
.Setup(s => s.GetHashFromTorrentFile(It.IsAny<byte[]>()))
.Returns("CBC2F069FE8BB2F544EAE707D75BCD3DE9DCF951");
Mocker.GetMock<IHttpClient>()
@@ -210,7 +210,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.HadoukenTests
[Test]
public void should_return_status_with_outputdirs()
{
var configItems = new Dictionary<String, Object>();
var configItems = new Dictionary<string, object>();
configItems.Add("bittorrent.defaultSavePath", @"C:\Downloads\Downloading\deluge".AsOsAgnostic());
@@ -301,7 +301,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.HadoukenTests
.Returns("hash");
var result = Subject.Download(remoteAlbum);
Assert.IsFalse(result.Any(c => char.IsLower(c)));
}
src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbVortexTests/NzbVortexFixture.cs
+35 -35
View File
@@ -1,18 +1,18 @@
using System;
using System.Linq;
using System.Collections.Generic;
using System.Linq;
using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Core.Download;
using NzbDrone.Core.Download.Clients.Nzbget;
using NzbDrone.Test.Common;
using NzbDrone.Core.RemotePathMappings;
using NzbDrone.Common.Disk;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Download;
using NzbDrone.Core.Download.Clients;
using NzbDrone.Core.Download.Clients.Nzbget;
using NzbDrone.Core.Download.Clients.NzbVortex;
using NzbDrone.Core.Download.Clients.NzbVortex.Responses;
using NzbDrone.Core.RemotePathMappings;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbVortexTests
{
@@ -28,42 +28,42 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbVortexTests
{
Subject.Definition = new DownloadClientDefinition();
Subject.Definition.Settings = new NzbVortexSettings
{
Host = "127.0.0.1",
Port = 2222,
ApiKey = "1234-ABCD",
MusicCategory = "Music",
RecentTvPriority = (int)NzbgetPriority.High
};
{
Host = "127.0.0.1",
Port = 2222,
ApiKey = "1234-ABCD",
MusicCategory = "Music",
RecentTvPriority = (int)NzbgetPriority.High
};
_queued = new NzbVortexQueueItem
{
Id = RandomNumber,
DownloadedSize = 1000,
TotalDownloadSize = 10,
GroupName = "Music",
UiTitle = "Fall Out Boy-Make America Psycho Again-CD-FLAC-2015-FORSAKEN"
{
Id = RandomNumber,
DownloadedSize = 1000,
TotalDownloadSize = 10,
GroupName = "Music",
UiTitle = "Fall Out Boy-Make America Psycho Again-CD-FLAC-2015-FORSAKEN"
};
_failed = new NzbVortexQueueItem
{
DownloadedSize = 1000,
TotalDownloadSize = 1000,
GroupName = "Music",
UiTitle = "Fall Out Boy-Make America Psycho Again-CD-FLAC-2015-FORSAKEN",
DestinationPath = "somedirectory",
State = NzbVortexStateType.UncompressFailed,
};
{
DownloadedSize = 1000,
TotalDownloadSize = 1000,
GroupName = "Music",
UiTitle = "Fall Out Boy-Make America Psycho Again-CD-FLAC-2015-FORSAKEN",
DestinationPath = "somedirectory",
State = NzbVortexStateType.UncompressFailed,
};
_completed = new NzbVortexQueueItem
{
DownloadedSize = 1000,
TotalDownloadSize = 1000,
GroupName = "Music",
UiTitle = "Fall Out Boy-Make America Psycho Again-CD-FLAC-2015-FORSAKEN",
DestinationPath = "/remote/mount/music/Fall Out Boy-Make America Psycho Again-CD-FLAC-2015-FORSAKEN",
State = NzbVortexStateType.Done
};
{
DownloadedSize = 1000,
TotalDownloadSize = 1000,
GroupName = "Music",
UiTitle = "Fall Out Boy-Make America Psycho Again-CD-FLAC-2015-FORSAKEN",
DestinationPath = "/remote/mount/music/Fall Out Boy-Make America Psycho Again-CD-FLAC-2015-FORSAKEN",
State = NzbVortexStateType.Done
};
}
protected void GivenFailedDownload()
@@ -103,7 +103,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbVortexTests
public void queued_item_should_have_required_properties()
{
GivenQueue(_queued);
var result = Subject.GetItems().Single();
VerifyQueued(result);
src/NzbDrone.Core.Test/Download/DownloadClientTests/NzbgetTests/NzbgetFixture.cs
+46 -47
View File
@@ -1,15 +1,15 @@
using System;
using System.Linq;
using System.Collections.Generic;
using System.Linq;
using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Common.Disk;
using NzbDrone.Core.Download;
using NzbDrone.Core.Download.Clients.Nzbget;
using NzbDrone.Test.Common;
using NzbDrone.Core.RemotePathMappings;
using NzbDrone.Common.Disk;
using NzbDrone.Core.Exceptions;
using NzbDrone.Core.RemotePathMappings;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
{
@@ -26,53 +26,53 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
{
Subject.Definition = new DownloadClientDefinition();
Subject.Definition.Settings = new NzbgetSettings
{
Host = "127.0.0.1",
Port = 2222,
Username = "admin",
Password = "pass",
MusicCategory = "music",
RecentTvPriority = (int)NzbgetPriority.High
};
{
Host = "127.0.0.1",
Port = 2222,
Username = "admin",
Password = "pass",
MusicCategory = "music",
RecentTvPriority = (int)NzbgetPriority.High
};
_queued = new NzbgetQueueItem
{
FileSizeLo = 1000,
RemainingSizeLo = 10,
Category = "music",
NzbName = "Fall Out Boy-Make America Psycho Again-CD-FLAC-2015-FORSAKEN",
Parameters = new List<NzbgetParameter> { new NzbgetParameter { Name = "drone", Value = "id" } }
};
{
FileSizeLo = 1000,
RemainingSizeLo = 10,
Category = "music",
NzbName = "Fall Out Boy-Make America Psycho Again-CD-FLAC-2015-FORSAKEN",
Parameters = new List<NzbgetParameter> { new NzbgetParameter { Name = "drone", Value = "id" } }
};
_failed = new NzbgetHistoryItem
{
FileSizeLo = 1000,
Category = "music",
Name = "Fall Out Boy-Make America Psycho Again-CD-FLAC-2015-FORSAKEN",
DestDir = "somedirectory",
Parameters = new List<NzbgetParameter> { new NzbgetParameter { Name = "drone", Value = "id" } },
ParStatus = "Some Error",
UnpackStatus = "NONE",
MoveStatus = "NONE",
ScriptStatus = "NONE",
DeleteStatus = "NONE",
MarkStatus = "NONE"
};
{
FileSizeLo = 1000,
Category = "music",
Name = "Fall Out Boy-Make America Psycho Again-CD-FLAC-2015-FORSAKEN",
DestDir = "somedirectory",
Parameters = new List<NzbgetParameter> { new NzbgetParameter { Name = "drone", Value = "id" } },
ParStatus = "Some Error",
UnpackStatus = "NONE",
MoveStatus = "NONE",
ScriptStatus = "NONE",
DeleteStatus = "NONE",
MarkStatus = "NONE"
};
_completed = new NzbgetHistoryItem
{
FileSizeLo = 1000,
Category = "music",
Name = "Fall Out Boy-Make America Psycho Again-CD-FLAC-2015-FORSAKEN",
DestDir = "/remote/mount/music/Fall Out Boy-Make America Psycho Again-CD-FLAC-2015-FORSAKEN",
Parameters = new List<NzbgetParameter> { new NzbgetParameter { Name = "drone", Value = "id" } },
ParStatus = "SUCCESS",
UnpackStatus = "NONE",
MoveStatus = "SUCCESS",
ScriptStatus = "NONE",
DeleteStatus = "NONE",
MarkStatus = "NONE"
};
{
FileSizeLo = 1000,
Category = "music",
Name = "Fall Out Boy-Make America Psycho Again-CD-FLAC-2015-FORSAKEN",
DestDir = "/remote/mount/music/Fall Out Boy-Make America Psycho Again-CD-FLAC-2015-FORSAKEN",
Parameters = new List<NzbgetParameter> { new NzbgetParameter { Name = "drone", Value = "id" } },
ParStatus = "SUCCESS",
UnpackStatus = "NONE",
MoveStatus = "SUCCESS",
ScriptStatus = "NONE",
DeleteStatus = "NONE",
MarkStatus = "NONE"
};
Mocker.GetMock<INzbgetProxy>()
.Setup(s => s.GetGlobalStatus(It.IsAny<NzbgetSettings>()))
@@ -168,7 +168,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
GivenQueue(_queued);
GivenHistory(null);
var result = Subject.GetItems().Single();
VerifyQueued(result);
@@ -320,7 +320,6 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
{
// TODO: We would love to have a way to distinguish between scripts reporting video corruption, or some internal script error.
// That way we could return Warning instead of Failed to notify the user to take action.
_completed.ScriptStatus = "FAILURE";
GivenQueue(null);
src/NzbDrone.Core.Test/Download/DownloadClientTests/QBittorrentTests/QBittorrentFixture.cs
+8 -8
View File
@@ -7,9 +7,9 @@ using NUnit.Framework;
using NzbDrone.Common.Http;
using NzbDrone.Core.Download;
using NzbDrone.Core.Download.Clients.QBittorrent;
using NzbDrone.Core.Exceptions;
using NzbDrone.Core.MediaFiles.TorrentInfo;
using NzbDrone.Test.Common;
using NzbDrone.Core.Exceptions;
namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
{
@@ -63,7 +63,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
Mocker.GetMock<IHttpClient>()
.Setup(s => s.Get(It.Is<HttpRequest>(h => h.Url.FullUri == _downloadUrl)))
.Returns<HttpRequest>(r => new HttpResponse(r, httpHeader, new Byte[0], System.Net.HttpStatusCode.Found));
.Returns<HttpRequest>(r => new HttpResponse(r, httpHeader, new byte[0], System.Net.HttpStatusCode.Found));
}
protected void GivenFailedDownload()
@@ -299,7 +299,6 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
[Test]
public void Download_should_accept_magnet_if_trackers_provided_and_dht_is_disabled()
{
Mocker.GetMock<IQBittorrentProxy>()
.Setup(s => s.GetConfig(It.IsAny<QBittorrentSettings>()))
.Returns(new QBittorrentPreferences { DhtEnabled = false });
@@ -308,7 +307,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
remoteAlbum.Release.DownloadUrl = "magnet:?xt=urn:btih:ZPBPA2P6ROZPKRHK44D5OW6NHXU5Z6KR&tr=udp://abc";
Assert.DoesNotThrow(() => Subject.Download(remoteAlbum));
Mocker.GetMock<IQBittorrentProxy>()
.Verify(s => s.AddTorrentFromUrl(It.IsAny<string>(), It.IsAny<QBittorrentSettings>()), Times.Once());
}
@@ -417,8 +416,10 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
protected virtual QBittorrentTorrent GivenCompletedTorrent(
string state = "pausedUP",
float ratio = 0.1f, float ratioLimit = -2,
int seedingTime = 1, int seedingTimeLimit = -2)
float ratio = 0.1f,
float ratioLimit = -2,
int seedingTime = 1,
int seedingTimeLimit = -2)
{
var torrent = new QBittorrentTorrent
{
@@ -502,7 +503,6 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
item.CanMoveFiles.Should().BeFalse();
}
[Test]
public void should_not_be_removable_and_should_not_allow_move_files_if_max_seedingtime_reached_and_not_paused()
{
@@ -567,7 +567,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.QBittorrentTests
var item = Subject.GetItems().Single();
item.CanBeRemoved.Should().BeFalse();
item.CanMoveFiles.Should().BeFalse();
var item2 = Subject.GetItems().Single();
Mocker.GetMock<IQBittorrentProxy>()
src/NzbDrone.Core.Test/Download/DownloadClientTests/RTorrentTests/RTorrentFixture.cs
+20 -21
View File
@@ -1,11 +1,11 @@
using System.Linq;
using System.Collections.Generic;
using System.Linq;
using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Core.MediaFiles.TorrentInfo;
using NzbDrone.Core.Download;
using NzbDrone.Core.Download.Clients.RTorrent;
using NzbDrone.Core.MediaFiles.TorrentInfo;
namespace NzbDrone.Core.Test.Download.DownloadClientTests.RTorrentTests
{
@@ -25,26 +25,26 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.RTorrentTests
};
_downloading = new RTorrentTorrent
{
Hash = "HASH",
IsFinished = false,
IsOpen = true,
IsActive = true,
Name = _title,
TotalSize = 1000,
RemainingSize = 500,
Path = "somepath"
};
{
Hash = "HASH",
IsFinished = false,
IsOpen = true,
IsActive = true,
Name = _title,
TotalSize = 1000,
RemainingSize = 500,
Path = "somepath"
};
_completed = new RTorrentTorrent
{
Hash = "HASH",
IsFinished = true,
Name = _title,
TotalSize = 1000,
RemainingSize = 0,
Path = "somepath"
};
{
Hash = "HASH",
IsFinished = true,
Name = _title,
TotalSize = 1000,
RemainingSize = 0,
Path = "somepath"
};
Mocker.GetMock<ITorrentFileInfoReader>()
.Setup(s => s.GetHashFromTorrentFile(It.IsAny<byte[]>()))
@@ -61,7 +61,6 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.RTorrentTests
.Setup(s => s.AddTorrentFromFile(It.IsAny<string>(), It.IsAny<byte[]>(), It.IsAny<string>(), It.IsAny<RTorrentPriority>(), It.IsAny<string>(), It.IsAny<RTorrentSettings>()))
.Callback(PrepareClientToReturnCompletedItem);
Mocker.GetMock<IRTorrentProxy>()
.Setup(s => s.HasHashTorrent(It.IsAny<string>(), It.IsAny<RTorrentSettings>()))
.Returns(true);
src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/JsonConvertersTests/SabnzbdQueueTimeConverterFixture.cs
+3 -3
View File
@@ -15,9 +15,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests.JsonConve
[TestCase("0:1:59", 119)]
[TestCase("0:59:59", 3599)]
[TestCase("1:0:0", 3600)]
[TestCase("1:0:0:1", 24 * 3600 + 1)]
[TestCase("40:12:14", 40 * 3600 + 12 * 60 + 14)]
[TestCase("1:16:12:14", 40 * 3600 + 12 * 60 + 14)]
[TestCase("1:0:0:1", (24 * 3600) + 1)]
[TestCase("40:12:14", (40 * 3600) + (12 * 60) + 14)]
[TestCase("1:16:12:14", (40 * 3600) + (12 * 60) + 14)]
public void valid_time_formats_should_be_parsed_correctly(string time, int expectedSeconds)
{
var thing = string.Format(QUERY, time);
src/NzbDrone.Core.Test/Download/DownloadClientTests/SabnzbdTests/SabnzbdFixture.cs
+34 -32
View File
@@ -1,18 +1,18 @@
using System;
using System.Linq;
using System.Collections.Generic;
using System.Linq;
using FizzWare.NBuilder;
using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Common.Disk;
using NzbDrone.Core.Download;
using NzbDrone.Core.Download.Clients.Sabnzbd;
using NzbDrone.Core.Download.Clients.Sabnzbd.Responses;
using NzbDrone.Core.Music;
using NzbDrone.Test.Common;
using NzbDrone.Core.RemotePathMappings;
using NzbDrone.Common.Disk;
using NzbDrone.Core.Validation;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
{
@@ -30,20 +30,20 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
{
Subject.Definition = new DownloadClientDefinition();
Subject.Definition.Settings = new SabnzbdSettings
{
Host = "127.0.0.1",
Port = 2222,
ApiKey = "5c770e3197e4fe763423ee7c392c25d1",
Username = "admin",
Password = "pass",
MusicCategory = "tv",
RecentTvPriority = (int)SabnzbdPriority.High
};
{
Host = "127.0.0.1",
Port = 2222,
ApiKey = "5c770e3197e4fe763423ee7c392c25d1",
Username = "admin",
Password = "pass",
MusicCategory = "tv",
RecentTvPriority = (int)SabnzbdPriority.High
};
_queued = new SabnzbdQueue
{
DefaultRootFolder = @"Y:\nzbget\root".AsOsAgnostic(),
Paused = false,
Items = new List<SabnzbdQueueItem>()
{
DefaultRootFolder = @"Y:\nzbget\root".AsOsAgnostic(),
Paused = false,
Items = new List<SabnzbdQueueItem>()
{
new SabnzbdQueueItem
{
@@ -56,11 +56,11 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
Title = "Droned.S01E01.Pilot.1080p.WEB-DL-DRONE"
}
}
};
};
_failed = new SabnzbdHistory
{
Items = new List<SabnzbdHistoryItem>()
{
Items = new List<SabnzbdHistoryItem>()
{
new SabnzbdHistoryItem
{
@@ -71,11 +71,11 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
Title = "Droned.S01E01.Pilot.1080p.WEB-DL-DRONE"
}
}
};
};
_completed = new SabnzbdHistory
{
Items = new List<SabnzbdHistoryItem>()
{
Items = new List<SabnzbdHistoryItem>()
{
new SabnzbdHistoryItem
{
@@ -87,19 +87,19 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
Storage = "/remote/mount/vv/Droned.S01E01.Pilot.1080p.WEB-DL-DRONE"
}
}
};
};
_config = new SabnzbdConfig
{
Misc = new SabnzbdConfigMisc
{
Misc = new SabnzbdConfigMisc
{
complete_dir = @"/remote/mount"
},
Categories = new List<SabnzbdCategory>
complete_dir = @"/remote/mount"
},
Categories = new List<SabnzbdCategory>
{
new SabnzbdCategory { Name = "tv", Dir = "vv" }
}
};
};
Mocker.GetMock<ISabnzbdProxy>()
.Setup(v => v.GetVersion(It.IsAny<SabnzbdSettings>()))
@@ -110,9 +110,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
.Returns(_config);
_fullStatus = new SabnzbdFullStatus
{
CompleteDir = @"Y:\nzbget\root\complete".AsOsAgnostic()
};
{
CompleteDir = @"Y:\nzbget\root\complete".AsOsAgnostic()
};
Mocker.GetMock<ISabnzbdProxy>()
.Setup(s => s.GetFullStatus(It.IsAny<SabnzbdSettings>()))
@@ -163,7 +163,9 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
protected virtual void GivenHistory(SabnzbdHistory history)
{
if (history == null)
{
history = new SabnzbdHistory() { Items = new List<SabnzbdHistoryItem>() };
}
Mocker.GetMock<ISabnzbdProxy>()
.Setup(s => s.GetHistory(It.IsAny<int>(), It.IsAny<int>(), It.IsAny<string>(), It.IsAny<SabnzbdSettings>()))
src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixture.cs
+1 -3
View File
@@ -284,7 +284,6 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
item.RemainingTime.Should().NotHaveValue();
}
[Test]
public void should_not_be_removable_and_should_not_allow_move_files_if_max_ratio_reached_and_not_stopped()
{
@@ -340,7 +339,6 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
item.CanMoveFiles.Should().BeFalse();
}
[Test]
public void should_not_be_removable_and_should_not_allow_move_files_if_max_idletime_reached_and_not_paused()
{
@@ -389,7 +387,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
public void should_not_be_removable_if_overridden_max_idletime_not_reached_and_paused()
{
GivenGlobalSeedLimits(null, 20);
PrepareClientToReturnCompletedItem(true, ratio: 2.0, seedingTime: 30, idleLimit: 40);
PrepareClientToReturnCompletedItem(true, ratio: 2.0, seedingTime: 30, idleLimit: 40);
var item = Subject.GetItems().Single();
item.CanBeRemoved.Should().BeFalse();
src/NzbDrone.Core.Test/Download/DownloadClientTests/TransmissionTests/TransmissionFixtureBase.cs
+7 -6
View File
@@ -110,7 +110,6 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
Mocker.GetMock<ITransmissionProxy>()
.Setup(v => v.GetConfig(It.IsAny<TransmissionSettings>()))
.Returns(() => Json.Deserialize<TransmissionConfig>(_transmissionConfigItems.ToJson()));
}
protected void GivenMusicCategory()
@@ -144,7 +143,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
.Setup(s => s.AddTorrentFromData(It.IsAny<byte[]>(), It.IsAny<string>(), It.IsAny<TransmissionSettings>()))
.Callback(PrepareClientToReturnQueuedItem);
}
protected virtual void GivenTorrents(List<TransmissionTorrent> torrents)
{
if (torrents == null)
@@ -159,7 +158,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
protected void PrepareClientToReturnQueuedItem()
{
GivenTorrents(new List<TransmissionTorrent>
GivenTorrents(new List<TransmissionTorrent>
{
_queued
});
@@ -167,7 +166,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
protected void PrepareClientToReturnDownloadingItem()
{
GivenTorrents(new List<TransmissionTorrent>
GivenTorrents(new List<TransmissionTorrent>
{
_downloading
});
@@ -175,7 +174,7 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
protected void PrepareClientToReturnFailedItem()
{
GivenTorrents(new List<TransmissionTorrent>
GivenTorrents(new List<TransmissionTorrent>
{
_failed
});
@@ -184,7 +183,10 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
protected void PrepareClientToReturnCompletedItem(bool stopped = false, double ratio = 0.9, int seedingTime = 60, double? ratioLimit = null, int? idleLimit = null)
{
if (stopped)
{
_completed.Status = TransmissionTorrentStatus.Stopped;
}
_completed.UploadedEver = (int)(_completed.DownloadedEver * ratio);
_completed.SecondsSeeding = seedingTime * 60;
@@ -214,7 +216,6 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.TransmissionTests
}
}
GivenTorrents(new List<TransmissionTorrent>
{
_completed
src/NzbDrone.Core.Test/Download/DownloadClientTests/UTorrentTests/UTorrentFixture.cs
+52 -52
View File
@@ -1,13 +1,13 @@
using System;
using System.Linq;
using System.Collections.Generic;
using System.Linq;
using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Common.Http;
using NzbDrone.Core.MediaFiles.TorrentInfo;
using NzbDrone.Core.Download;
using NzbDrone.Core.Download.Clients.UTorrent;
using NzbDrone.Core.MediaFiles.TorrentInfo;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests
@@ -25,65 +25,65 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.UTorrentTests
{
Subject.Definition = new DownloadClientDefinition();
Subject.Definition.Settings = new UTorrentSettings
{
Host = "127.0.0.1",
Port = 2222,
Username = "admin",
Password = "pass",
MusicCategory = "lidarr"
{
Host = "127.0.0.1",
Port = 2222,
Username = "admin",
Password = "pass",
MusicCategory = "lidarr"
};
_queued = new UTorrentTorrent
{
Hash = "HASH",
Status = UTorrentTorrentStatus.Queued | UTorrentTorrentStatus.Loaded,
Name = _title,
Size = 1000,
Remaining = 1000,
Progress = 0,
Label = "lidarr",
DownloadUrl = _downloadUrl,
RootDownloadPath = "somepath"
};
{
Hash = "HASH",
Status = UTorrentTorrentStatus.Queued | UTorrentTorrentStatus.Loaded,
Name = _title,
Size = 1000,
Remaining = 1000,
Progress = 0,
Label = "lidarr",
DownloadUrl = _downloadUrl,
RootDownloadPath = "somepath"
};
_downloading = new UTorrentTorrent
{
Hash = "HASH",
Status = UTorrentTorrentStatus.Started | UTorrentTorrentStatus.Loaded,
Name = _title,
Size = 1000,
Remaining = 100,
Progress = 0.9,
Label = "lidarr",
DownloadUrl = _downloadUrl,
RootDownloadPath = "somepath"
};
{
Hash = "HASH",
Status = UTorrentTorrentStatus.Started | UTorrentTorrentStatus.Loaded,
Name = _title,
Size = 1000,
Remaining = 100,
Progress = 0.9,
Label = "lidarr",
DownloadUrl = _downloadUrl,
RootDownloadPath = "somepath"
};
_failed = new UTorrentTorrent
{
Hash = "HASH",
Status = UTorrentTorrentStatus.Error,
Name = _title,
Size = 1000,
Remaining = 100,
Progress = 0.9,
Label = "lidarr",
DownloadUrl = _downloadUrl,
RootDownloadPath = "somepath"
};
{
Hash = "HASH",
Status = UTorrentTorrentStatus.Error,
Name = _title,
Size = 1000,
Remaining = 100,
Progress = 0.9,
Label = "lidarr",
DownloadUrl = _downloadUrl,
RootDownloadPath = "somepath"
};
_completed = new UTorrentTorrent
{
Hash = "HASH",
Status = UTorrentTorrentStatus.Checked | UTorrentTorrentStatus.Loaded,
Name = _title,
Size = 1000,
Remaining = 0,
Progress = 1.0,
Label = "lidarr",
DownloadUrl = _downloadUrl,
RootDownloadPath = "somepath"
};
{
Hash = "HASH",
Status = UTorrentTorrentStatus.Checked | UTorrentTorrentStatus.Loaded,
Name = _title,
Size = 1000,
Remaining = 0,
Progress = 1.0,
Label = "lidarr",
DownloadUrl = _downloadUrl,
RootDownloadPath = "somepath"
};
Mocker.GetMock<ITorrentFileInfoReader>()
.Setup(s => s.GetHashFromTorrentFile(It.IsAny<byte[]>()))
src/NzbDrone.Core.Test/Download/DownloadClientTests/VuzeTests/VuzeFixture.cs
-1
View File
@@ -341,6 +341,5 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.VuzeTests
items.Should().HaveCount(1);
items.First().OutputPath.Should().Be(@"C:\Downloads\" + fileName);
}
}
}
src/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs
+11 -9
View File
@@ -10,10 +10,9 @@ using NzbDrone.Core.Download;
using NzbDrone.Core.Download.Clients;
using NzbDrone.Core.Exceptions;
using NzbDrone.Core.Indexers;
using NzbDrone.Core.Music;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Music;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.Download
{
@@ -82,7 +81,7 @@ namespace NzbDrone.Core.Test.Download
{
var mock = WithUsenetClient();
mock.Setup(s => s.Download(It.IsAny<RemoteAlbum>()));
Subject.DownloadReport(_parseResult);
VerifyEventPublished<AlbumGrabbedEvent>();
@@ -93,7 +92,7 @@ namespace NzbDrone.Core.Test.Download
{
var mock = WithUsenetClient();
mock.Setup(s => s.Download(It.IsAny<RemoteAlbum>()));
Subject.DownloadReport(_parseResult);
mock.Verify(s => s.Download(It.IsAny<RemoteAlbum>()), Times.Once());
@@ -116,8 +115,9 @@ namespace NzbDrone.Core.Test.Download
{
var mock = WithUsenetClient();
mock.Setup(s => s.Download(It.IsAny<RemoteAlbum>()))
.Callback<RemoteAlbum>(v => {
throw new ReleaseDownloadException(v.Release, "Error", new WebException());
.Callback<RemoteAlbum>(v =>
{
throw new ReleaseDownloadException(v.Release, "Error", new WebException());
});
Assert.Throws<ReleaseDownloadException>(() => Subject.DownloadReport(_parseResult));
@@ -135,8 +135,9 @@ namespace NzbDrone.Core.Test.Download
var mock = WithUsenetClient();
mock.Setup(s => s.Download(It.IsAny<RemoteAlbum>()))
.Callback<RemoteAlbum>(v => {
throw new ReleaseDownloadException(v.Release, "Error", new TooManyRequestsException(request, response));
.Callback<RemoteAlbum>(v =>
{
throw new ReleaseDownloadException(v.Release, "Error", new TooManyRequestsException(request, response));
});
Assert.Throws<ReleaseDownloadException>(() => Subject.DownloadReport(_parseResult));
@@ -184,7 +185,8 @@ namespace NzbDrone.Core.Test.Download
{
var mock = WithUsenetClient();
mock.Setup(s => s.Download(It.IsAny<RemoteAlbum>()))
.Callback<RemoteAlbum>(v => {
.Callback<RemoteAlbum>(v =>
{
throw new ReleaseUnavailableException(v.Release, "Error", new WebException());
});
src/NzbDrone.Core.Test/Download/FailedDownloadServiceFixture.cs
+1 -4
View File
@@ -8,9 +8,9 @@ using NzbDrone.Core.Download;
using NzbDrone.Core.Download.TrackedDownloads;
using NzbDrone.Core.History;
using NzbDrone.Core.Messaging.Events;
using NzbDrone.Core.Music;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Music;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.Download
@@ -44,11 +44,9 @@ namespace NzbDrone.Core.Test.Download
.With(c => c.RemoteAlbum = remoteAlbum)
.Build();
Mocker.GetMock<IHistoryService>()
.Setup(s => s.Find(_trackedDownload.DownloadItem.DownloadId, HistoryEventType.Grabbed))
.Returns(_grabHistory);
}
private void GivenNoGrabbedHistory()
@@ -131,7 +129,6 @@ namespace NzbDrone.Core.Test.Download
_trackedDownload.State.Should().NotBe(TrackedDownloadStage.DownloadFailed);
}
private void AssertDownloadFailed()
{
Mocker.GetMock<IEventAggregator>()
src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/AddFixture.cs
+9 -10
View File
@@ -8,12 +8,12 @@ using NUnit.Framework;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.DecisionEngine;
using NzbDrone.Core.Download.Pending;
using NzbDrone.Core.Music;
using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Profiles.Qualities;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Music;
namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
{
@@ -39,16 +39,16 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
.Build();
_profile = new QualityProfile
{
Name = "Test",
Cutoff = Quality.MP3_256.Id,
Items = new List<QualityProfileQualityItem>
{
Name = "Test",
Cutoff = Quality.MP3_256.Id,
Items = new List<QualityProfileQualityItem>
{
new QualityProfileQualityItem { Allowed = true, Quality = Quality.MP3_256 },
new QualityProfileQualityItem { Allowed = true, Quality = Quality.MP3_320 },
new QualityProfileQualityItem { Allowed = true, Quality = Quality.MP3_320 }
},
};
};
_artist.QualityProfile = new LazyLoaded<QualityProfile>(_profile);
@@ -58,11 +58,11 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
_parsedAlbumInfo.Quality = new QualityModel(Quality.MP3_256);
_remoteAlbum = new RemoteAlbum();
_remoteAlbum.Albums = new List<Album>{ _album };
_remoteAlbum.Albums = new List<Album> { _album };
_remoteAlbum.Artist = _artist;
_remoteAlbum.ParsedAlbumInfo = _parsedAlbumInfo;
_remoteAlbum.Release = _release;
_temporarilyRejected = new DownloadDecision(_remoteAlbum, new Rejection("Temp Rejected", RejectionType.Temporary));
_heldReleases = new List<PendingRelease>();
@@ -85,7 +85,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
Mocker.GetMock<IParsingService>()
.Setup(s => s.GetAlbums(It.IsAny<ParsedAlbumInfo>(), _artist, null))
.Returns(new List<Album> {_album});
.Returns(new List<Album> { _album });
Mocker.GetMock<IPrioritizeDownloadDecision>()
.Setup(s => s.PrioritizeDecisions(It.IsAny<List<DownloadDecision>>()))
@@ -98,7 +98,6 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
release.Indexer = indexer;
release.PublishDate = publishDate;
var heldReleases = Builder<PendingRelease>.CreateListOfSize(1)
.All()
.With(h => h.ArtistId = _artist.Id)
src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/PendingReleaseServiceFixture.cs
+4 -3
View File
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Core.DecisionEngine;
@@ -7,7 +8,6 @@ using NzbDrone.Core.Download.Pending;
using NzbDrone.Core.Indexers;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Test.Framework;
using FluentAssertions;
namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
{
@@ -18,9 +18,10 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
{
Mocker.GetMock<IPendingReleaseRepository>()
.Setup(v => v.All())
.Returns(new List<PendingRelease> {
.Returns(new List<PendingRelease>
{
new PendingRelease { Release = new ReleaseInfo { IndexerId = 1 } }
});
});
}
[Test]
src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveGrabbedFixture.cs
+9 -9
View File
@@ -8,12 +8,12 @@ using NzbDrone.Common.Extensions;
using NzbDrone.Core.DecisionEngine;
using NzbDrone.Core.Download;
using NzbDrone.Core.Download.Pending;
using NzbDrone.Core.Music;
using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Profiles.Qualities;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Music;
namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
{
@@ -39,16 +39,16 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
.Build();
_profile = new QualityProfile
{
Name = "Test",
Cutoff = Quality.MP3_256.Id,
Items = new List<QualityProfileQualityItem>
{
Name = "Test",
Cutoff = Quality.MP3_256.Id,
Items = new List<QualityProfileQualityItem>
{
new QualityProfileQualityItem { Allowed = true, Quality = Quality.MP3_256 },
new QualityProfileQualityItem { Allowed = true, Quality = Quality.MP3_320 },
new QualityProfileQualityItem { Allowed = true, Quality = Quality.FLAC }
},
};
};
_artist.QualityProfile = new LazyLoaded<QualityProfile>(_profile);
@@ -58,11 +58,11 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
_parsedAlbumInfo.Quality = new QualityModel(Quality.MP3_256);
_remoteAlbum = new RemoteAlbum();
_remoteAlbum.Albums = new List<Album>{ _album };
_remoteAlbum.Albums = new List<Album> { _album };
_remoteAlbum.Artist = _artist;
_remoteAlbum.ParsedAlbumInfo = _parsedAlbumInfo;
_remoteAlbum.Release = _release;
_temporarilyRejected = new DownloadDecision(_remoteAlbum, new Rejection("Temp Rejected", RejectionType.Temporary));
_heldReleases = new List<PendingRelease>();
@@ -85,7 +85,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
Mocker.GetMock<IParsingService>()
.Setup(s => s.GetAlbums(It.IsAny<ParsedAlbumInfo>(), _artist, null))
.Returns(new List<Album> {_album});
.Returns(new List<Album> { _album });
Mocker.GetMock<IPrioritizeDownloadDecision>()
.Setup(s => s.PrioritizeDecisions(It.IsAny<List<DownloadDecision>>()))
src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemovePendingFixture.cs
+10 -11
View File
@@ -5,10 +5,10 @@ using Moq;
using NUnit.Framework;
using NzbDrone.Common.Crypto;
using NzbDrone.Core.Download.Pending;
using NzbDrone.Core.Music;
using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Music;
namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
{
@@ -32,7 +32,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
Mocker.GetMock<IPendingReleaseRepository>()
.Setup(s => s.All())
.Returns( _pending);
.Returns(_pending);
Mocker.GetMock<IArtistService>()
.Setup(s => s.GetArtist(It.IsAny<int>()))
@@ -44,22 +44,22 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
Mocker.GetMock<IParsingService>()
.Setup(s => s.GetAlbums(It.IsAny<ParsedAlbumInfo>(), It.IsAny<Artist>(), null))
.Returns(new List<Album>{ _album });
.Returns(new List<Album> { _album });
}
private void AddPending(int id, string album)
{
_pending.Add(new PendingRelease
{
Id = id,
ParsedAlbumInfo = new ParsedAlbumInfo { AlbumTitle = album}
});
{
Id = id,
ParsedAlbumInfo = new ParsedAlbumInfo { AlbumTitle = album }
});
}
[Test]
public void should_remove_same_release()
{
AddPending(id: 1, album: "Album" );
AddPending(id: 1, album: "Album");
var queueId = HashConverter.GetHashInt31(string.Format("pending-{0}-album{1}", 1, _album.Id));
@@ -67,7 +67,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
AssertRemoved(1);
}
[Test]
public void should_remove_multiple_releases_release()
{
@@ -97,11 +97,10 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
AssertRemoved(1, 2);
}
private void AssertRemoved(params int[] ids)
{
Mocker.GetMock<IPendingReleaseRepository>().Verify(c => c.DeleteMany(It.Is<IEnumerable<int>>(s => s.SequenceEqual(ids))));
}
}
}
src/NzbDrone.Core.Test/Download/Pending/PendingReleaseServiceTests/RemoveRejectedFixture.cs
+8 -9
View File
@@ -9,12 +9,12 @@ using NzbDrone.Core.DecisionEngine;
using NzbDrone.Core.Download;
using NzbDrone.Core.Download.Pending;
using NzbDrone.Core.Indexers;
using NzbDrone.Core.Music;
using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Profiles.Qualities;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Music;
namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
{
@@ -39,16 +39,16 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
.Build();
_profile = new QualityProfile
{
Name = "Test",
Cutoff = Quality.MP3_192.Id,
Items = new List<QualityProfileQualityItem>
{
Name = "Test",
Cutoff = Quality.MP3_192.Id,
Items = new List<QualityProfileQualityItem>
{
new QualityProfileQualityItem { Allowed = true, Quality = Quality.MP3_192 },
new QualityProfileQualityItem { Allowed = true, Quality = Quality.MP3_256 },
new QualityProfileQualityItem { Allowed = true, Quality = Quality.MP3_320 }
},
};
};
_artist.QualityProfile = new LazyLoaded<QualityProfile>(_profile);
@@ -58,7 +58,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
_parsedAlbumInfo.Quality = new QualityModel(Quality.MP3_192);
_remoteAlbum = new RemoteAlbum();
_remoteAlbum.Albums = new List<Album>{ _album };
_remoteAlbum.Albums = new List<Album> { _album };
_remoteAlbum.Artist = _artist;
_remoteAlbum.ParsedAlbumInfo = _parsedAlbumInfo;
_remoteAlbum.Release = _release;
@@ -79,7 +79,7 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
Mocker.GetMock<IParsingService>()
.Setup(s => s.GetAlbums(It.IsAny<ParsedAlbumInfo>(), _artist, null))
.Returns(new List<Album> {_album});
.Returns(new List<Album> { _album });
Mocker.GetMock<IPrioritizeDownloadDecision>()
.Setup(s => s.PrioritizeDecisions(It.IsAny<List<DownloadDecision>>()))
@@ -92,7 +92,6 @@ namespace NzbDrone.Core.Test.Download.Pending.PendingReleaseServiceTests
release.Indexer = indexer;
release.PublishDate = publishDate;
var heldReleases = Builder<PendingRelease>.CreateListOfSize(1)
.All()
.With(h => h.ArtistId = _artist.Id)
src/NzbDrone.Core.Test/Download/RedownloadFailedDownloadServiceFixture.cs
+22 -14
View File
@@ -1,13 +1,13 @@
using NUnit.Framework;
using NzbDrone.Core.Download;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Messaging.Commands;
using Moq;
using System.Collections.Generic;
using NzbDrone.Core.Music;
using FizzWare.NBuilder;
using Moq;
using NUnit.Framework;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Download;
using NzbDrone.Core.IndexerSearch;
using NzbDrone.Core.Messaging.Commands;
using NzbDrone.Core.Music;
using NzbDrone.Core.Test.Framework;
namespace NzbDrone.Core.Test.Download
{
@@ -29,7 +29,8 @@ namespace NzbDrone.Core.Test.Download
[Test]
public void should_skip_redownload_if_event_has_skipredownload_set()
{
var failedEvent = new DownloadFailedEvent {
var failedEvent = new DownloadFailedEvent
{
ArtistId = 1,
AlbumIds = new List<int> { 1 },
SkipReDownload = true
@@ -45,7 +46,8 @@ namespace NzbDrone.Core.Test.Download
[Test]
public void should_skip_redownload_if_redownload_failed_disabled()
{
var failedEvent = new DownloadFailedEvent {
var failedEvent = new DownloadFailedEvent
{
ArtistId = 1,
AlbumIds = new List<int> { 1 }
};
@@ -64,7 +66,8 @@ namespace NzbDrone.Core.Test.Download
[Test]
public void should_redownload_album_on_failure()
{
var failedEvent = new DownloadFailedEvent {
var failedEvent = new DownloadFailedEvent
{
ArtistId = 1,
AlbumIds = new List<int> { 2 }
};
@@ -74,7 +77,8 @@ namespace NzbDrone.Core.Test.Download
Mocker.GetMock<IManageCommandQueue>()
.Verify(x => x.Push(It.Is<AlbumSearchCommand>(c => c.AlbumIds.Count == 1 &&
c.AlbumIds[0] == 2),
It.IsAny<CommandPriority>(), It.IsAny<CommandTrigger>()),
It.IsAny<CommandPriority>(),
It.IsAny<CommandTrigger>()),
Times.Once());
Mocker.GetMock<IManageCommandQueue>()
@@ -85,7 +89,8 @@ namespace NzbDrone.Core.Test.Download
[Test]
public void should_redownload_multiple_albums_on_failure()
{
var failedEvent = new DownloadFailedEvent {
var failedEvent = new DownloadFailedEvent
{
ArtistId = 1,
AlbumIds = new List<int> { 2, 3 }
};
@@ -96,7 +101,8 @@ namespace NzbDrone.Core.Test.Download
.Verify(x => x.Push(It.Is<AlbumSearchCommand>(c => c.AlbumIds.Count == 2 &&
c.AlbumIds[0] == 2 &&
c.AlbumIds[1] == 3),
It.IsAny<CommandPriority>(), It.IsAny<CommandTrigger>()),
It.IsAny<CommandPriority>(),
It.IsAny<CommandTrigger>()),
Times.Once());
Mocker.GetMock<IManageCommandQueue>()
@@ -108,7 +114,8 @@ namespace NzbDrone.Core.Test.Download
public void should_redownload_artist_on_failure()
{
// note that artist is set to have 3 albums in setup
var failedEvent = new DownloadFailedEvent {
var failedEvent = new DownloadFailedEvent
{
ArtistId = 2,
AlbumIds = new List<int> { 1, 2, 3 }
};
@@ -117,7 +124,8 @@ namespace NzbDrone.Core.Test.Download
Mocker.GetMock<IManageCommandQueue>()
.Verify(x => x.Push(It.Is<ArtistSearchCommand>(c => c.ArtistId == failedEvent.ArtistId),
It.IsAny<CommandPriority>(), It.IsAny<CommandTrigger>()),
It.IsAny<CommandPriority>(),
It.IsAny<CommandTrigger>()),
Times.Once());
Mocker.GetMock<IManageCommandQueue>()
src/NzbDrone.Core.Test/Download/TrackedDownloads/TrackedDownloadServiceFixture.cs
+9 -7
View File
@@ -1,17 +1,17 @@
using System.Collections.Generic;
using System.Linq;
using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Core.Download;
using NzbDrone.Core.Download.TrackedDownloads;
using NzbDrone.Core.History;
using NzbDrone.Core.Indexers;
using NzbDrone.Core.Music;
using NzbDrone.Core.Music.Events;
using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Music;
using NzbDrone.Core.Indexers;
using System.Linq;
using NzbDrone.Core.Music.Events;
namespace NzbDrone.Core.Test.Download.TrackedDownloads
{
@@ -22,13 +22,15 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
{
Mocker.GetMock<IHistoryService>()
.Setup(s => s.FindByDownloadId(It.Is<string>(sr => sr == "35238")))
.Returns(new List<History.History>(){
new History.History(){
.Returns(new List<History.History>()
{
new History.History()
{
DownloadId = "35238",
SourceTitle = "Audio Artist - Audio Album [2018 - FLAC]",
ArtistId = 5,
AlbumId = 4,
}
}
});
}