Skip to content

Call base.Close() in MockFileStream.Close() #398

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 4 commits into from
Nov 9, 2018
Merged

Call base.Close() in MockFileStream.Close() #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72cc060
Call base.Close() in MockFileStream.Close()
biltongza Nov 8, 2018
16dcfdc
Check if we are closed already before trying to close again (fixes mu…
biltongza Nov 8, 2018
5477fe7
- Call base.Close() before OnClose() to keep consistent with Dispose()
biltongza Nov 9, 2018
c7f96cc
Added test case for #397
biltongza Nov 9, 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
15 changes: 15 additions & 0 deletions System.IO.Abstractions.TestingHelpers.Tests/MockFileStreamTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,20 @@ public void MockFileStream_Dispose_MultipleCallsDontThrow()
// Assert
Assert.DoesNotThrow(() => stream.Dispose());
}

[Test]
public void MockFileStream_Dispose_OperationsAfterDisposeThrow()
{
var fileSystem = new MockFileSystem();
var path = XFS.Path("C:\\test");
fileSystem.AddFile(path, new MockFileData(new byte[0]));
var stream = fileSystem.FileInfo.FromFileName(path).OpenWrite();

// Act
stream.Dispose();

// Assert
Assert.Throws<ObjectDisposedException>(() => stream.WriteByte(0));
}
}
}
7 changes: 7 additions & 0 deletions System.IO.Abstractions.TestingHelpers/MockFileStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ public class MockFileStream : MemoryStream
private readonly bool canWrite = true;
private readonly FileOptions options;
private bool disposed;
private bool closed;

public enum StreamType
{
Expand Down Expand Up @@ -64,8 +65,14 @@ public MockFileStream(
#if NET40
public override void Close()
{
if (closed)
{
return;
}
InternalFlush();
base.Close();
OnClose();
closed = true;
}
#else
protected override void Dispose(bool disposing)
Expand Down