Skip to content

EnumerationOptions With recursion #652

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
fgreinacher merged 1 commit into from
Oct 12, 2020
Merged

EnumerationOptions With recursion #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/System.IO.Abstractions.TestingHelpers/MockDirectory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public override string[] GetDirectories(string path, string searchPattern, Searc
#if FEATURE_ENUMERATION_OPTIONS
public override string[] GetDirectories(string path, string searchPattern, EnumerationOptions enumerationOptions)
{
return GetDirectories(path, "*");
return GetDirectories(path, "*", enumerationOptions.RecurseSubdirectories ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly);
}
#endif

Expand Down Expand Up @@ -206,7 +206,7 @@ public override string[] GetFiles(string path, string searchPattern, SearchOptio
#if FEATURE_ENUMERATION_OPTIONS
public override string[] GetFiles(string path, string searchPattern, EnumerationOptions enumerationOptions)
{
return GetFiles(path, "*");
return GetFiles(path, "*", enumerationOptions.RecurseSubdirectories ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly);
}
#endif

Expand Down
45 changes: 45 additions & 0 deletions tests/System.IO.Abstractions.TestingHelpers.Tests/MockDirectoryInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,51 @@ public void MockDirectoryInfo_EnumerateFileSystemInfos_ShouldReturnDirectoriesAn
Assert.That(result.Length, Is.EqualTo(2));
}

[Test]
public void MockDirectoryInfo_EnumerateFileSystemInfos_ShouldReturnDirectoriesAndNamesWithSearchPatternRecursive()
{
var fileSystem = new MockFileSystem(new Dictionary<string, MockFileData>
{
{ XFS.Path(@"c:\temp\folder\file.txt"), new MockFileData("") },
{ XFS.Path(@"c:\temp\folder\folder"), new MockDirectoryData() },
{ XFS.Path(@"c:\temp\folder\older"), new MockDirectoryData() }
});

var directoryInfo = new MockDirectoryInfo(fileSystem, XFS.Path(@"c:\"));
var result = directoryInfo.EnumerateFileSystemInfos("*", SearchOption.AllDirectories).ToArray();

Assert.That(result.Length, Is.EqualTo(5));
}

#if FEATURE_ENUMERATION_OPTIONS
[Test]
public void MockDirectoryInfo_EnumerateFileSystemInfos_ShouldReturnDirectoriesAndNamesWithSearchPatternRecursiveEnumerateOptions()
{
var fileSystem = new MockFileSystem(new Dictionary<string, MockFileData>
{
{ XFS.Path(@"c:\temp\folder\file.txt"), new MockFileData("") },
{ XFS.Path(@"c:\temp\folder\folder"), new MockDirectoryData() },
{ XFS.Path(@"c:\temp\folder\older"), new MockDirectoryData() }
});

var directoryInfo = new MockDirectoryInfo(fileSystem, XFS.Path(@"c:\"));

var enumerationOptions = new EnumerationOptions()
{
MatchType = MatchType.Win32,
RecurseSubdirectories = true,
IgnoreInaccessible = true,
ReturnSpecialDirectories = false,
AttributesToSkip = FileAttributes.Hidden,
MatchCasing = MatchCasing.PlatformDefault,
};

var result = directoryInfo.EnumerateFileSystemInfos("*", enumerationOptions).ToArray();

Assert.That(result.Length, Is.EqualTo(5));
}
#endif

[Test]
public void MockDirectoryInfo_GetParent_ShouldReturnDirectoriesAndNamesWithSearchPattern()
{
Expand Down