mirror/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2025-02-24 23:23:21 +00:00
Code Issues Releases Wiki Activity

Fix GetBestRootFolderPath tests

Browse source 
(cherry picked from commit 63a911a9a549749b5460c2b9fea48a25e78c52a4)
This commit is contained in:
Mark McDowall 2023-08-03 20:12:33 -07:00 committed by Bogdan
parent b8f06eb97d
commit 00e2933052
2 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/NzbDrone.Core.Test/RootFolderTests/GetBestRootFolderPathFixture.cs
View file

@ -1,8 +1,6 @@
using System.Linq; using System.Linq;
using FluentAssertions; using FluentAssertions;
using Moq;
using NUnit.Framework; using NUnit.Framework;
using NzbDrone.Common.Disk;
using NzbDrone.Core.RootFolders; using NzbDrone.Core.RootFolders;
using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common; using NzbDrone.Test.Common;
@ -34,15 +32,34 @@ public void should_return_root_folder_that_is_grandparent_path()
} }
[Test] [Test]
public void should_get_parent_path_from_diskProvider_if_matching_root_folder_is_not_found() public void should_get_parent_path_from_os_path_if_matching_root_folder_is_not_found()
{ {
var moviePath = @"T:\Test\Movies\Movie Title".AsOsAgnostic(); var moviePath = @"T:\Test\Movies\Movie Title".AsOsAgnostic();
GivenRootFolders(@"C:\Test\Movies".AsOsAgnostic(), @"D:\Test\Movies".AsOsAgnostic()); GivenRootFolders(@"C:\Test\Movies".AsOsAgnostic(), @"D:\Test\Movies".AsOsAgnostic());
Subject.GetBestRootFolderPath(moviePath); Subject.GetBestRootFolderPath(moviePath).Should().Be(@"T:\Test\Movies".AsOsAgnostic());
}
Mocker.GetMock<IDiskProvider>() [Test]
.Verify(v => v.GetParentFolder(moviePath), Times.Once); public void should_get_parent_path_from_os_path_if_matching_root_folder_is_not_found_for_posix_path()
{
WindowsOnly();
var moviePath = "/mnt/movies/Movie Title";
GivenRootFolders(@"C:\Test\Movies".AsOsAgnostic(), @"D:\Test\Movies".AsOsAgnostic());
Subject.GetBestRootFolderPath(moviePath).Should().Be(@"/mnt/movies");
}
[Test]
public void should_get_parent_path_from_os_path_if_matching_root_folder_is_not_found_for_windows_path()
{
PosixOnly();
var moviePath = @"T:\Test\Movies\Movie Title";
GivenRootFolders(@"C:\Test\Movies".AsOsAgnostic(), @"D:\Test\Movies".AsOsAgnostic());
Subject.GetBestRootFolderPath(moviePath).Should().Be(@"T:\Test\Movies");
} }
} }
} }

2
src/NzbDrone.Core/RootFolders/RootFolderService.cs
View file

@ -190,7 +190,7 @@ public string GetBestRootFolderPath(string path, List<RootFolder> rootFolders =
{ {
var osPath = new OsPath(path); var osPath = new OsPath(path);
return osPath.Directory.ToString(); return osPath.Directory.ToString().TrimEnd(osPath.IsUnixPath ? '/' : '\\');
} }
return possibleRootFolder?.Path; return possibleRootFolder?.Path;