folded HtmlReportRenderer to be treated just like any other processor

kkozmic · kkozmic · commit cb3d9a5faa61 · 2013-08-18T12:06:06.000+10:00
diff --git a/TestStack.ConventionTests/Convention.cs b/TestStack.ConventionTests/Convention.cs
@@ -10,7 +10,6 @@
     public static class Convention
     {
         static readonly HtmlReportRenderer HtmlRenderer = new HtmlReportRenderer(AssemblyDirectory);
-        static readonly List<ConventionResult> Reports = new List<ConventionResult>();
 
         static Convention()
         {
@@ -24,38 +23,41 @@ static Convention()
             };
         }
 
-        public static IEnumerable<ConventionResult> ConventionReports { get { return Reports; } }
-        public static IList<IReportDataFormatter> Formatters { get; set; } 
+        public static IList<IReportDataFormatter> Formatters { get; set; }
 
         public static void Is<TDataSource>(IConvention<TDataSource> convention, TDataSource data)
             where TDataSource : IConventionData
         {
-            Is(convention, data, new ThrowOnFailureResultsProcessor());
+            Is(convention, data, new IResultsProcessor[]
+            {
+                HtmlRenderer,
+                new ConventionReportTraceRenderer(),
+                new ThrowOnFailureResultsProcessor()
+            });
         }
 
         public static void Is<TDataSource>(IConvention<TDataSource> convention, TDataSource data,
-            IResultsProcessor processor)
+            IResultsProcessor[] processors)
             where TDataSource : IConventionData
         {
-            try
-            {
-                var context = new ConventionContext(data.Description, Formatters);
-                var conventionResult = context.Execute(convention, data);
-                Reports.AddRange(conventionResult);
+            var context = new ConventionContext(data.Description, Formatters);
+            var conventionResult = context.Execute(convention, data);
 
-                new ConventionReportTraceRenderer().Process(conventionResult);
-                processor.Process(conventionResult);
-            }
-            finally
+            foreach (var processor in processors)
             {
-                HtmlRenderer.Process(Reports.ToArray());
+                processor.Process(conventionResult);
             }
         }
 
         public static void IsWithApprovedExeptions<TDataSource>(IConvention<TDataSource> convention, TDataSource data)
             where TDataSource : IConventionData
         {
-            Is(convention, data, new ApproveResultsProcessor());
+            Is(convention, data, new IResultsProcessor[]
+            {
+                HtmlRenderer,
+                new ConventionReportTraceRenderer(),
+                new ApproveResultsProcessor()
+            });
         }
 
         // http://stackoverflow.com/questions/52797/c-how-do-i-get-the-path-of-the-assembly-the-code-is-in#answer-283917
diff --git a/TestStack.ConventionTests/Reporting/HtmlReportRenderer.cs b/TestStack.ConventionTests/Reporting/HtmlReportRenderer.cs
@@ -1,5 +1,7 @@
 ﻿namespace TestStack.ConventionTests.Reporting
 {
+    using System;
+    using System.Collections.Generic;
     using System.IO;
     using System.Text;
     using System.Web.UI;
@@ -8,6 +10,8 @@
     public class HtmlReportRenderer : IResultsProcessor
     {
         readonly string file;
+        static readonly List<ConventionResult> Reports = new List<ConventionResult>();
+        public static IEnumerable<ConventionResult> ConventionReports { get { return Reports; } }
 
         public HtmlReportRenderer(string assemblyDirectory)
         {
@@ -16,6 +20,7 @@ public HtmlReportRenderer(string assemblyDirectory)
 
         public void Process(params ConventionResult[] results)
         {
+            Reports.AddRange(results);
             var sb = new StringBuilder();
             var html = new HtmlTextWriter(new StringWriter(sb));
             html.WriteLine("<!DOCTYPE html>");
@@ -29,16 +34,16 @@ public void Process(params ConventionResult[] results)
             html.Write("Project Conventions");
             html.RenderEndTag();
 
-            foreach (var conventionReport in results)
+            foreach (var conventionReport in Reports)
             {
                 html.RenderBeginTag(HtmlTextWriterTag.P);
                 html.RenderBeginTag(HtmlTextWriterTag.Div);
                 html.RenderBeginTag(HtmlTextWriterTag.Strong);
                 html.Write(conventionReport.Result+": ");
                 html.RenderEndTag();
-                var title = string.Format("{0} for {1}", conventionReport.ConventionTitle, conventionReport.DataDescription);
+                var title = String.Format("{0} for {1}", conventionReport.ConventionTitle, conventionReport.DataDescription);
                 html.Write(title);
-                if (!string.IsNullOrEmpty(conventionReport.ApprovedException))
+                if (!String.IsNullOrEmpty(conventionReport.ApprovedException))
                 {
                     html.RenderBeginTag(HtmlTextWriterTag.Div);
                     html.RenderBeginTag(HtmlTextWriterTag.Strong);
@@ -49,7 +54,7 @@ public void Process(params ConventionResult[] results)
                 
                 html.RenderBeginTag(HtmlTextWriterTag.Ul);
 
-                if (!string.IsNullOrEmpty(conventionReport.ApprovedException))
+                if (!String.IsNullOrEmpty(conventionReport.ApprovedException))
                 {
                     html.RenderBeginTag(HtmlTextWriterTag.Li);
                     html.WriteLine(conventionReport.ApprovedException);

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`public static class Convention`
`11`	`11`	`{`
`12`	`12`	`static readonly HtmlReportRenderer HtmlRenderer = new HtmlReportRenderer(AssemblyDirectory);`
`13`		`- static readonly List<ConventionResult> Reports = new List<ConventionResult>();`
`14`	`13`
`15`	`14`	`static Convention()`
`16`	`15`	`{`
`@@ -24,38 +23,41 @@ static Convention()`
`24`	`23`	`};`
`25`	`24`	`}`
`26`	`25`
`27`		`- public static IEnumerable<ConventionResult> ConventionReports { get { return Reports; } }`
`28`		`- public static IList<IReportDataFormatter> Formatters { get; set; }`
	`26`	`+ public static IList<IReportDataFormatter> Formatters { get; set; }`
`29`	`27`
`30`	`28`	`public static void Is<TDataSource>(IConvention<TDataSource> convention, TDataSource data)`
`31`	`29`	`where TDataSource : IConventionData`
`32`	`30`	`{`
`33`		`- Is(convention, data, new ThrowOnFailureResultsProcessor());`
	`31`	`+ Is(convention, data, new IResultsProcessor[]`
	`32`	`+ {`
	`33`	`+ HtmlRenderer,`
	`34`	`+ new ConventionReportTraceRenderer(),`
	`35`	`+ new ThrowOnFailureResultsProcessor()`
	`36`	`+ });`
`34`	`37`	`}`
`35`	`38`
`36`	`39`	`public static void Is<TDataSource>(IConvention<TDataSource> convention, TDataSource data,`
`37`		`- IResultsProcessor processor)`
	`40`	`+ IResultsProcessor[] processors)`
`38`	`41`	`where TDataSource : IConventionData`
`39`	`42`	`{`
`40`		`- try`
`41`		`- {`
`42`		`- var context = new ConventionContext(data.Description, Formatters);`
`43`		`- var conventionResult = context.Execute(convention, data);`
`44`		`- Reports.AddRange(conventionResult);`
	`43`	`+ var context = new ConventionContext(data.Description, Formatters);`
	`44`	`+ var conventionResult = context.Execute(convention, data);`
`45`	`45`
`46`		`- new ConventionReportTraceRenderer().Process(conventionResult);`
`47`		`- processor.Process(conventionResult);`
`48`		`- }`
`49`		`- finally`
	`46`	`+ foreach (var processor in processors)`
`50`	`47`	`{`
`51`		`- HtmlRenderer.Process(Reports.ToArray());`
	`48`	`+ processor.Process(conventionResult);`
`52`	`49`	`}`
`53`	`50`	`}`
`54`	`51`
`55`	`52`	`public static void IsWithApprovedExeptions<TDataSource>(IConvention<TDataSource> convention, TDataSource data)`
`56`	`53`	`where TDataSource : IConventionData`
`57`	`54`	`{`
`58`		`- Is(convention, data, new ApproveResultsProcessor());`
	`55`	`+ Is(convention, data, new IResultsProcessor[]`
	`56`	`+ {`
	`57`	`+ HtmlRenderer,`
	`58`	`+ new ConventionReportTraceRenderer(),`
	`59`	`+ new ApproveResultsProcessor()`
	`60`	`+ });`
`59`	`61`	`}`
`60`	`62`
`61`	`63`	`// http://stackoverflow.com/questions/52797/c-how-do-i-get-the-path-of-the-assembly-the-code-is-in#answer-283917`