Skip to content

TestingHelpers: Lazily create File|DirectorySecurity for better suppo… #273

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

Closed
fgreinacher wants to merge 2 commits into from
Closed

TestingHelpers: Lazily create File|DirectorySecurity for better suppo… #273

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
7ee1abe
TestingHelpers: Lazily create File|DirectorySecurity for better suppo…
fgreinacher Feb 7, 2018
6037991
Remove package reference to Microsoft.DotNet.Analyzers.Compatibility
fgreinacher Feb 7, 2018
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
7 changes: 5 additions & 2 deletions TestingHelpers/MockDirectory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public MockDirectory(IMockFileDataAccessor mockFileDataAccessor, FileBase fileBa

public override DirectoryInfoBase CreateDirectory(string path)
{
return CreateDirectoryInternal(path, new DirectorySecurity());
return CreateDirectoryInternal(path, null);
}

#if NET40
Expand Down Expand Up @@ -61,7 +61,10 @@ private DirectoryInfoBase CreateDirectoryInternal(string path, DirectorySecurity
}

var created = new MockDirectoryInfo(mockFileDataAccessor, path);
created.SetAccessControl(directorySecurity);
if(directorySecurity != null)
{
created.SetAccessControl(directorySecurity);
}
return created;
}

Expand Down
6 changes: 3 additions & 3 deletions TestingHelpers/MockDirectoryData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ namespace System.IO.Abstractions.TestingHelpers
[Serializable]
public class MockDirectoryData : MockFileData
{
[NonSerialized]
private DirectorySecurity accessControl = new DirectorySecurity();
[NonSerialized]
private DirectorySecurity accessControl;

public override bool IsDirectory { get { return true; } }

Expand All @@ -17,7 +17,7 @@ public MockDirectoryData() : base(string.Empty)

public new DirectorySecurity AccessControl
{
get { return accessControl; }
get { return accessControl ?? (accessControl = new DirectorySecurity()); }
set { accessControl = value; }
}
}
Expand Down
4 changes: 2 additions & 2 deletions TestingHelpers/MockFileData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public class MockFileData
/// The access control of the <see cref="MockFileData"/>.
/// </summary>
[NonSerialized]
private FileSecurity accessControl = new FileSecurity();
private FileSecurity accessControl;

/// <summary>
/// Gets a value indicating whether the <see cref="MockFileData"/> is a directory or not.
Expand Down Expand Up @@ -181,7 +181,7 @@ public FileAttributes Attributes
/// </summary>
public FileSecurity AccessControl
{
get { return accessControl; }
get { return accessControl ?? (accessControl = new FileSecurity()); }
set { accessControl = value; }
}
}
Expand Down