Pulled out a executor class to simplify the ConventionClass

Author: Jake Ginnivan

TestStack.ConventionTests/Convention.cs

@@ -29,7 +29,7 @@ static Convention()
         }
 
         public static IEnumerable<ResultInfo> ConventionReports { get { return Reports; } }
-        public static IList<IReportDataFormatter> Formatters { get; private set; } 
+        public static IList<IReportDataFormatter> Formatters { get; set; } 
 
         public static void Is<TDataSource>(IConvention<TDataSource> convention, TDataSource data)
             where TDataSource : IConventionData
@@ -42,8 +42,7 @@ public static void Is<TDataSource>(IConvention<TDataSource> convention, TDataSou
         {
             try
             {
-                var conventionResult = GetConventionReport(convention.ConventionTitle, convention.GetFailingData(data).ToArray(), data);
-
+                var conventionResult = Executor.GetConventionReport(convention.ConventionTitle, convention.GetFailingData(data).ToArray(), data);
                 Reports.Add(conventionResult);
 
                 new ConventionReportTraceRenderer().Render(conventionResult);
@@ -58,15 +57,12 @@ public static void Is<TDataSource>(IConvention<TDataSource> convention, TDataSou
         public static void IsWithApprovedExeptions<TDataSource>(IConvention<TDataSource> convention, TDataSource data)
             where TDataSource : IConventionData
         {
-            var conventionResult = GetConventionReport(convention.ConventionTitle, convention.GetFailingData(data).ToArray(), data);
+            var conventionResult = Executor.GetConventionReportWithApprovedExeptions(convention.ConventionTitle, convention.GetFailingData(data).ToArray(), data);
             Reports.Add(conventionResult);
 
             try
             {
                 var conventionReportTextRenderer = new ConventionReportTextRenderer();
-                conventionReportTextRenderer.RenderItems(conventionResult);
-                conventionResult.WithApprovedException(conventionReportTextRenderer.Output);
-
                 conventionReportTextRenderer.Render(conventionResult);
                 Approvals.Verify(conventionReportTextRenderer.Output);
 
@@ -93,8 +89,8 @@ public static void Is<TDataSource>(ISymmetricConvention<TDataSource> convention,
         {
             try
             {
-                var conventionResult = GetConventionReport(convention.ConventionTitle, convention.GetFailingData(data).ToArray(), data);
-                var inverseConventionResult = GetConventionReport(convention.InverseTitle, convention.GetFailingInverseData(data).ToArray(), data);
+                var conventionResult = Executor.GetConventionReport(convention.ConventionTitle, convention.GetFailingData(data).ToArray(), data);
+                var inverseConventionResult = Executor.GetConventionReport(convention.InverseTitle, convention.GetFailingInverseData(data).ToArray(), data);
 
                 Reports.Add(conventionResult);
                 Reports.Add(inverseConventionResult);
@@ -111,26 +107,18 @@ public static void Is<TDataSource>(ISymmetricConvention<TDataSource> convention,
         public static void IsWithApprovedExeptions<TDataSource>(ISymmetricConvention<TDataSource> convention, TDataSource data)
             where TDataSource : IConventionData
         {
-            var conventionResult = GetConventionReport(convention.ConventionTitle, convention.GetFailingData(data).ToArray(), data);
-            var inverseConventionResult = GetConventionReport(convention.InverseTitle, convention.GetFailingInverseData(data).ToArray(), data);
+            var conventionResult = Executor.GetConventionReportWithApprovedExeptions(convention.ConventionTitle, convention.GetFailingData(data).ToArray(), data);
+            var inverseConventionResult = Executor.GetConventionReportWithApprovedExeptions(convention.InverseTitle, convention.GetFailingInverseData(data).ToArray(), data);
             Reports.Add(conventionResult);
             Reports.Add(inverseConventionResult);
 
             try
             {
-                var conventionReportTextRenderer = new ConventionReportTextRenderer();
-                // Add approved exceptions to report
-                conventionReportTextRenderer.RenderItems(conventionResult);
-                conventionResult.WithApprovedException(conventionReportTextRenderer.Output);
-
-                // Add approved exceptions to inverse report
-                conventionReportTextRenderer.RenderItems(inverseConventionResult);
-                inverseConventionResult.WithApprovedException(conventionReportTextRenderer.Output);
-
                 //Render both, with approved exceptions included
+                var conventionReportTextRenderer = new ConventionReportTextRenderer();
                 conventionReportTextRenderer.Render(conventionResult, inverseConventionResult);
                 Approvals.Verify(conventionReportTextRenderer.Output);
-                
+
                 // Trace on success
                 new ConventionReportTraceRenderer().Render(conventionResult, inverseConventionResult);
             }
@@ -144,30 +132,6 @@ public static void IsWithApprovedExeptions<TDataSource>(ISymmetricConvention<TDa
             }
         }
 
-        static ResultInfo GetConventionReport<TDataSource, TDataType>(string conventionTitle, TDataType[] failingData, TDataSource data)
-            where TDataSource : IConventionData
-        {
-            data.EnsureHasNonEmptySource();
-            var passed = failingData.None();
-
-            var conventionResult = new ResultInfo(
-                passed ? TestResult.Passed : TestResult.Failed,
-                conventionTitle,
-                data.Description,
-                failingData.Select(FormatData).ToArray());
-            return conventionResult;
-        }
-
-        static ConventionReportFailure FormatData<T>(T failingData)
-        {
-            var formatter = Formatters.FirstOrDefault(f => f.CanFormat(failingData));
-
-            if (formatter == null)
-                throw new NoDataFormatterFoundException(typeof(T).Name + " has no formatter, add one with `Convention.Formatters.Add(new MyDataFormatter());`");
-
-            return formatter.Format(failingData);
-        }
-
         // http://stackoverflow.com/questions/52797/c-how-do-i-get-the-path-of-the-assembly-the-code-is-in#answer-283917
         static string AssemblyDirectory
         {

TestStack.ConventionTests/Internal/Executor.cs

@@ -0,0 +1,42 @@
+namespace TestStack.ConventionTests.Internal
+{
+    using System.Linq;
+    using TestStack.ConventionTests.Reporting;
+
+    public static class Executor
+    {
+        public static ResultInfo GetConventionReport(string conventionTitle, object[] failingData, IConventionData data)
+        {
+            data.EnsureHasNonEmptySource();
+            var passed = failingData.None();
+
+            var conventionResult = new ResultInfo(
+                passed ? TestResult.Passed : TestResult.Failed,
+                conventionTitle,
+                data.Description,
+                failingData.Select(FormatData).ToArray());
+            return conventionResult;
+        }
+
+        public static ResultInfo GetConventionReportWithApprovedExeptions(string conventionTitle, object[] failingData, IConventionData data)
+        {
+            var conventionResult = Executor.GetConventionReport(conventionTitle, failingData, data);
+            var conventionReportTextRenderer = new ConventionReportTextRenderer();
+            // Add approved exceptions to report
+            conventionReportTextRenderer.RenderItems(conventionResult);
+            conventionResult.WithApprovedException(conventionReportTextRenderer.Output);
+
+            return conventionResult;
+        }
+
+        static ConventionReportFailure FormatData<T>(T failingData)
+        {
+            var formatter = Convention.Formatters.FirstOrDefault(f => f.CanFormat(failingData));
+
+            if (formatter == null)
+                throw new NoDataFormatterFoundException(typeof(T).Name + " has no formatter, add one with `Convention.Formatters.Add(new MyDataFormatter());`");
+
+            return formatter.Format(failingData);
+        }
+    }
+}

TestStack.ConventionTests/TestStack.ConventionTests.csproj

@@ -62,6 +62,7 @@
   <ItemGroup>
     <Compile Include="ConventionFailedException.cs" />
     <Compile Include="Internal\ConventionReportFailure.cs" />
+    <Compile Include="Internal\Executor.cs" />
     <Compile Include="Internal\ResultInfo.cs" />
     <Compile Include="Internal\NoDataFormatterFoundException.cs" />
     <Compile Include="Reporting\HtmlReportRenderer.cs" />