Incorporated feedback from previous commit

mwhelan · mwhelan · commit f370f2a605df · 2014-03-25T10:58:08.000Z
diff --git a/TestStack.BDDfy.Tests/Reporters/Diagnostics/DiagnosticsReportBuilderTests.cs b/TestStack.BDDfy.Tests/Reporters/Diagnostics/DiagnosticsReportBuilderTests.cs
@@ -7,7 +7,7 @@
 namespace TestStack.BDDfy.Tests.Reporters.Diagnostics
 {
     [TestFixture]
-    public class DiagnosticsReportBuilderSpecs
+    public class DiagnosticsReportBuilderTests
     {
         [Test]
         public void ShouldSerializeDiagnosticDataToSpecifiedFormat()
diff --git a/TestStack.BDDfy.Tests/Reporters/Diagnostics/DiagnosticsReporterTests.cs b/TestStack.BDDfy.Tests/Reporters/Diagnostics/DiagnosticsReporterTests.cs
@@ -9,7 +9,7 @@
 namespace TestStack.BDDfy.Tests.Reporters.Diagnostics
 {
     [TestFixture]
-    public class DiagnosticsReporterSpecs
+    public class DiagnosticsReporterTests
     {
         private IReportBuilder _builder;
         private IReportWriter _writer;
diff --git a/TestStack.BDDfy.Tests/Reporters/Html/HtmlReportBuilderTests.ShouldProduceExpectedHtml.approved.txt b/TestStack.BDDfy.Tests/Reporters/Html/HtmlReportBuilderTests.ShouldProduceExpectedHtml.approved.txt
diff --git a/TestStack.BDDfy.Tests/Reporters/Html/HtmlReportBuilderTests.cs b/TestStack.BDDfy.Tests/Reporters/Html/HtmlReportBuilderTests.cs
@@ -10,7 +10,7 @@ namespace TestStack.BDDfy.Tests.Reporters.Html
 {
     [TestFixture]
     [UseReporter(typeof(DiffReporter))]
-    public class HtmlReportBuilderSpecs
+    public class HtmlReportBuilderTests
     {
         [Test]
         public void ShouldProduceExpectedHtml()
diff --git a/TestStack.BDDfy.Tests/Reporters/Html/HtmlReporterTests.cs b/TestStack.BDDfy.Tests/Reporters/Html/HtmlReporterTests.cs
@@ -7,7 +7,7 @@
 namespace TestStack.BDDfy.Tests.Reporters.Html
 {
     [TestFixture]
-    public class HtmlReporterSpecs
+    public class HtmlReporterTests
     {
         private TestableHtmlReporter SUT;
         private const string OutputPath = @"C:\Reports";
diff --git a/TestStack.BDDfy.Tests/Reporters/MarkDown/MarkDownReportBuilderTests.cs b/TestStack.BDDfy.Tests/Reporters/MarkDown/MarkDownReportBuilderTests.cs
@@ -7,7 +7,7 @@
 namespace TestStack.BDDfy.Tests.Reporters.MarkDown
 {
     [TestFixture]
-    public class MarkDownReportBuilderSpecs
+    public class MarkDownReportBuilderTests
     {
         private MarkDownReportBuilder _sut;
         private IEnumerable<Story> _stories;
diff --git a/TestStack.BDDfy.Tests/Reporters/MarkDown/MarkDownReporterTests.cs b/TestStack.BDDfy.Tests/Reporters/MarkDown/MarkDownReporterTests.cs
@@ -9,7 +9,7 @@
 namespace TestStack.BDDfy.Tests.Reporters.MarkDown
 {
     [TestFixture]
-    public class MarkDownReporterSpecs
+    public class MarkDownReporterTests
     {
         private IReportBuilder _builder;
         private IReportWriter _writer;
diff --git a/TestStack.BDDfy.Tests/TestStack.BDDfy.Tests.csproj b/TestStack.BDDfy.Tests/TestStack.BDDfy.Tests.csproj
@@ -74,8 +74,8 @@
     <Compile Include="Arguments\MultipleArgumentsProvidedForTheSameStep.cs" />
     <Compile Include="Configuration\SequentialKeyGeneratorTests.cs" />
     <Compile Include="Configuration\TestRunnerTests.cs" />
-    <Compile Include="Reporters\Html\HtmlReportBuilderSpecs.cs" />
-    <Compile Include="Reporters\Html\HtmlReporterSpecs.cs" />
+    <Compile Include="Reporters\Html\HtmlReportBuilderTests.cs" />
+    <Compile Include="Reporters\Html\HtmlReporterTests.cs" />
     <Compile Include="Reporters\Html\TestableHtmlReporter.cs" />
     <Compile Include="Scanner\WhenStepScannerFactoryAsyncMethods.cs" />
     <Compile Include="Configuration\CustomProcessor.cs" />
@@ -94,11 +94,11 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="HumanizerTests.cs" />
-    <Compile Include="Reporters\Diagnostics\DiagnosticsReportBuilderSpecs.cs" />
+    <Compile Include="Reporters\Diagnostics\DiagnosticsReportBuilderTests.cs" />
     <Compile Include="Reporters\Diagnostics\WhenBuildingReportDiagnostics.cs" />
-    <Compile Include="Reporters\Diagnostics\DiagnosticsReporterSpecs.cs" />
-    <Compile Include="Reporters\MarkDown\MarkDownReportBuilderSpecs.cs" />
-    <Compile Include="Reporters\MarkDown\MarkDownReporterSpecs.cs" />
+    <Compile Include="Reporters\Diagnostics\DiagnosticsReporterTests.cs" />
+    <Compile Include="Reporters\MarkDown\MarkDownReportBuilderTests.cs" />
+    <Compile Include="Reporters\MarkDown\MarkDownReporterTests.cs" />
     <Compile Include="Reporters\ReportTestData.cs" />
     <Compile Include="Scanner\ExecutableAttributeOrderOrdersTheStepsCorrectly.cs" />
     <Compile Include="Scanner\PropertiesAreNotConsideredAsStepsEvenWhenTheirNameMatchesConventions.cs" />
diff --git a/TestStack.BDDfy/Reporters/Html/HtmlReportBuilder.cs b/TestStack.BDDfy/Reporters/Html/HtmlReportBuilder.cs
@@ -233,8 +233,7 @@ private void AddStoryMetadataAndNarrative(Story story)
                 {
                     using (OpenTag("<ul class='storyNarrative'>", HtmlTag.ul))
                     {
-                        if(!string.IsNullOrEmpty(story.Metadata.Narrative1))
-                            AddLine(string.Format("<li>{0}</li>", story.Metadata.Narrative1));
+                        AddLine(string.Format("<li>{0}</li>", story.Metadata.Narrative1));
                         if (!string.IsNullOrEmpty(story.Metadata.Narrative2))
                             AddLine(string.Format("<li>{0}</li>", story.Metadata.Narrative2));
                         if (!string.IsNullOrEmpty(story.Metadata.Narrative3))

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`namespace TestStack.BDDfy.Tests.Reporters.Diagnostics`
`8`	`8`	`{`
`9`	`9`	`[TestFixture]`
`10`		`- public class DiagnosticsReportBuilderSpecs`
	`10`	`+ public class DiagnosticsReportBuilderTests`
`11`	`11`	`{`
`12`	`12`	`[Test]`
`13`	`13`	`public void ShouldSerializeDiagnosticDataToSpecifiedFormat()`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`namespace TestStack.BDDfy.Tests.Reporters.Diagnostics`
`10`	`10`	`{`
`11`	`11`	`[TestFixture]`
`12`		`- public class DiagnosticsReporterSpecs`
	`12`	`+ public class DiagnosticsReporterTests`
`13`	`13`	`{`
`14`	`14`	`private IReportBuilder _builder;`
`15`	`15`	`private IReportWriter _writer;`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace TestStack.BDDfy.Tests.Reporters.Html`
`10`	`10`	`{`
`11`	`11`	`[TestFixture]`
`12`	`12`	`[UseReporter(typeof(DiffReporter))]`
`13`		`- public class HtmlReportBuilderSpecs`
	`13`	`+ public class HtmlReportBuilderTests`
`14`	`14`	`{`
`15`	`15`	`[Test]`
`16`	`16`	`public void ShouldProduceExpectedHtml()`
Original file line number	Diff line number	Diff line change
`@@ -233,8 +233,7 @@ private void AddStoryMetadataAndNarrative(Story story)`
`233`	`233`	`{`
`234`	`234`	`using (OpenTag("<ul class='storyNarrative'>", HtmlTag.ul))`
`235`	`235`	`{`
`236`		`- if(!string.IsNullOrEmpty(story.Metadata.Narrative1))`
`237`		`- AddLine(string.Format("<li>{0}</li>", story.Metadata.Narrative1));`
	`236`	`+ AddLine(string.Format("<li>{0}</li>", story.Metadata.Narrative1));`
`238`	`237`	`if (!string.IsNullOrEmpty(story.Metadata.Narrative2))`
`239`	`238`	`AddLine(string.Format("<li>{0}</li>", story.Metadata.Narrative2));`
`240`	`239`	`if (!string.IsNullOrEmpty(story.Metadata.Narrative3))`