Reorganised report processor files and fixed one failing test.

mwhelan · mwhelan · commit d2971ffe726a · 2013-07-22T15:47:51.000+01:00
diff --git a/TestStack.BDDfy.Samples/Atm/HtmlReportConfig.cs b/TestStack.BDDfy.Samples/Atm/HtmlReportConfig.cs
@@ -1,4 +1,4 @@
-﻿using TestStack.BDDfy.Processors.HtmlReporter;
+﻿using TestStack.BDDfy.Processors.Reporters.Html;
 
 namespace TestStack.BDDfy.Samples.Atm
 {
diff --git a/TestStack.BDDfy.Samples/BDDfyConfiguration.cs b/TestStack.BDDfy.Samples/BDDfyConfiguration.cs
@@ -1,6 +1,6 @@
 ﻿using NUnit.Framework;
 using TestStack.BDDfy.Configuration;
-using TestStack.BDDfy.Processors.HtmlReporter;
+using TestStack.BDDfy.Processors.Reporters.Html;
 using TestStack.BDDfy.Samples.Atm;
 using TestStack.BDDfy.Samples.TicTacToe;
 
diff --git a/TestStack.BDDfy.Tests/Configuration/BatchProcessorsTests.cs b/TestStack.BDDfy.Tests/Configuration/BatchProcessorsTests.cs
@@ -2,7 +2,8 @@
 using System.Linq;
 using TestStack.BDDfy.Configuration;
 using TestStack.BDDfy.Processors;
-using TestStack.BDDfy.Processors.HtmlReporter;
+using TestStack.BDDfy.Processors.Reporters.Html;
+using TestStack.BDDfy.Processors.Reporters.MarkDown;
 
 namespace TestStack.BDDfy.Tests.Configuration
 {
diff --git a/TestStack.BDDfy.Tests/Configuration/ProcessorPipelineTests.cs b/TestStack.BDDfy.Tests/Configuration/ProcessorPipelineTests.cs
@@ -2,6 +2,7 @@
 using NUnit.Framework;
 using TestStack.BDDfy.Configuration;
 using TestStack.BDDfy.Processors;
+using TestStack.BDDfy.Processors.Reporters;
 
 namespace TestStack.BDDfy.Tests.Configuration
 {
diff --git a/TestStack.BDDfy.Tests/Processors/Diagnostics/DiagnosticsReportBuilderSpecs.cs b/TestStack.BDDfy.Tests/Processors/Diagnostics/DiagnosticsReportBuilderSpecs.cs
@@ -1,9 +1,8 @@
-﻿using System.Collections.Generic;
-using NSubstitute;
+﻿using NSubstitute;
 using NUnit.Framework;
-using TestStack.BDDfy.Processors;
-using TestStack.BDDfy.Processors.Reports.Diagnostics;
-using TestStack.BDDfy.Processors.Reports.Serializers;
+using TestStack.BDDfy.Processors.Reporters;
+using TestStack.BDDfy.Processors.Reporters.Diagnostics;
+using TestStack.BDDfy.Processors.Reporters.Serializers;
 using TestStack.BDDfy.Tests.Processors.Reports;
 
 namespace TestStack.BDDfy.Tests.Processors.Diagnostics
@@ -15,14 +14,13 @@ public class DiagnosticsReportBuilderSpecs
         public void ShouldSerializeDiagnosticDataToSpecifiedFormat()
         {
             var serializer = Substitute.For<ISerializer>();
-            var model = new FileReportModel(
-                new ReportTestData().CreateTwoStoriesEachWithTwoScenariosWithThreeStepsOfFiveMilliseconds());
+            var testData = new ReportTestData().CreateTwoStoriesEachWithTwoScenariosWithThreeStepsOfFiveMilliseconds();
+            var model = new FileReportModel(testData);
             var sut = new DiagnosticsReportBuilder(serializer);
 
             sut.CreateReport(model);
             
-            serializer.Received().Serialize(Arg.Any<IList<StoryDiagnostic>>());
+            serializer.Received().Serialize(Arg.Any<object>());
         }
-
     }
 }
diff --git a/TestStack.BDDfy.Tests/Processors/Diagnostics/DiagnosticsReporterSpecs.cs b/TestStack.BDDfy.Tests/Processors/Diagnostics/DiagnosticsReporterSpecs.cs
@@ -3,10 +3,9 @@
 using NSubstitute;
 using NUnit.Framework;
 using TestStack.BDDfy.Processors;
-using TestStack.BDDfy.Processors.Reports;
-using TestStack.BDDfy.Processors.Reports.Diagnostics;
-using TestStack.BDDfy.Processors.Reports.Serializers;
-using TestStack.BDDfy.Processors.Reports.Writers;
+using TestStack.BDDfy.Processors.Reporters;
+using TestStack.BDDfy.Processors.Reporters.Diagnostics;
+using TestStack.BDDfy.Processors.Reporters.Writers;
 
 namespace TestStack.BDDfy.Tests.Processors.Diagnostics
 {
diff --git a/TestStack.BDDfy.Tests/Processors/Diagnostics/WhenBuildingReportDiagnostics.cs b/TestStack.BDDfy.Tests/Processors/Diagnostics/WhenBuildingReportDiagnostics.cs
@@ -1,9 +1,8 @@
 ﻿using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using TestStack.BDDfy.Processors;
-using TestStack.BDDfy.Processors.Reports.Diagnostics;
-using TestStack.BDDfy.Processors.Reports.MarkDown;
+using TestStack.BDDfy.Processors.Reporters;
+using TestStack.BDDfy.Processors.Reporters.Diagnostics;
 using TestStack.BDDfy.Tests.Processors.Reports;
 
 namespace TestStack.BDDfy.Tests.Processors.Diagnostics
diff --git a/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReportBuilderSpecs.cs b/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReportBuilderSpecs.cs
@@ -2,7 +2,8 @@
 using System.Text.RegularExpressions;
 using NUnit.Framework;
 using TestStack.BDDfy.Processors;
-using TestStack.BDDfy.Processors.Reports.MarkDown;
+using TestStack.BDDfy.Processors.Reporters;
+using TestStack.BDDfy.Processors.Reporters.MarkDown;
 using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes;
 
 namespace TestStack.BDDfy.Tests.Processors.Reports.MarkDown
diff --git a/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReporterSpecs.cs b/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReporterSpecs.cs
@@ -3,9 +3,9 @@
 using NSubstitute;
 using NUnit.Framework;
 using TestStack.BDDfy.Processors;
-using TestStack.BDDfy.Processors.Reports;
-using TestStack.BDDfy.Processors.Reports.Diagnostics;
-using TestStack.BDDfy.Processors.Reports.Writers;
+using TestStack.BDDfy.Processors.Reporters;
+using TestStack.BDDfy.Processors.Reporters.MarkDown;
+using TestStack.BDDfy.Processors.Reporters.Writers;
 
 namespace TestStack.BDDfy.Tests.Processors.Reports.MarkDown
 {
diff --git a/TestStack.BDDfy/Configuration/BatchProcessors.cs b/TestStack.BDDfy/Configuration/BatchProcessors.cs
@@ -2,8 +2,9 @@
 using System.Linq;
 using TestStack.BDDfy.Core;
 using TestStack.BDDfy.Processors;
-using TestStack.BDDfy.Processors.HtmlReporter;
-using TestStack.BDDfy.Processors.Reports.Diagnostics;
+using TestStack.BDDfy.Processors.Reporters.Diagnostics;
+using TestStack.BDDfy.Processors.Reporters.Html;
+using TestStack.BDDfy.Processors.Reporters.MarkDown;
 
 namespace TestStack.BDDfy.Configuration
 {
diff --git a/TestStack.BDDfy/Configuration/HtmlReportFactory.cs b/TestStack.BDDfy/Configuration/HtmlReportFactory.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Processors.HtmlReporter;
+using TestStack.BDDfy.Processors.Reporters.Html;
 
 namespace TestStack.BDDfy.Configuration
 {
diff --git a/TestStack.BDDfy/Configuration/Processors.cs b/TestStack.BDDfy/Configuration/Processors.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using TestStack.BDDfy.Core;
 using TestStack.BDDfy.Processors;
+using TestStack.BDDfy.Processors.Reporters;
 
 namespace TestStack.BDDfy.Configuration
 {
diff --git a/TestStack.BDDfy/Processors/Reporters/ConsoleReporter.cs b/TestStack.BDDfy/Processors/Reporters/ConsoleReporter.cs
@@ -4,7 +4,7 @@
 using TestStack.BDDfy.Configuration;
 using TestStack.BDDfy.Core;
 
-namespace TestStack.BDDfy.Processors
+namespace TestStack.BDDfy.Processors.Reporters
 {
     public class ConsoleReporter : IProcessor
     {
diff --git a/TestStack.BDDfy/Processors/Reporters/Diagnostics/DiagnosticsReportBuilder.cs b/TestStack.BDDfy/Processors/Reporters/Diagnostics/DiagnosticsReportBuilder.cs
@@ -1,9 +1,8 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using System.Linq;
-using TestStack.BDDfy.Processors.Reports.Serializers;
+using TestStack.BDDfy.Processors.Reporters.Serializers;
 
-namespace TestStack.BDDfy.Processors.Reports.Diagnostics
+namespace TestStack.BDDfy.Processors.Reporters.Diagnostics
 {
     public class DiagnosticsReportBuilder : IReportBuilder
     {
diff --git a/TestStack.BDDfy/Processors/Reporters/Diagnostics/DiagnosticsReporter.cs b/TestStack.BDDfy/Processors/Reporters/Diagnostics/DiagnosticsReporter.cs
@@ -1,9 +1,9 @@
 ﻿using System;
 using System.Collections.Generic;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Processors.Reports.Writers;
+using TestStack.BDDfy.Processors.Reporters.Writers;
 
-namespace TestStack.BDDfy.Processors.Reports.Diagnostics
+namespace TestStack.BDDfy.Processors.Reporters.Diagnostics
 {
     public class DiagnosticsReporter : IBatchProcessor
     {
diff --git a/TestStack.BDDfy/Processors/Reporters/Diagnostics/StoryDiagnostic.cs b/TestStack.BDDfy/Processors/Reporters/Diagnostics/StoryDiagnostic.cs
@@ -1,6 +1,6 @@
 ﻿using System.Collections.Generic;
 
-namespace TestStack.BDDfy.Processors.Reports.Diagnostics
+namespace TestStack.BDDfy.Processors.Reporters.Diagnostics
 {
     public class StoryDiagnostic
     {
diff --git a/TestStack.BDDfy/Processors/Reporters/FileReportModel.cs b/TestStack.BDDfy/Processors/Reporters/FileReportModel.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using TestStack.BDDfy.Core;
 
-namespace TestStack.BDDfy.Processors
+namespace TestStack.BDDfy.Processors.Reporters
 {
     public class FileReportModel
     {
diff --git a/TestStack.BDDfy/Processors/Reporters/FileReportSummaryModel.cs b/TestStack.BDDfy/Processors/Reporters/FileReportSummaryModel.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using TestStack.BDDfy.Core;
 
-namespace TestStack.BDDfy.Processors
+namespace TestStack.BDDfy.Processors.Reporters
 {
     public class FileReportSummaryModel
     {
diff --git a/TestStack.BDDfy/Processors/Reporters/Html/BDDfy.css b/TestStack.BDDfy/Processors/Reporters/Html/BDDfy.css
diff --git a/TestStack.BDDfy/Processors/Reporters/Html/BDDfy.js b/TestStack.BDDfy/Processors/Reporters/Html/BDDfy.js
diff --git a/TestStack.BDDfy/Processors/Reporters/Html/DefaultHtmlReportConfiguration.cs b/TestStack.BDDfy/Processors/Reporters/Html/DefaultHtmlReportConfiguration.cs
@@ -3,7 +3,7 @@
 using System.Reflection;
 using TestStack.BDDfy.Core;
 
-namespace TestStack.BDDfy.Processors.HtmlReporter
+namespace TestStack.BDDfy.Processors.Reporters.Html
 {
     public class DefaultHtmlReportConfiguration : IHtmlReportConfiguration
     {
diff --git a/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportBuilder.cs b/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportBuilder.cs
@@ -2,9 +2,8 @@
 using System.Linq;
 using System.Text;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Processors.Reports;
 
-namespace TestStack.BDDfy.Processors.HtmlReporter
+namespace TestStack.BDDfy.Processors.Reporters.Html
 {
     public class HtmlReportBuilder : IReportBuilder
     {
diff --git a/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportResources.Designer.cs b/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportResources.Designer.cs
diff --git a/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportResources.resx b/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportResources.resx
diff --git a/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportTag.cs b/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportTag.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace TestStack.BDDfy.Processors.HtmlReporter
+namespace TestStack.BDDfy.Processors.Reporters.Html
 {
     class HtmlReportTag : IDisposable
     {
diff --git a/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportViewModel.cs b/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportViewModel.cs
@@ -1,7 +1,7 @@
 ﻿using System.Collections.Generic;
 using TestStack.BDDfy.Core;
 
-namespace TestStack.BDDfy.Processors.HtmlReporter
+namespace TestStack.BDDfy.Processors.Reporters.Html
 {
     public class HtmlReportViewModel : FileReportModel
     {
diff --git a/TestStack.BDDfy/Processors/Reporters/Html/HtmlReporter.cs b/TestStack.BDDfy/Processors/Reporters/Html/HtmlReporter.cs
@@ -3,10 +3,9 @@
 using System.IO;
 using System.Linq;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Processors.Reports;
-using TestStack.BDDfy.Processors.Reports.Writers;
+using TestStack.BDDfy.Processors.Reporters.Writers;
 
-namespace TestStack.BDDfy.Processors.HtmlReporter
+namespace TestStack.BDDfy.Processors.Reporters.Html
 {
     public class HtmlReporter : IBatchProcessor
     {
diff --git a/TestStack.BDDfy/Processors/Reporters/Html/HtmlTag.cs b/TestStack.BDDfy/Processors/Reporters/Html/HtmlTag.cs
@@ -1,4 +1,4 @@
-namespace TestStack.BDDfy.Processors.HtmlReporter
+namespace TestStack.BDDfy.Processors.Reporters.Html
 {
     // ReSharper disable InconsistentNaming
     public enum HtmlTag
diff --git a/TestStack.BDDfy/Processors/Reporters/Html/IHtmlReportConfiguration.cs b/TestStack.BDDfy/Processors/Reporters/Html/IHtmlReportConfiguration.cs
@@ -1,6 +1,6 @@
 using TestStack.BDDfy.Core;
 
-namespace TestStack.BDDfy.Processors.HtmlReporter
+namespace TestStack.BDDfy.Processors.Reporters.Html
 {
     public interface IHtmlReportConfiguration
     {
diff --git a/TestStack.BDDfy/Processors/Reporters/Html/jquery-1.7.1.min.js b/TestStack.BDDfy/Processors/Reporters/Html/jquery-1.7.1.min.js
diff --git a/TestStack.BDDfy/Processors/Reporters/IReportBuilder.cs b/TestStack.BDDfy/Processors/Reporters/IReportBuilder.cs
@@ -1,4 +1,4 @@
-﻿namespace TestStack.BDDfy.Processors.Reports
+﻿namespace TestStack.BDDfy.Processors.Reporters
 {
     public interface IReportBuilder
     {
diff --git a/TestStack.BDDfy/Processors/Reporters/MarkDown/MarkDownReportBuilder.cs b/TestStack.BDDfy/Processors/Reporters/MarkDown/MarkDownReportBuilder.cs
@@ -1,6 +1,6 @@
 ﻿using System.Text;
 
-namespace TestStack.BDDfy.Processors.Reports.MarkDown
+namespace TestStack.BDDfy.Processors.Reporters.MarkDown
 {
     public class MarkDownReportBuilder : IReportBuilder
     {
diff --git a/TestStack.BDDfy/Processors/Reporters/MarkDown/MarkDownReporter.cs b/TestStack.BDDfy/Processors/Reporters/MarkDown/MarkDownReporter.cs
@@ -1,12 +1,9 @@
 ﻿using System;
 using System.Collections.Generic;
 using TestStack.BDDfy.Core;
-using TestStack.BDDfy.Processors.Reports;
-using TestStack.BDDfy.Processors.Reports.Diagnostics;
-using TestStack.BDDfy.Processors.Reports.MarkDown;
-using TestStack.BDDfy.Processors.Reports.Writers;
+using TestStack.BDDfy.Processors.Reporters.Writers;
 
-namespace TestStack.BDDfy.Processors
+namespace TestStack.BDDfy.Processors.Reporters.MarkDown
 {
     /// <summary>
     /// This is a custom reporter that shows you how easily you can create a custom report.
diff --git a/TestStack.BDDfy/Processors/Reporters/Serializers/ISerializer.cs b/TestStack.BDDfy/Processors/Reporters/Serializers/ISerializer.cs
@@ -1,4 +1,4 @@
-namespace TestStack.BDDfy.Processors.Reports.Serializers
+namespace TestStack.BDDfy.Processors.Reporters.Serializers
 {
     public interface ISerializer
     {
diff --git a/TestStack.BDDfy/Processors/Reporters/Serializers/JsonFormatter.cs b/TestStack.BDDfy/Processors/Reporters/Serializers/JsonFormatter.cs
diff --git a/TestStack.BDDfy/Processors/Reporters/Serializers/JsonSerializer.cs b/TestStack.BDDfy/Processors/Reporters/Serializers/JsonSerializer.cs
diff --git a/TestStack.BDDfy/Processors/Reporters/Writers/FileWriter.cs b/TestStack.BDDfy/Processors/Reporters/Writers/FileWriter.cs
diff --git a/TestStack.BDDfy/Processors/Reporters/Writers/IReportWriter.cs b/TestStack.BDDfy/Processors/Reporters/Writers/IReportWriter.cs
diff --git a/TestStack.BDDfy/TestStack.BDDfy.csproj b/TestStack.BDDfy/TestStack.BDDfy.csproj

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using TestStack.BDDfy.Processors.HtmlReporter;`
	`1`	`+using TestStack.BDDfy.Processors.Reporters.Html;`
`2`	`2`
`3`	`3`	`namespace TestStack.BDDfy.Samples.Atm`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,8 @@`
`2`	`2`	`using System.Linq;`
`3`	`3`	`using TestStack.BDDfy.Configuration;`
`4`	`4`	`using TestStack.BDDfy.Processors;`
`5`		`-using TestStack.BDDfy.Processors.HtmlReporter;`
	`5`	`+using TestStack.BDDfy.Processors.Reporters.Html;`
	`6`	`+using TestStack.BDDfy.Processors.Reporters.MarkDown;`
`6`	`7`
`7`	`8`	`namespace TestStack.BDDfy.Tests.Configuration`
`8`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using NUnit.Framework;`
`3`	`3`	`using TestStack.BDDfy.Configuration;`
`4`	`4`	`using TestStack.BDDfy.Processors;`
	`5`	`+using TestStack.BDDfy.Processors.Reporters;`
`5`	`6`
`6`	`7`	`namespace TestStack.BDDfy.Tests.Configuration`
`7`	`8`	`{`