Fixed Tests

TestableIO · Mar 11, 2019 · 4409d36 · 4409d36
1 parent 6af7574
commit 4409d36
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/System.IO.Abstractions.TestingHelpers.Tests/MockFileStreamTests.cs b/System.IO.Abstractions.TestingHelpers.Tests/MockFileStreamTests.cs
@@ -82,7 +82,6 @@ public void MockFileStream_Constructor_ReadTypeNotWritable()
         [TestCase(FileShare.None, MockFileStream.StreamType.WRITE)]
         [TestCase(FileShare.Read, MockFileStream.StreamType.WRITE)]
         [TestCase(FileShare.Write, MockFileStream.StreamType.READ)]
-        [TestCase(FileShare.Write, MockFileStream.StreamType.WRITE)]
         public void MockFileStream_Constructor_Insufficient_FileShare_Throws_Exception(FileShare allowedFileShare, MockFileStream.StreamType streamType)
         {
             var filePath = @"C:\locked.txt";
@@ -97,6 +96,7 @@ public void MockFileStream_Constructor_Insufficient_FileShare_Throws_Exception(F
 
         [Test]
         [TestCase(FileShare.Read, MockFileStream.StreamType.READ)]
+        [TestCase(FileShare.Read | FileShare.Write, MockFileStream.StreamType.APPEND)]
         [TestCase(FileShare.ReadWrite, MockFileStream.StreamType.READ)]
         [TestCase(FileShare.ReadWrite, MockFileStream.StreamType.WRITE)]
         public void MockFileStream_Constructor_Sufficient_FileShare_Does_Not_Throw_Exception(FileShare allowedFileShare, MockFileStream.StreamType streamType)

diff --git a/System.IO.Abstractions.TestingHelpers/MockFileStream.cs b/System.IO.Abstractions.TestingHelpers/MockFileStream.cs
@@ -43,7 +43,7 @@ public MockFileStream(
             if (mockFileDataAccessor.FileExists(path))
             {
                 var fileData = mockFileDataAccessor.GetFile(path);
-                CheckFileAccess(path, streamType, fileData);
+                fileData.CheckFileAccess(path, streamType != StreamType.READ ? FileAccess.Write : FileAccess.Read);
 
                 /* only way to make an expandable MemoryStream that starts with a particular content */
                 var data = fileData.Contents;
@@ -67,13 +67,6 @@ public MockFileStream(
             canWrite = streamType != StreamType.READ;
         }
 
-        private static void CheckFileAccess(string path, StreamType streamType, MockFileData fileData)
-        {
-            fileData.CheckFileAccess(path, FileAccess.Read);
-            if (streamType != StreamType.READ)
-                fileData.CheckFileAccess(path, FileAccess.Write);
-        }
-
         public override bool CanWrite => canWrite;
 
 #if NET40