Skip to content

fix: Fixing UNC path GetFullPath when Current Directory is a UNC path #887

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

Merged
mergify merged 2 commits into from
Dec 19, 2022
Merged

fix: Fixing UNC path GetFullPath when Current Directory is a UNC path #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a69f22c
Fixing UNC path GetFullPath when Current Directory is a UNC path
michal-ciechan Dec 15, 2022
f1350fb
Merge branch 'main' into main
fgreinacher Dec 19, 2022
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
6 changes: 3 additions & 3 deletions src/TestableIO.System.IO.Abstractions.TestingHelpers/MockPath.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public override string GetFullPath(string path)
// unc paths need at least two segments, the others need one segment
var isUnixRooted = mockFileDataAccessor.StringOperations.StartsWith(
mockFileDataAccessor.Directory.GetCurrentDirectory(),
string.Format(CultureInfo.InvariantCulture, "{0}", DirectorySeparatorChar));
"/");

var minPathSegments = isUnc
? 2
Expand Down Expand Up @@ -121,7 +121,7 @@ public override string GetFullPath(string path)

if (isUnixRooted && !isUnc)
{
fullPath = DirectorySeparatorChar + fullPath;
fullPath = "/" + fullPath;
}
else if (isUnixRooted)
{
Expand Down Expand Up @@ -156,4 +156,4 @@ public override string GetTempFileName()
/// <inheritdoc />
public override string GetTempPath() => defaultTempDirectory;
}
}
}
21 changes: 21 additions & 0 deletions tests/TestableIO.System.IO.Abstractions.TestingHelpers.Tests/MockDirectoryInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,28 @@ public void MockDirectoryInfo_GetFiles_ShouldWorkWithUNCPath()
Assert.AreEqual(fileName, files[0].FullName);
}

[Test]
[WindowsOnly(WindowsSpecifics.UNCPaths)]
public void MockDirectoryInfo_GetFiles_ShouldWorkWithUNCPath_WhenCurrentDirectoryIsUnc()
{
var fileName = XFS.Path(@"\\unc\folder\file.txt");
var directoryName = XFS.Path(@"\\unc\folder");
// Arrange
var fileSystem = new MockFileSystem(new Dictionary<string, MockFileData>
{
{fileName, ""}
});

fileSystem.Directory.SetCurrentDirectory(directoryName);

var directoryInfo = new MockDirectoryInfo(fileSystem, directoryName);

// Act
var files = directoryInfo.GetFiles();

// Assert
Assert.AreEqual(fileName, files[0].FullName);
}

[Test]
public void MockDirectoryInfo_FullName_ShouldReturnFullNameWithoutIncludingTrailingPathDelimiter()
Expand Down