Skip to content

fix: use correct base path in Directory.CreateTempSubdirectory #1127

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
vbreuss merged 3 commits into from
Jun 22, 2024
Merged

fix: use correct base path in Directory.CreateTempSubdirectory #1127

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
a19856e
Add failing test for #1125
vbreuss Jun 22, 2024
93c1f73
Use correct path for temporary directory
vbreuss Jun 22, 2024
e9f512f
Fix failing tests
vbreuss Jun 22, 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
4 changes: 2 additions & 2 deletions src/TestableIO.System.IO.Abstractions.TestingHelpers/MockDirectory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ public override IDirectoryInfo CreateTempSubdirectory(string prefix = null)
// Perform directory name generation in a loop, just in case the randomly generated name already exists.
do
{
var randomDir = $"{prefix}{Path.GetRandomFileName()}";
potentialTempDirectory = Path.Combine(Path.GetTempPath(), randomDir);
var randomDir = $"{prefix}{FileSystem.Path.GetRandomFileName()}";
potentialTempDirectory = Path.Combine(FileSystem.Path.GetTempPath(), randomDir);
} while (Exists(potentialTempDirectory));

return CreateDirectoryInternal(potentialTempDirectory);
Expand Down
4 changes: 2 additions & 2 deletions tests/TestableIO.System.IO.Abstractions.TestingHelpers.Tests/MockDirectoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,7 @@ public void MockDirectory_CreateTempSubdirectory_ShouldCreateSubdirectoryInTempD

// Assert
Assert.That(fileSystem.Directory.Exists(result.FullName), Is.True);
Assert.That(result.FullName.Contains(Path.GetTempPath()), Is.True);
Assert.That(result.FullName, Does.StartWith(fileSystem.Path.GetTempPath()));
}

[Test]
Expand All @@ -877,7 +877,7 @@ public void MockDirectory_CreateTempSubdirectoryWithPrefix_ShouldCreateDirectory
// Assert
Assert.That(fileSystem.Directory.Exists(result.FullName), Is.True);
Assert.That(Path.GetFileName(result.FullName).StartsWith("foo-"), Is.True);
Assert.That(result.FullName.Contains(Path.GetTempPath()), Is.True);
Assert.That(result.FullName.Contains(fileSystem.Path.GetTempPath()), Is.True);
}
#endif

Expand Down