more renames. This makes more sense now IMO

kkozmic · kkozmic · commit ceec835767fc · 2013-08-14T15:39:51.000+10:00
diff --git a/TestStack.ConventionTests/Convention.cs b/TestStack.ConventionTests/Convention.cs
@@ -12,7 +12,7 @@
     public static class Convention
     {
         static readonly HtmlReportRenderer HtmlRenderer = new HtmlReportRenderer(AssemblyDirectory);
-        static readonly List<ResultInfo> Reports = new List<ResultInfo>();
+        static readonly List<ConventionResult> Reports = new List<ConventionResult>();
 
         static Convention()
         {
@@ -26,7 +26,7 @@ static Convention()
             };
         }
 
-        public static IEnumerable<ResultInfo> ConventionReports { get { return Reports; } }
+        public static IEnumerable<ConventionResult> ConventionReports { get { return Reports; } }
         public static IList<IReportDataFormatter> Formatters { get; set; } 
 
         public static void Is<TDataSource>(IConvention<TDataSource> convention, TDataSource data)
diff --git a/TestStack.ConventionTests/Internal/ConventionContext.cs b/TestStack.ConventionTests/Internal/ConventionContext.cs
@@ -7,26 +7,25 @@
 
     public class ConventionContext : IConventionResultContext
     {
-        readonly List<ResultInfo> conventionResults;
         readonly string dataDescription;
         readonly IList<IReportDataFormatter> formatters;
+        readonly IList<ConventionResult> results = new List<ConventionResult>();
 
         public ConventionContext(string dataDescription, IList<IReportDataFormatter> formatters)
         {
             this.formatters = formatters;
             this.dataDescription = dataDescription;
-            conventionResults = new List<ResultInfo>();
         }
 
-        public ResultInfo[] ConventionResults
+        public ConventionResult[] ConventionResults
         {
-            get { return conventionResults.ToArray(); }
+            get { return results.ToArray(); }
         }
 
         public void Is<T>(string resultTitle, IEnumerable<T> failingData)
         {
             // ReSharper disable PossibleMultipleEnumeration
-            conventionResults.Add(new ResultInfo(
+            results.Add(new ConventionResult(
                 failingData.None() ? TestResult.Passed : TestResult.Failed,
                 resultTitle,
                 dataDescription,
@@ -37,12 +36,12 @@ public void IsSymmetric<TResult>(
             string firstSetFailureTitle, IEnumerable<TResult> firstSetFailureData,
             string secondSetFailureTitle, IEnumerable<TResult> secondSetFailureData)
         {
-            conventionResults.Add(new ResultInfo(
+            results.Add(new ConventionResult(
                 firstSetFailureData.None() ? TestResult.Passed : TestResult.Failed,
                 firstSetFailureTitle,
                 dataDescription,
                 firstSetFailureData.Select(FormatData).ToArray()));
-            conventionResults.Add(new ResultInfo(
+            results.Add(new ConventionResult(
                 secondSetFailureData.None() ? TestResult.Passed : TestResult.Failed,
                 secondSetFailureTitle,
                 dataDescription,
diff --git a/TestStack.ConventionTests/Internal/ConventionResult.cs b/TestStack.ConventionTests/Internal/ConventionResult.cs
@@ -1,28 +1,28 @@
-﻿namespace TestStack.ConventionTests.Internal
-{
-    using TestStack.ConventionTests.Reporting;
-
-    public class ResultInfo
-    {
-        public TestResult Result { get; private set; }
-        public string ConventionTitle { get; private set; }
-        public string DataDescription { get; private set; }
-        public ConventionReportFailure[] ConventionFailures { get; private set; }
-        public string ApprovedException { get; private set; }
-
-        public ResultInfo(TestResult result, string conventionTitle, string dataDescription, ConventionReportFailure[] conventionFailures)
-        {
-            Result = result;
-            ConventionTitle = conventionTitle;
-            DataDescription = dataDescription;
-            ConventionFailures = conventionFailures;
-        }
-
-        public void WithApprovedException(string output)
-        {
-            ApprovedException = output;
-            Result = TestResult.Passed;
-            ConventionFailures = new ConventionReportFailure[0];
-        }
-    }
+﻿namespace TestStack.ConventionTests.Internal
+{
+    using TestStack.ConventionTests.Reporting;
+
+    public class ConventionResult
+    {
+        public TestResult Result { get; private set; }
+        public string ConventionTitle { get; private set; }
+        public string DataDescription { get; private set; }
+        public ConventionReportFailure[] ConventionFailures { get; private set; }
+        public string ApprovedException { get; private set; }
+
+        public ConventionResult(TestResult result, string conventionTitle, string dataDescription, ConventionReportFailure[] conventionFailures)
+        {
+            Result = result;
+            ConventionTitle = conventionTitle;
+            DataDescription = dataDescription;
+            ConventionFailures = conventionFailures;
+        }
+
+        public void WithApprovedException(string output)
+        {
+            ApprovedException = output;
+            Result = TestResult.Passed;
+            ConventionFailures = new ConventionReportFailure[0];
+        }
+    }
 }
diff --git a/TestStack.ConventionTests/Internal/Executor.cs b/TestStack.ConventionTests/Internal/Executor.cs
@@ -5,7 +5,7 @@
 
     public static class Executor
     {
-        public static ResultInfo[] GetConventionResults<TDataSource>(IConvention<TDataSource> convention, TDataSource data)
+        public static ConventionResult[] GetConventionResults<TDataSource>(IConvention<TDataSource> convention, TDataSource data)
             where TDataSource : IConventionData
         {
             if (!data.HasData)
@@ -17,7 +17,7 @@ public static ResultInfo[] GetConventionResults<TDataSource>(IConvention<TDataSo
             return resultGatherer.ConventionResults;
         }
 
-        public static ResultInfo[] GetConventionResultsWithApprovedExeptions<TDataSource>(
+        public static ConventionResult[] GetConventionResultsWithApprovedExeptions<TDataSource>(
             IConvention<TDataSource> convention, TDataSource data)
             where TDataSource : IConventionData
         {
diff --git a/TestStack.ConventionTests/Reporting/ConventionReportTextRenderer.cs b/TestStack.ConventionTests/Reporting/ConventionReportTextRenderer.cs
@@ -5,7 +5,7 @@
 
     public class ConventionReportTextRenderer : IConventionReportRenderer
     {
-        public void Render(params ResultInfo[] conventionResult)
+        public void Render(params ConventionResult[] conventionResult)
         {
             var stringBuilder = new StringBuilder();
 
@@ -34,14 +34,14 @@ public void Render(params ResultInfo[] conventionResult)
 
         public string Output { get; private set; }
 
-        public void RenderItems(ResultInfo conventionResult)
+        public void RenderItems(ConventionResult conventionResult)
         {
             var stringBuilder = new StringBuilder();
             RenderItems(conventionResult, stringBuilder);
             Output = stringBuilder.ToString();
         }
 
-        static void RenderItems(ResultInfo resultInfo, StringBuilder stringBuilder)
+        static void RenderItems(ConventionResult resultInfo, StringBuilder stringBuilder)
         {
             foreach (var conventionFailure in resultInfo.ConventionFailures)
             {
diff --git a/TestStack.ConventionTests/Reporting/ConventionReportTraceRenderer.cs b/TestStack.ConventionTests/Reporting/ConventionReportTraceRenderer.cs
@@ -5,7 +5,7 @@
 
     public class ConventionReportTraceRenderer : IConventionReportRenderer
     {
-        public void Render(params ResultInfo[] conventionResult)
+        public void Render(params ConventionResult[] conventionResult)
         {
             var conventionReportTextRenderer = new ConventionReportTextRenderer();
             conventionReportTextRenderer.Render(conventionResult);
diff --git a/TestStack.ConventionTests/Reporting/ConventionResultExceptionReporter.cs b/TestStack.ConventionTests/Reporting/ConventionResultExceptionReporter.cs
@@ -5,7 +5,7 @@
 
     public class ConventionResultExceptionReporter : IConventionReportRenderer
     {
-        public void Render(params ResultInfo[] conventionResult)
+        public void Render(params ConventionResult[] conventionResult)
         {
             var conventionReportTextRenderer = new ConventionReportTextRenderer();
             conventionReportTextRenderer.Render(conventionResult);
diff --git a/TestStack.ConventionTests/Reporting/HtmlReportRenderer.cs b/TestStack.ConventionTests/Reporting/HtmlReportRenderer.cs
@@ -14,7 +14,7 @@ public HtmlReportRenderer(string assemblyDirectory)
             file = Path.Combine(assemblyDirectory, "Conventions.htm");
         }
 
-        public void Render(params ResultInfo[] conventionResult)
+        public void Render(params ConventionResult[] conventionResult)
         {
             var sb = new StringBuilder();
             var html = new HtmlTextWriter(new StringWriter(sb));
diff --git a/TestStack.ConventionTests/Reporting/IConventionReportRenderer.cs b/TestStack.ConventionTests/Reporting/IConventionReportRenderer.cs
@@ -4,6 +4,6 @@
 
     public interface IConventionReportRenderer
     {
-        void Render(params ResultInfo[] conventionResult);
+        void Render(params ConventionResult[] conventionResult);
     }
 }
diff --git a/TestStack.ConventionTests/TestStack.ConventionTests.csproj b/TestStack.ConventionTests/TestStack.ConventionTests.csproj
@@ -65,7 +65,7 @@
     <Compile Include="Internal\ConventionReportFailure.cs" />
     <Compile Include="Internal\ConventionContext.cs" />
     <Compile Include="Internal\Executor.cs" />
-    <Compile Include="Internal\ResultInfo.cs" />
+    <Compile Include="Internal\ConventionResult.cs" />
     <Compile Include="Internal\NoDataFormatterFoundException.cs" />
     <Compile Include="Reporting\CsvReporter.cs" />
     <Compile Include="Reporting\DefaultFormatter.cs" />

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`public static class Convention`
`13`	`13`	`{`
`14`	`14`	`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>();`
`16`	`16`
`17`	`17`	`static Convention()`
`18`	`18`	`{`
`@@ -26,7 +26,7 @@ static Convention()`
`26`	`26`	`};`
`27`	`27`	`}`
`28`	`28`
`29`		`- public static IEnumerable<ResultInfo> ConventionReports { get { return Reports; } }`
	`29`	`+ public static IEnumerable<ConventionResult> ConventionReports { get { return Reports; } }`
`30`	`30`	`public static IList<IReportDataFormatter> Formatters { get; set; }`
`31`	`31`
`32`	`32`	`public static void Is<TDataSource>(IConvention<TDataSource> convention, TDataSource data)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`public static class Executor`
`7`	`7`	`{`
`8`		`- public static ResultInfo[] GetConventionResults<TDataSource>(IConvention<TDataSource> convention, TDataSource data)`
	`8`	`+ public static ConventionResult[] GetConventionResults<TDataSource>(IConvention<TDataSource> convention, TDataSource data)`
`9`	`9`	`where TDataSource : IConventionData`
`10`	`10`	`{`
`11`	`11`	`if (!data.HasData)`
`@@ -17,7 +17,7 @@ public static ResultInfo[] GetConventionResults<TDataSource>(IConvention<TDataSo`
`17`	`17`	`return resultGatherer.ConventionResults;`
`18`	`18`	`}`
`19`	`19`
`20`		`- public static ResultInfo[] GetConventionResultsWithApprovedExeptions<TDataSource>(`
	`20`	`+ public static ConventionResult[] GetConventionResultsWithApprovedExeptions<TDataSource>(`
`21`	`21`	`IConvention<TDataSource> convention, TDataSource data)`
`22`	`22`	`where TDataSource : IConventionData`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`public class ConventionReportTextRenderer : IConventionReportRenderer`
`7`	`7`	`{`
`8`		`- public void Render(params ResultInfo[] conventionResult)`
	`8`	`+ public void Render(params ConventionResult[] conventionResult)`
`9`	`9`	`{`
`10`	`10`	`var stringBuilder = new StringBuilder();`
`11`	`11`
`@@ -34,14 +34,14 @@ public void Render(params ResultInfo[] conventionResult)`
`34`	`34`
`35`	`35`	`public string Output { get; private set; }`
`36`	`36`
`37`		`- public void RenderItems(ResultInfo conventionResult)`
	`37`	`+ public void RenderItems(ConventionResult conventionResult)`
`38`	`38`	`{`
`39`	`39`	`var stringBuilder = new StringBuilder();`
`40`	`40`	`RenderItems(conventionResult, stringBuilder);`
`41`	`41`	`Output = stringBuilder.ToString();`
`42`	`42`	`}`
`43`	`43`
`44`		`- static void RenderItems(ResultInfo resultInfo, StringBuilder stringBuilder)`
	`44`	`+ static void RenderItems(ConventionResult resultInfo, StringBuilder stringBuilder)`
`45`	`45`	`{`
`46`	`46`	`foreach (var conventionFailure in resultInfo.ConventionFailures)`
`47`	`47`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`public class ConventionReportTraceRenderer : IConventionReportRenderer`
`7`	`7`	`{`
`8`		`- public void Render(params ResultInfo[] conventionResult)`
	`8`	`+ public void Render(params ConventionResult[] conventionResult)`
`9`	`9`	`{`
`10`	`10`	`var conventionReportTextRenderer = new ConventionReportTextRenderer();`
`11`	`11`	`conventionReportTextRenderer.Render(conventionResult);`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`public class ConventionResultExceptionReporter : IConventionReportRenderer`
`7`	`7`	`{`
`8`		`- public void Render(params ResultInfo[] conventionResult)`
	`8`	`+ public void Render(params ConventionResult[] conventionResult)`
`9`	`9`	`{`
`10`	`10`	`var conventionReportTextRenderer = new ConventionReportTextRenderer();`
`11`	`11`	`conventionReportTextRenderer.Render(conventionResult);`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public HtmlReportRenderer(string assemblyDirectory)`
`14`	`14`	`file = Path.Combine(assemblyDirectory, "Conventions.htm");`
`15`	`15`	`}`
`16`	`16`
`17`		`- public void Render(params ResultInfo[] conventionResult)`
	`17`	`+ public void Render(params ConventionResult[] conventionResult)`
`18`	`18`	`{`
`19`	`19`	`var sb = new StringBuilder();`
`20`	`20`	`var html = new HtmlTextWriter(new StringWriter(sb));`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`
`5`	`5`	`public interface IConventionReportRenderer`
`6`	`6`	`{`
`7`		`- void Render(params ResultInfo[] conventionResult);`
	`7`	`+ void Render(params ConventionResult[] conventionResult);`
`8`	`8`	`}`
`9`	`9`	`}`