Commit 7390914

authored

Merge pull request #359 from anthonylangsworth/HelpWriter_Disposal

Do not dispose ParserSettings.HelpWriter in ParserSettings.Dispose (fix for #355)

2 parents 4fa8ddf + 922fe40 commit 7390914Copy full SHA for 7390914

File tree

+49

-5

lines changed

+49

-5

lines changed

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,9 @@ public CultureInfo ParsingCulture`
`92`	`92`	`/// Gets or sets the <see cref="System.IO.TextWriter"/> used for help method output.`
`93`	`93`	`/// Setting this property to null, will disable help screen.`
`94`	`94`	`/// </summary>`
	`95`	`+ /// <remarks>`
	`96`	`+ /// It is the caller's responsibility to dispose or close the <see cref="TextWriter"/>.`
	`97`	`+ /// </remarks>`
`95`	`98`	`public TextWriter HelpWriter`
`96`	`99`	`{`
`97`	`100`	`get { return helpWriter; }`
`@@ -165,11 +168,7 @@ private void Dispose(bool disposing)`
`165`	`168`
`166`	`169`	`if (disposing)`
`167`	`170`	`{`
`168`		`- if (HelpWriter != null)`
`169`		`- {`
`170`		`- helpWriter.Dispose();`
`171`		`- helpWriter = null;`
`172`		`- }`
	`171`	`+ // Do not dispose HelpWriter. It is the caller's responsibility.`
`173`	`172`
`174`	`173`	`disposed = true;`
`175`	`174`	`}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@`
`116`	`116`	`<Compile Include="Unit\Infrastructure\FSharpOptionHelperTests.cs" />`
`117`	`117`	`<Compile Include="Unit\Core\ReflectionExtensions.cs" />`
`118`	`118`	`<Compile Include="Unit\ParserResultExtensionsTests.cs" />`
	`119`	`+ <Compile Include="Unit\ParserSettingsTests.cs" />`
`119`	`120`	`<Compile Include="Unit\ParserTests.cs" />`
`120`	`121`	`<Compile Include="Unit\Text\HelpTextTests.cs" />`
`121`	`122`	`<Compile Include="Unit\UnParserExtensionsTests.cs" />`

Lines changed: 44 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,44 @@`
	`1`	`+using System;`
	`2`	`+using System.Collections.Generic;`
	`3`	`+using System.IO;`
	`4`	`+using System.Linq;`
	`5`	`+using System.Text;`
	`6`	`+using System.Threading.Tasks;`
	`7`	`+using FluentAssertions;`
	`8`	`+using Xunit;`
	`9`	`+`
	`10`	`+namespace CommandLine.Tests.Unit`
	`11`	`+{`
	`12`	`+ public class ParserSettingsTests`
	`13`	`+ {`
	`14`	`+ public class DisposeTrackingStringWriter : StringWriter`
	`15`	`+ {`
	`16`	`+ public DisposeTrackingStringWriter()`
	`17`	`+ {`
	`18`	`+ Disposed = false;`
	`19`	`+ }`
	`20`	`+`
	`21`	`+ public bool Disposed { get; private set; }`
	`22`	`+`
	`23`	`+ protected override void Dispose(bool disposing)`
	`24`	`+ {`
	`25`	`+ Disposed = true;`
	`26`	`+ base.Dispose(disposing);`
	`27`	`+ }`
	`28`	`+ }`
	`29`	`+`
	`30`	`+ [Fact]`
	`31`	`+ public void Disposal_does_not_dispose_HelpWriter()`
	`32`	`+ {`
	`33`	`+ using (DisposeTrackingStringWriter textWriter = new DisposeTrackingStringWriter())`
	`34`	`+ {`
	`35`	`+ using (ParserSettings parserSettings = new ParserSettings())`
	`36`	`+ {`
	`37`	`+ parserSettings.HelpWriter = textWriter;`
	`38`	`+ }`
	`39`	`+`
	`40`	`+ textWriter.Disposed.Should().BeFalse("not disposed");`
	`41`	`+ }`
	`42`	`+ }`
	`43`	`+ }`
	`44`	`+}`

Comments

(0)