open-source-mirrors
/
Lidarr
mirror of https://github.com/Lidarr/Lidarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more linux fixes

Browse Source
pull/4/head
kay.one 11 years ago
parent b06a58966e
commit c2b4eadc47
7 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File

14
NzbDrone.Common.Test/PathExtensionFixture.cs
Unescape View File

@ -109,43 +109,43 @@ namespace NzbDrone.Common.Test
[Test] [Test]
public void AppDataDirectory_path_test() public void AppDataDirectory_path_test()
{ {
GetIAppDirectoryInfo().GetAppDataPath().Should().BeEquivalentTo(@"C:\NzbDrone\"); GetIAppDirectoryInfo().GetAppDataPath().Should().BeEquivalentTo(@"C:\NzbDrone\".AsOsAgnostic());
} }
[Test] [Test]
public void Config_path_test() public void Config_path_test()
{ {
GetIAppDirectoryInfo().GetConfigPath().Should().BeEquivalentTo(@"C:\NzbDrone\Config.xml"); GetIAppDirectoryInfo().GetConfigPath().Should().BeEquivalentTo(@"C:\NzbDrone\Config.xml".AsOsAgnostic());
} }
[Test] [Test]
public void Sanbox() public void Sanbox()
{ {
GetIAppDirectoryInfo().GetUpdateSandboxFolder().Should().BeEquivalentTo(@"C:\Temp\Nzbdrone_update\"); GetIAppDirectoryInfo().GetUpdateSandboxFolder().Should().BeEquivalentTo(@"C:\Temp\Nzbdrone_update\".AsOsAgnostic());
} }
[Test] [Test]
public void GetUpdatePackageFolder() public void GetUpdatePackageFolder()
{ {
GetIAppDirectoryInfo().GetUpdatePackageFolder().Should().BeEquivalentTo(@"C:\Temp\Nzbdrone_update\NzbDrone\"); GetIAppDirectoryInfo().GetUpdatePackageFolder().Should().BeEquivalentTo(@"C:\Temp\Nzbdrone_update\NzbDrone\".AsOsAgnostic());
} }
[Test] [Test]
public void GetUpdateClientFolder() public void GetUpdateClientFolder()
{ {
GetIAppDirectoryInfo().GetUpdateClientFolder().Should().BeEquivalentTo(@"C:\Temp\Nzbdrone_update\NzbDrone\NzbDrone.Update\"); GetIAppDirectoryInfo().GetUpdateClientFolder().Should().BeEquivalentTo(@"C:\Temp\Nzbdrone_update\NzbDrone\NzbDrone.Update\".AsOsAgnostic());
} }
[Test] [Test]
public void GetUpdateClientExePath() public void GetUpdateClientExePath()
{ {
GetIAppDirectoryInfo().GetUpdateClientExePath().Should().BeEquivalentTo(@"C:\Temp\Nzbdrone_update\NzbDrone.Update.exe"); GetIAppDirectoryInfo().GetUpdateClientExePath().Should().BeEquivalentTo(@"C:\Temp\Nzbdrone_update\NzbDrone.Update.exe".AsOsAgnostic());
} }
[Test] [Test]
public void GetUpdateLogFolder() public void GetUpdateLogFolder()
{ {
GetIAppDirectoryInfo().GetUpdateLogFolder().Should().BeEquivalentTo(@"C:\NzbDrone\UpdateLogs\"); GetIAppDirectoryInfo().GetUpdateLogFolder().Should().BeEquivalentTo(@"C:\NzbDrone\UpdateLogs\".AsOsAgnostic());
} }
} }
} }

10
NzbDrone.Core.Test/MediaFileTests/EpisodeFileMoverFixture.cs
Unescape View File

@ -32,7 +32,7 @@ namespace NzbDrone.Core.Test.MediaFileTests
.Build().ToList(); .Build().ToList();
const string filename = @"30 Rock - S01E01 - TBD"; const string filename = @"30 Rock - S01E01 - TBD";
var fi = Path.Combine(@"C:\Test\TV\30 Rock\Season 01\", filename + ".avi"); var fi = Path.Combine(@"C:\Test\TV\30 Rock\Season 01\", filename + ".avi").AsOsAgnostic();
var file = Builder<EpisodeFile>.CreateNew() var file = Builder<EpisodeFile>.CreateNew()
.With(f => f.SeriesId = fakeSeries.Id) .With(f => f.SeriesId = fakeSeries.Id)
@ -80,8 +80,8 @@ namespace NzbDrone.Core.Test.MediaFileTests
.Build().ToList(); .Build().ToList();
const string filename = @"30 Rock - S01E01 - TBD"; const string filename = @"30 Rock - S01E01 - TBD";
var fi = Path.Combine(@"C:\Test\TV\30 Rock\Season 01\", filename + ".mkv"); var fi = Path.Combine(@"C:\Test\TV\30 Rock\Season 01\", filename + ".mkv").AsOsAgnostic();
var currentFilename = Path.Combine(@"C:\Test\TV\30 Rock\Season 01\", "30.Rock.S01E01.Test.WED-DL.mkv"); var currentFilename = Path.Combine(@"C:\Test\TV\30 Rock\Season 01\", "30.Rock.S01E01.Test.WED-DL.mkv").AsOsAgnostic();
const string message = "30 Rock - 1x01 - [WEBDL]"; const string message = "30 Rock - 1x01 - [WEBDL]";
var file = Builder<EpisodeFile>.CreateNew() var file = Builder<EpisodeFile>.CreateNew()
@ -131,8 +131,8 @@ namespace NzbDrone.Core.Test.MediaFileTests
.Build().ToList(); .Build().ToList();
const string filename = @"30 Rock - S01E01 - TBD"; const string filename = @"30 Rock - S01E01 - TBD";
var fi = Path.Combine(@"C:\Test\TV\30 Rock\Season 01\", filename + ".mkv"); var fi = Path.Combine(@"C:\Test\TV\30 Rock\Season 01\", filename + ".mkv").AsOsAgnostic();
var currentFilename = Path.Combine(@"C:\Test\TV\30 Rock\Season 01\", "30.Rock.S01E01.Test.WED-DL.mkv"); var currentFilename = Path.Combine(@"C:\Test\TV\30 Rock\Season 01\", "30.Rock.S01E01.Test.WED-DL.mkv").AsOsAgnostic();
const string message = "30 Rock - 1x01 - [WEBDL]"; const string message = "30 Rock - 1x01 - [WEBDL]";
var file = Builder<EpisodeFile>.CreateNew() var file = Builder<EpisodeFile>.CreateNew()

13
NzbDrone.Core.Test/MediaFileTests/EpisodeImportTests/NotExistingFileSpecificationFixture.cs
Unescape View File

@ -9,6 +9,7 @@ using NzbDrone.Core.MediaFiles.EpisodeImport.Specifications;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Tv; using NzbDrone.Core.Tv;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.MediaFileTests.EpisodeImportTests namespace NzbDrone.Core.Test.MediaFileTests.EpisodeImportTests
{ {
@ -22,7 +23,7 @@ namespace NzbDrone.Core.Test.MediaFileTests.EpisodeImportTests
{ {
_localEpisode = new LocalEpisode _localEpisode = new LocalEpisode
{ {
Path = @"C:\Test\30 Rock\30.rock.s01e01.avi", Path = @"C:\Test\30 Rock\30.rock.s01e01.avi".AsOsAgnostic(),
Size = 100 Size = 100
}; };
} }
@ -36,7 +37,7 @@ namespace NzbDrone.Core.Test.MediaFileTests.EpisodeImportTests
.With(e => e.EpisodeFile = new LazyLoaded<EpisodeFile>( .With(e => e.EpisodeFile = new LazyLoaded<EpisodeFile>(
new EpisodeFile new EpisodeFile
{ {
Path = @"C:\Test\30 Rock\30.rock.s01e01.avi", Path = @"C:\Test\30 Rock\30.rock.s01e01.avi".AsOsAgnostic(),
Size = 100 Size = 100
})) }))
.Build() .Build()
@ -54,7 +55,7 @@ namespace NzbDrone.Core.Test.MediaFileTests.EpisodeImportTests
.With(e => e.EpisodeFile = new LazyLoaded<EpisodeFile>( .With(e => e.EpisodeFile = new LazyLoaded<EpisodeFile>(
new EpisodeFile new EpisodeFile
{ {
Path = @"C:\Test\30 Rock\Season 01\30.rock.s01e01.avi", Path = @"C:\Test\30 Rock\Season 01\30.rock.s01e01.avi".AsOsAgnostic(),
Size = 100 Size = 100
})) }))
.Build() .Build()
@ -84,7 +85,7 @@ namespace NzbDrone.Core.Test.MediaFileTests.EpisodeImportTests
.With(e => e.EpisodeFile = new LazyLoaded<EpisodeFile>( .With(e => e.EpisodeFile = new LazyLoaded<EpisodeFile>(
new EpisodeFile new EpisodeFile
{ {
Path = @"C:\Test\30 Rock\Season 01\30.rock.s01e01.avi", Path = @"C:\Test\30 Rock\Season 01\30.rock.s01e01.avi".AsOsAgnostic(),
Size = 50 Size = 50
})) }))
.Build() .Build()
@ -102,7 +103,7 @@ namespace NzbDrone.Core.Test.MediaFileTests.EpisodeImportTests
.With(e => e.EpisodeFile = new LazyLoaded<EpisodeFile>( .With(e => e.EpisodeFile = new LazyLoaded<EpisodeFile>(
new EpisodeFile new EpisodeFile
{ {
Path = @"C:\Test\30 Rock\Season 01\30.rock.s01e01.pilot.avi", Path = @"C:\Test\30 Rock\Season 01\30.rock.s01e01.pilot.avi".AsOsAgnostic(),
Size = 100 Size = 100
})) }))
.Build() .Build()
@ -124,7 +125,7 @@ namespace NzbDrone.Core.Test.MediaFileTests.EpisodeImportTests
.With(e => e.EpisodeFile = new LazyLoaded<EpisodeFile>( .With(e => e.EpisodeFile = new LazyLoaded<EpisodeFile>(
new EpisodeFile new EpisodeFile
{ {
Path = @"C:\Test\30 Rock\Season 01\30.rock.s01e01.pilot.avi", Path = @"C:\Test\30 Rock\Season 01\30.rock.s01e01.pilot.avi".AsOsAgnostic(),
Size = 100 Size = 100
})) }))
.Build() .Build()

3
NzbDrone.Core.Test/ProviderTests/DiskProviderTests/FreeDiskSpaceTest.cs
Unescape View File

@ -3,6 +3,7 @@ using FluentAssertions;
using NUnit.Framework; using NUnit.Framework;
using NzbDrone.Common; using NzbDrone.Common;
using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.ProviderTests.DiskProviderTests namespace NzbDrone.Core.Test.ProviderTests.DiskProviderTests
{ {
@ -28,7 +29,7 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskProviderTests
[Test] [Test]
public void should_throw_if_drive_doesnt_exist() public void should_throw_if_drive_doesnt_exist()
{ {
Assert.Throws<DirectoryNotFoundException>(() => Subject.GetAvilableSpace(@"Z:\NOT_A_REAL_PATH\DOES_NOT_EXIST")); Assert.Throws<DirectoryNotFoundException>(() => Subject.GetAvilableSpace(@"Z:\NOT_A_REAL_PATH\DOES_NOT_EXIST".AsOsAgnostic()));
} }
} }
} }

13
NzbDrone.Core.Test/ProviderTests/RecycleBinProviderTests/DeleteFileFixture.cs
Unescape View File

@ -7,6 +7,7 @@ using NzbDrone.Common;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
using NzbDrone.Core.MediaFiles; using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.ProviderTests.RecycleBinProviderTests namespace NzbDrone.Core.Test.ProviderTests.RecycleBinProviderTests
{ {
@ -16,7 +17,7 @@ namespace NzbDrone.Core.Test.ProviderTests.RecycleBinProviderTests
{ {
private void WithRecycleBin() private void WithRecycleBin()
{ {
Mocker.GetMock<IConfigService>().SetupGet(s => s.RecycleBin).Returns(@"C:\Test\Recycle Bin"); Mocker.GetMock<IConfigService>().SetupGet(s => s.RecycleBin).Returns(@"C:\Test\Recycle Bin".AsOsAgnostic());
} }
private void WithoutRecycleBin() private void WithoutRecycleBin()
@ -29,7 +30,7 @@ namespace NzbDrone.Core.Test.ProviderTests.RecycleBinProviderTests
{ {
WithoutRecycleBin(); WithoutRecycleBin();
var path = @"C:\Test\TV\30 Rock\S01E01.avi"; var path = @"C:\Test\TV\30 Rock\S01E01.avi".AsOsAgnostic();
Mocker.Resolve<RecycleBinProvider>().DeleteFile(path); Mocker.Resolve<RecycleBinProvider>().DeleteFile(path);
@ -41,23 +42,23 @@ namespace NzbDrone.Core.Test.ProviderTests.RecycleBinProviderTests
{ {
WithRecycleBin(); WithRecycleBin();
var path = @"C:\Test\TV\30 Rock\S01E01.avi"; var path = @"C:\Test\TV\30 Rock\S01E01.avi".AsOsAgnostic();
Mocker.Resolve<RecycleBinProvider>().DeleteFile(path); Mocker.Resolve<RecycleBinProvider>().DeleteFile(path);
Mocker.GetMock<IDiskProvider>().Verify(v => v.MoveFile(path, @"C:\Test\Recycle Bin\S01E01.avi"), Times.Once()); Mocker.GetMock<IDiskProvider>().Verify(v => v.MoveFile(path, @"C:\Test\Recycle Bin\S01E01.avi".AsOsAgnostic()), Times.Once());
} }
[Test] [Test]
public void should_call_fileSetLastWriteTime_for_each_file() public void should_call_fileSetLastWriteTime_for_each_file()
{ {
WithRecycleBin(); WithRecycleBin();
var path = @"C:\Test\TV\30 Rock\S01E01.avi"; var path = @"C:\Test\TV\30 Rock\S01E01.avi".AsOsAgnostic();
Mocker.Resolve<RecycleBinProvider>().DeleteFile(path); Mocker.Resolve<RecycleBinProvider>().DeleteFile(path);
Mocker.GetMock<IDiskProvider>().Verify(v => v.FileSetLastWriteTimeUtc(@"C:\Test\Recycle Bin\S01E01.avi", It.IsAny<DateTime>()), Times.Once()); Mocker.GetMock<IDiskProvider>().Verify(v => v.FileSetLastWriteTimeUtc(@"C:\Test\Recycle Bin\S01E01.avi".AsOsAgnostic(), It.IsAny<DateTime>()), Times.Once());
} }
} }
} }

4
NzbDrone.Core.Test/RootFolderTests/RootFolderServiceFixture.cs
Unescape View File

@ -97,9 +97,9 @@ namespace NzbDrone.Core.Test.RootFolderTests
[Test] [Test]
public void adding_duplicated_root_folder_should_throw() public void adding_duplicated_root_folder_should_throw()
{ {
Mocker.GetMock<IBasicRepository<RootFolder>>().Setup(c => c.All()).Returns(new List<RootFolder> { new RootFolder { Path = "C:\\TV" } }); Mocker.GetMock<IBasicRepository<RootFolder>>().Setup(c => c.All()).Returns(new List<RootFolder> { new RootFolder { Path = "C:\\TV".AsOsAgnostic() } });
Assert.Throws<InvalidOperationException>(() => Subject.Add(new RootFolder { Path = @"C:\TV" })); Assert.Throws<InvalidOperationException>(() => Subject.Add(new RootFolder { Path = @"C:\TV".AsOsAgnostic() }));
} }
} }
} }

1
NzbDrone.Test.Common/StringExtensions.cs
Unescape View File

@ -12,7 +12,6 @@ namespace NzbDrone.Test.Common
if (path.Length > 2 && path[1] == ':') if (path.Length > 2 && path[1] == ':')
{ {
path = path.Replace(':', Path.DirectorySeparatorChar); path = path.Replace(':', Path.DirectorySeparatorChar);
path = Path.DirectorySeparatorChar + path;
} }
path = path.Replace("\\", Path.DirectorySeparatorChar.ToString()); path = path.Replace("\\", Path.DirectorySeparatorChar.ToString());
} }

Write Preview
Loading…
Cancel
Save