Check on error called.

anthonylangsworth · anthonylangsworth · commit d10f3678fd97 · 2016-10-01T22:33:16.000+10:00
Also changed IList&lt;Attribute&gt; to IEnumerable&lt;Attribute&gt;.
diff --git a/src/CommandLine/Infrastructure/ReflectionHelper.cs b/src/CommandLine/Infrastructure/ReflectionHelper.cs
@@ -28,7 +28,7 @@ static class ReflectionHelper
         /// Attributes that replace the existing assembly attributes or null,
         /// to clear any testing attributes.
         /// </param>
-        public static void SetAttributeOverride(IList<Attribute> overrides)
+        public static void SetAttributeOverride(IEnumerable<Attribute> overrides)
         {
             if (overrides != null)
             {
@@ -46,7 +46,7 @@ public static Maybe<TAttribute> GetAttribute<TAttribute>()
             // Test support
             if (_overrides != null)
             {
-                return
+                return 
                     _overrides.ContainsKey(typeof(TAttribute)) ?
                         Maybe.Just((TAttribute)_overrides[typeof(TAttribute)]) :
                         Maybe.Nothing< TAttribute>();
diff --git a/tests/CommandLine.Tests/Unit/Text/HelpTextTests.cs b/tests/CommandLine.Tests/Unit/Text/HelpTextTests.cs
@@ -579,8 +579,14 @@ public void AutoBuild_when_no_assembly_attributes()
 
                 ParserResult<Simple_Options> fakeResult = new NotParsed<Simple_Options>(
                     TypeInfo.Create(typeof (Simple_Options)), new Error[0]);
-                HelpText actualResult = HelpText.AutoBuild(fakeResult, ht => ht, ex => ex);
+                bool onErrorCalled = false;
+                HelpText actualResult = HelpText.AutoBuild(fakeResult, ht => 
+                {
+                    onErrorCalled = true;
+                    return ht;
+                }, ex => ex);
                 
+                onErrorCalled.Should().BeTrue();
                 actualResult.Copyright.Should().Be(expectedCopyright);
             }
             finally
@@ -605,8 +611,14 @@ public void AutoBuild_with_assembly_title_and_version_attributes_only()
 
                 ParserResult<Simple_Options> fakeResult = new NotParsed<Simple_Options>(
                     TypeInfo.Create(typeof (Simple_Options)), new Error[0]);
-                HelpText actualResult = HelpText.AutoBuild(fakeResult, ht => ht, ex => ex);
+                bool onErrorCalled = false;
+                HelpText actualResult = HelpText.AutoBuild(fakeResult, ht =>
+                {
+                    onErrorCalled = true;
+                    return ht;
+                }, ex => ex);
 
+                onErrorCalled.Should().BeTrue();
                 actualResult.Heading.Should().Be(string.Format("{0} {1}", expectedTitle, expectedVersion));
             }
             finally
@@ -630,8 +642,14 @@ public void AutoBuild_with_assembly_company_attribute_only()
 
                 ParserResult<Simple_Options> fakeResult = new NotParsed<Simple_Options>(
                     TypeInfo.Create(typeof (Simple_Options)), new Error[0]);
-                HelpText actualResult = HelpText.AutoBuild(fakeResult, ht => ht, ex => ex);
+                bool onErrorCalled = false;
+                HelpText actualResult = HelpText.AutoBuild(fakeResult, ht =>
+                {
+                    onErrorCalled = true;
+                    return ht;
+                }, ex => ex);
 
+                onErrorCalled.Should().BeFalse(); // Other attributes have fallback logic
                 actualResult.Copyright.Should().Be(string.Format("Copyright (C) {0} {1}", DateTime.Now.Year, expectedCompany));
             }
             finally

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ static class ReflectionHelper`
`28`	`28`	`/// Attributes that replace the existing assembly attributes or null,`
`29`	`29`	`/// to clear any testing attributes.`
`30`	`30`	`/// </param>`
`31`		`- public static void SetAttributeOverride(IList<Attribute> overrides)`
	`31`	`+ public static void SetAttributeOverride(IEnumerable<Attribute> overrides)`
`32`	`32`	`{`
`33`	`33`	`if (overrides != null)`
`34`	`34`	`{`
`@@ -46,7 +46,7 @@ public static Maybe<TAttribute> GetAttribute<TAttribute>()`
`46`	`46`	`// Test support`
`47`	`47`	`if (_overrides != null)`
`48`	`48`	`{`
`49`		`- return`
	`49`	`+ return`
`50`	`50`	`_overrides.ContainsKey(typeof(TAttribute)) ?`
`51`	`51`	`Maybe.Just((TAttribute)_overrides[typeof(TAttribute)]) :`
`52`	`52`	`Maybe.Nothing< TAttribute>();`