Skip to content

fix: return correct Parent of DirectoryInfo with trailing directory separator #846

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
merged 2 commits into from
Sep 6, 2025
Merged

fix: return correct Parent of DirectoryInfo with trailing directory separator #846

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
58e02af
fix: return correct `Parent` of `DirectoryInfo` with trailing directo…
vbreuss Sep 6, 2025
48f566a
Rename local variable
vbreuss Sep 6, 2025
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
7 changes: 5 additions & 2 deletions Source/Testably.Abstractions.Testing/Storage/InMemoryLocation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,12 @@ public override int GetHashCode()
/// <inheritdoc cref="IStorageLocation.GetParent()" />
public IStorageLocation? GetParent()
{
string? parentPath = _fileSystem.Execute.Path.GetDirectoryName(FullPath);
string fullPathWithoutTrailingSeparator = FullPath
.TrimEnd(_fileSystem.Path.DirectorySeparatorChar);
string? parentPath =
_fileSystem.Execute.Path.GetDirectoryName(fullPathWithoutTrailingSeparator);
if (string.Equals(
_fileSystem.Execute.Path.GetPathRoot(FullPath),
_fileSystem.Execute.Path.GetPathRoot(fullPathWithoutTrailingSeparator),
FullPath,
_fileSystem.Execute.StringComparisonMode)
|| parentPath == null)
Expand Down
20 changes: 17 additions & 3 deletions Tests/Testably.Abstractions.Tests/FileSystem/DirectoryInfo/Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,8 @@ public async Task Parent_ArbitraryPaths_ShouldNotBeNull(string path1,
IDirectoryInfo sut = FileSystem.DirectoryInfo.New(path);

await That(sut.Parent).IsNotNull();
await That(sut?.Exists).IsFalse();
await That(sut?.Parent).IsNotNull();
await That(sut?.Parent?.Exists).IsFalse();
await That(sut.Exists).IsFalse();
await That(sut.Parent!.Exists).IsFalse();
}

[Fact]
Expand Down Expand Up @@ -343,6 +342,21 @@ public async Task Parent_ToString_ShouldBeDirectoryNameOnNetFramework(
}
}

[Theory]
[AutoData]
public async Task Parent_WithTrailingDirectorySeparator_ShouldReturnCorrectParent(string path1,
string path2)
{
string path = FileSystem.Path.Combine(path1, path2);
string expectedParent = FileSystem.Path.GetFullPath(path1);

IDirectoryInfo sut =
FileSystem.DirectoryInfo.New(path + FileSystem.Path.DirectorySeparatorChar);

await That(sut.Parent).IsNotNull();
await That(sut.Parent!.FullName).IsEqualTo(expectedParent);
}

[Fact]
public async Task Root_Name_ShouldBeCorrect()
{
Expand Down
Loading