Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: support relative path with drive information in Path.GetFullPath #411

Merged
merged 7 commits into from
Oct 11, 2023
Merged

fix: support relative path with drive information in Path.GetFullPath #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9193e98
Add failing tests
vbreuss Oct 10, 2023
5d5fec9
Support relative paths with drive information
vbreuss Oct 10, 2023
74afb7a
Add missing test to ensure correct behaviour for Path.GetFullPath whe…
vbreuss Oct 10, 2023
90cda37
Reorder tests
vbreuss Oct 10, 2023
812dc61
Use OrdinalIgnoreCase
vbreuss Oct 10, 2023
bceaba6
Use invariant in PathMock
vbreuss Oct 10, 2023
5bf4c29
Ensure to use an unused drive
vbreuss Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions Source/Testably.Abstractions.Testing/FileSystem/PathMock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,21 @@ public override string GetFullPath(string path)
{
path.EnsureValidArgument(FileSystem, nameof(path));

string? pathRoot = Path.GetPathRoot(path);
string? directoryRoot = Path.GetPathRoot(_fileSystem.Storage.CurrentDirectory);
if (!string.IsNullOrEmpty(pathRoot) && !string.IsNullOrEmpty(directoryRoot))
{
if (char.ToUpperInvariant(pathRoot[0]) != char.ToUpperInvariant(directoryRoot[0]))
{
return Path.GetFullPath(path);
}

if (pathRoot.Length < directoryRoot.Length)
{
path = path.Substring(pathRoot.Length);
}
}

return Path.GetFullPath(Path.Combine(
_fileSystem.Storage.CurrentDirectory,
path));
Expand Down
43 changes: 43 additions & 0 deletions Tests/Testably.Abstractions.Tests/FileSystem/Path/GetFullPathTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,49 @@ public abstract partial class GetFullPathTests<TFileSystem>
: FileSystemTestBase<TFileSystem>
where TFileSystem : IFileSystem
{
[SkippableFact]
public void GetFullPath_Dot_ShouldReturnToCurrentDirectory()
{
string expectedFullPath = FileSystem.Directory.GetCurrentDirectory();

string result = FileSystem.Path.GetFullPath(".");

result.Should().Be(expectedFullPath);
}

[SkippableFact]
public void GetFullPath_RelativePathWithDrive_ShouldReturnExpectedValue()
{
Skip.IfNot(Test.RunsOnWindows);

string currentDirectory = FileSystem.Directory.GetCurrentDirectory();
string drive = currentDirectory.Substring(0, 1);
string input = $"{drive}:test.txt";
string expectedFullPath = FileSystem.Path.Combine(currentDirectory, "test.txt");

string result = FileSystem.Path.GetFullPath(input);

result.Should().Be(expectedFullPath);
}

[SkippableFact]
public void
GetFullPath_RelativePathWithDrive_WhenCurrentDirectoryIsDifferent_ShouldReturnExpectedValue()
{
Skip.IfNot(Test.RunsOnWindows);

string currentDirectory = FileSystem.Directory.GetCurrentDirectory();
string otherDrive = currentDirectory
.Substring(0,1)
.Equals("x", StringComparison.OrdinalIgnoreCase) ? "Y" : "X";
string input = $"{otherDrive}:test.txt";
string expectedFullPath = $@"{otherDrive}:\test.txt";

string result = FileSystem.Path.GetFullPath(input);

result.Should().Be(expectedFullPath);
}

[SkippableTheory]
[InlineData(@"top/../most/file", @"most/file")]
[InlineData(@"top/../most/../dir/file", @"dir/file")]
Expand Down