removed HtmlMetroReporter

Author: MehdiK

TestStack.BDDfy.Tests/Configuration/BatchProcessorsTests.cs

@@ -10,6 +10,11 @@ namespace TestStack.BDDfy.Tests.Configuration
     [TestFixture]
     public class BatchProcessorsTests
     {
+        static bool MetroReportProcessorIsActive(IBatchProcessor batchProcessor)
+        {
+            return batchProcessor is HtmlReporter && ((HtmlReporter)batchProcessor).ReportBuilder is HtmlMetroReportBuilder;
+        }
+
         [Test]
         public void ReturnsHtmlReporterByDefault()
         {
@@ -28,26 +33,28 @@ public void DoesNotReturnMarkDownReporterByDefault()
         public void DoesNotReturnHtmlMetroReporterByDefault()
         {
             var processors = Configurator.BatchProcessors.GetProcessors().ToList();
-            Assert.IsFalse(processors.Any(p => p is HtmlMetroReporter));
+            Assert.IsFalse(processors.Any(MetroReportProcessorIsActive));
         }
 
         [Test]
         public void DoesNotReturnHtmlReporterWhenItIsDeactivated()
         {
             Configurator.BatchProcessors.HtmlReport.Disable();
+            
             var processors = Configurator.BatchProcessors.GetProcessors().ToList();
-
             Assert.IsFalse(processors.Any(p => p is HtmlReporter));
+            
             Configurator.BatchProcessors.HtmlReport.Enable();
         }
 
         [Test]
         public void ReturnsMarkdownReporterWhenItIsActivated()
         {
             Configurator.BatchProcessors.MarkDownReport.Enable();
+            
             var processors = Configurator.BatchProcessors.GetProcessors().ToList();
-
             Assert.IsTrue(processors.Any(p => p is MarkDownReporter));
+            
             Configurator.BatchProcessors.MarkDownReport.Disable();
         }
 
@@ -57,10 +64,8 @@ public void ReturnsHtmlMetroReporterWhenItIsActivated()
             Configurator.BatchProcessors.HtmlMetroReport.Enable();           
 
             var processors = Configurator.BatchProcessors.GetProcessors().ToList();
-
-            Assert.IsTrue(processors.OfType<HtmlMetroReporter>().Any(),
-                "The metro Html report was not found in batch processors");
-
+            Assert.IsTrue(processors.Any(MetroReportProcessorIsActive), "The metro Html report was not found in batch processors");
+            
             Configurator.BatchProcessors.HtmlMetroReport.Disable();
         }
     }

TestStack.BDDfy.Tests/Reporters/Html/HtmlReporterTests.cs

@@ -25,7 +25,7 @@ public void SetUp()
         [Test]
         public void ShouldCreateReportIfProcessingSucceeds()
         {
-            _sut.Builder.CreateReport(Arg.Any<FileReportModel>()).Returns(ReportData);
+            _sut.ReportBuilder.CreateReport(Arg.Any<FileReportModel>()).Returns(ReportData);
 
             _sut.Process(new List<Story>());
 
@@ -35,7 +35,7 @@ public void ShouldCreateReportIfProcessingSucceeds()
         [Test]
         public void ShouldPrintErrorInReportIfProcessingFails()
         {
-            _sut.Builder.CreateReport(Arg.Any<FileReportModel>()).Returns(x => { throw new Exception(ErrorMessage); });
+            _sut.ReportBuilder.CreateReport(Arg.Any<FileReportModel>()).Returns(x => { throw new Exception(ErrorMessage); });
 
             _sut.Process(new ReportTestData().CreateTwoStoriesEachWithTwoScenariosWithThreeStepsOfFiveMilliseconds());
 

TestStack.BDDfy.Tests/Reporters/Html/TestableHtmlReporter.cs

@@ -9,15 +9,14 @@ namespace TestStack.BDDfy.Tests.Reporters.Html
     public class TestableHtmlReporter : HtmlReporter
     {
         public IHtmlReportConfiguration Configuration { get; set; }
-        public IReportBuilder Builder { get; set; }
         public IReportWriter Writer { get; set; }
         public IFileReader FileReader { get; set; }
 
-        public TestableHtmlReporter(IHtmlReportConfiguration configuration, IReportBuilder builder, IReportWriter writer, IFileReader fileReader) 
-            : base(configuration, builder, writer, fileReader)
+        public TestableHtmlReporter(IHtmlReportConfiguration configuration, IReportBuilder reportBuilder, IReportWriter writer, IFileReader fileReader) 
+            : base(configuration, reportBuilder, writer, fileReader)
         {
             Configuration = configuration;
-            Builder = builder;
+            ReportBuilder = reportBuilder;
             Writer = writer;
             FileReader = fileReader;
             Configuration.RunsOn(Arg.Any<Story>()).Returns(true);

TestStack.BDDfy/Configuration/BatchProcessors.cs

@@ -37,7 +37,7 @@ IEnumerable<IBatchProcessor> _GetProcessors()
         private readonly BatchProcessorFactory _htmlReportFactory = new BatchProcessorFactory(() => new HtmlReporter(new DefaultHtmlReportConfiguration()));
         public BatchProcessorFactory HtmlReport { get { return _htmlReportFactory; } }
 
-        private readonly BatchProcessorFactory _htmlMetroReportFactory = new BatchProcessorFactory(() => new HtmlMetroReporter(new DefaultHtmlReportConfiguration()),false);
+        private readonly BatchProcessorFactory _htmlMetroReportFactory = new BatchProcessorFactory(() => new HtmlReporter(new DefaultHtmlReportConfiguration(), new HtmlMetroReportBuilder()), false);
         public BatchProcessorFactory HtmlMetroReport { get { return _htmlMetroReportFactory; } }
 
         private readonly BatchProcessorFactory _markDownFactory = new BatchProcessorFactory(() => new MarkDownReporter(), false);

TestStack.BDDfy/Reporters/Html/HtmlReporter.cs

@@ -9,7 +9,7 @@ namespace TestStack.BDDfy.Reporters.Html
 {
     public class HtmlReporter : IBatchProcessor
     {
-        private readonly IReportBuilder _builder;
+        public IReportBuilder ReportBuilder { get; set; }
         private readonly IReportWriter _writer;
         private readonly IFileReader _fileReader;
         readonly IHtmlReportConfiguration _configuration;
@@ -27,12 +27,12 @@ public HtmlReporter(IHtmlReportConfiguration configuration, IReportBuilder htmlR
 
         public HtmlReporter(
             IHtmlReportConfiguration configuration, 
-            IReportBuilder builder, 
+            IReportBuilder reportBuilder, 
             IReportWriter writer, 
             IFileReader reader)
         {
             _configuration = configuration;
-            _builder = builder;
+            ReportBuilder = reportBuilder;
             _writer = writer;
             _fileReader = reader;
         }
@@ -51,7 +51,7 @@ void WriteOutHtmlReport(IEnumerable<Story> stories)
 
             try
             {
-                report = _builder.CreateReport(Model);
+                report = ReportBuilder.CreateReport(Model);
             }
             catch (Exception ex)
             {

TestStack.BDDfy/Reporters/HtmlMetro/HtmlMetroReportBuilder.cs

@@ -14,11 +14,7 @@ string IReportBuilder.CreateReport(FileReportModel model)
 
         public string CreateReport(HtmlReportViewModel model)
         {
-            var t = new MetroHtmlReportTemplate(model, DateProvider());
-
-            var html = t.TransformText();
-
-            return html;
+            return new MetroHtmlReportTemplate(model, DateProvider()).TransformText();
         }
 
         public Func<DateTime> DateProvider

TestStack.BDDfy/Reporters/HtmlMetro/HtmlMetroReporter.cs

@@ -90,7 +90,6 @@
     <Compile Include="Reporters\Html\DefaultHtmlReportConfiguration.cs" />
     <Compile Include="Reporters\Html\HtmlReporter.cs" />
     <Compile Include="Reporters\Html\HtmlReportBuilder.cs" />
-    <Compile Include="Reporters\HtmlMetro\HtmlMetroReporter.cs" />
     <Compile Include="Reporters\Html\HtmlReportResources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>