Skip to content

Commit 2ee3406

Browse files
author
Jake Ginnivan
committed
Making failure more explicit for ConventionResult
1 parent 05c7a79 commit 2ee3406

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

ConventionTests.sln.DotSettings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArgumentNameForLiteralExpression/@EntryIndexedValue">DO_NOT_SHOW</s:String>
23
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=all/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="all"&gt;&lt;CSArrangeThisQualifier&gt;True&lt;/CSArrangeThisQualifier&gt;&lt;CSRemoveCodeRedundancies&gt;True&lt;/CSRemoveCodeRedundancies&gt;&lt;CSUseAutoProperty&gt;True&lt;/CSUseAutoProperty&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSUseVar&gt;&lt;BehavourStyle&gt;CAN_CHANGE_TO_IMPLICIT&lt;/BehavourStyle&gt;&lt;LocalVariableStyle&gt;ALWAYS_IMPLICIT&lt;/LocalVariableStyle&gt;&lt;ForeachVariableStyle&gt;ALWAYS_IMPLICIT&lt;/ForeachVariableStyle&gt;&lt;/CSUseVar&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;/Profile&gt;</s:String>
34
<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">all</s:String>
45
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/EXPLICIT_PRIVATE_MODIFIER/@EntryValue">False</s:Boolean>

TestStack.ConventionTests/Internal/ConventionResult.cs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,26 @@
77

88
public class ConventionResult
99
{
10-
ConventionResult()
10+
ConventionResult(bool failed)
1111
{
12+
Failed = failed;
1213
}
1314

1415
public string Message { get; private set; }
1516

16-
public bool Failed
17-
{
18-
get { return !string.IsNullOrEmpty(Message); }
19-
}
17+
public bool Failed { get; private set; }
2018

2119
public static ConventionResult For<TResult>(
2220
string header, IEnumerable<TResult> items,
2321
Action<TResult, StringBuilder> itemDescriptor)
2422
{
2523
var array = items.ToArray();
26-
var result = new ConventionResult();
2724
if (array.None())
2825
{
29-
return result;
26+
return new ConventionResult(failed: false);
3027
}
3128

32-
// NOTE: we might possibly want to abstract the StringBuilder to have more high level construct that would allow us to plug rich reports here...
29+
var result = new ConventionResult(true);
3330
var message = new StringBuilder(header);
3431
message.AppendLine();
3532
message.AppendLine(string.Empty.PadRight(header.Length, '-'));
@@ -53,10 +50,9 @@ public static ConventionResult ForSymmetric<TResult>(
5350
{
5451
var firstArray = firstResults.ToArray();
5552
var secondArray = secondResults.ToArray();
56-
var result = new ConventionResult();
5753
if (firstArray.None() && secondArray.None())
5854
{
59-
return result;
55+
return new ConventionResult(failed: true);
6056
}
6157

6258
var message = new StringBuilder();

0 commit comments

Comments
 (0)