diff --git a/CallbackHander.Testing/CallbackHander.Testing.csproj b/CallbackHander.Testing/CallbackHander.Testing.csproj index 8696056..fb6694b 100644 --- a/CallbackHander.Testing/CallbackHander.Testing.csproj +++ b/CallbackHander.Testing/CallbackHander.Testing.csproj @@ -1,4 +1,4 @@ - + net8.0 @@ -7,13 +7,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj b/CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj index 9a02dd9..4ec0409 100644 --- a/CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj +++ b/CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj @@ -7,16 +7,16 @@ - - - - - - + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CallbackHandler.BusinessLogic/CallbackHandler.BusinessLogic.csproj b/CallbackHandler.BusinessLogic/CallbackHandler.BusinessLogic.csproj index 739a388..e6110cb 100644 --- a/CallbackHandler.BusinessLogic/CallbackHandler.BusinessLogic.csproj +++ b/CallbackHandler.BusinessLogic/CallbackHandler.BusinessLogic.csproj @@ -4,10 +4,10 @@ net8.0 - - - - + + + + diff --git a/CallbackHandler.BusinessLogic/RequestHandler/CallbackHandlerRequestHandler.cs b/CallbackHandler.BusinessLogic/RequestHandler/CallbackHandlerRequestHandler.cs index 3dbc0b2..ef71587 100644 --- a/CallbackHandler.BusinessLogic/RequestHandler/CallbackHandlerRequestHandler.cs +++ b/CallbackHandler.BusinessLogic/RequestHandler/CallbackHandlerRequestHandler.cs @@ -1,4 +1,5 @@ -using SimpleResults; +using Shared.Results; +using SimpleResults; namespace CallbackHandler.BusinessLogic.RequestHandler { diff --git a/CallbackHandler.BusinessLogic/Services/CallbackDomainService.cs b/CallbackHandler.BusinessLogic/Services/CallbackDomainService.cs index c673828..bb7215b 100644 --- a/CallbackHandler.BusinessLogic/Services/CallbackDomainService.cs +++ b/CallbackHandler.BusinessLogic/Services/CallbackDomainService.cs @@ -1,4 +1,5 @@ -using SimpleResults; +using Shared.Results; +using SimpleResults; namespace CallbackHandler.BusinessLogic.Services; diff --git a/CallbackHandler.CallbackMessage.DomainEvents/CallbackHandler.CallbackMessage.DomainEvents.csproj b/CallbackHandler.CallbackMessage.DomainEvents/CallbackHandler.CallbackMessage.DomainEvents.csproj index 67711ce..0e2353d 100644 --- a/CallbackHandler.CallbackMessage.DomainEvents/CallbackHandler.CallbackMessage.DomainEvents.csproj +++ b/CallbackHandler.CallbackMessage.DomainEvents/CallbackHandler.CallbackMessage.DomainEvents.csproj @@ -5,7 +5,7 @@ None - - + + \ No newline at end of file diff --git a/CallbackHandler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj b/CallbackHandler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj index 252522f..77ff87c 100644 --- a/CallbackHandler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj +++ b/CallbackHandler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj @@ -7,16 +7,16 @@ - - - - - - + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CallbackHandler.CallbackMessageAggregate/CallbackHandler.CallbackMessageAggregate.csproj b/CallbackHandler.CallbackMessageAggregate/CallbackHandler.CallbackMessageAggregate.csproj index 545420c..1c724aa 100644 --- a/CallbackHandler.CallbackMessageAggregate/CallbackHandler.CallbackMessageAggregate.csproj +++ b/CallbackHandler.CallbackMessageAggregate/CallbackHandler.CallbackMessageAggregate.csproj @@ -9,9 +9,9 @@ - - - - + + + + \ No newline at end of file diff --git a/CallbackHandler.IntegrationTests/CallbackHandler.IntegrationTests.csproj b/CallbackHandler.IntegrationTests/CallbackHandler.IntegrationTests.csproj index 8b5b6fa..7c7485f 100644 --- a/CallbackHandler.IntegrationTests/CallbackHandler.IntegrationTests.csproj +++ b/CallbackHandler.IntegrationTests/CallbackHandler.IntegrationTests.csproj @@ -9,14 +9,14 @@ - - - - - - - - + + + + + + + + diff --git a/CallbackHandler.IntegrationTests/Features/BankDepositCallback.feature.cs b/CallbackHandler.IntegrationTests/Features/BankDepositCallback.feature.cs index ca96f0c..3afbc03 100644 --- a/CallbackHandler.IntegrationTests/Features/BankDepositCallback.feature.cs +++ b/CallbackHandler.IntegrationTests/Features/BankDepositCallback.feature.cs @@ -1,8 +1,8 @@ // ------------------------------------------------------------------------------ // // This code was generated by Reqnroll (https://www.reqnroll.net/). -// Reqnroll Version:1.0.0.0 -// Reqnroll Generator Version:1.0.0.0 +// Reqnroll Version:2.0.0.0 +// Reqnroll Generator Version:2.0.0.0 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -17,51 +17,60 @@ namespace CallbackHandler.IntegrationTests.Features using System.Linq; - [System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "1.0.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "2.0.0.0")] [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [NUnit.Framework.TestFixtureAttribute()] [NUnit.Framework.DescriptionAttribute("BankDepositCallback")] + [NUnit.Framework.FixtureLifeCycleAttribute(NUnit.Framework.LifeCycle.InstancePerTestCase)] [NUnit.Framework.CategoryAttribute("base")] [NUnit.Framework.CategoryAttribute("shared")] public partial class BankDepositCallbackFeature { - private Reqnroll.ITestRunner testRunner; + private global::Reqnroll.ITestRunner testRunner; private static string[] featureTags = new string[] { "base", "shared"}; + private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Features", "BankDepositCallback", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags); + #line 1 "BankDepositCallback.feature" #line hidden [NUnit.Framework.OneTimeSetUpAttribute()] - public virtual async System.Threading.Tasks.Task FeatureSetupAsync() + public static async System.Threading.Tasks.Task FeatureSetupAsync() { - testRunner = Reqnroll.TestRunnerManager.GetTestRunnerForAssembly(null, NUnit.Framework.TestContext.CurrentContext.WorkerId); - Reqnroll.FeatureInfo featureInfo = new Reqnroll.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Features", "BankDepositCallback", null, ProgrammingLanguage.CSharp, featureTags); - await testRunner.OnFeatureStartAsync(featureInfo); } [NUnit.Framework.OneTimeTearDownAttribute()] - public virtual async System.Threading.Tasks.Task FeatureTearDownAsync() + public static async System.Threading.Tasks.Task FeatureTearDownAsync() { - await testRunner.OnFeatureEndAsync(); - testRunner = null; } [NUnit.Framework.SetUpAttribute()] public async System.Threading.Tasks.Task TestInitializeAsync() { + testRunner = global::Reqnroll.TestRunnerManager.GetTestRunnerForAssembly(featureHint: featureInfo); + if (((testRunner.FeatureContext != null) + && (testRunner.FeatureContext.FeatureInfo.Equals(featureInfo) == false))) + { + await testRunner.OnFeatureEndAsync(); + } + if ((testRunner.FeatureContext == null)) + { + await testRunner.OnFeatureStartAsync(featureInfo); + } } [NUnit.Framework.TearDownAttribute()] public async System.Threading.Tasks.Task TestTearDownAsync() { await testRunner.OnScenarioEndAsync(); + global::Reqnroll.TestRunnerManager.ReleaseTestRunner(testRunner); } - public void ScenarioInitialize(Reqnroll.ScenarioInfo scenarioInfo) + public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) { testRunner.OnScenarioInitialize(scenarioInfo); testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(NUnit.Framework.TestContext.CurrentContext); @@ -83,18 +92,18 @@ public async System.Threading.Tasks.Task ProcessABankDepositCallback() { string[] tagsOfScenario = ((string[])(null)); System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new System.Collections.Specialized.OrderedDictionary(); - Reqnroll.ScenarioInfo scenarioInfo = new Reqnroll.ScenarioInfo("Process a Bank Deposit Callback", null, tagsOfScenario, argumentsOfScenario, featureTags); + global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Process a Bank Deposit Callback", null, tagsOfScenario, argumentsOfScenario, featureTags); #line 4 this.ScenarioInitialize(scenarioInfo); #line hidden - if ((TagHelper.ContainsIgnoreTag(tagsOfScenario) || TagHelper.ContainsIgnoreTag(featureTags))) + if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags))) { testRunner.SkipScenario(); } else { await this.ScenarioStartAsync(); - Reqnroll.Table table1 = new Reqnroll.Table(new string[] { + global::Reqnroll.Table table1 = new global::Reqnroll.Table(new string[] { "Amount", "DateTime", "DepositId", @@ -114,10 +123,10 @@ public async System.Threading.Tasks.Task ProcessABankDepositCallback() await testRunner.GivenAsync("I have the following Bank Deposit Callbacks", ((string)(null)), table1, "Given "); #line hidden #line 8 - await testRunner.WhenAsync("I send the requests to the callback handler for deposits", ((string)(null)), ((Reqnroll.Table)(null)), "When "); + await testRunner.WhenAsync("I send the requests to the callback handler for deposits", ((string)(null)), ((global::Reqnroll.Table)(null)), "When "); #line hidden #line 9 - await testRunner.ThenAsync("the deposit records are recorded", ((string)(null)), ((Reqnroll.Table)(null)), "Then "); + await testRunner.ThenAsync("the deposit records are recorded", ((string)(null)), ((global::Reqnroll.Table)(null)), "Then "); #line hidden } await this.ScenarioCleanupAsync(); diff --git a/CallbackHandler.Tests/CallbackHandler.Tests.csproj b/CallbackHandler.Tests/CallbackHandler.Tests.csproj index 7672c24..6e775b6 100644 --- a/CallbackHandler.Tests/CallbackHandler.Tests.csproj +++ b/CallbackHandler.Tests/CallbackHandler.Tests.csproj @@ -7,17 +7,17 @@ - + - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/CallbackHandler/CallbackHandler.csproj b/CallbackHandler/CallbackHandler.csproj index a66acd4..4697613 100644 --- a/CallbackHandler/CallbackHandler.csproj +++ b/CallbackHandler/CallbackHandler.csproj @@ -6,22 +6,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/CallbackHandler/Controllers/CallbackController.cs b/CallbackHandler/Controllers/CallbackController.cs index 0753a36..72e717d 100644 --- a/CallbackHandler/Controllers/CallbackController.cs +++ b/CallbackHandler/Controllers/CallbackController.cs @@ -1,5 +1,6 @@ using CallbackHandlers.Models; using Shared.EventStore.Aggregate; +using Shared.Results; using SimpleResults; namespace CallbackHandler.Controllers