diff --git a/TestingHelpers/MockDirectory.cs b/TestingHelpers/MockDirectory.cs
index fd088dcb3..d988f354c 100644
--- a/TestingHelpers/MockDirectory.cs
+++ b/TestingHelpers/MockDirectory.cs
@@ -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
@@ -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;
}
diff --git a/TestingHelpers/MockDirectoryData.cs b/TestingHelpers/MockDirectoryData.cs
index 65cf59700..9668db74f 100644
--- a/TestingHelpers/MockDirectoryData.cs
+++ b/TestingHelpers/MockDirectoryData.cs
@@ -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; } }
@@ -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; }
}
}
diff --git a/TestingHelpers/MockFileData.cs b/TestingHelpers/MockFileData.cs
index 0d9945bc4..2808d9c27 100644
--- a/TestingHelpers/MockFileData.cs
+++ b/TestingHelpers/MockFileData.cs
@@ -60,7 +60,7 @@ public class MockFileData
/// The access control of the .
///
[NonSerialized]
- private FileSecurity accessControl = new FileSecurity();
+ private FileSecurity accessControl;
///
/// Gets a value indicating whether the is a directory or not.
@@ -181,7 +181,7 @@ public FileAttributes Attributes
///
public FileSecurity AccessControl
{
- get { return accessControl; }
+ get { return accessControl ?? (accessControl = new FileSecurity()); }
set { accessControl = value; }
}
}