Skip to content

Commit 05c7a79

Browse files
author
Jake Ginnivan
committed
Reordered the ConventionResult.For arguments
1 parent 7408630 commit 05c7a79

File tree

5 files changed

+8
-11
lines changed

5 files changed

+8
-11
lines changed

TestStack.ConventionTests.Tests/ConventionAssertionClassTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class FailingConvention : IConvention<FakeData>
3030
{
3131
public ConventionResult Execute(FakeData data)
3232
{
33-
return ConventionResult.For(new[] { "" }, "Header", (s, builder) => builder.AppendLine("Different"));
33+
return ConventionResult.For("Header", new[] { "" }, (s, builder) => builder.AppendLine("Different"));
3434
}
3535
}
3636
}

TestStack.ConventionTests/Conventions/AllMethodsAreVirtual.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public ConventionResult Execute(Types data)
2525
let nonVirtuals = applicableType.NonVirtualMethods()
2626
where nonVirtuals.Any()
2727
select Tuple.Create(applicableType, nonVirtuals);
28-
return ConventionResult.For(items, HeaderMessage, DescribeTypeAndMethods);
28+
return ConventionResult.For(HeaderMessage, items, DescribeTypeAndMethods);
2929
}
3030

3131
// I like how that's encapsulated in the reusable convention type, whereas previously it was part of the convention/test code

TestStack.ConventionTests/Conventions/FilesAreEmbeddedResources.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ public class FilesAreEmbeddedResources : IConvention<ProjectFiles>
88
{
99
public ConventionResult Execute(ProjectFiles data)
1010
{
11-
return ConventionResult.For(data.Files.Where(s => s.ReferenceType != "EmbeddedResource"),
12-
"The following files which should be embedded resources:",
13-
(t, m) => m.AppendLine("\t" + t.FilePath));
11+
return ConventionResult.For("The following files which should be embedded resources:",
12+
data.Files.Where(s => s.ReferenceType != "EmbeddedResource"), (t, m) => m.AppendLine("\t" + t.FilePath));
1413
}
1514
}
1615
}

TestStack.ConventionTests/Conventions/ProjectDoesNotReferenceDllsFromBinOrObjDirectories.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public ConventionResult Execute(ProjectReferences data)
1414
{
1515
var invalid = data.References.Where(IsBinOrObjReference);
1616
var header = string.Format("Some invalid assembly references found in {0}", data.Assembly.GetName().Name);
17-
return ConventionResult.For(invalid, header, FormatLine);
17+
return ConventionResult.For(header, invalid, FormatLine);
1818
}
1919

2020
void FormatLine(ProjectReference assemblyReference, StringBuilder m)

TestStack.ConventionTests/Internal/ConventionResult.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ public bool Failed
1919
}
2020

2121
public static ConventionResult For<TResult>(
22-
IEnumerable<TResult> items,
23-
string header,
22+
string header, IEnumerable<TResult> items,
2423
Action<TResult, StringBuilder> itemDescriptor)
2524
{
2625
var array = items.ToArray();
@@ -41,11 +40,10 @@ public static ConventionResult For<TResult>(
4140
}
4241

4342
public static ConventionResult For<TResult>(
44-
IEnumerable<TResult> items,
45-
string header,
43+
IEnumerable<TResult> items, string header,
4644
Func<TResult, string> itemDescriptor)
4745
{
48-
return For(items, header, (item, message) => message.AppendLine(itemDescriptor(item)));
46+
return For(header, items, (item, message) => message.AppendLine(itemDescriptor(item)));
4947
}
5048

5149
public static ConventionResult ForSymmetric<TResult>(

0 commit comments

Comments
 (0)