diff --git a/TechTalk.SpecFlow.sln b/TechTalk.SpecFlow.sln index 858ae9903..0347debaa 100644 --- a/TechTalk.SpecFlow.sln +++ b/TechTalk.SpecFlow.sln @@ -33,8 +33,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImportGherkinParser", "Inst EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FeatureTests", "Tests\FeatureTests\FeatureTests.csproj", "{3FE793A8-E662-4026-B4EC-891324073235}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ExternalStepsVB", "Tests\FeatureTests\ExternalSteps\ExternalStepsVB\ExternalStepsVB.vbproj", "{D3F6B835-B228-4DCF-B533-B6ED469A33B3}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExternalStepsCS", "Tests\FeatureTests\ExternalSteps\ExternalStepsCS\ExternalStepsCS.csproj", "{3836A6FC-4ECC-413A-AC8F-83A0A773EC9E}" EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SpecFlowInstaller", "Installer\SpecFlowInstaller\SpecFlowInstaller.wixproj", "{89167EB9-F458-48DA-9D8F-F639A74F5871}" @@ -159,16 +157,6 @@ Global {3FE793A8-E662-4026-B4EC-891324073235}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {3FE793A8-E662-4026-B4EC-891324073235}.Release|Mixed Platforms.Build.0 = Release|Any CPU {3FE793A8-E662-4026-B4EC-891324073235}.Release|x86.ActiveCfg = Release|Any CPU - {D3F6B835-B228-4DCF-B533-B6ED469A33B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3F6B835-B228-4DCF-B533-B6ED469A33B3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3F6B835-B228-4DCF-B533-B6ED469A33B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {D3F6B835-B228-4DCF-B533-B6ED469A33B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {D3F6B835-B228-4DCF-B533-B6ED469A33B3}.Debug|x86.ActiveCfg = Debug|Any CPU - {D3F6B835-B228-4DCF-B533-B6ED469A33B3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3F6B835-B228-4DCF-B533-B6ED469A33B3}.Release|Any CPU.Build.0 = Release|Any CPU - {D3F6B835-B228-4DCF-B533-B6ED469A33B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {D3F6B835-B228-4DCF-B533-B6ED469A33B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {D3F6B835-B228-4DCF-B533-B6ED469A33B3}.Release|x86.ActiveCfg = Release|Any CPU {3836A6FC-4ECC-413A-AC8F-83A0A773EC9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3836A6FC-4ECC-413A-AC8F-83A0A773EC9E}.Debug|Any CPU.Build.0 = Debug|Any CPU {3836A6FC-4ECC-413A-AC8F-83A0A773EC9E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -220,7 +208,6 @@ Global {70376361-0BE1-478D-8EEC-47BD1C768165} = {A10B5CD6-38EC-4D7E-9D1C-2EBA8017E437} {F8FACCF0-5497-4C6B-861F-78D72FD9561B} = {A10B5CD6-38EC-4D7E-9D1C-2EBA8017E437} {3FE793A8-E662-4026-B4EC-891324073235} = {A10B5CD6-38EC-4D7E-9D1C-2EBA8017E437} - {D3F6B835-B228-4DCF-B533-B6ED469A33B3} = {A10B5CD6-38EC-4D7E-9D1C-2EBA8017E437} {3836A6FC-4ECC-413A-AC8F-83A0A773EC9E} = {A10B5CD6-38EC-4D7E-9D1C-2EBA8017E437} {1965463E-6972-4618-8E59-D3259AE7A125} = {A10B5CD6-38EC-4D7E-9D1C-2EBA8017E437} {E5C299D5-E7CC-4477-9A0B-4797B74BC88B} = {A10B5CD6-38EC-4D7E-9D1C-2EBA8017E437} diff --git a/Tests/FeatureTests/App.config b/Tests/FeatureTests/App.config index 6c026b5ed..3e4445223 100644 --- a/Tests/FeatureTests/App.config +++ b/Tests/FeatureTests/App.config @@ -22,7 +22,6 @@ /> - diff --git a/Tests/FeatureTests/ExternalSteps/ExternalSteps.feature b/Tests/FeatureTests/ExternalSteps/ExternalSteps.feature index f78ac1c99..9d39880a8 100644 --- a/Tests/FeatureTests/ExternalSteps/ExternalSteps.feature +++ b/Tests/FeatureTests/ExternalSteps/ExternalSteps.feature @@ -3,7 +3,7 @@ As a bdd enthusiast I want to use step definitions from other assemblies -Scenario: Steps defined in an external VB project and an external c-sharp project +Scenario: Steps defined in an external .NET (e.g. c# or VB.NET) Given I have external step definitions in a separate assembly referenced by this project When I call those steps Then the scenario should pass diff --git a/Tests/FeatureTests/ExternalSteps/ExternalSteps.feature.cs b/Tests/FeatureTests/ExternalSteps/ExternalSteps.feature.cs index 9b747e21d..85172f0d2 100644 --- a/Tests/FeatureTests/ExternalSteps/ExternalSteps.feature.cs +++ b/Tests/FeatureTests/ExternalSteps/ExternalSteps.feature.cs @@ -1,7 +1,7 @@ // ------------------------------------------------------------------------------ // // This code was generated by SpecFlow (http://www.specflow.org/). -// SpecFlow Version:1.2.0.0 +// SpecFlow Version:1.3.0.0 // Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if @@ -14,7 +14,7 @@ namespace TechTalk.SpecFlow.FeatureTests.ExternalSteps using TechTalk.SpecFlow; - [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "1.2.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "1.3.0.0")] [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [NUnit.Framework.TestFixtureAttribute()] [NUnit.Framework.DescriptionAttribute("External Step Definitions")] @@ -30,7 +30,7 @@ public partial class ExternalStepDefinitionsFeature public virtual void FeatureSetup() { testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner(); - TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en"), "External Step Definitions", "In order to modularize my solution\r\nAs a bdd enthusiast\r\nI want to use step defin" + + TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "External Step Definitions", "In order to modularize my solution\r\nAs a bdd enthusiast\r\nI want to use step defin" + "itions from other assemblies", ((string[])(null))); testRunner.OnFeatureStart(featureInfo); } @@ -54,19 +54,19 @@ public virtual void ScenarioTearDown() } [NUnit.Framework.TestAttribute()] - [NUnit.Framework.DescriptionAttribute("Steps defined in an external VB project and an external c-sharp project")] - public virtual void StepsDefinedInAnExternalVBProjectAndAnExternalC_SharpProject() + [NUnit.Framework.DescriptionAttribute("Steps defined in an external .NET (e.g. c# or VB.NET)")] + public virtual void StepsDefinedInAnExternal_NETE_G_COrVB_NET() { - TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Steps defined in an external VB project and an external c-sharp project", ((string[])(null))); + TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("Steps defined in an external .NET (e.g. c# or VB.NET)", ((string[])(null))); #line 6 this.ScenarioSetup(scenarioInfo); #line 7 - testRunner.Given("I have external step definitions in a separate assembly referenced by this projec" + +testRunner.Given("I have external step definitions in a separate assembly referenced by this projec" + "t"); #line 8 - testRunner.When("I call those steps"); +testRunner.When("I call those steps"); #line 9 - testRunner.Then("the scenario should pass"); +testRunner.Then("the scenario should pass"); #line hidden testRunner.CollectScenarioErrors(); } diff --git a/Tests/FeatureTests/ExternalSteps/ExternalStepsCS/CSSteps.cs b/Tests/FeatureTests/ExternalSteps/ExternalStepsCS/CSSteps.cs index 2ac2bf7af..a90752a04 100644 --- a/Tests/FeatureTests/ExternalSteps/ExternalStepsCS/CSSteps.cs +++ b/Tests/FeatureTests/ExternalSteps/ExternalStepsCS/CSSteps.cs @@ -10,6 +10,18 @@ namespace ExternalStepsCS [Binding] public class CSSteps { + [Given(@"I have external step definitions in a separate assembly referenced by this project")] + public void GivenIHaveExternalStepDefinitionsInASeparateAssemblyReferencedByThisProject() + { + ScenarioContext.Current["counter"] = 1; + } + + [When(@"I call those steps")] + public void WhenICallThoseSteps() + { + ScenarioContext.Current["counter"] = (int)ScenarioContext.Current["counter"] + 1; + } + [Then("the scenario should pass")] public void GivenAFeatureWhichRequiresADependentContext() { diff --git a/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/ExternalStepsVB.vbproj b/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/ExternalStepsVB.vbproj deleted file mode 100644 index 3b4b0fd39..000000000 --- a/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/ExternalStepsVB.vbproj +++ /dev/null @@ -1,113 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {D3F6B835-B228-4DCF-B533-B6ED469A33B3} - Library - ExternalStepsVB - ExternalStepsVB - 512 - Windows - v3.5 - On - Binary - Off - On - - - true - full - true - true - bin\Debug\ - ExternalStepsVB.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - pdbonly - false - true - true - bin\Release\ - ExternalStepsVB.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - - - - - 3.5 - - - 3.5 - - - 3.5 - - - - - - - - - - - - - - - - - True - Application.myapp - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - {413EE28C-4F89-4C6F-BA1E-2CDEE4CD43B4} - TechTalk.SpecFlow - - - - - \ No newline at end of file diff --git a/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/Application.Designer.vb b/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/Application.Designer.vb deleted file mode 100644 index d4e7c6707..000000000 --- a/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/Application.Designer.vb +++ /dev/null @@ -1,13 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:2.0.50727.4927 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - diff --git a/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/Application.myapp b/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/Application.myapp deleted file mode 100644 index 758895def..000000000 --- a/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/Application.myapp +++ /dev/null @@ -1,10 +0,0 @@ - - - false - false - 0 - true - 0 - 1 - true - diff --git a/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/AssemblyInfo.vb b/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/AssemblyInfo.vb deleted file mode 100644 index c2414cd00..000000000 --- a/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/AssemblyInfo.vb +++ /dev/null @@ -1,35 +0,0 @@ -Imports System -Imports System.Reflection -Imports System.Runtime.InteropServices - -' General Information about an assembly is controlled through the following -' set of attributes. Change these attribute values to modify the information -' associated with an assembly. - -' Review the values of the assembly attributes - - - - - - - - - - -'The following GUID is for the ID of the typelib if this project is exposed to COM - - -' Version information for an assembly consists of the following four values: -' -' Major Version -' Minor Version -' Build Number -' Revision -' -' You can specify all the values or you can default the Build and Revision Numbers -' by using the '*' as shown below: -' - - - diff --git a/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/Resources.Designer.vb b/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/Resources.Designer.vb deleted file mode 100644 index 80f727dc5..000000000 --- a/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/Resources.Designer.vb +++ /dev/null @@ -1,62 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:2.0.50727.4927 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My.Resources - - 'This class was auto-generated by the StronglyTypedResourceBuilder - 'class via a tool like ResGen or Visual Studio. - 'To add or remove a member, edit your .ResX file then rerun ResGen - 'with the /str option, or rebuild your VS project. - ' - ' A strongly-typed resource class, for looking up localized strings, etc. - ' - _ - Friend Module Resources - - Private resourceMan As Global.System.Resources.ResourceManager - - Private resourceCulture As Global.System.Globalization.CultureInfo - - ' - ' Returns the cached ResourceManager instance used by this class. - ' - _ - Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager - Get - If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("ExternalStepsVB.Resources", GetType(Resources).Assembly) - resourceMan = temp - End If - Return resourceMan - End Get - End Property - - ' - ' Overrides the current thread's CurrentUICulture property for all - ' resource lookups using this strongly typed resource class. - ' - _ - Friend Property Culture() As Global.System.Globalization.CultureInfo - Get - Return resourceCulture - End Get - Set(ByVal value As Global.System.Globalization.CultureInfo) - resourceCulture = value - End Set - End Property - End Module -End Namespace diff --git a/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/Resources.resx b/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/Resources.resx deleted file mode 100644 index af7dbebba..000000000 --- a/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/Settings.Designer.vb b/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/Settings.Designer.vb deleted file mode 100644 index ac249979b..000000000 --- a/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/Settings.Designer.vb +++ /dev/null @@ -1,73 +0,0 @@ -'------------------------------------------------------------------------------ -' -' This code was generated by a tool. -' Runtime Version:2.0.50727.4927 -' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - - -Namespace My - - _ - Partial Friend NotInheritable Class MySettings - Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) - -#Region "My.Settings Auto-Save Functionality" -#If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean - - Private Shared addedHandlerLockObject As New Object - - _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub -#End If -#End Region - - Public Shared ReadOnly Property [Default]() As MySettings - Get - -#If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If -#End If - Return defaultInstance - End Get - End Property - End Class -End Namespace - -Namespace My - - _ - Friend Module MySettingsProperty - - _ - Friend ReadOnly Property Settings() As Global.ExternalStepsVB.My.MySettings - Get - Return Global.ExternalStepsVB.My.MySettings.Default - End Get - End Property - End Module -End Namespace diff --git a/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/Settings.settings b/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/Settings.settings deleted file mode 100644 index 85b890b3c..000000000 --- a/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/My Project/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/VBSteps.vb b/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/VBSteps.vb deleted file mode 100644 index ee30ea4dc..000000000 --- a/Tests/FeatureTests/ExternalSteps/ExternalStepsVB/VBSteps.vb +++ /dev/null @@ -1,16 +0,0 @@ -Imports TechTalk.SpecFlow - - _ -Public Class VBStepDefinitions - - _ - Public Sub step1() - ScenarioContext.Current.Item("counter") = 1 - End Sub - - <[When]("I call those steps")> _ - Public Sub step2() - ScenarioContext.Current.Item("counter") += 1 - End Sub - -End Class diff --git a/Tests/FeatureTests/FeatureTests.csproj b/Tests/FeatureTests/FeatureTests.csproj index 170388ebe..3a7a9fa79 100644 --- a/Tests/FeatureTests/FeatureTests.csproj +++ b/Tests/FeatureTests/FeatureTests.csproj @@ -117,10 +117,6 @@ {3836A6FC-4ECC-413A-AC8F-83A0A773EC9E} ExternalStepsCS - - {D3F6B835-B228-4DCF-B533-B6ED469A33B3} - ExternalStepsVB -