removed Executor, sidenote - Resharper is the bee's knees

All it took was two refactorings:
- move method to another type
- make method non-static
that's it - no extra manual work, it even folded the ConventionContext parameter and replaced it with 'this' where required. Respect

Author: kkozmic

TestStack.ConventionTests/Convention.cs

@@ -40,7 +40,8 @@ public static void Is<TDataSource>(IConvention<TDataSource> convention, TDataSou
         {
             try
             {
-                var conventionResult = Executor.GetConventionResults(convention, data);
+                var context = new ConventionContext(data.Description, Formatters);
+                var conventionResult = context.GetConventionResults(convention, data);
                 Reports.AddRange(conventionResult);
 
                 new ConventionReportTraceRenderer().Render(conventionResult);
@@ -55,7 +56,8 @@ public static void Is<TDataSource>(IConvention<TDataSource> convention, TDataSou
         public static void IsWithApprovedExeptions<TDataSource>(IConvention<TDataSource> convention, TDataSource data)
             where TDataSource : IConventionData
         {
-            var conventionResult = Executor.GetConventionResultsWithApprovedExeptions(convention, data);
+            var context = new ConventionContext(data.Description, Formatters);
+            var conventionResult = context.GetConventionResultsWithApprovedExeptions(convention, data);
             Reports.AddRange(conventionResult);
 
             try

TestStack.ConventionTests/Internal/ConventionContext.cs

@@ -3,6 +3,7 @@
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using TestStack.ConventionTests.Conventions;
     using TestStack.ConventionTests.Reporting;
 
     public class ConventionContext : IConventionResultContext
@@ -75,5 +76,35 @@ ConventionReportFailure FormatData<T>(T failingData)
 
             return formatter.Format(failingData);
         }
+
+        public ConventionResult[] GetConventionResults<TDataSource>(IConvention<TDataSource> convention, TDataSource data)
+            where TDataSource : IConventionData
+        {
+            if (!data.HasData)
+                throw new ConventionSourceInvalidException(String.Format("{0} has no data", data.Description));
+
+            convention.Execute(data, this);
+
+            return ConventionResults;
+        }
+
+        public ConventionResult[] GetConventionResultsWithApprovedExeptions<TDataSource>(
+            IConvention<TDataSource> convention, TDataSource data)
+            where TDataSource : IConventionData
+        {
+            var conventionReportTextRenderer = new ConventionReportTextRenderer();
+            // Add approved exceptions to report
+            if (!data.HasData)
+                throw new ConventionSourceInvalidException(String.Format("{0} has no data", data.Description));
+
+            convention.Execute(data, this);
+            foreach (var conventionResult in ConventionResults)
+            {
+                conventionReportTextRenderer.RenderItems(conventionResult);
+                conventionResult.WithApprovedException(conventionReportTextRenderer.Output);
+            }
+
+            return ConventionResults;
+        }
     }
 }

TestStack.ConventionTests/Internal/Executor.cs

@@ -64,7 +64,6 @@
     <Compile Include="IConventionResultContext.cs" />
     <Compile Include="Internal\ConventionReportFailure.cs" />
     <Compile Include="Internal\ConventionContext.cs" />
-    <Compile Include="Internal\Executor.cs" />
     <Compile Include="Internal\ConventionResult.cs" />
     <Compile Include="Internal\NoDataFormatterFoundException.cs" />
     <Compile Include="Reporting\CsvReporter.cs" />