moved knowledge of approved exceptions out of ConventionContext

Author: kkozmic

TestStack.ConventionTests/Convention.cs

@@ -41,7 +41,7 @@ public static void Is<TDataSource>(IConvention<TDataSource> convention, TDataSou
             try
             {
                 var context = new ConventionContext(data.Description, Formatters);
-                var conventionResult = context.GetConventionResults(convention, data);
+                var conventionResult = context.Execute(convention, data);
                 Reports.AddRange(conventionResult);
 
                 new ConventionReportTraceRenderer().Process(conventionResult);
@@ -57,7 +57,7 @@ public static void IsWithApprovedExeptions<TDataSource>(IConvention<TDataSource>
             where TDataSource : IConventionData
         {
             var context = new ConventionContext(data.Description, Formatters);
-            var conventionResult = context.GetConventionResultsWithApprovedExeptions(convention, data);
+            var conventionResult = context.Execute(convention, data);
             Reports.AddRange(conventionResult);
 
             try

TestStack.ConventionTests/Internal/ConventionContext.cs

@@ -77,7 +77,7 @@ ConventionReportFailure FormatData<T>(T failingData)
             return formatter.Format(failingData);
         }
 
-        public ConventionResult[] GetConventionResults<TDataSource>(IConvention<TDataSource> convention,
+        public ConventionResult[] Execute<TDataSource>(IConvention<TDataSource> convention,
             TDataSource data)
             where TDataSource : IConventionData
         {
@@ -87,24 +87,5 @@ public ConventionResult[] GetConventionResults<TDataSource>(IConvention<TDataSou
 
             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;
-        }
     }
 }