Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,36 @@ public void MockDirectoryInfo_FullName_ShouldReturnNormalizedPath(string directo
Assert.AreEqual(expectedFullName, actualFullName);
}

[TestCase(@"c:\temp\folder ", @"c:\temp\folder")]
[WindowsOnly(WindowsSpecifics.Drives)]
public void MockDirectoryInfo_FullName_ShouldReturnPathWithTrimmedTrailingSpaces(string directoryPath, string expectedFullName)
{
// Arrange
var fileSystem = new MockFileSystem();
var directoryInfo = new MockDirectoryInfo(fileSystem, directoryPath);

// Act
var actualFullName = directoryInfo.FullName;

// Assert
Assert.AreEqual(expectedFullName, actualFullName);
}

[TestCase(@"c:\temp\\folder ", @"folder")]
[WindowsOnly(WindowsSpecifics.Drives)]
public void MockDirectoryInfo_Name_ShouldReturnNameWithTrimmedTrailingSpaces(string directoryPath, string expectedName)
{
// Arrange
var fileSystem = new MockFileSystem();
var directoryInfo = new MockDirectoryInfo(fileSystem, directoryPath);

// Act
var actualName = directoryInfo.Name;

// Assert
Assert.AreEqual(expectedName, actualName);
}

[Test]
public void MockDirectoryInfo_Constructor_ShouldThrowArgumentNullException_IfArgumentDirectoryIsNull()
{
Expand Down
14 changes: 14 additions & 0 deletions System.IO.Abstractions.TestingHelpers.Tests/MockDirectoryTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,20 @@ public void MockDirectory_CreateDirectory_ShouldReturnDirectoryInfoBase()
Assert.IsNotNull(result);
}

[Test]
[WindowsOnly(WindowsSpecifics.Drives)]
public void MockDirectory_CreateDirectory_ShouldTrimTrailingSpaces()
{
// Arrange
var fileSystem = new MockFileSystem();

// Act
fileSystem.Directory.CreateDirectory(XFS.Path(@"c:\temp\folder "));

// Assert
Assert.IsTrue(fileSystem.Directory.Exists(XFS.Path(@"c:\temp\folder")));
}

[Test]
public void MockDirectory_CreMockDirectory_CreateDirectory_ShouldReturnDirectoryInfoBaseWhenDirectoryExists()
{
Expand Down
4 changes: 4 additions & 0 deletions System.IO.Abstractions.TestingHelpers/MockDirectory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ private IDirectoryInfo CreateDirectoryInternal(string path, DirectorySecurity di
}

path = mockFileDataAccessor.Path.GetFullPath(path).TrimSlashes();
if (XFS.IsWindowsPlatform())
{
path = path.TrimEnd(' ');
}

if (!Exists(path))
{
Expand Down
9 changes: 8 additions & 1 deletion System.IO.Abstractions.TestingHelpers/MockDirectoryInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

namespace System.IO.Abstractions.TestingHelpers
{
using XFS = MockUnixSupport;

[Serializable]
public class MockDirectoryInfo : DirectoryInfoBase
{
Expand All @@ -24,7 +26,12 @@ public MockDirectoryInfo(IMockFileDataAccessor mockFileDataAccessor, string dire
originalPath = directoryPath;
directoryPath = mockFileDataAccessor.Path.GetFullPath(directoryPath);

this.directoryPath = directoryPath.TrimSlashes();
directoryPath = directoryPath.TrimSlashes();
if (XFS.IsWindowsPlatform())
{
directoryPath = directoryPath.TrimEnd(' ');
}
this.directoryPath = directoryPath;
}

public override void Delete()
Expand Down