Skip to content

Commit ceec835

Browse files
kkozmickkozmic
committed
more renames. This makes more sense now IMO
1 parent 9c41696 commit ceec835

10 files changed

Lines changed: 45 additions & 46 deletions

‎TestStack.ConventionTests/Convention.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
public static class Convention
1313
{
1414
static readonly HtmlReportRenderer HtmlRenderer = new HtmlReportRenderer(AssemblyDirectory);
15-
static readonly List<ResultInfo> Reports = new List<ResultInfo>();
15+
static readonly List<ConventionResult> Reports = new List<ConventionResult>();
1616

1717
static Convention()
1818
{
@@ -26,7 +26,7 @@ static Convention()
2626
};
2727
}
2828

29-
public static IEnumerable<ResultInfo> ConventionReports { get { return Reports; } }
29+
public static IEnumerable<ConventionResult> ConventionReports { get { return Reports; } }
3030
public static IList<IReportDataFormatter> Formatters { get; set; }
3131

3232
public static void Is<TDataSource>(IConvention<TDataSource> convention, TDataSource data)

‎TestStack.ConventionTests/Internal/ConventionContext.cs‎

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

88
public class ConventionContext : IConventionResultContext
99
{
10-
readonly List<ResultInfo> conventionResults;
1110
readonly string dataDescription;
1211
readonly IList<IReportDataFormatter> formatters;
12+
readonly IList<ConventionResult> results = new List<ConventionResult>();
1313

1414
public ConventionContext(string dataDescription, IList<IReportDataFormatter> formatters)
1515
{
1616
this.formatters = formatters;
1717
this.dataDescription = dataDescription;
18-
conventionResults = new List<ResultInfo>();
1918
}
2019

21-
public ResultInfo[] ConventionResults
20+
public ConventionResult[] ConventionResults
2221
{
23-
get { return conventionResults.ToArray(); }
22+
get { return results.ToArray(); }
2423
}
2524

2625
public void Is<T>(string resultTitle, IEnumerable<T> failingData)
2726
{
2827
// ReSharper disable PossibleMultipleEnumeration
29-
conventionResults.Add(new ResultInfo(
28+
results.Add(new ConventionResult(
3029
failingData.None() ? TestResult.Passed : TestResult.Failed,
3130
resultTitle,
3231
dataDescription,
@@ -37,12 +36,12 @@ public void IsSymmetric<TResult>(
3736
string firstSetFailureTitle, IEnumerable<TResult> firstSetFailureData,
3837
string secondSetFailureTitle, IEnumerable<TResult> secondSetFailureData)
3938
{
40-
conventionResults.Add(new ResultInfo(
39+
results.Add(new ConventionResult(
4140
firstSetFailureData.None() ? TestResult.Passed : TestResult.Failed,
4241
firstSetFailureTitle,
4342
dataDescription,
4443
firstSetFailureData.Select(FormatData).ToArray()));
45-
conventionResults.Add(new ResultInfo(
44+
results.Add(new ConventionResult(
4645
secondSetFailureData.None() ? TestResult.Passed : TestResult.Failed,
4746
secondSetFailureTitle,
4847
dataDescription,

TestStack.ConventionTests/Internal/ResultInfo.cs renamed to TestStack.ConventionTests/Internal/ConventionResult.cs

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
namespace TestStack.ConventionTests.Internal
2-
{
3-
using TestStack.ConventionTests.Reporting;
4-
5-
public class ResultInfo
6-
{
7-
public TestResult Result { get; private set; }
8-
public string ConventionTitle { get; private set; }
9-
public string DataDescription { get; private set; }
10-
public ConventionReportFailure[] ConventionFailures { get; private set; }
11-
public string ApprovedException { get; private set; }
12-
13-
public ResultInfo(TestResult result, string conventionTitle, string dataDescription, ConventionReportFailure[] conventionFailures)
14-
{
15-
Result = result;
16-
ConventionTitle = conventionTitle;
17-
DataDescription = dataDescription;
18-
ConventionFailures = conventionFailures;
19-
}
20-
21-
public void WithApprovedException(string output)
22-
{
23-
ApprovedException = output;
24-
Result = TestResult.Passed;
25-
ConventionFailures = new ConventionReportFailure[0];
26-
}
27-
}
1+
namespace TestStack.ConventionTests.Internal
2+
{
3+
using TestStack.ConventionTests.Reporting;
4+
5+
public class ConventionResult
6+
{
7+
public TestResult Result { get; private set; }
8+
public string ConventionTitle { get; private set; }
9+
public string DataDescription { get; private set; }
10+
public ConventionReportFailure[] ConventionFailures { get; private set; }
11+
public string ApprovedException { get; private set; }
12+
13+
public ConventionResult(TestResult result, string conventionTitle, string dataDescription, ConventionReportFailure[] conventionFailures)
14+
{
15+
Result = result;
16+
ConventionTitle = conventionTitle;
17+
DataDescription = dataDescription;
18+
ConventionFailures = conventionFailures;
19+
}
20+
21+
public void WithApprovedException(string output)
22+
{
23+
ApprovedException = output;
24+
Result = TestResult.Passed;
25+
ConventionFailures = new ConventionReportFailure[0];
26+
}
27+
}
2828
}

‎TestStack.ConventionTests/Internal/Executor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
public static class Executor
77
{
8-
public static ResultInfo[] GetConventionResults<TDataSource>(IConvention<TDataSource> convention, TDataSource data)
8+
public static ConventionResult[] GetConventionResults<TDataSource>(IConvention<TDataSource> convention, TDataSource data)
99
where TDataSource : IConventionData
1010
{
1111
if (!data.HasData)
@@ -17,7 +17,7 @@ public static ResultInfo[] GetConventionResults<TDataSource>(IConvention<TDataSo
1717
return resultGatherer.ConventionResults;
1818
}
1919

20-
public static ResultInfo[] GetConventionResultsWithApprovedExeptions<TDataSource>(
20+
public static ConventionResult[] GetConventionResultsWithApprovedExeptions<TDataSource>(
2121
IConvention<TDataSource> convention, TDataSource data)
2222
where TDataSource : IConventionData
2323
{

‎TestStack.ConventionTests/Reporting/ConventionReportTextRenderer.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
public class ConventionReportTextRenderer : IConventionReportRenderer
77
{
8-
public void Render(params ResultInfo[] conventionResult)
8+
public void Render(params ConventionResult[] conventionResult)
99
{
1010
var stringBuilder = new StringBuilder();
1111

@@ -34,14 +34,14 @@ public void Render(params ResultInfo[] conventionResult)
3434

3535
public string Output { get; private set; }
3636

37-
public void RenderItems(ResultInfo conventionResult)
37+
public void RenderItems(ConventionResult conventionResult)
3838
{
3939
var stringBuilder = new StringBuilder();
4040
RenderItems(conventionResult, stringBuilder);
4141
Output = stringBuilder.ToString();
4242
}
4343

44-
static void RenderItems(ResultInfo resultInfo, StringBuilder stringBuilder)
44+
static void RenderItems(ConventionResult resultInfo, StringBuilder stringBuilder)
4545
{
4646
foreach (var conventionFailure in resultInfo.ConventionFailures)
4747
{

‎TestStack.ConventionTests/Reporting/ConventionReportTraceRenderer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
public class ConventionReportTraceRenderer : IConventionReportRenderer
77
{
8-
public void Render(params ResultInfo[] conventionResult)
8+
public void Render(params ConventionResult[] conventionResult)
99
{
1010
var conventionReportTextRenderer = new ConventionReportTextRenderer();
1111
conventionReportTextRenderer.Render(conventionResult);

‎TestStack.ConventionTests/Reporting/ConventionResultExceptionReporter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
public class ConventionResultExceptionReporter : IConventionReportRenderer
77
{
8-
public void Render(params ResultInfo[] conventionResult)
8+
public void Render(params ConventionResult[] conventionResult)
99
{
1010
var conventionReportTextRenderer = new ConventionReportTextRenderer();
1111
conventionReportTextRenderer.Render(conventionResult);

‎TestStack.ConventionTests/Reporting/HtmlReportRenderer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public HtmlReportRenderer(string assemblyDirectory)
1414
file = Path.Combine(assemblyDirectory, "Conventions.htm");
1515
}
1616

17-
public void Render(params ResultInfo[] conventionResult)
17+
public void Render(params ConventionResult[] conventionResult)
1818
{
1919
var sb = new StringBuilder();
2020
var html = new HtmlTextWriter(new StringWriter(sb));

‎TestStack.ConventionTests/Reporting/IConventionReportRenderer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
public interface IConventionReportRenderer
66
{
7-
void Render(params ResultInfo[] conventionResult);
7+
void Render(params ConventionResult[] conventionResult);
88
}
99
}

‎TestStack.ConventionTests/TestStack.ConventionTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<Compile Include="Internal\ConventionReportFailure.cs" />
6666
<Compile Include="Internal\ConventionContext.cs" />
6767
<Compile Include="Internal\Executor.cs" />
68-
<Compile Include="Internal\ResultInfo.cs" />
68+
<Compile Include="Internal\ConventionResult.cs" />
6969
<Compile Include="Internal\NoDataFormatterFoundException.cs" />
7070
<Compile Include="Reporting\CsvReporter.cs" />
7171
<Compile Include="Reporting\DefaultFormatter.cs" />

0 commit comments

Comments
 (0)