Merge remote branch 'upstream/master'

xerxesb · Jun 29, 2010 · b73812e · b73812e
2 parents 35f02bc + 3c0a991
commit b73812e
Show file tree

Hide file tree

Showing 8 changed files with 107 additions and 12 deletions.
diff --git a/Installer/SpecFlowInstaller/Product.wxs b/Installer/SpecFlowInstaller/Product.wxs
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?define ProductShortName = "SpecFlow" ?>
-<?define ProductVersion = "1.3.0" ?>
-<?define ProductVersionText = "1.3" ?>
+<?define ProductVersion = "1.3.1" ?>
+<?define ProductVersionText = "1.3.1" ?>
 <?define ProductUrl = "http://www.specflow.org" ?>
 <?define Manufacturer = "TechTalk" ?>
 <?define UpgradeCode = "A72428B6-8ADB-4EDF-BC23-4BE4E19F01A0" ?>

diff --git a/Tests/ReportingTest.SampleProject/NUnitResult/TestResult.err b/Tests/ReportingTest.SampleProject/NUnitResult/TestResult.err
diff --git a/Tests/ReportingTest.SampleProject/NUnitResult/TestResult.txt b/Tests/ReportingTest.SampleProject/NUnitResult/TestResult.txt
@@ -0,0 +1,33 @@
+***** ReportingTest.SampleProject.FeatureWithFailingScenariosFeature.IgnoredScenario
+***** ReportingTest.SampleProject.FeatureWithFailingScenariosFeature.ScenarioWithFailingSteps
+Given I have a precondition that is failing
+-> error: simulated failure
+***** ReportingTest.SampleProject.FeatureWithFailingScenariosFeature.ScenarioWithPendingSteps
+Given I have a pending precondition
+-> No matching step definition found for the step. Use the following code to create one:
+    [Binding]
+    public class StepDefinitions
+    {
+        [Given(@"I have a pending precondition")]
+        public void GivenIHaveAPendingPrecondition()
+        {
+            ScenarioContext.Current.Pending();
+        }
+    }
+
+***** ReportingTest.SampleProject.FeatureWithSuccessfulScenariosFeature.FirstSuccessfulScenario
+Given I have a precondition that is successful
+-> done: StepDefinitions.GivenIHaveAPreconditionThatIs("successful") (0,0s)
+When I do something that works
+-> done: StepDefinitions.GivenIHaveAPreconditionThatIs("works") (0,0s)
+Then I have a postcondition that is successful
+-> done: StepDefinitions.GivenIHaveAPreconditionThatIs("successful") (0,0s)
+***** ReportingTest.SampleProject.FeatureWithSuccessfulScenariosFeature.SecondSuccessfulScenario
+Given I have a precondition that is successful
+-> done: StepDefinitions.GivenIHaveAPreconditionThatIs("successful") (0,0s)
+And I have a precondition that is successful
+-> done: StepDefinitions.GivenIHaveAPreconditionThatIs("successful") (0,0s)
+When I do something that works
+-> done: StepDefinitions.GivenIHaveAPreconditionThatIs("works") (0,0s)
+Then I have a postcondition that is successful
+-> done: StepDefinitions.GivenIHaveAPreconditionThatIs("successful") (0,0s)
diff --git a/Tests/ReportingTest.SampleProject/NUnitResult/TestResult.xml b/Tests/ReportingTest.SampleProject/NUnitResult/TestResult.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!--This file represents the results of running a test suite-->
+<test-results name="bin\Debug\ReportingTest.SampleProject.dll" total="4" errors="0" failures="1" not-run="1" inconclusive="1" ignored="1" skipped="0" invalid="0" date="2010-06-20" time="16:47:13">
+  <environment nunit-version="2.5.5.10112" clr-version="2.0.50727.4927" os-version="Microsoft Windows NT 6.1.7600.0" platform="Win32NT" cwd="C:\Users\jba\Dev\Projects\SpecFlow\Tests\ReportingTest.SampleProject" machine-name="TTV-JBA01" user="jba" user-domain="TECHTALK" />
+  <culture-info current-culture="de-AT" current-uiculture="en-US" />
+  <test-suite type="Assembly" name="bin\Debug\ReportingTest.SampleProject.dll" executed="True" result="Failure" success="False" time="1.085" asserts="0">
+    <results>
+      <test-suite type="Namespace" name="ReportingTest" executed="True" result="Failure" success="False" time="1.076" asserts="0">
+        <results>
+          <test-suite type="Namespace" name="SampleProject" executed="True" result="Failure" success="False" time="1.075" asserts="0">
+            <results>
+              <test-suite type="TestFixture" name="FeatureWithFailingScenariosFeature" description="Feature with failing scenarios" executed="True" result="Failure" success="False" time="1.039" asserts="0">
+                <results>
+                  <test-case name="ReportingTest.SampleProject.FeatureWithFailingScenariosFeature.IgnoredScenario" description="Ignored scenario" executed="False" result="Ignored">
+                    <reason>
+                      <message><![CDATA[]]></message>
+                    </reason>
+                  </test-case>
+                  <test-case name="ReportingTest.SampleProject.FeatureWithFailingScenariosFeature.ScenarioWithFailingSteps" description="Scenario with failing steps" executed="True" result="Failure" success="False" time="0.222" asserts="0">
+                    <failure>
+                      <message><![CDATA[simulated failure]]></message>
+                      <stack-trace><![CDATA[at ReportingTest.SampleProject.StepDefinitions.GivenIHaveAPreconditionThatIs(String result) in C:\Users\jba\Dev\Projects\SpecFlow\Tests\ReportingTest.SampleProject\StepDefinitions.cs:line 24
+at lambda_method(ExecutionScope , String )
+at TechTalk.SpecFlow.Bindings.MethodBinding.InvokeAction(Object[] arguments, ITestTracer testTracer, TimeSpan& duration) in C:\Users\jba\Dev\Projects\SpecFlow\Runtime\Bindings\StepMethodBinding.cs:line 150
+at TechTalk.SpecFlow.TestRunner.ExecuteStepMatch(BindingMatch match, Object[] arguments) in C:\Users\jba\Dev\Projects\SpecFlow\Runtime\TestRunner.cs:line 406
+at TechTalk.SpecFlow.TestRunner.ExecuteStep(StepArgs stepArgs) in C:\Users\jba\Dev\Projects\SpecFlow\Runtime\TestRunner.cs:line 289
+at TechTalk.SpecFlow.TestRunner.CollectScenarioErrors() in C:\Users\jba\Dev\Projects\SpecFlow\Runtime\TestRunner.cs:line 148
+at ReportingTest.SampleProject.FeatureWithFailingScenariosFeature.ScenarioWithFailingSteps() in c:\Users\jba\Dev\Projects\SpecFlow\Tests\ReportingTest.SampleProject\FeatureWithFailingScenarios.feature:line 14
+]]></stack-trace>
+                    </failure>
+                  </test-case>
+                  <test-case name="ReportingTest.SampleProject.FeatureWithFailingScenariosFeature.ScenarioWithPendingSteps" description="Scenario with pending steps" executed="True" result="Inconclusive" success="False" time="0.106" asserts="0">
+                    <reason>
+                      <message><![CDATA[No matching step definition found for one or more steps.
+[Binding]
+public class StepDefinitions
+{
+    [Given(@"I have a pending precondition")]
+    public void GivenIHaveAPendingPrecondition()
+    {
+        ScenarioContext.Current.Pending();
+    }
+}
+]]></message>
+                    </reason>
+                  </test-case>
+                </results>
+              </test-suite>
+              <test-suite type="TestFixture" name="FeatureWithSuccessfulScenariosFeature" description="Feature with successful scenarios" executed="True" result="Success" success="True" time="0.030" asserts="0">
+                <results>
+                  <test-case name="ReportingTest.SampleProject.FeatureWithSuccessfulScenariosFeature.FirstSuccessfulScenario" description="First successful scenario" executed="True" result="Success" success="True" time="0.023" asserts="0" />
+                  <test-case name="ReportingTest.SampleProject.FeatureWithSuccessfulScenariosFeature.SecondSuccessfulScenario" description="Second successful scenario" executed="True" result="Success" success="True" time="0.004" asserts="0" />
+                </results>
+              </test-suite>
+            </results>
+          </test-suite>
+        </results>
+      </test-suite>
+    </results>
+  </test-suite>
+</test-results>
diff --git a/Tests/RuntimeTests/StepExecutionTestsWithConversions.cs b/Tests/RuntimeTests/StepExecutionTestsWithConversions.cs
@@ -36,7 +36,7 @@ public virtual void DoubleArgWithTable(double param, Table table)
     public class StepExecutionTestsWithConversions : StepExecutionTestsBase
     {
         [Test]
-        public void SholdCallBindingWithSimpleConvertParam()
+        public void ShouldCallBindingWithSimpleConvertParam()
         {
             StepExecutionTestsBindings bindingInstance;
             TestRunner testRunner = GetTestRunnerFor(out bindingInstance);
@@ -52,7 +52,7 @@ public void SholdCallBindingWithSimpleConvertParam()
         }
 
         [Test]
-        public void SholdRaiseErrorIfSimpleConvertParamFails()
+        public void ShouldRaiseErrorIfSimpleConvertParamFails()
         {
             StepExecutionTestsBindings bindingInstance;
             TestRunner testRunner = GetTestRunnerFor(out bindingInstance);
@@ -66,7 +66,7 @@ public void SholdRaiseErrorIfSimpleConvertParamFails()
         }
 
         [Test]
-        public void SholdCallTheOnlyThatCanConvert()
+        public void ShouldCallTheOnlyThatCanConvert()
         {
             var converter = MockRepository.Stub<IStepArgumentTypeConverter>();
             ObjectContainer.StepArgumentTypeConverter = converter;
@@ -91,7 +91,7 @@ public void SholdCallTheOnlyThatCanConvert()
         }
 
         [Test]
-        public void SholdRaiseAmbiguousIfMultipleCanConvert()
+        public void ShouldRaiseAmbiguousIfMultipleCanConvert()
         {
             var converter = MockRepository.Stub<IStepArgumentTypeConverter>();
             ObjectContainer.StepArgumentTypeConverter = converter;
@@ -114,7 +114,7 @@ public void SholdRaiseAmbiguousIfMultipleCanConvert()
         }
 
         [Test]
-        public void SholdCallTheOnlyThatCanConvertWithTable()
+        public void ShouldCallTheOnlyThatCanConvertWithTable()
         {
             var converter = MockRepository.Stub<IStepArgumentTypeConverter>();
             ObjectContainer.StepArgumentTypeConverter = converter;
@@ -141,7 +141,7 @@ public void SholdCallTheOnlyThatCanConvertWithTable()
         }
 
         [Test]
-        public void SholdRaiseParamErrorIfNoneCanConvert()
+        public void ShouldRaiseParamErrorIfNoneCanConvert()
         {
             var converter = MockRepository.Stub<IStepArgumentTypeConverter>();
             ObjectContainer.StepArgumentTypeConverter = converter;

diff --git a/Tests/RuntimeTests/StepExecutionTestsWithConversionsInNonEnglishCulture.cs b/Tests/RuntimeTests/StepExecutionTestsWithConversionsInNonEnglishCulture.cs
@@ -29,7 +29,7 @@ protected override CultureInfo GetLanguage()
         }
 
         [Test]
-        public void SholdCallBindingWithSimpleConvertParam()
+        public void ShouldCallBindingWithSimpleConvertParam()
         {
             StepExecutionTestsBindings bindingInstance;
             TestRunner testRunner = GetTestRunnerFor(out bindingInstance);

diff --git a/VersionInfo.cs b/VersionInfo.cs
@@ -2,5 +2,5 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyVersion("1.3.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyVersion("1.3.1.0")]
+[assembly: AssemblyFileVersion("1.3.1.0")]
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,4 @@
-1.3.1 - ???
+1.3.1 - 2010/06/21
 
 New features:
 + Using standard Gherkin parser (http://github.com/aslakhellesoy/gherkin) v2.0.1
@@ -9,6 +9,7 @@ New features:
 + [StepTransformation] attribute has been renamed to [StepArgumentTransformation]
   because this name describe the intention better. Using the old attribute will 
   generate a warning.
++ Support for MbUnit
 
 Fixed issues:
 + NullReference exception when using BeforeTestRun event (Issue 41)