From 407b77b30c1ae2cd635ecbaf78b1c34173321068 Mon Sep 17 00:00:00 2001 From: Michael Whelan Date: Thu, 13 Mar 2014 16:01:16 +0000 Subject: [PATCH 1/3] Streamlined the Processors namespace --- Samples/TestStack.BDDfy.Samples/Atm/HtmlReportConfig.cs | 2 +- Samples/TestStack.BDDfy.Samples/BDDfyConfiguration.cs | 3 +-- TestStack.BDDfy.Tests/Configuration/BatchProcessorsTests.cs | 2 -- TestStack.BDDfy.Tests/Configuration/ProcessorPipelineTests.cs | 1 - .../Processors/Diagnostics/DiagnosticsReportBuilderSpecs.cs | 4 +--- .../Processors/Diagnostics/DiagnosticsReporterSpecs.cs | 3 --- .../Processors/Diagnostics/WhenBuildingReportDiagnostics.cs | 3 +-- .../Processors/Reports/MarkDown/MarkDownReportBuilderSpecs.cs | 2 -- .../Processors/Reports/MarkDown/MarkDownReporterSpecs.cs | 4 +--- TestStack.BDDfy/Configuration/BatchProcessors.cs | 3 --- TestStack.BDDfy/Configuration/HtmlReportFactory.cs | 2 +- TestStack.BDDfy/Configuration/Processors.cs | 1 - TestStack.BDDfy/Processors/Reporters/ConsoleReporter.cs | 2 +- .../Reporters/Diagnostics/DiagnosticsReportBuilder.cs | 3 +-- .../Processors/Reporters/Diagnostics/DiagnosticsReporter.cs | 3 +-- .../Processors/Reporters/Diagnostics/StoryDiagnostic.cs | 2 +- TestStack.BDDfy/Processors/Reporters/FileReportModel.cs | 2 +- .../Processors/Reporters/FileReportSummaryModel.cs | 2 +- .../Reporters/Html/DefaultHtmlReportConfiguration.cs | 2 +- .../Processors/Reporters/Html/HtmlReportBuilder.cs | 2 +- .../Processors/Reporters/Html/HtmlReportResources.Designer.cs | 2 +- TestStack.BDDfy/Processors/Reporters/Html/HtmlReportTag.cs | 2 +- .../Processors/Reporters/Html/HtmlReportViewModel.cs | 2 +- TestStack.BDDfy/Processors/Reporters/Html/HtmlReporter.cs | 3 +-- TestStack.BDDfy/Processors/Reporters/Html/HtmlTag.cs | 2 +- .../Processors/Reporters/Html/IHtmlReportConfiguration.cs | 2 +- TestStack.BDDfy/Processors/Reporters/IReportBuilder.cs | 2 +- .../Processors/Reporters/MarkDown/MarkDownReportBuilder.cs | 2 +- .../Processors/Reporters/MarkDown/MarkDownReporter.cs | 3 +-- .../Processors/Reporters/Serializers/ISerializer.cs | 2 +- .../Processors/Reporters/Serializers/JsonFormatter.cs | 2 +- .../Processors/Reporters/Serializers/JsonSerializer.cs | 2 +- TestStack.BDDfy/Processors/Reporters/Writers/FileWriter.cs | 3 +-- TestStack.BDDfy/Processors/Reporters/Writers/IReportWriter.cs | 2 +- 34 files changed, 28 insertions(+), 51 deletions(-) diff --git a/Samples/TestStack.BDDfy.Samples/Atm/HtmlReportConfig.cs b/Samples/TestStack.BDDfy.Samples/Atm/HtmlReportConfig.cs index 0c1763db..1489ab98 100644 --- a/Samples/TestStack.BDDfy.Samples/Atm/HtmlReportConfig.cs +++ b/Samples/TestStack.BDDfy.Samples/Atm/HtmlReportConfig.cs @@ -1,4 +1,4 @@ -using TestStack.BDDfy.Processors.Reporters.Html; +using TestStack.BDDfy.Processors; namespace TestStack.BDDfy.Samples.Atm { diff --git a/Samples/TestStack.BDDfy.Samples/BDDfyConfiguration.cs b/Samples/TestStack.BDDfy.Samples/BDDfyConfiguration.cs index d0f119a3..cba277a2 100644 --- a/Samples/TestStack.BDDfy.Samples/BDDfyConfiguration.cs +++ b/Samples/TestStack.BDDfy.Samples/BDDfyConfiguration.cs @@ -1,8 +1,7 @@ using NUnit.Framework; using TestStack.BDDfy.Configuration; -using TestStack.BDDfy.Processors.Reporters.Html; +using TestStack.BDDfy.Processors; using TestStack.BDDfy.Samples.Atm; -using TestStack.BDDfy.Samples.TicTacToe; namespace TestStack.BDDfy.Samples { diff --git a/TestStack.BDDfy.Tests/Configuration/BatchProcessorsTests.cs b/TestStack.BDDfy.Tests/Configuration/BatchProcessorsTests.cs index ea83df57..3ffbbdc8 100644 --- a/TestStack.BDDfy.Tests/Configuration/BatchProcessorsTests.cs +++ b/TestStack.BDDfy.Tests/Configuration/BatchProcessorsTests.cs @@ -2,8 +2,6 @@ using System.Linq; using TestStack.BDDfy.Configuration; using TestStack.BDDfy.Processors; -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 index e9162dec..67dcd4cf 100644 --- a/TestStack.BDDfy.Tests/Configuration/ProcessorPipelineTests.cs +++ b/TestStack.BDDfy.Tests/Configuration/ProcessorPipelineTests.cs @@ -2,7 +2,6 @@ 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 index 7750b0d8..8f8dd261 100644 --- a/TestStack.BDDfy.Tests/Processors/Diagnostics/DiagnosticsReportBuilderSpecs.cs +++ b/TestStack.BDDfy.Tests/Processors/Diagnostics/DiagnosticsReportBuilderSpecs.cs @@ -1,8 +1,6 @@ using NSubstitute; using NUnit.Framework; -using TestStack.BDDfy.Processors.Reporters; -using TestStack.BDDfy.Processors.Reporters.Diagnostics; -using TestStack.BDDfy.Processors.Reporters.Serializers; +using TestStack.BDDfy.Processors; using TestStack.BDDfy.Tests.Processors.Reports; namespace TestStack.BDDfy.Tests.Processors.Diagnostics diff --git a/TestStack.BDDfy.Tests/Processors/Diagnostics/DiagnosticsReporterSpecs.cs b/TestStack.BDDfy.Tests/Processors/Diagnostics/DiagnosticsReporterSpecs.cs index 9941e535..5ef91cb3 100644 --- a/TestStack.BDDfy.Tests/Processors/Diagnostics/DiagnosticsReporterSpecs.cs +++ b/TestStack.BDDfy.Tests/Processors/Diagnostics/DiagnosticsReporterSpecs.cs @@ -3,9 +3,6 @@ using NSubstitute; using NUnit.Framework; using TestStack.BDDfy.Processors; -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 index 58643b83..00f60635 100644 --- a/TestStack.BDDfy.Tests/Processors/Diagnostics/WhenBuildingReportDiagnostics.cs +++ b/TestStack.BDDfy.Tests/Processors/Diagnostics/WhenBuildingReportDiagnostics.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.Linq; using NUnit.Framework; -using TestStack.BDDfy.Processors.Reporters; -using TestStack.BDDfy.Processors.Reporters.Diagnostics; +using TestStack.BDDfy.Processors; 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 index fd949531..4d4005f8 100644 --- a/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReportBuilderSpecs.cs +++ b/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReportBuilderSpecs.cs @@ -2,8 +2,6 @@ using System.Text.RegularExpressions; using NUnit.Framework; using TestStack.BDDfy.Processors; -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 index e2274518..ee3494bd 100644 --- a/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReporterSpecs.cs +++ b/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReporterSpecs.cs @@ -2,9 +2,7 @@ using System.Collections.Generic; using NSubstitute; using NUnit.Framework; -using TestStack.BDDfy.Processors.Reporters; -using TestStack.BDDfy.Processors.Reporters.MarkDown; -using TestStack.BDDfy.Processors.Reporters.Writers; +using TestStack.BDDfy.Processors; namespace TestStack.BDDfy.Tests.Processors.Reports.MarkDown { diff --git a/TestStack.BDDfy/Configuration/BatchProcessors.cs b/TestStack.BDDfy/Configuration/BatchProcessors.cs index 04bb665d..77d925c6 100644 --- a/TestStack.BDDfy/Configuration/BatchProcessors.cs +++ b/TestStack.BDDfy/Configuration/BatchProcessors.cs @@ -2,9 +2,6 @@ using System.Linq; using TestStack.BDDfy.Core; using TestStack.BDDfy.Processors; -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 index 73815dbb..1a9d6cbd 100644 --- 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.Reporters.Html; +using TestStack.BDDfy.Processors; namespace TestStack.BDDfy.Configuration { diff --git a/TestStack.BDDfy/Configuration/Processors.cs b/TestStack.BDDfy/Configuration/Processors.cs index 854b182d..51c31e9d 100644 --- a/TestStack.BDDfy/Configuration/Processors.cs +++ b/TestStack.BDDfy/Configuration/Processors.cs @@ -3,7 +3,6 @@ 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 index 465e870c..5c08d574 100644 --- 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.Reporters +namespace TestStack.BDDfy.Processors { public class ConsoleReporter : IProcessor { diff --git a/TestStack.BDDfy/Processors/Reporters/Diagnostics/DiagnosticsReportBuilder.cs b/TestStack.BDDfy/Processors/Reporters/Diagnostics/DiagnosticsReportBuilder.cs index f6c10da0..6d1f5314 100644 --- a/TestStack.BDDfy/Processors/Reporters/Diagnostics/DiagnosticsReportBuilder.cs +++ b/TestStack.BDDfy/Processors/Reporters/Diagnostics/DiagnosticsReportBuilder.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.Linq; -using TestStack.BDDfy.Processors.Reporters.Serializers; -namespace TestStack.BDDfy.Processors.Reporters.Diagnostics +namespace TestStack.BDDfy.Processors { public class DiagnosticsReportBuilder : IReportBuilder { diff --git a/TestStack.BDDfy/Processors/Reporters/Diagnostics/DiagnosticsReporter.cs b/TestStack.BDDfy/Processors/Reporters/Diagnostics/DiagnosticsReporter.cs index 8af56f21..33aa38fc 100644 --- a/TestStack.BDDfy/Processors/Reporters/Diagnostics/DiagnosticsReporter.cs +++ b/TestStack.BDDfy/Processors/Reporters/Diagnostics/DiagnosticsReporter.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Processors.Reporters.Writers; -namespace TestStack.BDDfy.Processors.Reporters.Diagnostics +namespace TestStack.BDDfy.Processors { public class DiagnosticsReporter : IBatchProcessor { diff --git a/TestStack.BDDfy/Processors/Reporters/Diagnostics/StoryDiagnostic.cs b/TestStack.BDDfy/Processors/Reporters/Diagnostics/StoryDiagnostic.cs index df88e357..4832a289 100644 --- 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.Reporters.Diagnostics +namespace TestStack.BDDfy.Processors { public class StoryDiagnostic { diff --git a/TestStack.BDDfy/Processors/Reporters/FileReportModel.cs b/TestStack.BDDfy/Processors/Reporters/FileReportModel.cs index 6a929e5d..dfc29737 100644 --- 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.Reporters +namespace TestStack.BDDfy.Processors { public class FileReportModel { diff --git a/TestStack.BDDfy/Processors/Reporters/FileReportSummaryModel.cs b/TestStack.BDDfy/Processors/Reporters/FileReportSummaryModel.cs index 4ac5d133..137c8bff 100644 --- 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.Reporters +namespace TestStack.BDDfy.Processors { public class FileReportSummaryModel { diff --git a/TestStack.BDDfy/Processors/Reporters/Html/DefaultHtmlReportConfiguration.cs b/TestStack.BDDfy/Processors/Reporters/Html/DefaultHtmlReportConfiguration.cs index 2ca39194..3d33d20c 100644 --- 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.Reporters.Html +namespace TestStack.BDDfy.Processors { public class DefaultHtmlReportConfiguration : IHtmlReportConfiguration { diff --git a/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportBuilder.cs b/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportBuilder.cs index 519202c2..38eb43c5 100644 --- a/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportBuilder.cs +++ b/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportBuilder.cs @@ -3,7 +3,7 @@ using System.Text; using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Processors.Reporters.Html +namespace TestStack.BDDfy.Processors { public class HtmlReportBuilder : IReportBuilder { diff --git a/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportResources.Designer.cs b/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportResources.Designer.cs index 71378d23..aee96096 100644 --- a/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportResources.Designer.cs +++ b/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportResources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace TestStack.BDDfy.Processors.Reporters.Html { +namespace TestStack.BDDfy.Processors { using System; diff --git a/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportTag.cs b/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportTag.cs index 78be230a..700ec727 100644 --- 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.Reporters.Html +namespace TestStack.BDDfy.Processors { class HtmlReportTag : IDisposable { diff --git a/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportViewModel.cs b/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportViewModel.cs index c5b336b1..8db628bf 100644 --- 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.Reporters.Html +namespace TestStack.BDDfy.Processors { public class HtmlReportViewModel : FileReportModel { diff --git a/TestStack.BDDfy/Processors/Reporters/Html/HtmlReporter.cs b/TestStack.BDDfy/Processors/Reporters/Html/HtmlReporter.cs index 151b564f..58956f9f 100644 --- a/TestStack.BDDfy/Processors/Reporters/Html/HtmlReporter.cs +++ b/TestStack.BDDfy/Processors/Reporters/Html/HtmlReporter.cs @@ -3,9 +3,8 @@ using System.IO; using System.Linq; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Processors.Reporters.Writers; -namespace TestStack.BDDfy.Processors.Reporters.Html +namespace TestStack.BDDfy.Processors { public class HtmlReporter : IBatchProcessor { diff --git a/TestStack.BDDfy/Processors/Reporters/Html/HtmlTag.cs b/TestStack.BDDfy/Processors/Reporters/Html/HtmlTag.cs index 2446ffea..bd8d38c7 100644 --- a/TestStack.BDDfy/Processors/Reporters/Html/HtmlTag.cs +++ b/TestStack.BDDfy/Processors/Reporters/Html/HtmlTag.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Processors.Reporters.Html +namespace TestStack.BDDfy.Processors { // ReSharper disable InconsistentNaming public enum HtmlTag diff --git a/TestStack.BDDfy/Processors/Reporters/Html/IHtmlReportConfiguration.cs b/TestStack.BDDfy/Processors/Reporters/Html/IHtmlReportConfiguration.cs index 1748e570..4a4a412a 100644 --- 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.Reporters.Html +namespace TestStack.BDDfy.Processors { public interface IHtmlReportConfiguration { diff --git a/TestStack.BDDfy/Processors/Reporters/IReportBuilder.cs b/TestStack.BDDfy/Processors/Reporters/IReportBuilder.cs index dc0bfa20..e8cc18ab 100644 --- a/TestStack.BDDfy/Processors/Reporters/IReportBuilder.cs +++ b/TestStack.BDDfy/Processors/Reporters/IReportBuilder.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Processors.Reporters +namespace TestStack.BDDfy.Processors { public interface IReportBuilder { diff --git a/TestStack.BDDfy/Processors/Reporters/MarkDown/MarkDownReportBuilder.cs b/TestStack.BDDfy/Processors/Reporters/MarkDown/MarkDownReportBuilder.cs index 33ddec78..abe4b58c 100644 --- 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.Reporters.MarkDown +namespace TestStack.BDDfy.Processors { public class MarkDownReportBuilder : IReportBuilder { diff --git a/TestStack.BDDfy/Processors/Reporters/MarkDown/MarkDownReporter.cs b/TestStack.BDDfy/Processors/Reporters/MarkDown/MarkDownReporter.cs index 78004ad4..84e81eb5 100644 --- a/TestStack.BDDfy/Processors/Reporters/MarkDown/MarkDownReporter.cs +++ b/TestStack.BDDfy/Processors/Reporters/MarkDown/MarkDownReporter.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Processors.Reporters.Writers; -namespace TestStack.BDDfy.Processors.Reporters.MarkDown +namespace TestStack.BDDfy.Processors { /// /// 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 index 1de4946d..4b73884e 100644 --- a/TestStack.BDDfy/Processors/Reporters/Serializers/ISerializer.cs +++ b/TestStack.BDDfy/Processors/Reporters/Serializers/ISerializer.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Processors.Reporters.Serializers +namespace TestStack.BDDfy.Processors { public interface ISerializer { diff --git a/TestStack.BDDfy/Processors/Reporters/Serializers/JsonFormatter.cs b/TestStack.BDDfy/Processors/Reporters/Serializers/JsonFormatter.cs index ab9852af..547c32ed 100644 --- a/TestStack.BDDfy/Processors/Reporters/Serializers/JsonFormatter.cs +++ b/TestStack.BDDfy/Processors/Reporters/Serializers/JsonFormatter.cs @@ -1,6 +1,6 @@ using System.Text; -namespace TestStack.BDDfy.Processors.Reporters.Serializers +namespace TestStack.BDDfy.Processors { // http://www.limilabs.com/blog/json-net-formatter public class JsonFormatter diff --git a/TestStack.BDDfy/Processors/Reporters/Serializers/JsonSerializer.cs b/TestStack.BDDfy/Processors/Reporters/Serializers/JsonSerializer.cs index 0bf428a9..b3d970b1 100644 --- a/TestStack.BDDfy/Processors/Reporters/Serializers/JsonSerializer.cs +++ b/TestStack.BDDfy/Processors/Reporters/Serializers/JsonSerializer.cs @@ -1,6 +1,6 @@ using System.Web.Script.Serialization; -namespace TestStack.BDDfy.Processors.Reporters.Serializers +namespace TestStack.BDDfy.Processors { public class JsonSerializer : ISerializer { diff --git a/TestStack.BDDfy/Processors/Reporters/Writers/FileWriter.cs b/TestStack.BDDfy/Processors/Reporters/Writers/FileWriter.cs index 75a6d320..7c57dd13 100644 --- a/TestStack.BDDfy/Processors/Reporters/Writers/FileWriter.cs +++ b/TestStack.BDDfy/Processors/Reporters/Writers/FileWriter.cs @@ -1,8 +1,7 @@ using System; using System.IO; -using TestStack.BDDfy.Processors.Reporters.Diagnostics; -namespace TestStack.BDDfy.Processors.Reporters.Writers +namespace TestStack.BDDfy.Processors { public class FileWriter : IReportWriter { diff --git a/TestStack.BDDfy/Processors/Reporters/Writers/IReportWriter.cs b/TestStack.BDDfy/Processors/Reporters/Writers/IReportWriter.cs index 37c04abc..0f5dbbe4 100644 --- a/TestStack.BDDfy/Processors/Reporters/Writers/IReportWriter.cs +++ b/TestStack.BDDfy/Processors/Reporters/Writers/IReportWriter.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Processors.Reporters.Writers +namespace TestStack.BDDfy.Processors { public interface IReportWriter { From fc449e20c0b9692e459a90c33c43649ed45f3c8f Mon Sep 17 00:00:00 2001 From: Michael Whelan Date: Thu, 13 Mar 2014 16:12:50 +0000 Subject: [PATCH 2/3] Streamlined the Scanners namespace --- .../Atm/AccountHasInsufficientFund.cs | 2 +- .../Atm/AccountHolderWithdrawsCash.cs | 2 +- Samples/TestStack.BDDfy.Samples/BDDfy_Rocks.cs | 2 +- Samples/TestStack.BDDfy.Samples/TicTacToe/TicTacToe.cs | 2 +- TestStack.BDDfy.Tests/Configuration/TestRunnerTests.cs | 3 +-- TestStack.BDDfy.Tests/Exceptions/ExceptionThrowingTest.cs | 2 +- TestStack.BDDfy.Tests/FluentScanner/BDDfyUsingFluentApi.cs | 2 +- .../FluentScanner/ScenarioToBeScannedUsingFluentScanner.cs | 3 +-- .../Reports/MarkDown/MarkDownReportBuilderSpecs.cs | 2 +- .../ExecutableAttributeOrderOrdersTheStepsCorrectly.cs | 3 +-- TestStack.BDDfy.Tests/Scanner/ExpressionExtensionsTests.cs | 2 +- TestStack.BDDfy.Tests/Scanner/StepScannerExtensions.cs | 3 +-- .../StepText/DefaultScanForStepsByMethodNameTests.cs | 2 +- .../Scanner/StepText/ExecutableAttributeScannerTests.cs | 3 +-- ...nOfExecutableAttributeAndMethodNamingConventionIsUsed.cs | 6 +----- ...hodNamesFollowNamingConventionsOtherThanGivenWhenThen.cs | 3 +-- .../Scanner/WhenStepScannerFactoryAsyncMethods.cs | 2 +- TestStack.BDDfy.Tests/Scanner/WhenStepsReturnTheirText.cs | 2 +- .../WhenTestClassFollowsGivenWhenThenNamingConvention.cs | 2 +- .../Scanner/WhenTestClassUsesExecutableAttributes.cs | 3 +-- .../Story/StoryCanBeSpecifiedInFluentMode.cs | 2 +- .../Story/StoryClassAndScenarioClassAreTheSame.cs | 2 +- TestStack.BDDfy.Tests/Story/StoryDouble.cs | 2 -- TestStack.BDDfy/BDDfyExtensions.cs | 1 - TestStack.BDDfy/Configuration/Scanners.cs | 3 --- TestStack.BDDfy/Configuration/StepScannerFactory.cs | 2 +- TestStack.BDDfy/Scanners/DefaultScanner.cs | 1 - .../Scanners/ScenarioScanners/FluentScenarioScanner.cs | 2 +- .../Scanners/ScenarioScanners/IScenarioScanner.cs | 2 +- .../Scanners/ScenarioScanners/ReflectiveScenarioScanner.cs | 3 +-- .../Scanners/StepScanners/AsyncTestSyncContext.cs | 2 +- .../StepScanners/ExecutableAttribute/ExecutableAttribute.cs | 2 +- .../ExecutableAttribute/ExecutableAttributeStepScanner.cs | 2 +- .../ExecutableAttribute/GwtAttributes/AndGivenAttribute.cs | 2 +- .../ExecutableAttribute/GwtAttributes/AndThenAttribute.cs | 2 +- .../ExecutableAttribute/GwtAttributes/AndWhenAttribute.cs | 2 +- .../ExecutableAttribute/GwtAttributes/GivenAttribute.cs | 2 +- .../ExecutableAttribute/GwtAttributes/ThenAttribute.cs | 2 +- .../ExecutableAttribute/GwtAttributes/WhenAttribute.cs | 2 +- .../Scanners/StepScanners/Fluent/ExpressionExtensions.cs | 2 +- .../Scanners/StepScanners/Fluent/FluentScanner.cs | 3 +-- .../Scanners/StepScanners/Fluent/FluentScannerExtensions.cs | 2 +- TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndGiven.cs | 2 +- TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndThen.cs | 2 +- TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndWhen.cs | 2 +- .../Scanners/StepScanners/Fluent/IFluentScanner.cs | 2 +- TestStack.BDDfy/Scanners/StepScanners/Fluent/IGiven.cs | 2 +- .../Scanners/StepScanners/Fluent/IInitialStep.cs | 2 +- TestStack.BDDfy/Scanners/StepScanners/Fluent/IThen.cs | 2 +- TestStack.BDDfy/Scanners/StepScanners/Fluent/IWhen.cs | 2 +- TestStack.BDDfy/Scanners/StepScanners/IStepScanner.cs | 2 +- .../Scanners/StepScanners/IgnoreStepAttribute.cs | 2 +- .../StepScanners/MethodName/DefaultMethodNameStepScanner.cs | 2 +- .../Scanners/StepScanners/MethodName/MethodNameMatcher.cs | 2 +- .../StepScanners/MethodName/MethodNameStepScanner.cs | 2 +- TestStack.BDDfy/Scanners/StepScanners/StepActionFactory.cs | 2 +- .../Scanners/StepScanners/StepScannerExtensions.cs | 2 +- TestStack.BDDfy/Scanners/StepScanners/StepTitleException.cs | 2 +- 58 files changed, 54 insertions(+), 74 deletions(-) diff --git a/Samples/TestStack.BDDfy.Samples/Atm/AccountHasInsufficientFund.cs b/Samples/TestStack.BDDfy.Samples/Atm/AccountHasInsufficientFund.cs index f52e725a..e69e5ee4 100644 --- a/Samples/TestStack.BDDfy.Samples/Atm/AccountHasInsufficientFund.cs +++ b/Samples/TestStack.BDDfy.Samples/Atm/AccountHasInsufficientFund.cs @@ -1,5 +1,5 @@ using NUnit.Framework; -using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Samples.Atm { diff --git a/Samples/TestStack.BDDfy.Samples/Atm/AccountHolderWithdrawsCash.cs b/Samples/TestStack.BDDfy.Samples/Atm/AccountHolderWithdrawsCash.cs index 41cfef53..7ee56ec6 100644 --- a/Samples/TestStack.BDDfy.Samples/Atm/AccountHolderWithdrawsCash.cs +++ b/Samples/TestStack.BDDfy.Samples/Atm/AccountHolderWithdrawsCash.cs @@ -1,6 +1,6 @@ using NUnit.Framework; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.StepScanners.Fluent; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Samples.Atm { diff --git a/Samples/TestStack.BDDfy.Samples/BDDfy_Rocks.cs b/Samples/TestStack.BDDfy.Samples/BDDfy_Rocks.cs index 60105ccd..f587fa5c 100644 --- a/Samples/TestStack.BDDfy.Samples/BDDfy_Rocks.cs +++ b/Samples/TestStack.BDDfy.Samples/BDDfy_Rocks.cs @@ -1,6 +1,6 @@ using NUnit.Framework; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.StepScanners.Fluent; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Samples { diff --git a/Samples/TestStack.BDDfy.Samples/TicTacToe/TicTacToe.cs b/Samples/TestStack.BDDfy.Samples/TicTacToe/TicTacToe.cs index fbc8a50a..ac11b768 100644 --- a/Samples/TestStack.BDDfy.Samples/TicTacToe/TicTacToe.cs +++ b/Samples/TestStack.BDDfy.Samples/TicTacToe/TicTacToe.cs @@ -1,6 +1,6 @@ using NUnit.Framework; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.StepScanners.Fluent; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Samples.TicTacToe { diff --git a/TestStack.BDDfy.Tests/Configuration/TestRunnerTests.cs b/TestStack.BDDfy.Tests/Configuration/TestRunnerTests.cs index a3098d84..0ef6a998 100644 --- a/TestStack.BDDfy.Tests/Configuration/TestRunnerTests.cs +++ b/TestStack.BDDfy.Tests/Configuration/TestRunnerTests.cs @@ -3,8 +3,7 @@ using NUnit.Framework; using TestStack.BDDfy.Configuration; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes; -using TestStack.BDDfy.Scanners.StepScanners.Fluent; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Configuration { diff --git a/TestStack.BDDfy.Tests/Exceptions/ExceptionThrowingTest.cs b/TestStack.BDDfy.Tests/Exceptions/ExceptionThrowingTest.cs index 0f6c4b5c..a5db8de0 100644 --- a/TestStack.BDDfy.Tests/Exceptions/ExceptionThrowingTest.cs +++ b/TestStack.BDDfy.Tests/Exceptions/ExceptionThrowingTest.cs @@ -2,7 +2,7 @@ using System.Linq; using NUnit.Framework; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.StepScanners.Fluent; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Exceptions { diff --git a/TestStack.BDDfy.Tests/FluentScanner/BDDfyUsingFluentApi.cs b/TestStack.BDDfy.Tests/FluentScanner/BDDfyUsingFluentApi.cs index da6a97ee..977fd6aa 100644 --- a/TestStack.BDDfy.Tests/FluentScanner/BDDfyUsingFluentApi.cs +++ b/TestStack.BDDfy.Tests/FluentScanner/BDDfyUsingFluentApi.cs @@ -5,7 +5,7 @@ using System.Linq; using TestStack.BDDfy.Configuration; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.StepScanners.Fluent; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.FluentScanner { diff --git a/TestStack.BDDfy.Tests/FluentScanner/ScenarioToBeScannedUsingFluentScanner.cs b/TestStack.BDDfy.Tests/FluentScanner/ScenarioToBeScannedUsingFluentScanner.cs index f7cb4481..61c3977d 100644 --- a/TestStack.BDDfy.Tests/FluentScanner/ScenarioToBeScannedUsingFluentScanner.cs +++ b/TestStack.BDDfy.Tests/FluentScanner/ScenarioToBeScannedUsingFluentScanner.cs @@ -3,8 +3,7 @@ using System.Linq; using System.Collections.Generic; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes; -using TestStack.BDDfy.Scanners.StepScanners.Fluent; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.FluentScanner { diff --git a/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReportBuilderSpecs.cs b/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReportBuilderSpecs.cs index 4d4005f8..855a4ccc 100644 --- a/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReportBuilderSpecs.cs +++ b/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReportBuilderSpecs.cs @@ -2,7 +2,7 @@ using System.Text.RegularExpressions; using NUnit.Framework; using TestStack.BDDfy.Processors; -using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Processors.Reports.MarkDown { diff --git a/TestStack.BDDfy.Tests/Scanner/ExecutableAttributeOrderOrdersTheStepsCorrectly.cs b/TestStack.BDDfy.Tests/Scanner/ExecutableAttributeOrderOrdersTheStepsCorrectly.cs index 7ee67a29..f4bec89b 100644 --- a/TestStack.BDDfy.Tests/Scanner/ExecutableAttributeOrderOrdersTheStepsCorrectly.cs +++ b/TestStack.BDDfy.Tests/Scanner/ExecutableAttributeOrderOrdersTheStepsCorrectly.cs @@ -3,8 +3,7 @@ using NUnit.Framework; using TestStack.BDDfy.Configuration; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.ScenarioScanners; -using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner { diff --git a/TestStack.BDDfy.Tests/Scanner/ExpressionExtensionsTests.cs b/TestStack.BDDfy.Tests/Scanner/ExpressionExtensionsTests.cs index 1f323fdd..491040d5 100644 --- a/TestStack.BDDfy.Tests/Scanner/ExpressionExtensionsTests.cs +++ b/TestStack.BDDfy.Tests/Scanner/ExpressionExtensionsTests.cs @@ -2,7 +2,7 @@ using System.Linq.Expressions; using NUnit.Framework; using System.Linq; -using TestStack.BDDfy.Scanners.StepScanners.Fluent; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner { diff --git a/TestStack.BDDfy.Tests/Scanner/StepScannerExtensions.cs b/TestStack.BDDfy.Tests/Scanner/StepScannerExtensions.cs index dcd3b5fd..cf64f9af 100644 --- a/TestStack.BDDfy.Tests/Scanner/StepScannerExtensions.cs +++ b/TestStack.BDDfy.Tests/Scanner/StepScannerExtensions.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.Linq; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.ScenarioScanners; -using TestStack.BDDfy.Scanners.StepScanners; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner { diff --git a/TestStack.BDDfy.Tests/Scanner/StepText/DefaultScanForStepsByMethodNameTests.cs b/TestStack.BDDfy.Tests/Scanner/StepText/DefaultScanForStepsByMethodNameTests.cs index af3bbfc4..02ed616e 100644 --- a/TestStack.BDDfy.Tests/Scanner/StepText/DefaultScanForStepsByMethodNameTests.cs +++ b/TestStack.BDDfy.Tests/Scanner/StepText/DefaultScanForStepsByMethodNameTests.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using System.Linq; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.StepScanners.MethodName; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner.StepText { diff --git a/TestStack.BDDfy.Tests/Scanner/StepText/ExecutableAttributeScannerTests.cs b/TestStack.BDDfy.Tests/Scanner/StepText/ExecutableAttributeScannerTests.cs index af26af3f..2c25c613 100644 --- a/TestStack.BDDfy.Tests/Scanner/StepText/ExecutableAttributeScannerTests.cs +++ b/TestStack.BDDfy.Tests/Scanner/StepText/ExecutableAttributeScannerTests.cs @@ -1,8 +1,7 @@ using System.Linq; using NUnit.Framework; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute; -using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner.StepText { diff --git a/TestStack.BDDfy.Tests/Scanner/WhenCombinationOfExecutableAttributeAndMethodNamingConventionIsUsed.cs b/TestStack.BDDfy.Tests/Scanner/WhenCombinationOfExecutableAttributeAndMethodNamingConventionIsUsed.cs index 015c8df4..32a0903d 100644 --- a/TestStack.BDDfy.Tests/Scanner/WhenCombinationOfExecutableAttributeAndMethodNamingConventionIsUsed.cs +++ b/TestStack.BDDfy.Tests/Scanner/WhenCombinationOfExecutableAttributeAndMethodNamingConventionIsUsed.cs @@ -3,11 +3,7 @@ using System.Linq; using TestStack.BDDfy.Configuration; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.ScenarioScanners; -using TestStack.BDDfy.Scanners.StepScanners; -using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute; -using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes; -using TestStack.BDDfy.Scanners.StepScanners.MethodName; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner { diff --git a/TestStack.BDDfy.Tests/Scanner/WhenMethodNamesFollowNamingConventionsOtherThanGivenWhenThen.cs b/TestStack.BDDfy.Tests/Scanner/WhenMethodNamesFollowNamingConventionsOtherThanGivenWhenThen.cs index 7e0be5f5..ac0ee83f 100644 --- a/TestStack.BDDfy.Tests/Scanner/WhenMethodNamesFollowNamingConventionsOtherThanGivenWhenThen.cs +++ b/TestStack.BDDfy.Tests/Scanner/WhenMethodNamesFollowNamingConventionsOtherThanGivenWhenThen.cs @@ -4,8 +4,7 @@ using System.Linq; using TestStack.BDDfy.Configuration; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.StepScanners; -using TestStack.BDDfy.Scanners.StepScanners.MethodName; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner { diff --git a/TestStack.BDDfy.Tests/Scanner/WhenStepScannerFactoryAsyncMethods.cs b/TestStack.BDDfy.Tests/Scanner/WhenStepScannerFactoryAsyncMethods.cs index 42a9d89a..11a58993 100644 --- a/TestStack.BDDfy.Tests/Scanner/WhenStepScannerFactoryAsyncMethods.cs +++ b/TestStack.BDDfy.Tests/Scanner/WhenStepScannerFactoryAsyncMethods.cs @@ -3,7 +3,7 @@ using System.Reflection; using System.Threading.Tasks; using NUnit.Framework; -using TestStack.BDDfy.Scanners.StepScanners; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner { diff --git a/TestStack.BDDfy.Tests/Scanner/WhenStepsReturnTheirText.cs b/TestStack.BDDfy.Tests/Scanner/WhenStepsReturnTheirText.cs index 67d5ab16..66c882d0 100644 --- a/TestStack.BDDfy.Tests/Scanner/WhenStepsReturnTheirText.cs +++ b/TestStack.BDDfy.Tests/Scanner/WhenStepsReturnTheirText.cs @@ -2,7 +2,7 @@ using System.Linq; using NUnit.Framework; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.StepScanners.MethodName; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner { diff --git a/TestStack.BDDfy.Tests/Scanner/WhenTestClassFollowsGivenWhenThenNamingConvention.cs b/TestStack.BDDfy.Tests/Scanner/WhenTestClassFollowsGivenWhenThenNamingConvention.cs index 7855d04e..af8dc283 100644 --- a/TestStack.BDDfy.Tests/Scanner/WhenTestClassFollowsGivenWhenThenNamingConvention.cs +++ b/TestStack.BDDfy.Tests/Scanner/WhenTestClassFollowsGivenWhenThenNamingConvention.cs @@ -2,7 +2,7 @@ using NUnit.Framework; using System.Linq; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.StepScanners.MethodName; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner { diff --git a/TestStack.BDDfy.Tests/Scanner/WhenTestClassUsesExecutableAttributes.cs b/TestStack.BDDfy.Tests/Scanner/WhenTestClassUsesExecutableAttributes.cs index 8348ebe1..17ea100c 100644 --- a/TestStack.BDDfy.Tests/Scanner/WhenTestClassUsesExecutableAttributes.cs +++ b/TestStack.BDDfy.Tests/Scanner/WhenTestClassUsesExecutableAttributes.cs @@ -4,8 +4,7 @@ using NUnit.Framework; using TestStack.BDDfy.Configuration; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute; -using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner { diff --git a/TestStack.BDDfy.Tests/Story/StoryCanBeSpecifiedInFluentMode.cs b/TestStack.BDDfy.Tests/Story/StoryCanBeSpecifiedInFluentMode.cs index 651aab1f..02424306 100644 --- a/TestStack.BDDfy.Tests/Story/StoryCanBeSpecifiedInFluentMode.cs +++ b/TestStack.BDDfy.Tests/Story/StoryCanBeSpecifiedInFluentMode.cs @@ -1,6 +1,6 @@ using NUnit.Framework; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.StepScanners.Fluent; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Story { diff --git a/TestStack.BDDfy.Tests/Story/StoryClassAndScenarioClassAreTheSame.cs b/TestStack.BDDfy.Tests/Story/StoryClassAndScenarioClassAreTheSame.cs index 5c38b480..f184c940 100644 --- a/TestStack.BDDfy.Tests/Story/StoryClassAndScenarioClassAreTheSame.cs +++ b/TestStack.BDDfy.Tests/Story/StoryClassAndScenarioClassAreTheSame.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using System.Linq; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Story { diff --git a/TestStack.BDDfy.Tests/Story/StoryDouble.cs b/TestStack.BDDfy.Tests/Story/StoryDouble.cs index bdc35e5d..2183856c 100644 --- a/TestStack.BDDfy.Tests/Story/StoryDouble.cs +++ b/TestStack.BDDfy.Tests/Story/StoryDouble.cs @@ -2,8 +2,6 @@ using System.Linq; using TestStack.BDDfy.Core; using TestStack.BDDfy.Scanners; -using TestStack.BDDfy.Scanners.ScenarioScanners; -using TestStack.BDDfy.Scanners.StepScanners.MethodName; namespace TestStack.BDDfy.Tests.Story { diff --git a/TestStack.BDDfy/BDDfyExtensions.cs b/TestStack.BDDfy/BDDfyExtensions.cs index d65bc3f3..874421d4 100644 --- a/TestStack.BDDfy/BDDfyExtensions.cs +++ b/TestStack.BDDfy/BDDfyExtensions.cs @@ -3,7 +3,6 @@ using TestStack.BDDfy.Configuration; using TestStack.BDDfy.Core; using TestStack.BDDfy.Scanners; -using TestStack.BDDfy.Scanners.ScenarioScanners; namespace TestStack.BDDfy { diff --git a/TestStack.BDDfy/Configuration/Scanners.cs b/TestStack.BDDfy/Configuration/Scanners.cs index 88f522a4..127807de 100644 --- a/TestStack.BDDfy/Configuration/Scanners.cs +++ b/TestStack.BDDfy/Configuration/Scanners.cs @@ -2,9 +2,6 @@ using System.Collections.Generic; using TestStack.BDDfy.Core; using TestStack.BDDfy.Scanners; -using TestStack.BDDfy.Scanners.StepScanners; -using TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute; -using TestStack.BDDfy.Scanners.StepScanners.MethodName; namespace TestStack.BDDfy.Configuration { diff --git a/TestStack.BDDfy/Configuration/StepScannerFactory.cs b/TestStack.BDDfy/Configuration/StepScannerFactory.cs index dd56de8c..8a774805 100644 --- a/TestStack.BDDfy/Configuration/StepScannerFactory.cs +++ b/TestStack.BDDfy/Configuration/StepScannerFactory.cs @@ -1,5 +1,5 @@ using System; -using TestStack.BDDfy.Scanners.StepScanners; +using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Configuration { diff --git a/TestStack.BDDfy/Scanners/DefaultScanner.cs b/TestStack.BDDfy/Scanners/DefaultScanner.cs index 55dd07e6..d09ab591 100644 --- a/TestStack.BDDfy/Scanners/DefaultScanner.cs +++ b/TestStack.BDDfy/Scanners/DefaultScanner.cs @@ -1,7 +1,6 @@ using System; using TestStack.BDDfy.Configuration; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.ScenarioScanners; namespace TestStack.BDDfy.Scanners { diff --git a/TestStack.BDDfy/Scanners/ScenarioScanners/FluentScenarioScanner.cs b/TestStack.BDDfy/Scanners/ScenarioScanners/FluentScenarioScanner.cs index b97c070b..f57f68bf 100644 --- a/TestStack.BDDfy/Scanners/ScenarioScanners/FluentScenarioScanner.cs +++ b/TestStack.BDDfy/Scanners/ScenarioScanners/FluentScenarioScanner.cs @@ -3,7 +3,7 @@ using System.Diagnostics; using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners.ScenarioScanners +namespace TestStack.BDDfy.Scanners { public class FluentScenarioScanner : IScenarioScanner { diff --git a/TestStack.BDDfy/Scanners/ScenarioScanners/IScenarioScanner.cs b/TestStack.BDDfy/Scanners/ScenarioScanners/IScenarioScanner.cs index a6695bee..f07e2978 100644 --- a/TestStack.BDDfy/Scanners/ScenarioScanners/IScenarioScanner.cs +++ b/TestStack.BDDfy/Scanners/ScenarioScanners/IScenarioScanner.cs @@ -1,6 +1,6 @@ using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners.ScenarioScanners +namespace TestStack.BDDfy.Scanners { public interface IScenarioScanner { diff --git a/TestStack.BDDfy/Scanners/ScenarioScanners/ReflectiveScenarioScanner.cs b/TestStack.BDDfy/Scanners/ScenarioScanners/ReflectiveScenarioScanner.cs index 0a67580e..965ae948 100644 --- a/TestStack.BDDfy/Scanners/ScenarioScanners/ReflectiveScenarioScanner.cs +++ b/TestStack.BDDfy/Scanners/ScenarioScanners/ReflectiveScenarioScanner.cs @@ -3,9 +3,8 @@ using System.Linq; using System.Reflection; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.StepScanners; -namespace TestStack.BDDfy.Scanners.ScenarioScanners +namespace TestStack.BDDfy.Scanners { public class ReflectiveScenarioScanner : IScenarioScanner { diff --git a/TestStack.BDDfy/Scanners/StepScanners/AsyncTestSyncContext.cs b/TestStack.BDDfy/Scanners/StepScanners/AsyncTestSyncContext.cs index 7c17282c..fc8b2b7f 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/AsyncTestSyncContext.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/AsyncTestSyncContext.cs @@ -1,7 +1,7 @@ using System; using System.Threading; -namespace TestStack.BDDfy.Scanners.StepScanners +namespace TestStack.BDDfy.Scanners { /// /// Implementation from xUnit 2.0 diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttribute.cs index 92f69732..3e627e1a 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttribute.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttribute.cs @@ -1,7 +1,7 @@ using System; using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute +namespace TestStack.BDDfy.Scanners { [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] public class ExecutableAttribute : Attribute diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttributeStepScanner.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttributeStepScanner.cs index d7d42e85..f6a43f60 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttributeStepScanner.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttributeStepScanner.cs @@ -3,7 +3,7 @@ using System.Reflection; using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute +namespace TestStack.BDDfy.Scanners { /// /// Uses reflection to scan scenario class for steps by looking for diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndGivenAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndGivenAttribute.cs index 16e25cc3..bbfda932 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndGivenAttribute.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndGivenAttribute.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes +namespace TestStack.BDDfy.Scanners { public class AndGivenAttribute : ExecutableAttribute { diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndThenAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndThenAttribute.cs index 921ca856..1b75ebfd 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndThenAttribute.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndThenAttribute.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes +namespace TestStack.BDDfy.Scanners { public class AndThenAttribute : ExecutableAttribute { diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndWhenAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndWhenAttribute.cs index 6d07abed..97032433 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndWhenAttribute.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndWhenAttribute.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes +namespace TestStack.BDDfy.Scanners { public class AndWhenAttribute : ExecutableAttribute { diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/GivenAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/GivenAttribute.cs index 3c4a7329..250ec631 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/GivenAttribute.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/GivenAttribute.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes +namespace TestStack.BDDfy.Scanners { public class GivenAttribute : ExecutableAttribute { diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/ThenAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/ThenAttribute.cs index 42624d98..9f704066 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/ThenAttribute.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/ThenAttribute.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes +namespace TestStack.BDDfy.Scanners { public class ThenAttribute : ExecutableAttribute { diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/WhenAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/WhenAttribute.cs index 2842ed96..c3fc457a 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/WhenAttribute.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/WhenAttribute.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Scanners.StepScanners.ExecutableAttribute.GwtAttributes +namespace TestStack.BDDfy.Scanners { public class WhenAttribute : ExecutableAttribute { diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/ExpressionExtensions.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/ExpressionExtensions.cs index 85b8fdad..1f425327 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/ExpressionExtensions.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/ExpressionExtensions.cs @@ -5,7 +5,7 @@ using System.Linq.Expressions; using System.Reflection; -namespace TestStack.BDDfy.Scanners.StepScanners.Fluent +namespace TestStack.BDDfy.Scanners { public static class ExpressionExtensions { diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScanner.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScanner.cs index a27b7eee..22722761 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScanner.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScanner.cs @@ -4,13 +4,12 @@ using System.Reflection; using System.Linq; using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners.ScenarioScanners; #if !NET35 using System.Threading.Tasks; #endif -namespace TestStack.BDDfy.Scanners.StepScanners.Fluent +namespace TestStack.BDDfy.Scanners { /// /// Provides an alternative method of implementing stories and scenarios. diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScannerExtensions.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScannerExtensions.cs index e88ee4c9..22cda802 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScannerExtensions.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScannerExtensions.cs @@ -3,7 +3,7 @@ // ReSharper disable CheckNamespace // This is in BDDfy namespace to make its usage simpler -namespace TestStack.BDDfy.Scanners.StepScanners.Fluent +namespace TestStack.BDDfy.Scanners // ReSharper restore CheckNamespace { public static class FluentStepScannerExtensions diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndGiven.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndGiven.cs index 7c2e54e9..a8e248ff 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndGiven.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndGiven.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Scanners.StepScanners.Fluent +namespace TestStack.BDDfy.Scanners { public interface IAndGiven : IGiven { diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndThen.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndThen.cs index da6bb320..6e37d967 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndThen.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndThen.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Scanners.StepScanners.Fluent +namespace TestStack.BDDfy.Scanners { public interface IAndThen : IThen { diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndWhen.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndWhen.cs index dc9c3a00..384130e7 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndWhen.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndWhen.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Scanners.StepScanners.Fluent +namespace TestStack.BDDfy.Scanners { public interface IAndWhen : IWhen { diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IFluentScanner.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IFluentScanner.cs index 644c9192..04be445d 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IFluentScanner.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IFluentScanner.cs @@ -2,7 +2,7 @@ using System.Linq.Expressions; using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners.StepScanners.Fluent +namespace TestStack.BDDfy.Scanners { public interface IFluentScanner : IHasScanner { diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IGiven.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IGiven.cs index 823da0ea..3a5c3c61 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IGiven.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IGiven.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; #endif -namespace TestStack.BDDfy.Scanners.StepScanners.Fluent +namespace TestStack.BDDfy.Scanners { public interface IGiven { diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IInitialStep.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IInitialStep.cs index 63e78d84..d36d83d2 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IInitialStep.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IInitialStep.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; #endif -namespace TestStack.BDDfy.Scanners.StepScanners.Fluent +namespace TestStack.BDDfy.Scanners { public interface IInitialStep { diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IThen.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IThen.cs index ce223944..5f8f1651 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IThen.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IThen.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; #endif -namespace TestStack.BDDfy.Scanners.StepScanners.Fluent +namespace TestStack.BDDfy.Scanners { public interface IThen : IFluentScanner { diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IWhen.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IWhen.cs index 9864beff..f91be29d 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IWhen.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IWhen.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; #endif -namespace TestStack.BDDfy.Scanners.StepScanners.Fluent +namespace TestStack.BDDfy.Scanners { public interface IWhen : IFluentScanner { diff --git a/TestStack.BDDfy/Scanners/StepScanners/IStepScanner.cs b/TestStack.BDDfy/Scanners/StepScanners/IStepScanner.cs index e1b38420..c55ea79b 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/IStepScanner.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/IStepScanner.cs @@ -2,7 +2,7 @@ using System.Reflection; using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners.StepScanners +namespace TestStack.BDDfy.Scanners { public interface IStepScanner { diff --git a/TestStack.BDDfy/Scanners/StepScanners/IgnoreStepAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/IgnoreStepAttribute.cs index a03d03af..b4273274 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/IgnoreStepAttribute.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/IgnoreStepAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace TestStack.BDDfy.Scanners.StepScanners +namespace TestStack.BDDfy.Scanners { /// /// A method attribute used to specify to the ExecutableAttributeStepScanner that it should ignore a method as a step diff --git a/TestStack.BDDfy/Scanners/StepScanners/MethodName/DefaultMethodNameStepScanner.cs b/TestStack.BDDfy/Scanners/StepScanners/MethodName/DefaultMethodNameStepScanner.cs index c7749da8..d95e6119 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/MethodName/DefaultMethodNameStepScanner.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/MethodName/DefaultMethodNameStepScanner.cs @@ -1,7 +1,7 @@ using System; using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners.StepScanners.MethodName +namespace TestStack.BDDfy.Scanners { public class DefaultMethodNameStepScanner : MethodNameStepScanner { diff --git a/TestStack.BDDfy/Scanners/StepScanners/MethodName/MethodNameMatcher.cs b/TestStack.BDDfy/Scanners/StepScanners/MethodName/MethodNameMatcher.cs index 30588d8b..c3fd3541 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/MethodName/MethodNameMatcher.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/MethodName/MethodNameMatcher.cs @@ -1,7 +1,7 @@ using System; using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners.StepScanners.MethodName +namespace TestStack.BDDfy.Scanners { public class MethodNameMatcher { diff --git a/TestStack.BDDfy/Scanners/StepScanners/MethodName/MethodNameStepScanner.cs b/TestStack.BDDfy/Scanners/StepScanners/MethodName/MethodNameStepScanner.cs index b2e4df3f..17025156 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/MethodName/MethodNameStepScanner.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/MethodName/MethodNameStepScanner.cs @@ -4,7 +4,7 @@ using System.Linq; using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners.StepScanners.MethodName +namespace TestStack.BDDfy.Scanners { /// /// Uses reflection to scan a scenario class for steps using method name conventions diff --git a/TestStack.BDDfy/Scanners/StepScanners/StepActionFactory.cs b/TestStack.BDDfy/Scanners/StepScanners/StepActionFactory.cs index 31f0f1d0..067a4c0e 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/StepActionFactory.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/StepActionFactory.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; #endif -namespace TestStack.BDDfy.Scanners.StepScanners +namespace TestStack.BDDfy.Scanners { public class StepActionFactory { diff --git a/TestStack.BDDfy/Scanners/StepScanners/StepScannerExtensions.cs b/TestStack.BDDfy/Scanners/StepScanners/StepScannerExtensions.cs index cdf54d28..85f09928 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/StepScannerExtensions.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/StepScannerExtensions.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace TestStack.BDDfy.Scanners.StepScanners +namespace TestStack.BDDfy.Scanners { internal static class StepScannerExtensions { diff --git a/TestStack.BDDfy/Scanners/StepScanners/StepTitleException.cs b/TestStack.BDDfy/Scanners/StepScanners/StepTitleException.cs index 7645c3ff..526975a0 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/StepTitleException.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/StepTitleException.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.Serialization; -namespace TestStack.BDDfy.Scanners.StepScanners +namespace TestStack.BDDfy.Scanners { public class StepTitleException : Exception { From 79dfc373f5eaecb608491c51e6e2b339e12d6086 Mon Sep 17 00:00:00 2001 From: Michael Whelan Date: Fri, 14 Mar 2014 10:06:25 +0000 Subject: [PATCH 3/3] Moved Scanners and Core to TestStack.BDDfy namespace. Set NamespaceProvider to false for those folders to disable namespace warnings. --- .../Atm/AccountHasInsufficientFund.cs | 1 - .../Atm/AccountHolderWithdrawsCash.cs | 2 -- .../Atm/HtmlReportConfig.cs | 2 +- .../TestStack.BDDfy.Samples/BDDfy_Rocks.cs | 2 -- .../CustomTextReporter.cs | 1 - .../TicTacToe/TicTacToe.cs | 2 -- .../TicTacToe/XWins.cs | 2 -- .../Arguments/ArgumentsProvidedForGiven.cs | 1 - .../Arguments/ArgumentsProvidedForThen.cs | 1 - ...MultipleArgumentsProvidedForTheSameStep.cs | 1 - .../Configuration/CustomProcessor.cs | 6 ++--- .../Configuration/ProcessorPipelineTests.cs | 10 ++++---- .../Configuration/TestRunnerTests.cs | 2 -- .../Exceptions/ExceptionThrowingTest.cs | 4 +--- .../WhenGivenThrowsNotImplementedException.cs | 1 - .../WhenThenThrowsNotImplementedException.cs | 1 - .../WhenWhenThrowsNotImplementedException.cs | 1 - .../WhenGivenThrowsException.cs | 1 - .../WhenThenThrowsException.cs | 1 - .../WhenWhenThrowsException.cs | 1 - .../Exceptions/WhenAnInconclusiveTestIsRun.cs | 1 - .../FluentScanner/BDDfyUsingFluentApi.cs | 2 -- .../ScenarioToBeScannedUsingFluentScanner.cs | 2 -- .../WhenStepsAreScannedUsingFluentScanner.cs | 1 - .../Diagnostics/DiagnosticsReporterSpecs.cs | 4 ++-- .../WhenBuildingReportDiagnostics.cs | 2 +- .../MarkDown/MarkDownReportBuilderSpecs.cs | 3 +-- .../Reports/MarkDown/MarkDownReporterSpecs.cs | 4 ++-- .../Processors/Reports/ReportTestData.cs | 9 ++++--- ...leAttributeOrderOrdersTheStepsCorrectly.cs | 2 -- .../Scanner/ExpressionExtensionsTests.cs | 1 - .../Scanner/StepScannerExtensions.cs | 2 -- .../DefaultScanForStepsByMethodNameTests.cs | 2 -- .../ExecutableAttributeScannerTests.cs | 2 -- ...ttributeAndMethodNamingConventionIsUsed.cs | 2 -- ...NamingConventionsOtherThanGivenWhenThen.cs | 2 -- .../WhenStepScannerFactoryAsyncMethods.cs | 1 - .../WhenStepsAreDefinedInABaseClass.cs | 3 +-- .../Scanner/WhenStepsReturnTheirText.cs | 2 -- ...assFollowsGivenWhenThenNamingConvention.cs | 2 -- .../WhenTestClassUsesExecutableAttributes.cs | 2 -- .../{Story => Stories}/DummyScenario.cs | 2 +- .../{Story => Stories}/SharedStoryNotion.cs | 4 +--- .../StoryCanBeSpecifiedInFluentMode.cs | 4 +--- .../StoryCanBeSpecifiedInReflectiveMode.cs | 3 +-- .../StoryClassAndScenarioClassAreTheSame.cs | 8 +++---- .../{Story => Stories}/StoryClassBase.cs | 4 +--- .../{Story => Stories}/StoryDouble.cs | 6 ++--- .../{Story => Stories}/StorySubclass.cs | 4 ++-- ...StoryAttibuteMissesAsATextInAsAProperty.cs | 3 +-- ...ttibuteMissesDuplicateTextsInProperties.cs | 3 +-- ...yAttibuteMissesIWantTextInIWantProperty.cs | 3 +-- ...ttibuteMissesSoThatTextInSoThatProperty.cs | 3 +-- .../TestStack.BDDfy.Tests.csproj | 24 +++++++++---------- .../WhenAnEmptyStoryIsBddified.cs | 1 - TestStack.BDDfy/BDDfyExtensions.cs | 2 -- .../Configuration/BatchProcessorFactory.cs | 1 - .../Configuration/BatchProcessors.cs | 1 - .../Configuration/HtmlReportFactory.cs | 1 - .../Configuration/ProcessorFactory.cs | 1 - TestStack.BDDfy/Configuration/Processors.cs | 1 - TestStack.BDDfy/Configuration/Scanners.cs | 2 -- .../Configuration/StepScannerFactory.cs | 1 - .../Configuration/TestRunnerFactory.cs | 1 - TestStack.BDDfy/Core/Engine.cs | 2 +- TestStack.BDDfy/Core/ExecutionOrder.cs | 2 +- TestStack.BDDfy/Core/ExecutionStep.cs | 2 +- TestStack.BDDfy/Core/IBatchProcessor.cs | 2 +- TestStack.BDDfy/Core/IHasScanner.cs | 2 +- TestStack.BDDfy/Core/IProcessor.cs | 2 +- TestStack.BDDfy/Core/IScanner.cs | 2 +- TestStack.BDDfy/Core/NetToString.cs | 2 +- TestStack.BDDfy/Core/ProcessType.cs | 2 +- .../Core/RunStepWithArgsAttribute.cs | 2 +- TestStack.BDDfy/Core/Scenario.cs | 2 +- TestStack.BDDfy/Core/StepExecutionResult.cs | 2 +- TestStack.BDDfy/Core/Story.cs | 2 +- TestStack.BDDfy/Core/StoryAttribute.cs | 2 +- TestStack.BDDfy/Core/StoryMetaData.cs | 2 +- TestStack.BDDfy/Processors/Disposer.cs | 1 - .../Processors/ExceptionProcessor.cs | 1 - .../Processors/Reporters/ConsoleReporter.cs | 1 - .../Diagnostics/DiagnosticsReporter.cs | 3 +-- .../Processors/Reporters/FileReportModel.cs | 1 - .../Reporters/FileReportSummaryModel.cs | 1 - .../Html/DefaultHtmlReportConfiguration.cs | 1 - .../Reporters/Html/HtmlReportBuilder.cs | 1 - .../Reporters/Html/HtmlReportViewModel.cs | 1 - .../Processors/Reporters/Html/HtmlReporter.cs | 1 - .../Html/IHtmlReportConfiguration.cs | 2 -- .../Reporters/MarkDown/MarkDownReporter.cs | 1 - TestStack.BDDfy/Processors/StoryCache.cs | 1 - TestStack.BDDfy/Processors/TestRunner.cs | 4 +--- TestStack.BDDfy/Scanners/DefaultScanner.cs | 3 +-- .../Scanners/IStoryMetaDataScanner.cs | 3 +-- .../ScenarioScanners/FluentScenarioScanner.cs | 3 +-- .../ScenarioScanners/IScenarioScanner.cs | 4 +--- .../ReflectiveScenarioScanner.cs | 3 +-- .../StepScanners/AsyncTestSyncContext.cs | 2 +- .../ExecutableAttribute.cs | 3 +-- .../ExecutableAttributeStepScanner.cs | 3 +-- .../GwtAttributes/AndGivenAttribute.cs | 4 ++-- .../GwtAttributes/AndThenAttribute.cs | 4 ++-- .../GwtAttributes/AndWhenAttribute.cs | 4 ++-- .../GwtAttributes/GivenAttribute.cs | 4 ++-- .../GwtAttributes/ThenAttribute.cs | 4 ++-- .../GwtAttributes/WhenAttribute.cs | 4 ++-- .../Fluent/ExpressionExtensions.cs | 2 +- .../StepScanners/Fluent/FluentScanner.cs | 3 +-- .../Fluent/FluentScannerExtensions.cs | 2 +- .../Scanners/StepScanners/Fluent/IAndGiven.cs | 2 +- .../Scanners/StepScanners/Fluent/IAndThen.cs | 2 +- .../Scanners/StepScanners/Fluent/IAndWhen.cs | 2 +- .../StepScanners/Fluent/IFluentScanner.cs | 3 +-- .../Scanners/StepScanners/Fluent/IGiven.cs | 2 +- .../StepScanners/Fluent/IInitialStep.cs | 2 +- .../Scanners/StepScanners/Fluent/IThen.cs | 2 +- .../Scanners/StepScanners/Fluent/IWhen.cs | 2 +- .../Scanners/StepScanners/IStepScanner.cs | 3 +-- .../StepScanners/IgnoreStepAttribute.cs | 2 +- .../DefaultMethodNameStepScanner.cs | 3 +-- .../MethodName/MethodNameMatcher.cs | 3 +-- .../MethodName/MethodNameStepScanner.cs | 3 +-- .../StepScanners/StepActionFactory.cs | 2 +- .../StepScanners/StepScannerExtensions.cs | 2 +- .../StepScanners/StepTitleException.cs | 2 +- .../Scanners/StoryAttributeMetaDataScanner.cs | 3 +-- 127 files changed, 105 insertions(+), 217 deletions(-) rename TestStack.BDDfy.Tests/{Story => Stories}/DummyScenario.cs (82%) rename TestStack.BDDfy.Tests/{Story => Stories}/SharedStoryNotion.cs (78%) rename TestStack.BDDfy.Tests/{Story => Stories}/StoryCanBeSpecifiedInFluentMode.cs (87%) rename TestStack.BDDfy.Tests/{Story => Stories}/StoryCanBeSpecifiedInReflectiveMode.cs (88%) rename TestStack.BDDfy.Tests/{Story => Stories}/StoryClassAndScenarioClassAreTheSame.cs (94%) rename TestStack.BDDfy.Tests/{Story => Stories}/StoryClassBase.cs (86%) rename TestStack.BDDfy.Tests/{Story => Stories}/StoryDouble.cs (90%) rename TestStack.BDDfy.Tests/{Story => Stories}/StorySubclass.cs (88%) rename TestStack.BDDfy.Tests/{Story => Stories}/WhenStoryAttibuteMissesAsATextInAsAProperty.cs (92%) rename TestStack.BDDfy.Tests/{Story => Stories}/WhenStoryAttibuteMissesDuplicateTextsInProperties.cs (92%) rename TestStack.BDDfy.Tests/{Story => Stories}/WhenStoryAttibuteMissesIWantTextInIWantProperty.cs (92%) rename TestStack.BDDfy.Tests/{Story => Stories}/WhenStoryAttibuteMissesSoThatTextInSoThatProperty.cs (92%) diff --git a/Samples/TestStack.BDDfy.Samples/Atm/AccountHasInsufficientFund.cs b/Samples/TestStack.BDDfy.Samples/Atm/AccountHasInsufficientFund.cs index e69e5ee4..f75a76ee 100644 --- a/Samples/TestStack.BDDfy.Samples/Atm/AccountHasInsufficientFund.cs +++ b/Samples/TestStack.BDDfy.Samples/Atm/AccountHasInsufficientFund.cs @@ -1,5 +1,4 @@ using NUnit.Framework; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Samples.Atm { diff --git a/Samples/TestStack.BDDfy.Samples/Atm/AccountHolderWithdrawsCash.cs b/Samples/TestStack.BDDfy.Samples/Atm/AccountHolderWithdrawsCash.cs index 7ee56ec6..ed93144b 100644 --- a/Samples/TestStack.BDDfy.Samples/Atm/AccountHolderWithdrawsCash.cs +++ b/Samples/TestStack.BDDfy.Samples/Atm/AccountHolderWithdrawsCash.cs @@ -1,6 +1,4 @@ using NUnit.Framework; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Samples.Atm { diff --git a/Samples/TestStack.BDDfy.Samples/Atm/HtmlReportConfig.cs b/Samples/TestStack.BDDfy.Samples/Atm/HtmlReportConfig.cs index 1489ab98..5d1348bb 100644 --- a/Samples/TestStack.BDDfy.Samples/Atm/HtmlReportConfig.cs +++ b/Samples/TestStack.BDDfy.Samples/Atm/HtmlReportConfig.cs @@ -7,7 +7,7 @@ namespace TestStack.BDDfy.Samples.Atm /// public class HtmlReportConfig : DefaultHtmlReportConfiguration { - public override bool RunsOn(Core.Story story) + public override bool RunsOn(Story story) { return story.MetaData.Type.Namespace != null && story.MetaData.Type.Namespace.EndsWith("Atm"); } diff --git a/Samples/TestStack.BDDfy.Samples/BDDfy_Rocks.cs b/Samples/TestStack.BDDfy.Samples/BDDfy_Rocks.cs index f587fa5c..0aef5f52 100644 --- a/Samples/TestStack.BDDfy.Samples/BDDfy_Rocks.cs +++ b/Samples/TestStack.BDDfy.Samples/BDDfy_Rocks.cs @@ -1,6 +1,4 @@ using NUnit.Framework; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Samples { diff --git a/Samples/TestStack.BDDfy.Samples/CustomTextReporter.cs b/Samples/TestStack.BDDfy.Samples/CustomTextReporter.cs index dcc07e6b..3a89b640 100644 --- a/Samples/TestStack.BDDfy.Samples/CustomTextReporter.cs +++ b/Samples/TestStack.BDDfy.Samples/CustomTextReporter.cs @@ -2,7 +2,6 @@ using System.IO; using System.Linq; using System.Text; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Samples { diff --git a/Samples/TestStack.BDDfy.Samples/TicTacToe/TicTacToe.cs b/Samples/TestStack.BDDfy.Samples/TicTacToe/TicTacToe.cs index ac11b768..abba7a8a 100644 --- a/Samples/TestStack.BDDfy.Samples/TicTacToe/TicTacToe.cs +++ b/Samples/TestStack.BDDfy.Samples/TicTacToe/TicTacToe.cs @@ -1,6 +1,4 @@ using NUnit.Framework; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Samples.TicTacToe { diff --git a/Samples/TestStack.BDDfy.Samples/TicTacToe/XWins.cs b/Samples/TestStack.BDDfy.Samples/TicTacToe/XWins.cs index b527f2ae..c70c7080 100644 --- a/Samples/TestStack.BDDfy.Samples/TicTacToe/XWins.cs +++ b/Samples/TestStack.BDDfy.Samples/TicTacToe/XWins.cs @@ -1,6 +1,4 @@ using NUnit.Framework; -using TestStack.BDDfy.Core; - namespace TestStack.BDDfy.Samples.TicTacToe { public class XWins : GameUnderTest diff --git a/TestStack.BDDfy.Tests/Arguments/ArgumentsProvidedForGiven.cs b/TestStack.BDDfy.Tests/Arguments/ArgumentsProvidedForGiven.cs index 9f988547..834c175b 100644 --- a/TestStack.BDDfy.Tests/Arguments/ArgumentsProvidedForGiven.cs +++ b/TestStack.BDDfy.Tests/Arguments/ArgumentsProvidedForGiven.cs @@ -1,6 +1,5 @@ using NUnit.Framework; using System.Collections.Generic; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Tests.Arguments { diff --git a/TestStack.BDDfy.Tests/Arguments/ArgumentsProvidedForThen.cs b/TestStack.BDDfy.Tests/Arguments/ArgumentsProvidedForThen.cs index 6f0f5eeb..0a2dd878 100644 --- a/TestStack.BDDfy.Tests/Arguments/ArgumentsProvidedForThen.cs +++ b/TestStack.BDDfy.Tests/Arguments/ArgumentsProvidedForThen.cs @@ -1,5 +1,4 @@ using NUnit.Framework; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Tests.Arguments { diff --git a/TestStack.BDDfy.Tests/Arguments/MultipleArgumentsProvidedForTheSameStep.cs b/TestStack.BDDfy.Tests/Arguments/MultipleArgumentsProvidedForTheSameStep.cs index 7f72a335..29772cc8 100644 --- a/TestStack.BDDfy.Tests/Arguments/MultipleArgumentsProvidedForTheSameStep.cs +++ b/TestStack.BDDfy.Tests/Arguments/MultipleArgumentsProvidedForTheSameStep.cs @@ -1,6 +1,5 @@ using NUnit.Framework; using System.Collections.Generic; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Tests.Arguments { diff --git a/TestStack.BDDfy.Tests/Configuration/CustomProcessor.cs b/TestStack.BDDfy.Tests/Configuration/CustomProcessor.cs index 7ac03e5e..9ebe2edb 100644 --- a/TestStack.BDDfy.Tests/Configuration/CustomProcessor.cs +++ b/TestStack.BDDfy.Tests/Configuration/CustomProcessor.cs @@ -1,6 +1,4 @@ -using TestStack.BDDfy.Core; - -namespace TestStack.BDDfy.Tests.Configuration +namespace TestStack.BDDfy.Tests.Configuration { public class CustomProcessor : IProcessor { @@ -9,7 +7,7 @@ public ProcessType ProcessType get { return ProcessType.BeforeReport; } } - public void Process(Core.Story story) + public void Process(Story story) { } } diff --git a/TestStack.BDDfy.Tests/Configuration/ProcessorPipelineTests.cs b/TestStack.BDDfy.Tests/Configuration/ProcessorPipelineTests.cs index 67dcd4cf..7847ce50 100644 --- a/TestStack.BDDfy.Tests/Configuration/ProcessorPipelineTests.cs +++ b/TestStack.BDDfy.Tests/Configuration/ProcessorPipelineTests.cs @@ -10,7 +10,7 @@ public class ProcessorPipelineTests [Test] public void ReturnsDefaultPipelineByDefault() { - var processors = Configurator.Processors.GetProcessors(new Core.Story(null)).ToList(); + var processors = Configurator.Processors.GetProcessors(new Story(null)).ToList(); Assert.IsTrue(processors.Any(p => p is ConsoleReporter)); Assert.IsTrue(processors.Any(p => p is StoryCache)); @@ -22,7 +22,7 @@ public void ReturnsDefaultPipelineByDefault() public void DoesNotReturnConsoleReportWhenItIsDeactivated() { Configurator.Processors.ConsoleReport.Disable(); - var processors = Configurator.Processors.GetProcessors(new Core.Story(null)).ToList(); + var processors = Configurator.Processors.GetProcessors(new Story(null)).ToList(); Assert.IsFalse(processors.Any(p => p is ConsoleReporter)); Assert.IsTrue(processors.Any(p => p is StoryCache)); @@ -35,7 +35,7 @@ public void DoesNotReturnConsoleReportWhenItIsDeactivated() public void DoesNotReturnConsoleReportForExcludedStories() { Configurator.Processors.ConsoleReport.RunsOn(s => s.MetaData != null); - var processors = Configurator.Processors.GetProcessors(new Core.Story(null)).ToList(); + var processors = Configurator.Processors.GetProcessors(new Story(null)).ToList(); Assert.IsFalse(processors.Any(p => p is ConsoleReporter)); Configurator.Processors.ConsoleReport.RunsOn(s => true); @@ -45,7 +45,7 @@ public void DoesNotReturnConsoleReportForExcludedStories() public void DoesNotReturnTestRunnerWhenItIsDeactivated() { Configurator.Processors.TestRunner.Disable(); - var processors = Configurator.Processors.GetProcessors(new Core.Story(null)).ToList(); + var processors = Configurator.Processors.GetProcessors(new Story(null)).ToList(); Assert.IsTrue(processors.Any(p => p is ConsoleReporter)); Assert.IsFalse(processors.Any(p => p is TestRunner)); @@ -60,7 +60,7 @@ public void CanAddCustomProcessor() var processors = Configurator .Processors .Add(() => new CustomProcessor()) - .GetProcessors(new Core.Story(null)).ToList(); + .GetProcessors(new Story(null)).ToList(); Assert.IsTrue(processors.Any(p => p is CustomProcessor)); Assert.IsTrue(processors.Any(p => p is StoryCache)); diff --git a/TestStack.BDDfy.Tests/Configuration/TestRunnerTests.cs b/TestStack.BDDfy.Tests/Configuration/TestRunnerTests.cs index 0ef6a998..642b0cdf 100644 --- a/TestStack.BDDfy.Tests/Configuration/TestRunnerTests.cs +++ b/TestStack.BDDfy.Tests/Configuration/TestRunnerTests.cs @@ -2,8 +2,6 @@ using System.Linq; using NUnit.Framework; using TestStack.BDDfy.Configuration; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Configuration { diff --git a/TestStack.BDDfy.Tests/Exceptions/ExceptionThrowingTest.cs b/TestStack.BDDfy.Tests/Exceptions/ExceptionThrowingTest.cs index a5db8de0..9ad5cdbf 100644 --- a/TestStack.BDDfy.Tests/Exceptions/ExceptionThrowingTest.cs +++ b/TestStack.BDDfy.Tests/Exceptions/ExceptionThrowingTest.cs @@ -1,8 +1,6 @@ using System; using System.Linq; using NUnit.Framework; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Exceptions { @@ -132,7 +130,7 @@ Scenario Scenario } } - Core.Story Story { get; set; } + Story Story { get; set; } public void AssertTearDownMethodIsExecuted() { diff --git a/TestStack.BDDfy.Tests/Exceptions/NotImplementedException/WhenGivenThrowsNotImplementedException.cs b/TestStack.BDDfy.Tests/Exceptions/NotImplementedException/WhenGivenThrowsNotImplementedException.cs index 8fe43e28..30de26e8 100644 --- a/TestStack.BDDfy.Tests/Exceptions/NotImplementedException/WhenGivenThrowsNotImplementedException.cs +++ b/TestStack.BDDfy.Tests/Exceptions/NotImplementedException/WhenGivenThrowsNotImplementedException.cs @@ -1,5 +1,4 @@ using NUnit.Framework; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Tests.Exceptions.NotImplementedException { diff --git a/TestStack.BDDfy.Tests/Exceptions/NotImplementedException/WhenThenThrowsNotImplementedException.cs b/TestStack.BDDfy.Tests/Exceptions/NotImplementedException/WhenThenThrowsNotImplementedException.cs index d4031994..275d18b2 100644 --- a/TestStack.BDDfy.Tests/Exceptions/NotImplementedException/WhenThenThrowsNotImplementedException.cs +++ b/TestStack.BDDfy.Tests/Exceptions/NotImplementedException/WhenThenThrowsNotImplementedException.cs @@ -1,5 +1,4 @@ using NUnit.Framework; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Tests.Exceptions.NotImplementedException { diff --git a/TestStack.BDDfy.Tests/Exceptions/NotImplementedException/WhenWhenThrowsNotImplementedException.cs b/TestStack.BDDfy.Tests/Exceptions/NotImplementedException/WhenWhenThrowsNotImplementedException.cs index e4627f67..185b47d4 100644 --- a/TestStack.BDDfy.Tests/Exceptions/NotImplementedException/WhenWhenThrowsNotImplementedException.cs +++ b/TestStack.BDDfy.Tests/Exceptions/NotImplementedException/WhenWhenThrowsNotImplementedException.cs @@ -1,5 +1,4 @@ using NUnit.Framework; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Tests.Exceptions.NotImplementedException { diff --git a/TestStack.BDDfy.Tests/Exceptions/OtherExceptions/WhenGivenThrowsException.cs b/TestStack.BDDfy.Tests/Exceptions/OtherExceptions/WhenGivenThrowsException.cs index 852cecd1..3661e256 100644 --- a/TestStack.BDDfy.Tests/Exceptions/OtherExceptions/WhenGivenThrowsException.cs +++ b/TestStack.BDDfy.Tests/Exceptions/OtherExceptions/WhenGivenThrowsException.cs @@ -1,6 +1,5 @@ using System; using NUnit.Framework; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Tests.Exceptions.OtherExceptions { diff --git a/TestStack.BDDfy.Tests/Exceptions/OtherExceptions/WhenThenThrowsException.cs b/TestStack.BDDfy.Tests/Exceptions/OtherExceptions/WhenThenThrowsException.cs index 7a73e4dc..a83fffe1 100644 --- a/TestStack.BDDfy.Tests/Exceptions/OtherExceptions/WhenThenThrowsException.cs +++ b/TestStack.BDDfy.Tests/Exceptions/OtherExceptions/WhenThenThrowsException.cs @@ -1,6 +1,5 @@ using System; using NUnit.Framework; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Tests.Exceptions.OtherExceptions { diff --git a/TestStack.BDDfy.Tests/Exceptions/OtherExceptions/WhenWhenThrowsException.cs b/TestStack.BDDfy.Tests/Exceptions/OtherExceptions/WhenWhenThrowsException.cs index 0d9f54fd..43940ec8 100644 --- a/TestStack.BDDfy.Tests/Exceptions/OtherExceptions/WhenWhenThrowsException.cs +++ b/TestStack.BDDfy.Tests/Exceptions/OtherExceptions/WhenWhenThrowsException.cs @@ -1,6 +1,5 @@ using System; using NUnit.Framework; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Tests.Exceptions.OtherExceptions { diff --git a/TestStack.BDDfy.Tests/Exceptions/WhenAnInconclusiveTestIsRun.cs b/TestStack.BDDfy.Tests/Exceptions/WhenAnInconclusiveTestIsRun.cs index 8fc0cbd9..3f2a5e12 100644 --- a/TestStack.BDDfy.Tests/Exceptions/WhenAnInconclusiveTestIsRun.cs +++ b/TestStack.BDDfy.Tests/Exceptions/WhenAnInconclusiveTestIsRun.cs @@ -1,6 +1,5 @@ using System.Linq; using NUnit.Framework; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Tests.Exceptions { diff --git a/TestStack.BDDfy.Tests/FluentScanner/BDDfyUsingFluentApi.cs b/TestStack.BDDfy.Tests/FluentScanner/BDDfyUsingFluentApi.cs index 977fd6aa..474543b4 100644 --- a/TestStack.BDDfy.Tests/FluentScanner/BDDfyUsingFluentApi.cs +++ b/TestStack.BDDfy.Tests/FluentScanner/BDDfyUsingFluentApi.cs @@ -4,8 +4,6 @@ using NUnit.Framework; using System.Linq; using TestStack.BDDfy.Configuration; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.FluentScanner { diff --git a/TestStack.BDDfy.Tests/FluentScanner/ScenarioToBeScannedUsingFluentScanner.cs b/TestStack.BDDfy.Tests/FluentScanner/ScenarioToBeScannedUsingFluentScanner.cs index 61c3977d..778c87c7 100644 --- a/TestStack.BDDfy.Tests/FluentScanner/ScenarioToBeScannedUsingFluentScanner.cs +++ b/TestStack.BDDfy.Tests/FluentScanner/ScenarioToBeScannedUsingFluentScanner.cs @@ -2,8 +2,6 @@ using System.Globalization; using System.Linq; using System.Collections.Generic; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.FluentScanner { diff --git a/TestStack.BDDfy.Tests/FluentScanner/WhenStepsAreScannedUsingFluentScanner.cs b/TestStack.BDDfy.Tests/FluentScanner/WhenStepsAreScannedUsingFluentScanner.cs index 4bc8b8fc..970291d1 100644 --- a/TestStack.BDDfy.Tests/FluentScanner/WhenStepsAreScannedUsingFluentScanner.cs +++ b/TestStack.BDDfy.Tests/FluentScanner/WhenStepsAreScannedUsingFluentScanner.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using NUnit.Framework; using System.Linq; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Tests.FluentScanner { diff --git a/TestStack.BDDfy.Tests/Processors/Diagnostics/DiagnosticsReporterSpecs.cs b/TestStack.BDDfy.Tests/Processors/Diagnostics/DiagnosticsReporterSpecs.cs index 5ef91cb3..e4e15e2b 100644 --- a/TestStack.BDDfy.Tests/Processors/Diagnostics/DiagnosticsReporterSpecs.cs +++ b/TestStack.BDDfy.Tests/Processors/Diagnostics/DiagnosticsReporterSpecs.cs @@ -18,7 +18,7 @@ public void ShouldCreateReportIfProcessingSucceeds() var sut = CreateSut(); _builder.CreateReport(Arg.Any()).Returns("Report Data"); - sut.Process(new List()); + sut.Process(new List()); _writer.Received().OutputReport("Report Data", Arg.Any(), Arg.Any()); } @@ -29,7 +29,7 @@ public void ShouldPrintErrorInReportIfProcessingFails() var sut = CreateSut(); _builder.CreateReport(Arg.Any()).Returns(x => { throw new Exception("Error occurred."); }); - sut.Process(new List()); + sut.Process(new List()); _writer.Received().OutputReport("There was an error compiling the json report: Error occurred.", Arg.Any(), Arg.Any()); diff --git a/TestStack.BDDfy.Tests/Processors/Diagnostics/WhenBuildingReportDiagnostics.cs b/TestStack.BDDfy.Tests/Processors/Diagnostics/WhenBuildingReportDiagnostics.cs index 00f60635..7ea5e042 100644 --- a/TestStack.BDDfy.Tests/Processors/Diagnostics/WhenBuildingReportDiagnostics.cs +++ b/TestStack.BDDfy.Tests/Processors/Diagnostics/WhenBuildingReportDiagnostics.cs @@ -10,7 +10,7 @@ namespace TestStack.BDDfy.Tests.Processors.Diagnostics public class WhenBuildingReportDiagnostics { private DiagnosticsReportBuilder _sut; - private IEnumerable _stories; + private IEnumerable _stories; private IList _result; public void GivenADiagnosticsReportBuilder() diff --git a/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReportBuilderSpecs.cs b/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReportBuilderSpecs.cs index 855a4ccc..fb8714d3 100644 --- a/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReportBuilderSpecs.cs +++ b/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReportBuilderSpecs.cs @@ -2,7 +2,6 @@ using System.Text.RegularExpressions; using NUnit.Framework; using TestStack.BDDfy.Processors; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Processors.Reports.MarkDown { @@ -10,7 +9,7 @@ namespace TestStack.BDDfy.Tests.Processors.Reports.MarkDown public class MarkDownReportBuilderSpecs { private MarkDownReportBuilder _sut; - private IEnumerable _stories; + private IEnumerable _stories; private string[] _result; [Given("Given a MarkDownReportBuilder")] diff --git a/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReporterSpecs.cs b/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReporterSpecs.cs index ee3494bd..af9e93a0 100644 --- a/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReporterSpecs.cs +++ b/TestStack.BDDfy.Tests/Processors/Reports/MarkDown/MarkDownReporterSpecs.cs @@ -18,7 +18,7 @@ public void ShouldCreateReportIfProcessingSucceeds() var sut = CreateSut(); _builder.CreateReport(Arg.Any()).Returns("Report Data"); - sut.Process(new List()); + sut.Process(new List()); _writer.Received().OutputReport("Report Data", Arg.Any(), Arg.Any()); } @@ -29,7 +29,7 @@ public void ShouldPrintErrorInReportIfProcessingFails() var sut = CreateSut(); _builder.CreateReport(Arg.Any()).Returns(x => { throw new Exception("Error occurred."); }); - sut.Process(new List()); + sut.Process(new List()); _writer.Received().OutputReport( Arg.Is(s => s.StartsWith("Error occurred.")), diff --git a/TestStack.BDDfy.Tests/Processors/Reports/ReportTestData.cs b/TestStack.BDDfy.Tests/Processors/Reports/ReportTestData.cs index 3ca50aef..1ba565c8 100644 --- a/TestStack.BDDfy.Tests/Processors/Reports/ReportTestData.cs +++ b/TestStack.BDDfy.Tests/Processors/Reports/ReportTestData.cs @@ -1,19 +1,18 @@ using System; using System.Collections.Generic; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Tests.Processors.Reports { public class ReportTestData { - public IEnumerable CreateTwoStoriesEachWithTwoScenariosWithThreeStepsOfFiveMilliseconds() + public IEnumerable CreateTwoStoriesEachWithTwoScenariosWithThreeStepsOfFiveMilliseconds() { var storyMetaData1 = new StoryMetaData(typeof(RegularAccountHolderStory), "As a person", "I want ice cream", "So that I can be happy", "Happiness"); var storyMetaData2 = new StoryMetaData(typeof(GoldAccountHolderStory), "As an account holder", "I want to withdraw cash", "So that I can get money when the bank is closed", "Account holder withdraws cash"); - var stories = new List() + var stories = new List() { - new Core.Story(storyMetaData1, GetScenarios()), - new Core.Story(storyMetaData2, GetScenarios()) + new Story(storyMetaData1, GetScenarios()), + new Story(storyMetaData2, GetScenarios()) }; return stories; diff --git a/TestStack.BDDfy.Tests/Scanner/ExecutableAttributeOrderOrdersTheStepsCorrectly.cs b/TestStack.BDDfy.Tests/Scanner/ExecutableAttributeOrderOrdersTheStepsCorrectly.cs index f4bec89b..82d6c4c5 100644 --- a/TestStack.BDDfy.Tests/Scanner/ExecutableAttributeOrderOrdersTheStepsCorrectly.cs +++ b/TestStack.BDDfy.Tests/Scanner/ExecutableAttributeOrderOrdersTheStepsCorrectly.cs @@ -2,8 +2,6 @@ using System.Linq; using NUnit.Framework; using TestStack.BDDfy.Configuration; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner { diff --git a/TestStack.BDDfy.Tests/Scanner/ExpressionExtensionsTests.cs b/TestStack.BDDfy.Tests/Scanner/ExpressionExtensionsTests.cs index 491040d5..3dc66563 100644 --- a/TestStack.BDDfy.Tests/Scanner/ExpressionExtensionsTests.cs +++ b/TestStack.BDDfy.Tests/Scanner/ExpressionExtensionsTests.cs @@ -2,7 +2,6 @@ using System.Linq.Expressions; using NUnit.Framework; using System.Linq; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner { diff --git a/TestStack.BDDfy.Tests/Scanner/StepScannerExtensions.cs b/TestStack.BDDfy.Tests/Scanner/StepScannerExtensions.cs index cf64f9af..e3de2086 100644 --- a/TestStack.BDDfy.Tests/Scanner/StepScannerExtensions.cs +++ b/TestStack.BDDfy.Tests/Scanner/StepScannerExtensions.cs @@ -1,7 +1,5 @@ using System.Collections.Generic; using System.Linq; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner { diff --git a/TestStack.BDDfy.Tests/Scanner/StepText/DefaultScanForStepsByMethodNameTests.cs b/TestStack.BDDfy.Tests/Scanner/StepText/DefaultScanForStepsByMethodNameTests.cs index 02ed616e..19f0e42c 100644 --- a/TestStack.BDDfy.Tests/Scanner/StepText/DefaultScanForStepsByMethodNameTests.cs +++ b/TestStack.BDDfy.Tests/Scanner/StepText/DefaultScanForStepsByMethodNameTests.cs @@ -1,7 +1,5 @@ using NUnit.Framework; using System.Linq; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner.StepText { diff --git a/TestStack.BDDfy.Tests/Scanner/StepText/ExecutableAttributeScannerTests.cs b/TestStack.BDDfy.Tests/Scanner/StepText/ExecutableAttributeScannerTests.cs index 2c25c613..11bf42f1 100644 --- a/TestStack.BDDfy.Tests/Scanner/StepText/ExecutableAttributeScannerTests.cs +++ b/TestStack.BDDfy.Tests/Scanner/StepText/ExecutableAttributeScannerTests.cs @@ -1,7 +1,5 @@ using System.Linq; using NUnit.Framework; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner.StepText { diff --git a/TestStack.BDDfy.Tests/Scanner/WhenCombinationOfExecutableAttributeAndMethodNamingConventionIsUsed.cs b/TestStack.BDDfy.Tests/Scanner/WhenCombinationOfExecutableAttributeAndMethodNamingConventionIsUsed.cs index 32a0903d..e96f0d67 100644 --- a/TestStack.BDDfy.Tests/Scanner/WhenCombinationOfExecutableAttributeAndMethodNamingConventionIsUsed.cs +++ b/TestStack.BDDfy.Tests/Scanner/WhenCombinationOfExecutableAttributeAndMethodNamingConventionIsUsed.cs @@ -2,8 +2,6 @@ using NUnit.Framework; using System.Linq; using TestStack.BDDfy.Configuration; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner { diff --git a/TestStack.BDDfy.Tests/Scanner/WhenMethodNamesFollowNamingConventionsOtherThanGivenWhenThen.cs b/TestStack.BDDfy.Tests/Scanner/WhenMethodNamesFollowNamingConventionsOtherThanGivenWhenThen.cs index ac0ee83f..d33f54a8 100644 --- a/TestStack.BDDfy.Tests/Scanner/WhenMethodNamesFollowNamingConventionsOtherThanGivenWhenThen.cs +++ b/TestStack.BDDfy.Tests/Scanner/WhenMethodNamesFollowNamingConventionsOtherThanGivenWhenThen.cs @@ -3,8 +3,6 @@ using NUnit.Framework; using System.Linq; using TestStack.BDDfy.Configuration; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner { diff --git a/TestStack.BDDfy.Tests/Scanner/WhenStepScannerFactoryAsyncMethods.cs b/TestStack.BDDfy.Tests/Scanner/WhenStepScannerFactoryAsyncMethods.cs index 11a58993..147b6576 100644 --- a/TestStack.BDDfy.Tests/Scanner/WhenStepScannerFactoryAsyncMethods.cs +++ b/TestStack.BDDfy.Tests/Scanner/WhenStepScannerFactoryAsyncMethods.cs @@ -3,7 +3,6 @@ using System.Reflection; using System.Threading.Tasks; using NUnit.Framework; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner { diff --git a/TestStack.BDDfy.Tests/Scanner/WhenStepsAreDefinedInABaseClass.cs b/TestStack.BDDfy.Tests/Scanner/WhenStepsAreDefinedInABaseClass.cs index 761bc74c..38d299e8 100644 --- a/TestStack.BDDfy.Tests/Scanner/WhenStepsAreDefinedInABaseClass.cs +++ b/TestStack.BDDfy.Tests/Scanner/WhenStepsAreDefinedInABaseClass.cs @@ -1,14 +1,13 @@ using NUnit.Framework; using System.Linq; using TestStack.BDDfy.Configuration; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Tests.Scanner { [TestFixture] public class WhenStepsAreDefinedInABaseClass { - private Core.Story _story; + private Story _story; class TheBaseClass { diff --git a/TestStack.BDDfy.Tests/Scanner/WhenStepsReturnTheirText.cs b/TestStack.BDDfy.Tests/Scanner/WhenStepsReturnTheirText.cs index 66c882d0..edbb649a 100644 --- a/TestStack.BDDfy.Tests/Scanner/WhenStepsReturnTheirText.cs +++ b/TestStack.BDDfy.Tests/Scanner/WhenStepsReturnTheirText.cs @@ -1,8 +1,6 @@ using System.Collections.Generic; using System.Linq; using NUnit.Framework; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner { diff --git a/TestStack.BDDfy.Tests/Scanner/WhenTestClassFollowsGivenWhenThenNamingConvention.cs b/TestStack.BDDfy.Tests/Scanner/WhenTestClassFollowsGivenWhenThenNamingConvention.cs index af8dc283..271a35bb 100644 --- a/TestStack.BDDfy.Tests/Scanner/WhenTestClassFollowsGivenWhenThenNamingConvention.cs +++ b/TestStack.BDDfy.Tests/Scanner/WhenTestClassFollowsGivenWhenThenNamingConvention.cs @@ -1,8 +1,6 @@ using System.Collections.Generic; using NUnit.Framework; using System.Linq; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner { diff --git a/TestStack.BDDfy.Tests/Scanner/WhenTestClassUsesExecutableAttributes.cs b/TestStack.BDDfy.Tests/Scanner/WhenTestClassUsesExecutableAttributes.cs index 17ea100c..caf1ecba 100644 --- a/TestStack.BDDfy.Tests/Scanner/WhenTestClassUsesExecutableAttributes.cs +++ b/TestStack.BDDfy.Tests/Scanner/WhenTestClassUsesExecutableAttributes.cs @@ -3,8 +3,6 @@ using System.Linq; using NUnit.Framework; using TestStack.BDDfy.Configuration; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Tests.Scanner { diff --git a/TestStack.BDDfy.Tests/Story/DummyScenario.cs b/TestStack.BDDfy.Tests/Stories/DummyScenario.cs similarity index 82% rename from TestStack.BDDfy.Tests/Story/DummyScenario.cs rename to TestStack.BDDfy.Tests/Stories/DummyScenario.cs index 53959900..1b1727f4 100644 --- a/TestStack.BDDfy.Tests/Story/DummyScenario.cs +++ b/TestStack.BDDfy.Tests/Stories/DummyScenario.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Tests.Story +namespace TestStack.BDDfy.Tests.Stories { public class DummyScenario { diff --git a/TestStack.BDDfy.Tests/Story/SharedStoryNotion.cs b/TestStack.BDDfy.Tests/Stories/SharedStoryNotion.cs similarity index 78% rename from TestStack.BDDfy.Tests/Story/SharedStoryNotion.cs rename to TestStack.BDDfy.Tests/Stories/SharedStoryNotion.cs index 81b76d40..5dd1c262 100644 --- a/TestStack.BDDfy.Tests/Story/SharedStoryNotion.cs +++ b/TestStack.BDDfy.Tests/Stories/SharedStoryNotion.cs @@ -1,6 +1,4 @@ -using TestStack.BDDfy.Core; - -namespace TestStack.BDDfy.Tests.Story +namespace TestStack.BDDfy.Tests.Stories { [Story( AsA = "As a programmer", diff --git a/TestStack.BDDfy.Tests/Story/StoryCanBeSpecifiedInFluentMode.cs b/TestStack.BDDfy.Tests/Stories/StoryCanBeSpecifiedInFluentMode.cs similarity index 87% rename from TestStack.BDDfy.Tests/Story/StoryCanBeSpecifiedInFluentMode.cs rename to TestStack.BDDfy.Tests/Stories/StoryCanBeSpecifiedInFluentMode.cs index 02424306..29be61d4 100644 --- a/TestStack.BDDfy.Tests/Story/StoryCanBeSpecifiedInFluentMode.cs +++ b/TestStack.BDDfy.Tests/Stories/StoryCanBeSpecifiedInFluentMode.cs @@ -1,8 +1,6 @@ using NUnit.Framework; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; -namespace TestStack.BDDfy.Tests.Story +namespace TestStack.BDDfy.Tests.Stories { [Story] public class StoryCanBeSpecifiedInFluentMode diff --git a/TestStack.BDDfy.Tests/Story/StoryCanBeSpecifiedInReflectiveMode.cs b/TestStack.BDDfy.Tests/Stories/StoryCanBeSpecifiedInReflectiveMode.cs similarity index 88% rename from TestStack.BDDfy.Tests/Story/StoryCanBeSpecifiedInReflectiveMode.cs rename to TestStack.BDDfy.Tests/Stories/StoryCanBeSpecifiedInReflectiveMode.cs index 4fdcd810..efb19d34 100644 --- a/TestStack.BDDfy.Tests/Story/StoryCanBeSpecifiedInReflectiveMode.cs +++ b/TestStack.BDDfy.Tests/Stories/StoryCanBeSpecifiedInReflectiveMode.cs @@ -1,7 +1,6 @@ using NUnit.Framework; -using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Tests.Story +namespace TestStack.BDDfy.Tests.Stories { [Story] public class StoryCanBeSpecifiedInReflectiveMode diff --git a/TestStack.BDDfy.Tests/Story/StoryClassAndScenarioClassAreTheSame.cs b/TestStack.BDDfy.Tests/Stories/StoryClassAndScenarioClassAreTheSame.cs similarity index 94% rename from TestStack.BDDfy.Tests/Story/StoryClassAndScenarioClassAreTheSame.cs rename to TestStack.BDDfy.Tests/Stories/StoryClassAndScenarioClassAreTheSame.cs index f184c940..8e660abf 100644 --- a/TestStack.BDDfy.Tests/Story/StoryClassAndScenarioClassAreTheSame.cs +++ b/TestStack.BDDfy.Tests/Stories/StoryClassAndScenarioClassAreTheSame.cs @@ -1,14 +1,12 @@ -using NUnit.Framework; using System.Linq; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; +using NUnit.Framework; -namespace TestStack.BDDfy.Tests.Story +namespace TestStack.BDDfy.Tests.Stories { [TestFixture] public class StoryClassAndScenarioClassAreTheSame { - private Core.Story _story; + private Story _story; [Story( AsA = "As a story with no scenarios specified using attributes", diff --git a/TestStack.BDDfy.Tests/Story/StoryClassBase.cs b/TestStack.BDDfy.Tests/Stories/StoryClassBase.cs similarity index 86% rename from TestStack.BDDfy.Tests/Story/StoryClassBase.cs rename to TestStack.BDDfy.Tests/Stories/StoryClassBase.cs index c679d980..3c009e24 100644 --- a/TestStack.BDDfy.Tests/Story/StoryClassBase.cs +++ b/TestStack.BDDfy.Tests/Stories/StoryClassBase.cs @@ -1,6 +1,4 @@ -using TestStack.BDDfy.Core; - -namespace TestStack.BDDfy.Tests.Story +namespace TestStack.BDDfy.Tests.Stories { [Story( Title = StoryTitle, diff --git a/TestStack.BDDfy.Tests/Story/StoryDouble.cs b/TestStack.BDDfy.Tests/Stories/StoryDouble.cs similarity index 90% rename from TestStack.BDDfy.Tests/Story/StoryDouble.cs rename to TestStack.BDDfy.Tests/Stories/StoryDouble.cs index 2183856c..3748af05 100644 --- a/TestStack.BDDfy.Tests/Story/StoryDouble.cs +++ b/TestStack.BDDfy.Tests/Stories/StoryDouble.cs @@ -1,9 +1,7 @@ -using NUnit.Framework; using System.Linq; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; +using NUnit.Framework; -namespace TestStack.BDDfy.Tests.Story +namespace TestStack.BDDfy.Tests.Stories { [Story( AsA = "As a good programmer", diff --git a/TestStack.BDDfy.Tests/Story/StorySubclass.cs b/TestStack.BDDfy.Tests/Stories/StorySubclass.cs similarity index 88% rename from TestStack.BDDfy.Tests/Story/StorySubclass.cs rename to TestStack.BDDfy.Tests/Stories/StorySubclass.cs index 67fb9537..9c6f1c48 100644 --- a/TestStack.BDDfy.Tests/Story/StorySubclass.cs +++ b/TestStack.BDDfy.Tests/Stories/StorySubclass.cs @@ -1,10 +1,10 @@ using NUnit.Framework; -namespace TestStack.BDDfy.Tests.Story +namespace TestStack.BDDfy.Tests.Stories { public class StoryAttributeIsInheritedFromBaseClass : StoryClassBase { - Core.Story _story; + Story _story; [Test] public void Verify() diff --git a/TestStack.BDDfy.Tests/Story/WhenStoryAttibuteMissesAsATextInAsAProperty.cs b/TestStack.BDDfy.Tests/Stories/WhenStoryAttibuteMissesAsATextInAsAProperty.cs similarity index 92% rename from TestStack.BDDfy.Tests/Story/WhenStoryAttibuteMissesAsATextInAsAProperty.cs rename to TestStack.BDDfy.Tests/Stories/WhenStoryAttibuteMissesAsATextInAsAProperty.cs index e3e4d16b..97a493de 100644 --- a/TestStack.BDDfy.Tests/Story/WhenStoryAttibuteMissesAsATextInAsAProperty.cs +++ b/TestStack.BDDfy.Tests/Stories/WhenStoryAttibuteMissesAsATextInAsAProperty.cs @@ -1,7 +1,6 @@ using NUnit.Framework; -using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Tests.Story +namespace TestStack.BDDfy.Tests.Stories { [TestFixture] [Story( diff --git a/TestStack.BDDfy.Tests/Story/WhenStoryAttibuteMissesDuplicateTextsInProperties.cs b/TestStack.BDDfy.Tests/Stories/WhenStoryAttibuteMissesDuplicateTextsInProperties.cs similarity index 92% rename from TestStack.BDDfy.Tests/Story/WhenStoryAttibuteMissesDuplicateTextsInProperties.cs rename to TestStack.BDDfy.Tests/Stories/WhenStoryAttibuteMissesDuplicateTextsInProperties.cs index 0ca56fd6..da424dfe 100644 --- a/TestStack.BDDfy.Tests/Story/WhenStoryAttibuteMissesDuplicateTextsInProperties.cs +++ b/TestStack.BDDfy.Tests/Stories/WhenStoryAttibuteMissesDuplicateTextsInProperties.cs @@ -1,7 +1,6 @@ using NUnit.Framework; -using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Tests.Story +namespace TestStack.BDDfy.Tests.Stories { [TestFixture] [Story( diff --git a/TestStack.BDDfy.Tests/Story/WhenStoryAttibuteMissesIWantTextInIWantProperty.cs b/TestStack.BDDfy.Tests/Stories/WhenStoryAttibuteMissesIWantTextInIWantProperty.cs similarity index 92% rename from TestStack.BDDfy.Tests/Story/WhenStoryAttibuteMissesIWantTextInIWantProperty.cs rename to TestStack.BDDfy.Tests/Stories/WhenStoryAttibuteMissesIWantTextInIWantProperty.cs index ca6a9161..b3d4a33c 100644 --- a/TestStack.BDDfy.Tests/Story/WhenStoryAttibuteMissesIWantTextInIWantProperty.cs +++ b/TestStack.BDDfy.Tests/Stories/WhenStoryAttibuteMissesIWantTextInIWantProperty.cs @@ -1,7 +1,6 @@ using NUnit.Framework; -using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Tests.Story +namespace TestStack.BDDfy.Tests.Stories { [TestFixture] [Story( diff --git a/TestStack.BDDfy.Tests/Story/WhenStoryAttibuteMissesSoThatTextInSoThatProperty.cs b/TestStack.BDDfy.Tests/Stories/WhenStoryAttibuteMissesSoThatTextInSoThatProperty.cs similarity index 92% rename from TestStack.BDDfy.Tests/Story/WhenStoryAttibuteMissesSoThatTextInSoThatProperty.cs rename to TestStack.BDDfy.Tests/Stories/WhenStoryAttibuteMissesSoThatTextInSoThatProperty.cs index 36095e20..05ce40f9 100644 --- a/TestStack.BDDfy.Tests/Story/WhenStoryAttibuteMissesSoThatTextInSoThatProperty.cs +++ b/TestStack.BDDfy.Tests/Stories/WhenStoryAttibuteMissesSoThatTextInSoThatProperty.cs @@ -1,7 +1,6 @@ using NUnit.Framework; -using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Tests.Story +namespace TestStack.BDDfy.Tests.Stories { [TestFixture] [Story( diff --git a/TestStack.BDDfy.Tests/TestStack.BDDfy.Tests.csproj b/TestStack.BDDfy.Tests/TestStack.BDDfy.Tests.csproj index 3922d4c5..477f815f 100644 --- a/TestStack.BDDfy.Tests/TestStack.BDDfy.Tests.csproj +++ b/TestStack.BDDfy.Tests/TestStack.BDDfy.Tests.csproj @@ -99,16 +99,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -122,8 +122,8 @@ - - + + diff --git a/TestStack.BDDfy.Tests/WhenAnEmptyStoryIsBddified.cs b/TestStack.BDDfy.Tests/WhenAnEmptyStoryIsBddified.cs index 3a629976..69507aaa 100644 --- a/TestStack.BDDfy.Tests/WhenAnEmptyStoryIsBddified.cs +++ b/TestStack.BDDfy.Tests/WhenAnEmptyStoryIsBddified.cs @@ -1,5 +1,4 @@ using NUnit.Framework; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Tests { diff --git a/TestStack.BDDfy/BDDfyExtensions.cs b/TestStack.BDDfy/BDDfyExtensions.cs index 874421d4..cb3c4174 100644 --- a/TestStack.BDDfy/BDDfyExtensions.cs +++ b/TestStack.BDDfy/BDDfyExtensions.cs @@ -1,8 +1,6 @@ using System; using System.Linq; using TestStack.BDDfy.Configuration; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy { diff --git a/TestStack.BDDfy/Configuration/BatchProcessorFactory.cs b/TestStack.BDDfy/Configuration/BatchProcessorFactory.cs index 808dad5e..45cccc5f 100644 --- a/TestStack.BDDfy/Configuration/BatchProcessorFactory.cs +++ b/TestStack.BDDfy/Configuration/BatchProcessorFactory.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Configuration { diff --git a/TestStack.BDDfy/Configuration/BatchProcessors.cs b/TestStack.BDDfy/Configuration/BatchProcessors.cs index 77d925c6..c883c2ff 100644 --- a/TestStack.BDDfy/Configuration/BatchProcessors.cs +++ b/TestStack.BDDfy/Configuration/BatchProcessors.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Linq; -using TestStack.BDDfy.Core; using TestStack.BDDfy.Processors; namespace TestStack.BDDfy.Configuration diff --git a/TestStack.BDDfy/Configuration/HtmlReportFactory.cs b/TestStack.BDDfy/Configuration/HtmlReportFactory.cs index 1a9d6cbd..7a7cef5e 100644 --- a/TestStack.BDDfy/Configuration/HtmlReportFactory.cs +++ b/TestStack.BDDfy/Configuration/HtmlReportFactory.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using TestStack.BDDfy.Core; using TestStack.BDDfy.Processors; namespace TestStack.BDDfy.Configuration diff --git a/TestStack.BDDfy/Configuration/ProcessorFactory.cs b/TestStack.BDDfy/Configuration/ProcessorFactory.cs index bd52d2c5..781418ad 100644 --- a/TestStack.BDDfy/Configuration/ProcessorFactory.cs +++ b/TestStack.BDDfy/Configuration/ProcessorFactory.cs @@ -1,5 +1,4 @@ using System; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Configuration { diff --git a/TestStack.BDDfy/Configuration/Processors.cs b/TestStack.BDDfy/Configuration/Processors.cs index 51c31e9d..0e73743c 100644 --- a/TestStack.BDDfy/Configuration/Processors.cs +++ b/TestStack.BDDfy/Configuration/Processors.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using TestStack.BDDfy.Core; using TestStack.BDDfy.Processors; namespace TestStack.BDDfy.Configuration diff --git a/TestStack.BDDfy/Configuration/Scanners.cs b/TestStack.BDDfy/Configuration/Scanners.cs index 127807de..2dd2a2f6 100644 --- a/TestStack.BDDfy/Configuration/Scanners.cs +++ b/TestStack.BDDfy/Configuration/Scanners.cs @@ -1,7 +1,5 @@ using System; using System.Collections.Generic; -using TestStack.BDDfy.Core; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Configuration { diff --git a/TestStack.BDDfy/Configuration/StepScannerFactory.cs b/TestStack.BDDfy/Configuration/StepScannerFactory.cs index 8a774805..db4d6881 100644 --- a/TestStack.BDDfy/Configuration/StepScannerFactory.cs +++ b/TestStack.BDDfy/Configuration/StepScannerFactory.cs @@ -1,5 +1,4 @@ using System; -using TestStack.BDDfy.Scanners; namespace TestStack.BDDfy.Configuration { diff --git a/TestStack.BDDfy/Configuration/TestRunnerFactory.cs b/TestStack.BDDfy/Configuration/TestRunnerFactory.cs index 55e58c1c..9b082e24 100644 --- a/TestStack.BDDfy/Configuration/TestRunnerFactory.cs +++ b/TestStack.BDDfy/Configuration/TestRunnerFactory.cs @@ -1,5 +1,4 @@ using System; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Configuration { diff --git a/TestStack.BDDfy/Core/Engine.cs b/TestStack.BDDfy/Core/Engine.cs index b0eabd89..3587cd9e 100644 --- a/TestStack.BDDfy/Core/Engine.cs +++ b/TestStack.BDDfy/Core/Engine.cs @@ -3,7 +3,7 @@ using TestStack.BDDfy.Configuration; using TestStack.BDDfy.Processors; -namespace TestStack.BDDfy.Core +namespace TestStack.BDDfy { public class Engine { diff --git a/TestStack.BDDfy/Core/ExecutionOrder.cs b/TestStack.BDDfy/Core/ExecutionOrder.cs index 83e5b34a..5908957b 100644 --- a/TestStack.BDDfy/Core/ExecutionOrder.cs +++ b/TestStack.BDDfy/Core/ExecutionOrder.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Core +namespace TestStack.BDDfy { public enum ExecutionOrder { diff --git a/TestStack.BDDfy/Core/ExecutionStep.cs b/TestStack.BDDfy/Core/ExecutionStep.cs index addeff50..70c28a98 100644 --- a/TestStack.BDDfy/Core/ExecutionStep.cs +++ b/TestStack.BDDfy/Core/ExecutionStep.cs @@ -1,7 +1,7 @@ using System; using System.Diagnostics; -namespace TestStack.BDDfy.Core +namespace TestStack.BDDfy { public class ExecutionStep { diff --git a/TestStack.BDDfy/Core/IBatchProcessor.cs b/TestStack.BDDfy/Core/IBatchProcessor.cs index a92a54d7..95d1dc65 100644 --- a/TestStack.BDDfy/Core/IBatchProcessor.cs +++ b/TestStack.BDDfy/Core/IBatchProcessor.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace TestStack.BDDfy.Core +namespace TestStack.BDDfy { public interface IBatchProcessor { diff --git a/TestStack.BDDfy/Core/IHasScanner.cs b/TestStack.BDDfy/Core/IHasScanner.cs index f1edb180..c1d0013a 100644 --- a/TestStack.BDDfy/Core/IHasScanner.cs +++ b/TestStack.BDDfy/Core/IHasScanner.cs @@ -1,6 +1,6 @@ using System; -namespace TestStack.BDDfy.Core +namespace TestStack.BDDfy { public interface IHasScanner { diff --git a/TestStack.BDDfy/Core/IProcessor.cs b/TestStack.BDDfy/Core/IProcessor.cs index 1a89547b..3f8d7ec5 100644 --- a/TestStack.BDDfy/Core/IProcessor.cs +++ b/TestStack.BDDfy/Core/IProcessor.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Core +namespace TestStack.BDDfy { public interface IProcessor { diff --git a/TestStack.BDDfy/Core/IScanner.cs b/TestStack.BDDfy/Core/IScanner.cs index 844e01e1..8a37b6f0 100644 --- a/TestStack.BDDfy/Core/IScanner.cs +++ b/TestStack.BDDfy/Core/IScanner.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Core +namespace TestStack.BDDfy { public interface IScanner { diff --git a/TestStack.BDDfy/Core/NetToString.cs b/TestStack.BDDfy/Core/NetToString.cs index 55a77cc7..d1f6851a 100644 --- a/TestStack.BDDfy/Core/NetToString.cs +++ b/TestStack.BDDfy/Core/NetToString.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace TestStack.BDDfy.Core +namespace TestStack.BDDfy { public class NetToString { diff --git a/TestStack.BDDfy/Core/ProcessType.cs b/TestStack.BDDfy/Core/ProcessType.cs index 686409a3..8e27e83e 100644 --- a/TestStack.BDDfy/Core/ProcessType.cs +++ b/TestStack.BDDfy/Core/ProcessType.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Core +namespace TestStack.BDDfy { public enum ProcessType { diff --git a/TestStack.BDDfy/Core/RunStepWithArgsAttribute.cs b/TestStack.BDDfy/Core/RunStepWithArgsAttribute.cs index df2f24c7..2367f20f 100644 --- a/TestStack.BDDfy/Core/RunStepWithArgsAttribute.cs +++ b/TestStack.BDDfy/Core/RunStepWithArgsAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace TestStack.BDDfy.Core +namespace TestStack.BDDfy { [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] public class RunStepWithArgsAttribute : Attribute diff --git a/TestStack.BDDfy/Core/Scenario.cs b/TestStack.BDDfy/Core/Scenario.cs index 5667055c..69e2ae48 100644 --- a/TestStack.BDDfy/Core/Scenario.cs +++ b/TestStack.BDDfy/Core/Scenario.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Reflection; -namespace TestStack.BDDfy.Core +namespace TestStack.BDDfy { public class Scenario { diff --git a/TestStack.BDDfy/Core/StepExecutionResult.cs b/TestStack.BDDfy/Core/StepExecutionResult.cs index 67b04622..838fa27b 100644 --- a/TestStack.BDDfy/Core/StepExecutionResult.cs +++ b/TestStack.BDDfy/Core/StepExecutionResult.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Core +namespace TestStack.BDDfy { public enum StepExecutionResult { diff --git a/TestStack.BDDfy/Core/Story.cs b/TestStack.BDDfy/Core/Story.cs index e9d6e5eb..a9b7bd75 100644 --- a/TestStack.BDDfy/Core/Story.cs +++ b/TestStack.BDDfy/Core/Story.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace TestStack.BDDfy.Core +namespace TestStack.BDDfy { public class Story { diff --git a/TestStack.BDDfy/Core/StoryAttribute.cs b/TestStack.BDDfy/Core/StoryAttribute.cs index 5db67352..3341ef90 100644 --- a/TestStack.BDDfy/Core/StoryAttribute.cs +++ b/TestStack.BDDfy/Core/StoryAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace TestStack.BDDfy.Core +namespace TestStack.BDDfy { [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)] public class StoryAttribute : Attribute diff --git a/TestStack.BDDfy/Core/StoryMetaData.cs b/TestStack.BDDfy/Core/StoryMetaData.cs index 561c9e0a..0346f90f 100644 --- a/TestStack.BDDfy/Core/StoryMetaData.cs +++ b/TestStack.BDDfy/Core/StoryMetaData.cs @@ -1,7 +1,7 @@ using System; using System.Text; -namespace TestStack.BDDfy.Core +namespace TestStack.BDDfy { public class StoryMetaData { diff --git a/TestStack.BDDfy/Processors/Disposer.cs b/TestStack.BDDfy/Processors/Disposer.cs index 95ff6129..02267431 100644 --- a/TestStack.BDDfy/Processors/Disposer.cs +++ b/TestStack.BDDfy/Processors/Disposer.cs @@ -1,5 +1,4 @@ using System.Linq; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Processors { diff --git a/TestStack.BDDfy/Processors/ExceptionProcessor.cs b/TestStack.BDDfy/Processors/ExceptionProcessor.cs index 9dbe4b25..9537f72c 100644 --- a/TestStack.BDDfy/Processors/ExceptionProcessor.cs +++ b/TestStack.BDDfy/Processors/ExceptionProcessor.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Processors { diff --git a/TestStack.BDDfy/Processors/Reporters/ConsoleReporter.cs b/TestStack.BDDfy/Processors/Reporters/ConsoleReporter.cs index 5c08d574..59b70d1d 100644 --- a/TestStack.BDDfy/Processors/Reporters/ConsoleReporter.cs +++ b/TestStack.BDDfy/Processors/Reporters/ConsoleReporter.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using TestStack.BDDfy.Configuration; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Processors { diff --git a/TestStack.BDDfy/Processors/Reporters/Diagnostics/DiagnosticsReporter.cs b/TestStack.BDDfy/Processors/Reporters/Diagnostics/DiagnosticsReporter.cs index 33aa38fc..ca2a8836 100644 --- a/TestStack.BDDfy/Processors/Reporters/Diagnostics/DiagnosticsReporter.cs +++ b/TestStack.BDDfy/Processors/Reporters/Diagnostics/DiagnosticsReporter.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Processors { @@ -17,7 +16,7 @@ public DiagnosticsReporter(IReportBuilder builder, IReportWriter writer) _writer = writer; } - public void Process(IEnumerable stories) + public void Process(IEnumerable stories) { const string error = "There was an error compiling the json report: "; var viewModel = new FileReportModel(stories); diff --git a/TestStack.BDDfy/Processors/Reporters/FileReportModel.cs b/TestStack.BDDfy/Processors/Reporters/FileReportModel.cs index dfc29737..7d98ce32 100644 --- a/TestStack.BDDfy/Processors/Reporters/FileReportModel.cs +++ b/TestStack.BDDfy/Processors/Reporters/FileReportModel.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Linq; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Processors { diff --git a/TestStack.BDDfy/Processors/Reporters/FileReportSummaryModel.cs b/TestStack.BDDfy/Processors/Reporters/FileReportSummaryModel.cs index 137c8bff..f6cdc6c3 100644 --- a/TestStack.BDDfy/Processors/Reporters/FileReportSummaryModel.cs +++ b/TestStack.BDDfy/Processors/Reporters/FileReportSummaryModel.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Linq; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Processors { diff --git a/TestStack.BDDfy/Processors/Reporters/Html/DefaultHtmlReportConfiguration.cs b/TestStack.BDDfy/Processors/Reporters/Html/DefaultHtmlReportConfiguration.cs index 3d33d20c..f9bd1216 100644 --- a/TestStack.BDDfy/Processors/Reporters/Html/DefaultHtmlReportConfiguration.cs +++ b/TestStack.BDDfy/Processors/Reporters/Html/DefaultHtmlReportConfiguration.cs @@ -1,7 +1,6 @@ using System; using System.IO; using System.Reflection; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Processors { diff --git a/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportBuilder.cs b/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportBuilder.cs index 38eb43c5..2e090fef 100644 --- a/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportBuilder.cs +++ b/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportBuilder.cs @@ -1,7 +1,6 @@ using System; using System.Linq; using System.Text; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Processors { diff --git a/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportViewModel.cs b/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportViewModel.cs index 8db628bf..030462a9 100644 --- a/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportViewModel.cs +++ b/TestStack.BDDfy/Processors/Reporters/Html/HtmlReportViewModel.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Processors { diff --git a/TestStack.BDDfy/Processors/Reporters/Html/HtmlReporter.cs b/TestStack.BDDfy/Processors/Reporters/Html/HtmlReporter.cs index 58956f9f..25c6b0be 100644 --- a/TestStack.BDDfy/Processors/Reporters/Html/HtmlReporter.cs +++ b/TestStack.BDDfy/Processors/Reporters/Html/HtmlReporter.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Processors { diff --git a/TestStack.BDDfy/Processors/Reporters/Html/IHtmlReportConfiguration.cs b/TestStack.BDDfy/Processors/Reporters/Html/IHtmlReportConfiguration.cs index 4a4a412a..9e391075 100644 --- a/TestStack.BDDfy/Processors/Reporters/Html/IHtmlReportConfiguration.cs +++ b/TestStack.BDDfy/Processors/Reporters/Html/IHtmlReportConfiguration.cs @@ -1,5 +1,3 @@ -using TestStack.BDDfy.Core; - namespace TestStack.BDDfy.Processors { public interface IHtmlReportConfiguration diff --git a/TestStack.BDDfy/Processors/Reporters/MarkDown/MarkDownReporter.cs b/TestStack.BDDfy/Processors/Reporters/MarkDown/MarkDownReporter.cs index 84e81eb5..8c24351f 100644 --- a/TestStack.BDDfy/Processors/Reporters/MarkDown/MarkDownReporter.cs +++ b/TestStack.BDDfy/Processors/Reporters/MarkDown/MarkDownReporter.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Processors { diff --git a/TestStack.BDDfy/Processors/StoryCache.cs b/TestStack.BDDfy/Processors/StoryCache.cs index 37d88528..14ee8c8e 100644 --- a/TestStack.BDDfy/Processors/StoryCache.cs +++ b/TestStack.BDDfy/Processors/StoryCache.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using TestStack.BDDfy.Core; namespace TestStack.BDDfy.Processors { diff --git a/TestStack.BDDfy/Processors/TestRunner.cs b/TestStack.BDDfy/Processors/TestRunner.cs index 19592554..cc30f5da 100644 --- a/TestStack.BDDfy/Processors/TestRunner.cs +++ b/TestStack.BDDfy/Processors/TestRunner.cs @@ -1,6 +1,4 @@ -using TestStack.BDDfy.Core; - -namespace TestStack.BDDfy.Processors +namespace TestStack.BDDfy.Processors { public class TestRunner : IProcessor { diff --git a/TestStack.BDDfy/Scanners/DefaultScanner.cs b/TestStack.BDDfy/Scanners/DefaultScanner.cs index d09ab591..b21965d0 100644 --- a/TestStack.BDDfy/Scanners/DefaultScanner.cs +++ b/TestStack.BDDfy/Scanners/DefaultScanner.cs @@ -1,8 +1,7 @@ using System; using TestStack.BDDfy.Configuration; -using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public class DefaultScanner : IScanner { diff --git a/TestStack.BDDfy/Scanners/IStoryMetaDataScanner.cs b/TestStack.BDDfy/Scanners/IStoryMetaDataScanner.cs index e37112a3..412a910a 100644 --- a/TestStack.BDDfy/Scanners/IStoryMetaDataScanner.cs +++ b/TestStack.BDDfy/Scanners/IStoryMetaDataScanner.cs @@ -1,7 +1,6 @@ using System; -using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public interface IStoryMetaDataScanner { diff --git a/TestStack.BDDfy/Scanners/ScenarioScanners/FluentScenarioScanner.cs b/TestStack.BDDfy/Scanners/ScenarioScanners/FluentScenarioScanner.cs index f57f68bf..6cbd94d8 100644 --- a/TestStack.BDDfy/Scanners/ScenarioScanners/FluentScenarioScanner.cs +++ b/TestStack.BDDfy/Scanners/ScenarioScanners/FluentScenarioScanner.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using System.Linq; using System.Diagnostics; -using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public class FluentScenarioScanner : IScenarioScanner { diff --git a/TestStack.BDDfy/Scanners/ScenarioScanners/IScenarioScanner.cs b/TestStack.BDDfy/Scanners/ScenarioScanners/IScenarioScanner.cs index f07e2978..490494b7 100644 --- a/TestStack.BDDfy/Scanners/ScenarioScanners/IScenarioScanner.cs +++ b/TestStack.BDDfy/Scanners/ScenarioScanners/IScenarioScanner.cs @@ -1,6 +1,4 @@ -using TestStack.BDDfy.Core; - -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public interface IScenarioScanner { diff --git a/TestStack.BDDfy/Scanners/ScenarioScanners/ReflectiveScenarioScanner.cs b/TestStack.BDDfy/Scanners/ScenarioScanners/ReflectiveScenarioScanner.cs index 965ae948..b19712bb 100644 --- a/TestStack.BDDfy/Scanners/ScenarioScanners/ReflectiveScenarioScanner.cs +++ b/TestStack.BDDfy/Scanners/ScenarioScanners/ReflectiveScenarioScanner.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public class ReflectiveScenarioScanner : IScenarioScanner { diff --git a/TestStack.BDDfy/Scanners/StepScanners/AsyncTestSyncContext.cs b/TestStack.BDDfy/Scanners/StepScanners/AsyncTestSyncContext.cs index fc8b2b7f..0452c7eb 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/AsyncTestSyncContext.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/AsyncTestSyncContext.cs @@ -1,7 +1,7 @@ using System; using System.Threading; -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { /// /// Implementation from xUnit 2.0 diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttribute.cs index 3e627e1a..be929223 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttribute.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttribute.cs @@ -1,7 +1,6 @@ using System; -using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] public class ExecutableAttribute : Attribute diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttributeStepScanner.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttributeStepScanner.cs index f6a43f60..532d25cf 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttributeStepScanner.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/ExecutableAttributeStepScanner.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { /// /// Uses reflection to scan scenario class for steps by looking for diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndGivenAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndGivenAttribute.cs index bbfda932..a1f034d1 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndGivenAttribute.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndGivenAttribute.cs @@ -1,8 +1,8 @@ -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public class AndGivenAttribute : ExecutableAttribute { public AndGivenAttribute() : this(null) { } - public AndGivenAttribute(string stepTitle) : base(Core.ExecutionOrder.ConsecutiveSetupState, stepTitle) { } + public AndGivenAttribute(string stepTitle) : base(ExecutionOrder.ConsecutiveSetupState, stepTitle) { } } } \ No newline at end of file diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndThenAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndThenAttribute.cs index 1b75ebfd..5d4bf405 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndThenAttribute.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndThenAttribute.cs @@ -1,10 +1,10 @@ -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public class AndThenAttribute : ExecutableAttribute { public AndThenAttribute() : this(null) { } - public AndThenAttribute(string stepTitle) : base(Core.ExecutionOrder.ConsecutiveAssertion, stepTitle) + public AndThenAttribute(string stepTitle) : base(ExecutionOrder.ConsecutiveAssertion, stepTitle) { Asserts = true; } diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndWhenAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndWhenAttribute.cs index 97032433..9956eada 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndWhenAttribute.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/AndWhenAttribute.cs @@ -1,8 +1,8 @@ -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public class AndWhenAttribute : ExecutableAttribute { public AndWhenAttribute() : this(null) { } - public AndWhenAttribute(string stepTitle) : base(Core.ExecutionOrder.ConsecutiveTransition, stepTitle) { } + public AndWhenAttribute(string stepTitle) : base(ExecutionOrder.ConsecutiveTransition, stepTitle) { } } } \ No newline at end of file diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/GivenAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/GivenAttribute.cs index 250ec631..4fe2cb04 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/GivenAttribute.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/GivenAttribute.cs @@ -1,8 +1,8 @@ -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public class GivenAttribute : ExecutableAttribute { public GivenAttribute() : this(null) { } - public GivenAttribute(string stepTitle) : base(Core.ExecutionOrder.SetupState, stepTitle) { } + public GivenAttribute(string stepTitle) : base(ExecutionOrder.SetupState, stepTitle) { } } } \ No newline at end of file diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/ThenAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/ThenAttribute.cs index 9f704066..0598dc36 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/ThenAttribute.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/ThenAttribute.cs @@ -1,10 +1,10 @@ -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public class ThenAttribute : ExecutableAttribute { public ThenAttribute() : this(null) { } - public ThenAttribute(string stepTitle) : base(Core.ExecutionOrder.Assertion, stepTitle) + public ThenAttribute(string stepTitle) : base(ExecutionOrder.Assertion, stepTitle) { Asserts = true; } diff --git a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/WhenAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/WhenAttribute.cs index c3fc457a..36ba9de9 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/WhenAttribute.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/ExecutableAttribute/GwtAttributes/WhenAttribute.cs @@ -1,8 +1,8 @@ -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public class WhenAttribute : ExecutableAttribute { public WhenAttribute() : this(null) { } - public WhenAttribute(string stepTitle) : base(Core.ExecutionOrder.Transition, stepTitle) { } + public WhenAttribute(string stepTitle) : base(ExecutionOrder.Transition, stepTitle) { } } } \ No newline at end of file diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/ExpressionExtensions.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/ExpressionExtensions.cs index 1f425327..5e5490d0 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/ExpressionExtensions.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/ExpressionExtensions.cs @@ -5,7 +5,7 @@ using System.Linq.Expressions; using System.Reflection; -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public static class ExpressionExtensions { diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScanner.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScanner.cs index 22722761..80051df6 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScanner.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScanner.cs @@ -3,13 +3,12 @@ using System.Linq.Expressions; using System.Reflection; using System.Linq; -using TestStack.BDDfy.Core; #if !NET35 using System.Threading.Tasks; #endif -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { /// /// Provides an alternative method of implementing stories and scenarios. diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScannerExtensions.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScannerExtensions.cs index 22cda802..1c65aff3 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScannerExtensions.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/FluentScannerExtensions.cs @@ -3,7 +3,7 @@ // ReSharper disable CheckNamespace // This is in BDDfy namespace to make its usage simpler -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy // ReSharper restore CheckNamespace { public static class FluentStepScannerExtensions diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndGiven.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndGiven.cs index a8e248ff..57b90e65 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndGiven.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndGiven.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public interface IAndGiven : IGiven { diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndThen.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndThen.cs index 6e37d967..85fec440 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndThen.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndThen.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public interface IAndThen : IThen { diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndWhen.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndWhen.cs index 384130e7..a5533851 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndWhen.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IAndWhen.cs @@ -1,4 +1,4 @@ -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public interface IAndWhen : IWhen { diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IFluentScanner.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IFluentScanner.cs index 04be445d..c4478b9d 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IFluentScanner.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IFluentScanner.cs @@ -1,8 +1,7 @@ using System; using System.Linq.Expressions; -using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public interface IFluentScanner : IHasScanner { diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IGiven.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IGiven.cs index 3a5c3c61..11b4f6db 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IGiven.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IGiven.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; #endif -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public interface IGiven { diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IInitialStep.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IInitialStep.cs index d36d83d2..f08618eb 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IInitialStep.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IInitialStep.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; #endif -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public interface IInitialStep { diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IThen.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IThen.cs index 5f8f1651..cec0e055 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IThen.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IThen.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; #endif -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public interface IThen : IFluentScanner { diff --git a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IWhen.cs b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IWhen.cs index f91be29d..e7aac70c 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/Fluent/IWhen.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/Fluent/IWhen.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; #endif -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public interface IWhen : IFluentScanner { diff --git a/TestStack.BDDfy/Scanners/StepScanners/IStepScanner.cs b/TestStack.BDDfy/Scanners/StepScanners/IStepScanner.cs index c55ea79b..bca922ef 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/IStepScanner.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/IStepScanner.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.Reflection; -using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public interface IStepScanner { diff --git a/TestStack.BDDfy/Scanners/StepScanners/IgnoreStepAttribute.cs b/TestStack.BDDfy/Scanners/StepScanners/IgnoreStepAttribute.cs index b4273274..2d45c610 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/IgnoreStepAttribute.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/IgnoreStepAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { /// /// A method attribute used to specify to the ExecutableAttributeStepScanner that it should ignore a method as a step diff --git a/TestStack.BDDfy/Scanners/StepScanners/MethodName/DefaultMethodNameStepScanner.cs b/TestStack.BDDfy/Scanners/StepScanners/MethodName/DefaultMethodNameStepScanner.cs index d95e6119..ed21388c 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/MethodName/DefaultMethodNameStepScanner.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/MethodName/DefaultMethodNameStepScanner.cs @@ -1,7 +1,6 @@ using System; -using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public class DefaultMethodNameStepScanner : MethodNameStepScanner { diff --git a/TestStack.BDDfy/Scanners/StepScanners/MethodName/MethodNameMatcher.cs b/TestStack.BDDfy/Scanners/StepScanners/MethodName/MethodNameMatcher.cs index c3fd3541..84f13504 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/MethodName/MethodNameMatcher.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/MethodName/MethodNameMatcher.cs @@ -1,7 +1,6 @@ using System; -using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public class MethodNameMatcher { diff --git a/TestStack.BDDfy/Scanners/StepScanners/MethodName/MethodNameStepScanner.cs b/TestStack.BDDfy/Scanners/StepScanners/MethodName/MethodNameStepScanner.cs index 17025156..3e8bb170 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/MethodName/MethodNameStepScanner.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/MethodName/MethodNameStepScanner.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Reflection; using System.Linq; -using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { /// /// Uses reflection to scan a scenario class for steps using method name conventions diff --git a/TestStack.BDDfy/Scanners/StepScanners/StepActionFactory.cs b/TestStack.BDDfy/Scanners/StepScanners/StepActionFactory.cs index 067a4c0e..8af7f323 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/StepActionFactory.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/StepActionFactory.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; #endif -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public class StepActionFactory { diff --git a/TestStack.BDDfy/Scanners/StepScanners/StepScannerExtensions.cs b/TestStack.BDDfy/Scanners/StepScanners/StepScannerExtensions.cs index 85f09928..45f20e4b 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/StepScannerExtensions.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/StepScannerExtensions.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { internal static class StepScannerExtensions { diff --git a/TestStack.BDDfy/Scanners/StepScanners/StepTitleException.cs b/TestStack.BDDfy/Scanners/StepScanners/StepTitleException.cs index 526975a0..09c4dc1c 100644 --- a/TestStack.BDDfy/Scanners/StepScanners/StepTitleException.cs +++ b/TestStack.BDDfy/Scanners/StepScanners/StepTitleException.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.Serialization; -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public class StepTitleException : Exception { diff --git a/TestStack.BDDfy/Scanners/StoryAttributeMetaDataScanner.cs b/TestStack.BDDfy/Scanners/StoryAttributeMetaDataScanner.cs index 98a5a241..20835612 100644 --- a/TestStack.BDDfy/Scanners/StoryAttributeMetaDataScanner.cs +++ b/TestStack.BDDfy/Scanners/StoryAttributeMetaDataScanner.cs @@ -1,9 +1,8 @@ using System; using System.Diagnostics; using System.Linq; -using TestStack.BDDfy.Core; -namespace TestStack.BDDfy.Scanners +namespace TestStack.BDDfy { public class StoryAttributeMetaDataScanner : IStoryMetaDataScanner {