Skip to content

feat: implement HasExtension and TrimEndingDirectorySeparator for simulated Path #574

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 3 commits into from
Apr 20, 2024
Merged

feat: implement HasExtension and TrimEndingDirectorySeparator for simulated Path #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48973dc
Add HasExtension
vbreuss Apr 20, 2024
90a8b21
Add TrimEndingDirectorySeparator
vbreuss Apr 20, 2024
97d59fa
Merge branch 'main' into topic/add-hasextension-and-trimendingdirecto…
vbreuss Apr 20, 2024
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
16 changes: 14 additions & 2 deletions Source/Testably.Abstractions.Testing/Helpers/Execute.SimulatedPath.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,15 @@ public bool HasExtension(ReadOnlySpan<char> path)

/// <inheritdoc cref="IPath.HasExtension(string)" />
public bool HasExtension([NotNullWhen(true)] string? path)
=> System.IO.Path.HasExtension(path);
{
if (path == null)
{
return false;
}

return TryGetExtensionIndex(path, out var dotIndex)
&& dotIndex < path.Length - 1;
}

#if FEATURE_SPAN
/// <inheritdoc cref="IPath.IsPathFullyQualified(ReadOnlySpan{char})" />
Expand Down Expand Up @@ -406,7 +414,11 @@ public ReadOnlySpan<char> TrimEndingDirectorySeparator(ReadOnlySpan<char> path)
#if FEATURE_PATH_ADVANCED
/// <inheritdoc cref="IPath.TrimEndingDirectorySeparator(string)" />
public string TrimEndingDirectorySeparator(string path)
=> System.IO.Path.TrimEndingDirectorySeparator(path);
{
return EndsInDirectorySeparator(path) && path.Length != GetRootLength(path)
? path.Substring(0, path.Length - 1)
: path;
}
#endif

#if FEATURE_PATH_JOIN
Expand Down
2 changes: 2 additions & 0 deletions ...s/Testably.Abstractions.Tests.SourceGenerator/ClassGenerators/FileSystemClassGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,11 @@ private bool IncludeSimulatedTests(ClassModel @class)
"GetPathRootTests",
"GetRandomFileNameTests",
"GetTempPathTests",
"HasExtensionTests",
"IsPathRootedTests",
"JoinTests",
"Tests",
"TrimEndingDirectorySeparatorTests",
"TryJoinTests"
];
return @class.Namespace
Expand Down
2 changes: 2 additions & 0 deletions Tests/Testably.Abstractions.Tests/FileSystem/Path/HasExtensionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public void HasExtension_Null_ShouldReturnFalse()
}

[SkippableTheory]
[InlineAutoData("abc.", false)]
[InlineAutoData(".foo", true)]
[InlineAutoData(".abc.xyz", true)]
[InlineAutoData("foo", false)]
Expand All @@ -30,6 +31,7 @@ public void HasExtension_ShouldReturnExpectedResult(

#if FEATURE_SPAN
[SkippableTheory]
[InlineAutoData("abc.", false)]
[InlineAutoData(".foo", true)]
[InlineAutoData(".abc.xyz", true)]
[InlineAutoData("foo", false)]
Expand Down