cleaned up scanners' tests

MehdiK · MehdiK · commit 7be8ed2e0315 · 2014-05-20T19:50:27.000-04:00
diff --git a/TestStack.BDDfy.Tests/Scanner/Examples/ExampleTableTests.cs b/TestStack.BDDfy.Tests/Scanner/Examples/ExampleTableTests.cs
@@ -3,7 +3,7 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace TestStack.BDDfy.Tests.Scanner.StepScanners.Examples
+namespace TestStack.BDDfy.Tests.Scanner.Examples
 {
     [TestFixture]
     public class ExampleTableTests
diff --git a/TestStack.BDDfy.Tests/Scanner/Examples/ExampleValueTests.cs b/TestStack.BDDfy.Tests/Scanner/Examples/ExampleValueTests.cs
@@ -2,7 +2,7 @@
 using NUnit.Framework;
 using Shouldly;
 
-namespace TestStack.BDDfy.Tests.Scanner.StepScanners.Examples
+namespace TestStack.BDDfy.Tests.Scanner.Examples
 {
     public class ExampleValueTests
     {
diff --git a/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamples.FluentCanBeUsedWithExamples.approved.txt b/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamples.FluentCanBeUsedWithExamples.approved.txt
diff --git a/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamples.Inline.approved.txt b/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamples.Inline.approved.txt
diff --git a/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamples.cs b/TestStack.BDDfy.Tests/Scanner/Examples/FluentWithExamples.cs
@@ -4,7 +4,7 @@
 using Shouldly;
 using TestStack.BDDfy.Reporters;
 
-namespace TestStack.BDDfy.Tests.Scanner.FluentScanner
+namespace TestStack.BDDfy.Tests.Scanner.Examples
 {
     [TestFixture]
     public class FluentWithExamples
diff --git a/TestStack.BDDfy.Tests/Scanner/Examples/ReflectiveWithExamples.Run.approved.txt b/TestStack.BDDfy.Tests/Scanner/Examples/ReflectiveWithExamples.Run.approved.txt
diff --git a/TestStack.BDDfy.Tests/Scanner/Examples/ReflectiveWithExamples.cs b/TestStack.BDDfy.Tests/Scanner/Examples/ReflectiveWithExamples.cs
@@ -3,7 +3,7 @@
 using Shouldly;
 using TestStack.BDDfy.Reporters;
 
-namespace TestStack.BDDfy.Tests.Scanner.ReflectiveScanner
+namespace TestStack.BDDfy.Tests.Scanner.Examples
 {
     [TestFixture]
     public class ReflectiveWithExamples
diff --git a/TestStack.BDDfy.Tests/Scanner/FluentScanner/UseExamples.RunExamplesWithFluentApi.approved.txt b/TestStack.BDDfy.Tests/Scanner/FluentScanner/UseExamples.RunExamplesWithFluentApi.approved.txt
diff --git a/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/DefaultScanForStepsByMethodNameTests.cs b/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/DefaultScanForStepsByMethodNameTests.cs
@@ -1,7 +1,7 @@
-using NUnit.Framework;
 using System.Linq;
+using NUnit.Framework;
 
-namespace TestStack.BDDfy.Tests.Scanner.StepText
+namespace TestStack.BDDfy.Tests.Scanner.ReflectiveScanner
 {
     public class DefaultScanForStepsByMethodNameTests
     {
diff --git a/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/ExecutableAttributeOrderOrdersTheStepsCorrectly.cs b/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/ExecutableAttributeOrderOrdersTheStepsCorrectly.cs
@@ -3,7 +3,7 @@
 using NUnit.Framework;
 using TestStack.BDDfy.Configuration;
 
-namespace TestStack.BDDfy.Tests.Scanner
+namespace TestStack.BDDfy.Tests.Scanner.ReflectiveScanner
 {
     [TestFixture]
     public class ExecutableAttributeOrderOrdersTheStepsCorrectly
diff --git a/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/ExecutableAttributeScannerTests.cs b/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/ExecutableAttributeScannerTests.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using NUnit.Framework;
 
-namespace TestStack.BDDfy.Tests.Scanner.StepText
+namespace TestStack.BDDfy.Tests.Scanner.ReflectiveScanner
 {
     public class ExecutableAttributeScannerTests
     {
diff --git a/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/PropertiesAreNotConsideredAsStepsEvenWhenTheirNameMatchesConventions.cs b/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/PropertiesAreNotConsideredAsStepsEvenWhenTheirNameMatchesConventions.cs
@@ -1,7 +1,7 @@
 using System;
 using NUnit.Framework;
 
-namespace TestStack.BDDfy.Tests.Scanner
+namespace TestStack.BDDfy.Tests.Scanner.ReflectiveScanner
 {
     [TestFixture]
     public class PropertiesAreNotConsideredAsStepsEvenWhenTheirNameMatchesConventions
diff --git a/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/StepScannerExtensions.cs b/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/StepScannerExtensions.cs
@@ -1,7 +1,7 @@
 ﻿using System.Collections.Generic;
 using System.Linq;
 
-namespace TestStack.BDDfy.Tests.Scanner
+namespace TestStack.BDDfy.Tests.Scanner.ReflectiveScanner
 {
     internal static class StepScannerExtensions
     {
diff --git a/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/WhenCombinationOfExecutableAttributeAndMethodNamingConventionIsUsed.cs b/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/WhenCombinationOfExecutableAttributeAndMethodNamingConventionIsUsed.cs
@@ -1,9 +1,9 @@
 using System;
-using NUnit.Framework;
 using System.Linq;
+using NUnit.Framework;
 using TestStack.BDDfy.Configuration;
 
-namespace TestStack.BDDfy.Tests.Scanner
+namespace TestStack.BDDfy.Tests.Scanner.ReflectiveScanner
 {
     [TestFixture]
     public class WhenCombinationOfExecutableAttributeAndMethodNamingConventionIsUsed
diff --git a/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/WhenMethodNamesFollowNamingConventionsOtherThanGivenWhenThen.cs b/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/WhenMethodNamesFollowNamingConventionsOtherThanGivenWhenThen.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
-using NUnit.Framework;
 using System.Linq;
+using NUnit.Framework;
 using TestStack.BDDfy.Configuration;
 
-namespace TestStack.BDDfy.Tests.Scanner
+namespace TestStack.BDDfy.Tests.Scanner.ReflectiveScanner
 {
     [TestFixture]
     public class WhenMethodNamesFollowNamingConventionsOtherThanGivenWhenThen
diff --git a/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/WhenStepScannerFactoryAsyncMethods.cs b/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/WhenStepScannerFactoryAsyncMethods.cs
@@ -3,7 +3,7 @@
 using System.Threading.Tasks;
 using NUnit.Framework;
 
-namespace TestStack.BDDfy.Tests.Scanner
+namespace TestStack.BDDfy.Tests.Scanner.ReflectiveScanner
 {
     [TestFixture]
     public class WhenStepScannerFactoryAsyncMethods
diff --git a/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/WhenStepsAreDefinedInABaseClass.cs b/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/WhenStepsAreDefinedInABaseClass.cs
@@ -1,8 +1,8 @@
-using NUnit.Framework;
 using System.Linq;
+using NUnit.Framework;
 using TestStack.BDDfy.Configuration;
 
-namespace TestStack.BDDfy.Tests.Scanner
+namespace TestStack.BDDfy.Tests.Scanner.ReflectiveScanner
 {
     [TestFixture]
     public class WhenStepsAreDefinedInABaseClass
diff --git a/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/WhenStepsReturnTheirText.cs b/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/WhenStepsReturnTheirText.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using NUnit.Framework;
 
-namespace TestStack.BDDfy.Tests.Scanner
+namespace TestStack.BDDfy.Tests.Scanner.ReflectiveScanner
 {
     [TestFixture]
     public class WhenStepsReturnTheirText
diff --git a/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/WhenTestClassFollowsGivenWhenThenNamingConvention.cs b/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/WhenTestClassFollowsGivenWhenThenNamingConvention.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using NUnit.Framework;
 using System.Linq;
+using NUnit.Framework;
 
-namespace TestStack.BDDfy.Tests.Scanner
+namespace TestStack.BDDfy.Tests.Scanner.ReflectiveScanner
 {
     [TestFixture]
     public class WhenTestClassFollowsGivenWhenThenNamingConvention
diff --git a/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/WhenTestClassUsesExecutableAttributes.cs b/TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/WhenTestClassUsesExecutableAttributes.cs
@@ -4,7 +4,7 @@
 using NUnit.Framework;
 using TestStack.BDDfy.Configuration;
 
-namespace TestStack.BDDfy.Tests.Scanner
+namespace TestStack.BDDfy.Tests.Scanner.ReflectiveScanner
 {
     [TestFixture]
     public class WhenTestClassUsesExecutableAttributes
diff --git a/TestStack.BDDfy.Tests/TestStack.BDDfy.Tests.csproj b/TestStack.BDDfy.Tests/TestStack.BDDfy.Tests.csproj
@@ -88,14 +88,14 @@
     <Compile Include="Reporters\ReportApprover.cs" />
     <Compile Include="Scanner\FluentScanner\ComplexStepsTests.cs" />
     <Compile Include="Scanner\FluentScanner\DoesNotConflictWithnSubstitute.cs" />
-    <Compile Include="Scanner\FluentScanner\FluentWithExamples.cs" />
+    <Compile Include="Scanner\Examples\FluentWithExamples.cs" />
     <Compile Include="Scanner\FluentScanner\InlineAssertions.cs" />
     <Compile Include="Scanner\FluentScanner\StepTitleTests.cs" />
     <Compile Include="Scanner\FluentScanner\PrependStepTypeTests.cs" />
-    <Compile Include="Scanner\ReflectiveScanner\ReflectiveWithExamples.cs" />
-    <Compile Include="Scanner\StepScanners\Examples\ExampleTableTests.cs" />
-    <Compile Include="Scanner\StepScanners\Examples\ExampleValueTests.cs" />
-    <Compile Include="Scanner\WhenStepScannerFactoryAsyncMethods.cs" />
+    <Compile Include="Scanner\Examples\ReflectiveWithExamples.cs" />
+    <Compile Include="Scanner\Examples\ExampleTableTests.cs" />
+    <Compile Include="Scanner\Examples\ExampleValueTests.cs" />
+    <Compile Include="Scanner\ReflectiveScanner\WhenStepScannerFactoryAsyncMethods.cs" />
     <Compile Include="Configuration\CustomProcessor.cs" />
     <Compile Include="Configuration\BatchProcessorsTests.cs" />
     <Compile Include="Configuration\ProcessorPipelineTests.cs" />
@@ -118,15 +118,15 @@
     <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" />
+    <Compile Include="Scanner\ReflectiveScanner\ExecutableAttributeOrderOrdersTheStepsCorrectly.cs" />
+    <Compile Include="Scanner\ReflectiveScanner\PropertiesAreNotConsideredAsStepsEvenWhenTheirNameMatchesConventions.cs" />
     <Compile Include="Scanner\FluentScanner\ExpressionExtensionsTests.cs" />
-    <Compile Include="Scanner\StepScannerExtensions.cs" />
-    <Compile Include="Scanner\StepText\DefaultScanForStepsByMethodNameTests.cs" />
-    <Compile Include="Scanner\StepText\ExecutableAttributeScannerTests.cs" />
-    <Compile Include="Scanner\WhenCombinationOfExecutableAttributeAndMethodNamingConventionIsUsed.cs" />
-    <Compile Include="Scanner\WhenStepsAreDefinedInABaseClass.cs" />
-    <Compile Include="Scanner\WhenStepsReturnTheirText.cs" />
+    <Compile Include="Scanner\ReflectiveScanner\StepScannerExtensions.cs" />
+    <Compile Include="Scanner\ReflectiveScanner\DefaultScanForStepsByMethodNameTests.cs" />
+    <Compile Include="Scanner\ReflectiveScanner\ExecutableAttributeScannerTests.cs" />
+    <Compile Include="Scanner\ReflectiveScanner\WhenCombinationOfExecutableAttributeAndMethodNamingConventionIsUsed.cs" />
+    <Compile Include="Scanner\ReflectiveScanner\WhenStepsAreDefinedInABaseClass.cs" />
+    <Compile Include="Scanner\ReflectiveScanner\WhenStepsReturnTheirText.cs" />
     <Compile Include="Stories\CanUseACustomStoryAttribute.cs" />
     <Compile Include="Stories\WhenStoryAttibuteMissesDuplicateTextsInProperties.cs" />
     <Compile Include="Stories\WhenStoryAttibuteMissesSoThatTextInSoThatProperty.cs" />
@@ -148,9 +148,9 @@
     <Compile Include="Exceptions\OtherExceptions\WhenThenThrowsException.cs" />
     <Compile Include="Exceptions\OtherExceptions\WhenWhenThrowsException.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Scanner\WhenMethodNamesFollowNamingConventionsOtherThanGivenWhenThen.cs" />
-    <Compile Include="Scanner\WhenTestClassFollowsGivenWhenThenNamingConvention.cs" />
-    <Compile Include="Scanner\WhenTestClassUsesExecutableAttributes.cs" />
+    <Compile Include="Scanner\ReflectiveScanner\WhenMethodNamesFollowNamingConventionsOtherThanGivenWhenThen.cs" />
+    <Compile Include="Scanner\ReflectiveScanner\WhenTestClassFollowsGivenWhenThenNamingConvention.cs" />
+    <Compile Include="Scanner\ReflectiveScanner\WhenTestClassUsesExecutableAttributes.cs" />
     <Compile Include="Stories\StoryClassAndScenarioClassAreTheSame.cs" />
     <Compile Include="Stories\StorySubclass.cs" />
     <Compile Include="TagsTests.cs" />
@@ -181,6 +181,10 @@
     <Content Include="Reporters\MarkDown\MarkDownReportBuilderTests.ShouldProduceExpectedMarkdownWithExamples.approved.txt" />
     <Content Include="Reporters\TextReporter\TextReporterTests.ShouldProduceExpectedTextWithExamples.approved.txt" />
     <Content Include="Reporters\TextReporter\TextReporterTests.ShouldProduceExpectedReport.approved.txt" />
+    <Content Include="Scanner\Examples\ReflectiveWithExamples.Run.approved.txt" />
+    <Content Include="Scanner\Examples\FluentWithExamples.FluentCanBeUsedWithExamples.approved.txt" />
+    <Content Include="Scanner\Examples\FluentWithExamples.Inline.approved.txt" />
+    <Content Include="Scanner\FluentScanner\PrependStepTypeTests.VerifyPrependStepTitles.approved.txt" />
     <Content Include="TagsTests.TagsAreReportedInHtmlReport.approved.txt" />
     <Content Include="TagsTests.TagsAreReportedInTextReport.approved.txt" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using NUnit.Framework;`
`4`	`4`	`using Shouldly;`
`5`	`5`
`6`		`-namespace TestStack.BDDfy.Tests.Scanner.StepScanners.Examples`
	`6`	`+namespace TestStack.BDDfy.Tests.Scanner.Examples`
`7`	`7`	`{`
`8`	`8`	`[TestFixture]`
`9`	`9`	`public class ExampleTableTests`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using NUnit.Framework;`
`3`	`3`	`using Shouldly;`
`4`	`4`
`5`		`-namespace TestStack.BDDfy.Tests.Scanner.StepScanners.Examples`
	`5`	`+namespace TestStack.BDDfy.Tests.Scanner.Examples`
`6`	`6`	`{`
`7`	`7`	`public class ExampleValueTests`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using Shouldly;`
`5`	`5`	`using TestStack.BDDfy.Reporters;`
`6`	`6`
`7`		`-namespace TestStack.BDDfy.Tests.Scanner.FluentScanner`
	`7`	`+namespace TestStack.BDDfy.Tests.Scanner.Examples`
`8`	`8`	`{`
`9`	`9`	`[TestFixture]`
`10`	`10`	`public class FluentWithExamples`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-using NUnit.Framework;`
`2`	`1`	`using System.Linq;`
	`2`	`+using NUnit.Framework;`
`3`	`3`
`4`		`-namespace TestStack.BDDfy.Tests.Scanner.StepText`
	`4`	`+namespace TestStack.BDDfy.Tests.Scanner.ReflectiveScanner`
`5`	`5`	`{`
`6`	`6`	`public class DefaultScanForStepsByMethodNameTests`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using NUnit.Framework;`
`4`	`4`	`using TestStack.BDDfy.Configuration;`
`5`	`5`
`6`		`-namespace TestStack.BDDfy.Tests.Scanner`
	`6`	`+namespace TestStack.BDDfy.Tests.Scanner.ReflectiveScanner`
`7`	`7`	`{`
`8`	`8`	`[TestFixture]`
`9`	`9`	`public class ExecutableAttributeOrderOrdersTheStepsCorrectly`