Skip to content

fix: throw IOException when creating a directory with a conflicting file #969

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
Apr 18, 2023
Merged

fix: throw IOException when creating a directory with a conflicting file #969

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
8140b27
Throw IOException when creating a directory with a conflicting file.
vbtig Apr 16, 2023
dffba9d
Also add similar test for DirectoryInfo.Create
vbtig Apr 16, 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
1 change: 1 addition & 0 deletions System.IO.Abstractions.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_", "_", "{BBF7AD8D-5522-48C0-A906-00CBB72308A0}"
ProjectSection(SolutionItems) = preProject
Directory.Build.props = Directory.Build.props
global.json = global.json
EndProjectSection
EndProject
Global
Expand Down
7 changes: 6 additions & 1 deletion 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 @@ -71,10 +71,15 @@ private IDirectoryInfo CreateDirectoryInternal(string path)
path = path.TrimEnd(' ');
}

if (!Exists(path))
var existingFile = mockFileDataAccessor.GetFile(path);
if (existingFile == null)
{
mockFileDataAccessor.AddDirectory(path);
}
else if (!existingFile.IsDirectory)
{
throw CommonExceptions.FileAlreadyExists("path");
}

var created = new MockDirectoryInfo(mockFileDataAccessor, path);

Expand Down
14 changes: 14 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 @@ -621,6 +621,20 @@ public void MockDirectoryInfo_LastWriteTimeUtc_ShouldReturnDefaultTimeForNonExis
Assert.That(result, Is.EqualTo(MockFileData.DefaultDateTimeOffset.UtcDateTime));
}

[Test]
public void MockDirectoryInfo_Create_WithConflictingFile_ShouldThrowIOException()
{
var fileSystem = new MockFileSystem();
fileSystem.AddFile(XFS.Path(@"c:\foo\bar.txt"), new MockFileData("Demo text content"));
var sut = fileSystem.DirectoryInfo.New(XFS.Path(@"c:\foo\bar.txt"));

// Act
TestDelegate action = () => sut.Create();

// Assert
Assert.Throws<IOException>(action);
}

public void MockDirectoryInfo_CreationTime_SetterShouldThrowDirectoryNotFoundExceptionForNonExistingDirectory()
{
var newTime = new DateTime(2022, 04, 06);
Expand Down
13 changes: 13 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 @@ -662,6 +662,19 @@ public void MockDirectory_Exists_ShouldReturnFalseForIllegalPath(string path)
Assert.IsFalse(result);
}

[Test]
public void MockDirectory_CreateDirectory_WithConflictingFile_ShouldThrowIOException()
{
var fileSystem = new MockFileSystem();
fileSystem.AddFile(XFS.Path(@"c:\foo\bar.txt"), new MockFileData("Demo text content"));

// Act
TestDelegate action = () => fileSystem.Directory.CreateDirectory(XFS.Path(@"c:\foo\bar.txt"));

// Assert
Assert.Throws<IOException>(action);
}

[Test]
public void MockDirectory_Exists_ShouldReturnFalseForFiles()
{
Expand Down