Merge branch 'main' into systemtestsspeed

* main: Bump version VS Code integration proper doc title (#280) Fix: Reqnroll generates invalid code for rule backgrounds in Visual Basic (#284) Update nunit.md (#276) SolutionTests: Check if SDK version is installed and if not ignore the test (#266) Fix for #271 This PR modifies the Feature AST visitor to appropriately handle Rule Background steps. (#272) Bugfix/fix reqnroll.verify parallelization (#255)
reqnroll · Oct 14, 2024 · 27776fe · 27776fe
2 parents bc1549a + cda0318
commit 27776fe
Show file tree

Hide file tree

Showing 29 changed files with 375 additions and 110 deletions.
diff --git a/.gitignore b/.gitignore
@@ -221,7 +221,7 @@ ClientBin/
 *.publishsettings
 orleans.codegen.cs
 
-# Including strong name files can present a security risk 
+# Including strong name files can present a security risk
 # (https://github.com/github/gitignore/pull/2483#issue-259490424)
 #*.snk
 
@@ -315,7 +315,7 @@ __pycache__/
 # OpenCover UI analysis results
 OpenCover/
 
-# Azure Stream Analytics local run output 
+# Azure Stream Analytics local run output
 ASALocalRun/
 
 # MSBuild Binary and Structured Log
@@ -384,3 +384,5 @@ docs/_build/*
 /docs/Scripts/
 /docs/pyvenv.cfg
 nCrunchTemp*.csproj
+
+*.received.*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,22 @@
 # [vNext]
 
+## Improvements:
+
 ## Bug fixes:
-* Modified VersionInfo class to force it to pull version information from the Reqnroll assembly
+
+*Contributors of this release (in alphabetical order):* 
+
+# v2.1.1 - 2024-10-08
+
+## Bug fixes:
+
+* Fix: Rule Backgounds cause External Data Plugin to fail (#271)
+* Fix: VersionInfo class might provide the version of the runner instead of the version of Reqnroll (#248)
 * Fix: Reqnroll.CustomPlugin NuGet package has a version mismatch for the System.CodeDom dependency (#244)
+* Fix: Reqnroll.Verify fails to run parallel tests determinately (#254). See our [verify documentation](docs/integrations/verify.md) on how to set up your test code to enable parallel testing.
+* Fix: Reqnroll generates invalid code for rule backgrounds in Visual Basic (#283)
 
-*Contributors of this release (in alphabetical order):* @clrudolphi, @UL-ChrisGlew
+*Contributors of this release (in alphabetical order):* @ajeckmans, @clrudolphi, @gasparnagy, @UL-ChrisGlew
 
 # v2.1.0 - 2024-08-30
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>2.1.1</VersionPrefix>
+    <VersionPrefix>2.1.2</VersionPrefix>
     <VersionSuffix>local</VersionSuffix>
     <AssemblyVersion>2.0.0</AssemblyVersion>
     <CompatibilityVersionUpperRange>3</CompatibilityVersionUpperRange>

diff --git a/...ata.ReqnrollPlugin.IntegrationTest/Features/ExternalDataWithRuleBackgroundFromCSV.feature b/...ata.ReqnrollPlugin.IntegrationTest/Features/ExternalDataWithRuleBackgroundFromCSV.feature
@@ -0,0 +1,17 @@
+Feature: ExternalDataWithRuleBackgroundFromCSV
+
+This feature demonstrates that Rule Background steps are handled appropriately when using the External Data Plugin.
+This test validates a regression.
+
+Rule: Steps in Background are properly executed
+	Background:
+	Given my favorite color is blue
+@DataSource:products.csv
+Scenario: The basket price is calculated correctly
+	The scenario will be treated as a scenario outline with the examples from the CSV file.
+	The CSV file contains multile fields, including product and price.
+	Given the price of <product> is €<price>
+	And the customer has put 1 pcs of <product> to the basket
+	When the basket price is calculated
+	Then the basket price should be €<price>
+	And the color given as my favorite was blue
diff --git a/...ExternalData.ReqnrollPlugin.IntegrationTest/StepDefinitions/BackgroundStepsDefinitions.cs b/...ExternalData.ReqnrollPlugin.IntegrationTest/StepDefinitions/BackgroundStepsDefinitions.cs
@@ -0,0 +1,28 @@
+using NUnit.Framework;
+using Reqnroll;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace XReqnroll.ExternalData.ReqnrollPlugin.IntegrationTest.StepDefinitions
+{
+    [Binding]
+    internal class BackgroundStepsDefinitions
+    {
+        [Given("my favorite color is {word}")]
+        public void GivenMyFavoriteColorIs(string color)
+        {
+            _color = color;
+        }
+
+        private string _color;
+
+        [Then("the color given as my favorite was {word}")]
+        public void ThenTheColorGivenAsMyFavoriteWas(string color)
+        {
+            Assert.That(_color, Is.EqualTo(color));
+        }
+    }
+}
diff --git a/...xternalData/Reqnroll.ExternalData.ReqnrollPlugin/Transformation/GherkinDocumentVisitor.cs b/...xternalData/Reqnroll.ExternalData.ReqnrollPlugin/Transformation/GherkinDocumentVisitor.cs
@@ -69,7 +69,8 @@ protected virtual void AcceptRule(Rule rule)
             OnRuleVisiting(rule);
             foreach (var ruleChild in rule.Children)
             {
-                if (ruleChild is ScenarioOutline scenarioOutline) AcceptScenarioOutline(scenarioOutline);
+                if (ruleChild is Background background) AcceptBackground(background);
+                else if (ruleChild is ScenarioOutline scenarioOutline) AcceptScenarioOutline(scenarioOutline);
                 else if (ruleChild is Scenario scenario) AcceptScenario(scenario);
             }
             OnRuleVisited(rule);

diff --git a/...xternalData/Reqnroll.ExternalData.ReqnrollPlugin/Transformation/ScenarioTransformation.cs b/...xternalData/Reqnroll.ExternalData.ReqnrollPlugin/Transformation/ScenarioTransformation.cs
@@ -66,7 +66,7 @@ private void OnScenarioVisitedInternal(Scenario scenario, Scenario transformedSc
 
         protected override void OnBackgroundVisited(Background background)
         {
-            _featureChildren.Add(background);
+            _currentChildren.Add(background);
         }
 
         protected override void OnRuleVisiting(Rule rule)

diff --git a/...s/Reqnroll.Verify/Reqnroll.Verify.ReqnrollPlugin.IntegrationTest/Features/Feature.feature b/...s/Reqnroll.Verify/Reqnroll.Verify.ReqnrollPlugin.IntegrationTest/Features/Feature.feature
@@ -1,14 +1,28 @@
+@DoNotParallelize
 Feature: Verify Test
 
-Scenario: Check if Verify is working
-	When I try Verify with Reqnroll
-	Then it works
-
-Scenario Outline: Check if Verify is working with Example Tables
-	When I try Verify with Reqnroll for Parameter '<Parameter>'
-	Then it works
-
-Examples: 
-	| Parameter |
-	| 1         |
-	| 2         |
+    Scenario: Check if Verify is working
+        When I try Verify with Reqnroll
+        Then it works
+
+    Scenario Outline: Check if Verify is working with Example Tables
+        When I try Verify with Reqnroll for Parameter '<Parameter>'
+        Then it works
+
+        Examples:
+          | Parameter |
+          | 1         |
+          | 2         |
+
+    Scenario: Check if Verify is working with multiple scenario parameters
+        When I try Verify with Reqnroll for Parameter '<Parameter>' and some additional parameter '<Additional Parameter>'
+        Then it works
+
+    Examples:
+      | Parameter | Additional Parameter |
+      | 1         | a                    |
+      | 2         | b                    |
+
+    Scenario: Check if Verify is working with global registered path info
+        When I try Verify with Reqnroll with global registered path info
+        Then it works
diff --git a/...Verify/Reqnroll.Verify.ReqnrollPlugin.IntegrationTest/Features/Parallel Feature 1.feature b/...Verify/Reqnroll.Verify.ReqnrollPlugin.IntegrationTest/Features/Parallel Feature 1.feature
@@ -0,0 +1,6 @@
+Feature: Verify Parallel feature #1
+
+    Scenario: Check if Verify uses the correct paths when ran in parallel 1
+        When I try Verify with Reqnroll in parallel
+        Then it works in parallel with contents `Verify Parallel feature #1`
+        And the verified file is `Verify Parallel feature #1.Check if Verify uses the correct paths when ran in parallel 1.verified.txt` with contents `Verify Parallel feature #1`
diff --git a/...Verify/Reqnroll.Verify.ReqnrollPlugin.IntegrationTest/Features/Parallel Feature 2.feature b/...Verify/Reqnroll.Verify.ReqnrollPlugin.IntegrationTest/Features/Parallel Feature 2.feature
@@ -0,0 +1,6 @@
+Feature: Verify Parallel feature #2
+
+    Scenario: Check if Verify uses the correct paths when ran in parallel 2
+        When I try Verify with Reqnroll in parallel
+        Then it works in parallel with contents `Verify Parallel feature #2`
+        And the verified file is `Verify Parallel feature #2.Check if Verify uses the correct paths when ran in parallel 2.verified.txt` with contents `Verify Parallel feature #2`
diff --git a/...lel feature #1.Check if Verify uses the correct paths when ran in parallel 1.verified.txt b/...lel feature #1.Check if Verify uses the correct paths when ran in parallel 1.verified.txt
@@ -0,0 +1 @@
+Verify Parallel feature #1
diff --git a/...lel feature #2.Check if Verify uses the correct paths when ran in parallel 2.verified.txt b/...lel feature #2.Check if Verify uses the correct paths when ran in parallel 2.verified.txt
@@ -0,0 +1 @@
+Verify Parallel feature #2
diff --git a/...ures/Verify Test.Check if Verify is working with global registered path info.verified.txt b/...ures/Verify Test.Check if Verify is working with global registered path info.verified.txt
@@ -0,0 +1 @@
+value
diff --git a/...Verify Test.Check if Verify is working with multiple scenario parameters_1_a.verified.txt b/...Verify Test.Check if Verify is working with multiple scenario parameters_1_a.verified.txt
@@ -0,0 +1 @@
+1 .. a
diff --git a/...Verify Test.Check if Verify is working with multiple scenario parameters_2_b.verified.txt b/...Verify Test.Check if Verify is working with multiple scenario parameters_2_b.verified.txt
@@ -0,0 +1 @@
+2 .. b
diff --git a/...rify.ReqnrollPlugin.IntegrationTest/Reqnroll.Verify.ReqnrollPlugin.IntegrationTest.csproj b/...rify.ReqnrollPlugin.IntegrationTest/Reqnroll.Verify.ReqnrollPlugin.IntegrationTest.csproj
@@ -34,10 +34,6 @@
     <ReqnrollGeneratorPlugins Include="$(MSBuildThisFileDirectory)..\..\Reqnroll.xUnit.Generator.ReqnrollPlugin\bin\$(Configuration)\netstandard2.0\Reqnroll.xUnit.Generator.ReqnrollPlugin.dll" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Features\" />
-  </ItemGroup>
-
   <Import Project="..\..\..\Reqnroll.Tools.MsBuild.Generation\build\Reqnroll.Tools.MsBuild.Generation.targets" />
   <!-- has to be before the PropertyGroup change-->
   <PropertyGroup>

diff --git a/....Verify/Reqnroll.Verify.ReqnrollPlugin.IntegrationTest/StepDefinitions/StepDefinitions.cs b/....Verify/Reqnroll.Verify.ReqnrollPlugin.IntegrationTest/StepDefinitions/StepDefinitions.cs
@@ -3,20 +3,79 @@ namespace Reqnroll.Verify.ReqnrollPlugin.IntegrationTest.StepDefinitions;
 [Binding]
 internal class StepDefinitions
 {
+    private readonly VerifySettings _settings;
+    private VerifyResult _verifyResult;
+
+    public StepDefinitions(VerifySettings settings)
+    {
+        _settings = settings;
+    }
+
     [When("I try Verify with Reqnroll")]
-    public async Task ITryVerifyWithReqnroll()
+    public async Task WhenITryVerifyWithReqnroll()
     {
-        await Verifier.Verify("value");
+        await Verifier.Verify("value", _settings);
     }
 
     [When(@"I try Verify with Reqnroll for Parameter '([^']*)'")]
     public async Task WhenITryVerifyWithReqnrollForParameter(string p0)
+    {
+        await Verifier.Verify("value", _settings);
+    }
+
+    [When(@"I try Verify with Reqnroll for Parameter '(.*)' and some additional parameter '(.*)'")]
+    public async Task WhenITryVerifyWithReqnrollForParameterAndSomeAdditionalParameter(string p0, string p1)
+    {
+        await Verifier.Verify($"{p0} .. {p1}", _settings);
+    }
+
+    [When(@"I try Verify with Reqnroll with global registered path info")]
+    public async Task WhenITryVerifyWithReqnrollWithGlobalRegisteredPathInfo()
     {
         await Verifier.Verify("value");
     }
 
     [Then("it works")]
-    public void ItWorks()
+    public void ThenItWorks()
     {
+        // no-op
+    }
+
+    private static readonly object Lock = new();
+    private static bool _isFirstCallComplete;
+
+    [When(@"I try Verify with Reqnroll in parallel")]
+    public static void WhenITryVerifyWithReqnrollInParallel()
+    {
+        // lock so the first execution will always finish after the second execution
+
+        if (!_isFirstCallComplete)
+        {
+            lock (Lock)
+            {
+                if (!_isFirstCallComplete)
+                {
+                    Thread.Sleep(500);
+                    _isFirstCallComplete = true;
+                }
+            }
+        }
+    }
+
+    [Then(@"it works in parallel with contents `(.*)`")]
+    public async Task ThenItWorksInParallelWithVerifyContents(string contents)
+    {
+        _verifyResult = await Verifier.Verify(contents, _settings);
+    }
+
+    [Then(@"the verified file is `(.*)` with contents `(.*)`")]
+    public void ThenTheVerifiedFileIsWithContents(string fileName, string contents)
+    {
+        var actualFilePath = _verifyResult.Files.First();
+        var actualFileName = Path.GetFileName(actualFilePath);
+        Assert.Equal(fileName, actualFileName);
+
+        var actualContents = File.ReadAllText(actualFilePath);
+        Assert.Equal(contents, actualContents);
     }
 }
diff --git a/Plugins/Reqnroll.Verify/Reqnroll.Verify.ReqnrollPlugin.IntegrationTest/reqnroll.json b/Plugins/Reqnroll.Verify/Reqnroll.Verify.ReqnrollPlugin.IntegrationTest/reqnroll.json
@@ -0,0 +1,8 @@
+{
+    "$schema": "https://schemas.reqnroll.net/reqnroll-config-latest.json",
+    "generator": {
+        "addNonParallelizableMarkerForTags": [
+            "DoNotParallelize"
+        ]
+    }
+}
diff --git a/Plugins/Reqnroll.Verify/Reqnroll.Verify.ReqnrollPlugin/VerifyRuntimePlugin.cs b/Plugins/Reqnroll.Verify/Reqnroll.Verify.ReqnrollPlugin/VerifyRuntimePlugin.cs
@@ -1,5 +1,9 @@
+using System;
 using System.Collections;
 using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
 using Reqnroll.Plugins;
 using Reqnroll.UnitTestProvider;
 using Reqnroll.Verify.ReqnrollPlugin;
@@ -15,33 +19,59 @@ public class VerifyRuntimePlugin : IRuntimePlugin
     public void Initialize(RuntimePluginEvents runtimePluginEvents, RuntimePluginParameters runtimePluginParameters, UnitTestProviderConfiguration unitTestProviderConfiguration)
     {
         runtimePluginEvents.CustomizeGlobalDependencies += RuntimePluginEvents_CustomizeGlobalDependencies;
+        runtimePluginEvents.CustomizeScenarioDependencies += RuntimePluginEvents_CustomizeScenarioDependencies;
     }
 
     private void RuntimePluginEvents_CustomizeGlobalDependencies(object sender, CustomizeGlobalDependenciesEventArgs e)
     {
         var runtimePluginTestExecutionLifecycleEvents = e.ObjectContainer.Resolve<RuntimePluginTestExecutionLifecycleEvents>();
-        runtimePluginTestExecutionLifecycleEvents.BeforeScenario += RuntimePluginTestExecutionLifecycleEvents_BeforeScenario;
+        runtimePluginTestExecutionLifecycleEvents.BeforeScenario += (_, runtimePluginBeforeScenarioEventArgs) =>
+        {
+            var scenarioContext = runtimePluginBeforeScenarioEventArgs.ObjectContainer.Resolve<ScenarioContext>();
+            var featureContext = runtimePluginBeforeScenarioEventArgs.ObjectContainer.Resolve<FeatureContext>();
+
+            Verifier.DerivePathInfo(
+                (_, projectDirectory, _, _) =>
+                {
+                    string scenarioInfoTitle = scenarioContext.ScenarioInfo.Title;
+
+                    foreach (DictionaryEntry scenarioInfoArgument in scenarioContext.ScenarioInfo.Arguments)
+                    {
+                        scenarioInfoTitle += "_" + scenarioInfoArgument.Value;
+                    }
+
+                    return new PathInfo(
+                        Path.Combine(projectDirectory, featureContext.FeatureInfo.FolderPath),
+                        featureContext.FeatureInfo.Title,
+                        scenarioInfoTitle);
+                });
+        };
     }
 
-    private void RuntimePluginTestExecutionLifecycleEvents_BeforeScenario(object sender, RuntimePluginBeforeScenarioEventArgs e)
+    private void RuntimePluginEvents_CustomizeScenarioDependencies(object sender, CustomizeScenarioDependenciesEventArgs e)
     {
-        var scenarioContext = e.ObjectContainer.Resolve<ScenarioContext>();
-        var featureContext = e.ObjectContainer.Resolve<FeatureContext>();
-
-        Verifier.DerivePathInfo(
-            (sourceFile, projectDirectory, type, method) =>
+        e.ObjectContainer.RegisterFactoryAs(
+            container =>
             {
-                string scenarioInfoTitle = scenarioContext.ScenarioInfo.Title;
+                var featureContext = container.Resolve<FeatureContext>();
+                var scenarioContext = container.Resolve<ScenarioContext>();
 
-                foreach (DictionaryEntry scenarioInfoArgument in scenarioContext.ScenarioInfo.Arguments)
+                var settings = new VerifySettings();
+                string projectDirectory = Directory.GetCurrentDirectory().Split([@"\bin\"], StringSplitOptions.RemoveEmptyEntries).First();
+
+                settings.UseDirectory(Path.Combine(projectDirectory, featureContext.FeatureInfo.FolderPath));
+                settings.UseTypeName(featureContext.FeatureInfo.Title);
+
+                var methodNameBuilder = new StringBuilder(scenarioContext.ScenarioInfo.Title);
+
+                foreach (DictionaryEntry entry in scenarioContext.ScenarioInfo.Arguments)
                 {
-                    scenarioInfoTitle += "_" + scenarioInfoArgument.Value;
+                    methodNameBuilder.AppendFormat("_{0}", entry.Value);
                 }
 
-                return new PathInfo(
-                    Path.Combine(projectDirectory, featureContext.FeatureInfo.FolderPath),
-                    featureContext.FeatureInfo.Title,
-                    scenarioInfoTitle);
+                settings.UseMethodName(methodNameBuilder.ToString());
+
+                return settings;
             });
     }
 }