Skip to content

feat: Implemented MockDirectory.CreateTempSubDirectory #964

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 15 commits into from
Apr 13, 2023
Merged

feat: Implemented MockDirectory.CreateTempSubDirectory #964

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e9cc5b5
Implemented MockDirectory.CreateTempSubdirectory.
gregington Apr 9, 2023
a41b5fc
Generated random directory names in a loop to prevent generating an e…
gregington Apr 9, 2023
dfb9af1
Used Path.GetRandomFileName to generate random directory name.
gregington Apr 11, 2023
a2194d7
Removed unused using.
gregington Apr 11, 2023
81cf253
Test for temp subdirectory now checks for Contains instead of StartsW…
gregington Apr 11, 2023
57ee7fa
Removed Random instance and serialization code no longer required.
gregington Apr 11, 2023
6d4a7e7
Fixed double prefixing of temporary directory.
gregington Apr 11, 2023
1c73fc6
Removed unused referencs to binary serialization.
gregington Apr 11, 2023
bde7bb9
Merge branch 'main' into create-temp-subdirectory
gregington Apr 11, 2023
4245564
Removed usused using.
gregington Apr 11, 2023
9152f1f
Merge branch 'main' into create-temp-subdirectory
gregington Apr 11, 2023
130edb2
Merge branch 'main' into create-temp-subdirectory
gregington Apr 11, 2023
0ebc1e9
style: remove extra whitespace
fgreinacher Apr 13, 2023
a30fae3
style: add newline
fgreinacher Apr 13, 2023
56991df
style: add newline
fgreinacher Apr 13, 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: 12 additions & 3 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 @@ -16,7 +16,7 @@ public class MockDirectory : DirectoryBase
{
private readonly IMockFileDataAccessor mockFileDataAccessor;
private string currentDirectory;
Comment thread
fgreinacher marked this conversation as resolved.

Comment thread
fgreinacher marked this conversation as resolved.
Outdated
/// <inheritdoc />
public MockDirectory(IMockFileDataAccessor mockFileDataAccessor, FileBase fileBase, string currentDirectory) :
this(mockFileDataAccessor, currentDirectory)
Expand All @@ -32,7 +32,6 @@ public MockDirectory(IMockFileDataAccessor mockFileDataAccessor, string currentD
mockFileDataAccessor ?? throw new ArgumentNullException(nameof(mockFileDataAccessor));
}


/// <inheritdoc />
Comment thread
fgreinacher marked this conversation as resolved.
public override IDirectoryInfo CreateDirectory(string path)
{
Expand Down Expand Up @@ -110,7 +109,17 @@ public override IFileSystemInfo CreateSymbolicLink(string path, string pathToTar
/// <inheritdoc />
public override IDirectoryInfo CreateTempSubdirectory(string prefix = null)
{
throw CommonExceptions.NotImplemented();
prefix ??= "";
string potentialTempDirectory;

// 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);
} while (Exists(potentialTempDirectory));

return CreateDirectoryInternal(potentialTempDirectory);
}
#endif

Expand Down
31 changes: 31 additions & 0 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 @@ -813,6 +813,37 @@ public void MockDirectory_CreateDirectory_ShouldSucceedIfTryingToCreateUNCPathSh
Assert.IsTrue(fileSystem.Directory.Exists(@"\\server\share\"));
}

#if FEATURE_CREATE_TEMP_SUBDIRECTORY
[Test]
public void MockDirectory_CreateTempSubdirectory_ShouldCreateSubdirectoryInTempDirectory()
{
// Arrange
var fileSystem = new MockFileSystem();

// Act
var result = fileSystem.Directory.CreateTempSubdirectory();

// Assert
Assert.IsTrue(fileSystem.Directory.Exists(result.FullName));
Assert.IsTrue(result.FullName.Contains(Path.GetTempPath()));
}

[Test]
public void MockDirectory_CreateTempSubdirectoryWithPrefix_ShouldCreateDirectoryWithGivenPrefixInTempDirectory()
{
// Arrange
var fileSystem = new MockFileSystem();

// Act
var result = fileSystem.Directory.CreateTempSubdirectory("foo-");

// Assert
Assert.IsTrue(fileSystem.Directory.Exists(result.FullName));
Assert.IsTrue(Path.GetFileName(result.FullName).StartsWith("foo-"));
Assert.IsTrue(result.FullName.Contains(Path.GetTempPath()));
}
#endif

[Test]
public void MockDirectory_Delete_ShouldDeleteDirectory()
{
Expand Down