diff --git a/TransactionProcessor.Aggregates.Tests/TransactionProcessor.Aggregates.Tests.csproj b/TransactionProcessor.Aggregates.Tests/TransactionProcessor.Aggregates.Tests.csproj index 685afdcc..12d995cc 100644 --- a/TransactionProcessor.Aggregates.Tests/TransactionProcessor.Aggregates.Tests.csproj +++ b/TransactionProcessor.Aggregates.Tests/TransactionProcessor.Aggregates.Tests.csproj @@ -14,18 +14,18 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/TransactionProcessor.Aggregates/ContractAggregate.cs b/TransactionProcessor.Aggregates/ContractAggregate.cs index ede5aab9..449c19d9 100644 --- a/TransactionProcessor.Aggregates/ContractAggregate.cs +++ b/TransactionProcessor.Aggregates/ContractAggregate.cs @@ -225,7 +225,8 @@ public ContractAggregate(){ } private ContractAggregate(Guid aggregateId){ - Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid"); + if (aggregateId == Guid.Empty) + throw new ArgumentNullException(nameof(aggregateId)); this.AggregateId = aggregateId; this.Products = new List(); diff --git a/TransactionProcessor.Aggregates/EstateAggregate.cs b/TransactionProcessor.Aggregates/EstateAggregate.cs index b65414a1..436e1d67 100644 --- a/TransactionProcessor.Aggregates/EstateAggregate.cs +++ b/TransactionProcessor.Aggregates/EstateAggregate.cs @@ -178,7 +178,8 @@ public EstateAggregate(){ } private EstateAggregate(Guid aggregateId){ - Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid"); + if (aggregateId == Guid.Empty) + throw new ArgumentNullException(nameof(aggregateId)); this.AggregateId = aggregateId; this.Operators = new Dictionary(); diff --git a/TransactionProcessor.Aggregates/FloatActivityAggregate.cs b/TransactionProcessor.Aggregates/FloatActivityAggregate.cs index 875b9f71..004f48a0 100644 --- a/TransactionProcessor.Aggregates/FloatActivityAggregate.cs +++ b/TransactionProcessor.Aggregates/FloatActivityAggregate.cs @@ -82,7 +82,8 @@ public FloatActivityAggregate() private FloatActivityAggregate(Guid aggregateId) { - Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid"); + if (aggregateId == Guid.Empty) + throw new ArgumentNullException(nameof(aggregateId)); this.AggregateId = aggregateId; this.Credits = new List(); diff --git a/TransactionProcessor.Aggregates/FloatAggregate.cs b/TransactionProcessor.Aggregates/FloatAggregate.cs index 937be522..368e6b6a 100644 --- a/TransactionProcessor.Aggregates/FloatAggregate.cs +++ b/TransactionProcessor.Aggregates/FloatAggregate.cs @@ -117,7 +117,8 @@ public FloatAggregate() private FloatAggregate(Guid aggregateId) { - Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid"); + if (aggregateId == Guid.Empty) + throw new ArgumentNullException(nameof(aggregateId)); this.AggregateId = aggregateId; this.Credits = new List<(DateTime creditPurchasedDate, Decimal amount, Decimal costPrice)>(); diff --git a/TransactionProcessor.Aggregates/MerchantAggregate.cs b/TransactionProcessor.Aggregates/MerchantAggregate.cs index 5e081fa6..0764cdd0 100644 --- a/TransactionProcessor.Aggregates/MerchantAggregate.cs +++ b/TransactionProcessor.Aggregates/MerchantAggregate.cs @@ -892,7 +892,8 @@ public MerchantAggregate() /// The aggregate identifier. private MerchantAggregate(Guid aggregateId) { - Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid"); + if (aggregateId == Guid.Empty) + throw new ArgumentNullException(nameof(aggregateId)); this.AggregateId = aggregateId; this.Addresses = new Dictionary(); diff --git a/TransactionProcessor.Aggregates/MerchantDepositListAggregate.cs b/TransactionProcessor.Aggregates/MerchantDepositListAggregate.cs index 834ed619..3d2804d3 100644 --- a/TransactionProcessor.Aggregates/MerchantDepositListAggregate.cs +++ b/TransactionProcessor.Aggregates/MerchantDepositListAggregate.cs @@ -211,7 +211,8 @@ public MerchantDepositListAggregate(){ } private MerchantDepositListAggregate(Guid aggregateId){ - Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid"); + if (aggregateId == Guid.Empty) + throw new ArgumentNullException(nameof(aggregateId)); this.AggregateId = aggregateId; this.Deposits = new List(); diff --git a/TransactionProcessor.Aggregates/MerchantStatementAggregate.cs b/TransactionProcessor.Aggregates/MerchantStatementAggregate.cs index 449d36ed..4b8d9a2f 100644 --- a/TransactionProcessor.Aggregates/MerchantStatementAggregate.cs +++ b/TransactionProcessor.Aggregates/MerchantStatementAggregate.cs @@ -52,7 +52,8 @@ public MerchantStatementAggregate() private MerchantStatementAggregate(Guid aggregateId) { - Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid"); + if (aggregateId == Guid.Empty) + throw new ArgumentNullException(nameof(aggregateId)); this.AggregateId = aggregateId; this.ActivityDates = new(); diff --git a/TransactionProcessor.Aggregates/MerchantStatementForDateAggregate.cs b/TransactionProcessor.Aggregates/MerchantStatementForDateAggregate.cs index f451a57f..70d88bfc 100644 --- a/TransactionProcessor.Aggregates/MerchantStatementForDateAggregate.cs +++ b/TransactionProcessor.Aggregates/MerchantStatementForDateAggregate.cs @@ -254,7 +254,8 @@ public MerchantStatementForDateAggregate() private MerchantStatementForDateAggregate(Guid aggregateId) { - Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid"); + if (aggregateId == Guid.Empty) + throw new ArgumentNullException(nameof(aggregateId)); this.AggregateId = aggregateId; this.Transactions = new List(); diff --git a/TransactionProcessor.Aggregates/OperatorAggregate.cs b/TransactionProcessor.Aggregates/OperatorAggregate.cs index faeb2f46..0691e4bd 100644 --- a/TransactionProcessor.Aggregates/OperatorAggregate.cs +++ b/TransactionProcessor.Aggregates/OperatorAggregate.cs @@ -111,7 +111,8 @@ public OperatorAggregate() private OperatorAggregate(Guid aggregateId) { - Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid"); + if (aggregateId == Guid.Empty) + throw new ArgumentNullException(nameof(aggregateId)); this.AggregateId = aggregateId; } diff --git a/TransactionProcessor.Aggregates/ReconciliationAggregate.cs b/TransactionProcessor.Aggregates/ReconciliationAggregate.cs index 3532bdf6..378e573b 100644 --- a/TransactionProcessor.Aggregates/ReconciliationAggregate.cs +++ b/TransactionProcessor.Aggregates/ReconciliationAggregate.cs @@ -184,7 +184,8 @@ public ReconciliationAggregate() private ReconciliationAggregate(Guid aggregateId) { - Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid"); + if (aggregateId == Guid.Empty) + throw new ArgumentNullException(nameof(aggregateId)); this.AggregateId = aggregateId; } diff --git a/TransactionProcessor.Aggregates/SettlementAggregate.cs b/TransactionProcessor.Aggregates/SettlementAggregate.cs index d64ba48e..0b89ec9f 100644 --- a/TransactionProcessor.Aggregates/SettlementAggregate.cs +++ b/TransactionProcessor.Aggregates/SettlementAggregate.cs @@ -298,7 +298,8 @@ public SettlementAggregate() /// The aggregate identifier. private SettlementAggregate(Guid aggregateId) { - Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid"); + if (aggregateId == Guid.Empty) + throw new ArgumentNullException(nameof(aggregateId)); this.AggregateId = aggregateId; this.CalculatedFeesPendingSettlement = new List<(Guid transactionId, Guid merchantId, CalculatedFee calculatedFee)>(); diff --git a/TransactionProcessor.Aggregates/TransactionAggregate.cs b/TransactionProcessor.Aggregates/TransactionAggregate.cs index a32e19f4..6e78103a 100644 --- a/TransactionProcessor.Aggregates/TransactionAggregate.cs +++ b/TransactionProcessor.Aggregates/TransactionAggregate.cs @@ -874,7 +874,8 @@ public TransactionAggregate() { } private TransactionAggregate(Guid aggregateId) { - Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid"); + if (aggregateId == Guid.Empty) + throw new ArgumentNullException(nameof(aggregateId)); this.AggregateId = aggregateId; this.CalculatedFees = new List(); diff --git a/TransactionProcessor.Aggregates/TransactionProcessor.Aggregates.csproj b/TransactionProcessor.Aggregates/TransactionProcessor.Aggregates.csproj index 90471907..c0ca0dec 100644 --- a/TransactionProcessor.Aggregates/TransactionProcessor.Aggregates.csproj +++ b/TransactionProcessor.Aggregates/TransactionProcessor.Aggregates.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/TransactionProcessor.Aggregates/VoucherAggregate.cs b/TransactionProcessor.Aggregates/VoucherAggregate.cs index 0055a0ed..50ab6785 100644 --- a/TransactionProcessor.Aggregates/VoucherAggregate.cs +++ b/TransactionProcessor.Aggregates/VoucherAggregate.cs @@ -259,7 +259,8 @@ public VoucherAggregate() /// The aggregate identifier. private VoucherAggregate(Guid aggregateId) { - Guard.ThrowIfInvalidGuid(aggregateId, "Aggregate Id cannot be an Empty Guid"); + if (aggregateId == Guid.Empty) + throw new ArgumentNullException(nameof(aggregateId)); this.AggregateId = aggregateId; } diff --git a/TransactionProcessor.BusinessLogic.Tests/TransactionProcessor.BusinessLogic.Tests.csproj b/TransactionProcessor.BusinessLogic.Tests/TransactionProcessor.BusinessLogic.Tests.csproj index 09cd1fd3..663aa3ab 100644 --- a/TransactionProcessor.BusinessLogic.Tests/TransactionProcessor.BusinessLogic.Tests.csproj +++ b/TransactionProcessor.BusinessLogic.Tests/TransactionProcessor.BusinessLogic.Tests.csproj @@ -7,22 +7,22 @@ - - - - - + + + + + - + - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj b/TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj index 2fcd09e1..6b95d77c 100644 --- a/TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj +++ b/TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj @@ -5,27 +5,27 @@ - - - - - - + + + + + + - - - - - - + + + + + + - - + + - + diff --git a/TransactionProcessor.Client/TransactionProcessor.Client.csproj b/TransactionProcessor.Client/TransactionProcessor.Client.csproj index edeef4a5..c30ae1f4 100644 --- a/TransactionProcessor.Client/TransactionProcessor.Client.csproj +++ b/TransactionProcessor.Client/TransactionProcessor.Client.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/TransactionProcessor.DataTransferObjects/TransactionProcessor.DataTransferObjects.csproj b/TransactionProcessor.DataTransferObjects/TransactionProcessor.DataTransferObjects.csproj index 686090b6..108ef852 100644 --- a/TransactionProcessor.DataTransferObjects/TransactionProcessor.DataTransferObjects.csproj +++ b/TransactionProcessor.DataTransferObjects/TransactionProcessor.DataTransferObjects.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/TransactionProcessor.Database/TransactionProcessor.Database.csproj b/TransactionProcessor.Database/TransactionProcessor.Database.csproj index b7c9a936..c449268c 100644 --- a/TransactionProcessor.Database/TransactionProcessor.Database.csproj +++ b/TransactionProcessor.Database/TransactionProcessor.Database.csproj @@ -10,19 +10,19 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - + + + + + + + + diff --git a/TransactionProcessor.DatabaseTests/TransactionProcessor.DatabaseTests.csproj b/TransactionProcessor.DatabaseTests/TransactionProcessor.DatabaseTests.csproj index 7e7f2ecb..587cf3aa 100644 --- a/TransactionProcessor.DatabaseTests/TransactionProcessor.DatabaseTests.csproj +++ b/TransactionProcessor.DatabaseTests/TransactionProcessor.DatabaseTests.csproj @@ -9,14 +9,20 @@ - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + - - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/TransactionProcessor.DomainEvents/TransactionProcessor.DomainEvents.csproj b/TransactionProcessor.DomainEvents/TransactionProcessor.DomainEvents.csproj index cfcb9402..e5e75941 100644 --- a/TransactionProcessor.DomainEvents/TransactionProcessor.DomainEvents.csproj +++ b/TransactionProcessor.DomainEvents/TransactionProcessor.DomainEvents.csproj @@ -6,6 +6,6 @@ enable - + diff --git a/TransactionProcessor.IntegrationTesting.Helpers/TransactionProcessor.IntegrationTesting.Helpers.csproj b/TransactionProcessor.IntegrationTesting.Helpers/TransactionProcessor.IntegrationTesting.Helpers.csproj index 94a2034d..3686b55c 100644 --- a/TransactionProcessor.IntegrationTesting.Helpers/TransactionProcessor.IntegrationTesting.Helpers.csproj +++ b/TransactionProcessor.IntegrationTesting.Helpers/TransactionProcessor.IntegrationTesting.Helpers.csproj @@ -7,12 +7,13 @@ - - - - - - + + + + + + + diff --git a/TransactionProcessor.IntegrationTests/Common/DockerHelper.cs b/TransactionProcessor.IntegrationTests/Common/DockerHelper.cs index 06b4f15c..cc73ccc6 100644 --- a/TransactionProcessor.IntegrationTests/Common/DockerHelper.cs +++ b/TransactionProcessor.IntegrationTests/Common/DockerHelper.cs @@ -136,9 +136,12 @@ public override ContainerBuilder SetupSecurityServiceContainer() environmentVariables.AddRange(additionalEnvironmentVariables); } + var imageDetails = this.GetImageDetails(ContainerType.SecurityService); + if (imageDetails.IsFailed) + throw new Exception(imageDetails.Message); ContainerBuilder securityServiceContainer = new Builder().UseContainer().WithName(this.SecurityServiceContainerName) .WithEnvironment(environmentVariables.ToArray()) - .UseImageDetails(this.GetImageDetails(ContainerType.SecurityService)) + .UseImageDetails(imageDetails.Data) .MountHostFolder(this.DockerPlatform, this.HostTraceFolder) .SetDockerCredentials(this.DockerCredentials); diff --git a/TransactionProcessor.IntegrationTests/Features/Contract.feature.cs b/TransactionProcessor.IntegrationTests/Features/Contract.feature.cs index bf5f5a00..6943098c 100644 --- a/TransactionProcessor.IntegrationTests/Features/Contract.feature.cs +++ b/TransactionProcessor.IntegrationTests/Features/Contract.feature.cs @@ -1,8 +1,8 @@ // ------------------------------------------------------------------------------ // -// This code was generated by Reqnroll (https://www.reqnroll.net/). -// Reqnroll Version:2.0.0.0 -// Reqnroll Generator Version:2.0.0.0 +// This code was generated by Reqnroll (https://reqnroll.net/). +// Reqnroll Version:3.0.0.0 +// Reqnroll Generator Version:3.0.0.0 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -15,13 +15,13 @@ namespace TransactionProcessor.IntegrationTests.Features { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "3.0.0.0")] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [NUnit.Framework.TestFixtureAttribute()] - [NUnit.Framework.DescriptionAttribute("Contract")] - [NUnit.Framework.FixtureLifeCycleAttribute(NUnit.Framework.LifeCycle.InstancePerTestCase)] - [NUnit.Framework.CategoryAttribute("base")] - [NUnit.Framework.CategoryAttribute("shared")] + [global::NUnit.Framework.TestFixtureAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Contract")] + [global::NUnit.Framework.FixtureLifeCycleAttribute(global::NUnit.Framework.LifeCycle.InstancePerTestCase)] + [global::NUnit.Framework.CategoryAttribute("base")] + [global::NUnit.Framework.CategoryAttribute("shared")] public partial class ContractFeature { @@ -31,22 +31,23 @@ public partial class ContractFeature "base", "shared"}; - private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Features", "Contract", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags); + private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Features", "Contract", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags, InitializeCucumberMessages()); #line 1 "Contract.feature" #line hidden - [NUnit.Framework.OneTimeSetUpAttribute()] + [global::NUnit.Framework.OneTimeSetUpAttribute()] public static async global::System.Threading.Tasks.Task FeatureSetupAsync() { } - [NUnit.Framework.OneTimeTearDownAttribute()] + [global::NUnit.Framework.OneTimeTearDownAttribute()] public static async global::System.Threading.Tasks.Task FeatureTearDownAsync() { + await global::Reqnroll.TestRunnerManager.ReleaseFeatureAsync(featureInfo); } - [NUnit.Framework.SetUpAttribute()] + [global::NUnit.Framework.SetUpAttribute()] public async global::System.Threading.Tasks.Task TestInitializeAsync() { testRunner = global::Reqnroll.TestRunnerManager.GetTestRunnerForAssembly(featureHint: featureInfo); @@ -72,7 +73,7 @@ public partial class ContractFeature } } - [NUnit.Framework.TearDownAttribute()] + [global::NUnit.Framework.TearDownAttribute()] public async global::System.Threading.Tasks.Task TestTearDownAsync() { if ((testRunner == null)) @@ -90,10 +91,10 @@ public partial class ContractFeature } } - public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) + public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo, global::Reqnroll.RuleInfo ruleInfo) { - testRunner.OnScenarioInitialize(scenarioInfo); - testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(NUnit.Framework.TestContext.CurrentContext); + testRunner.OnScenarioInitialize(scenarioInfo, ruleInfo); + testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(global::NUnit.Framework.TestContext.CurrentContext); } public async global::System.Threading.Tasks.Task ScenarioStartAsync() @@ -233,19 +234,27 @@ public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) #line hidden } - [NUnit.Framework.TestAttribute()] - [NUnit.Framework.DescriptionAttribute("Get Merchant Contracts")] + private static global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages InitializeCucumberMessages() + { + return new global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages("Features/Contract.feature.ndjson", 4); + } + + [global::NUnit.Framework.TestAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Get Merchant Contracts")] public async global::System.Threading.Tasks.Task GetMerchantContracts() { string[] tagsOfScenario = ((string[])(null)); global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary(); - global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Get Merchant Contracts", null, tagsOfScenario, argumentsOfScenario, featureTags); + string pickleIndex = "0"; + global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Get Merchant Contracts", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex); + string[] tagsOfRule = ((string[])(null)); + global::Reqnroll.RuleInfo ruleInfo = null; #line 46 -this.ScenarioInitialize(scenarioInfo); +this.ScenarioInitialize(scenarioInfo, ruleInfo); #line hidden if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags))) { - testRunner.SkipScenario(); + await testRunner.SkipScenarioAsync(); } else { @@ -530,19 +539,22 @@ public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) await this.ScenarioCleanupAsync(); } - [NUnit.Framework.TestAttribute()] - [NUnit.Framework.DescriptionAttribute("Prevent Duplicate Contracts")] + [global::NUnit.Framework.TestAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Prevent Duplicate Contracts")] public async global::System.Threading.Tasks.Task PreventDuplicateContracts() { string[] tagsOfScenario = ((string[])(null)); global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary(); - global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Prevent Duplicate Contracts", null, tagsOfScenario, argumentsOfScenario, featureTags); + string pickleIndex = "1"; + global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Prevent Duplicate Contracts", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex); + string[] tagsOfRule = ((string[])(null)); + global::Reqnroll.RuleInfo ruleInfo = null; #line 116 -this.ScenarioInitialize(scenarioInfo); +this.ScenarioInitialize(scenarioInfo, ruleInfo); #line hidden if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags))) { - testRunner.SkipScenario(); + await testRunner.SkipScenarioAsync(); } else { diff --git a/TransactionProcessor.IntegrationTests/Features/Estate.feature.cs b/TransactionProcessor.IntegrationTests/Features/Estate.feature.cs index b3d5894e..eaea9f2a 100644 --- a/TransactionProcessor.IntegrationTests/Features/Estate.feature.cs +++ b/TransactionProcessor.IntegrationTests/Features/Estate.feature.cs @@ -1,8 +1,8 @@ // ------------------------------------------------------------------------------ // -// This code was generated by Reqnroll (https://www.reqnroll.net/). -// Reqnroll Version:2.0.0.0 -// Reqnroll Generator Version:2.0.0.0 +// This code was generated by Reqnroll (https://reqnroll.net/). +// Reqnroll Version:3.0.0.0 +// Reqnroll Generator Version:3.0.0.0 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -15,13 +15,13 @@ namespace TransactionProcessor.IntegrationTests.Features { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "3.0.0.0")] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [NUnit.Framework.TestFixtureAttribute()] - [NUnit.Framework.DescriptionAttribute("Estate")] - [NUnit.Framework.FixtureLifeCycleAttribute(NUnit.Framework.LifeCycle.InstancePerTestCase)] - [NUnit.Framework.CategoryAttribute("base")] - [NUnit.Framework.CategoryAttribute("shared")] + [global::NUnit.Framework.TestFixtureAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Estate")] + [global::NUnit.Framework.FixtureLifeCycleAttribute(global::NUnit.Framework.LifeCycle.InstancePerTestCase)] + [global::NUnit.Framework.CategoryAttribute("base")] + [global::NUnit.Framework.CategoryAttribute("shared")] public partial class EstateFeature { @@ -31,22 +31,23 @@ public partial class EstateFeature "base", "shared"}; - private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Features", "Estate", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags); + private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Features", "Estate", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags, InitializeCucumberMessages()); #line 1 "Estate.feature" #line hidden - [NUnit.Framework.OneTimeSetUpAttribute()] + [global::NUnit.Framework.OneTimeSetUpAttribute()] public static async global::System.Threading.Tasks.Task FeatureSetupAsync() { } - [NUnit.Framework.OneTimeTearDownAttribute()] + [global::NUnit.Framework.OneTimeTearDownAttribute()] public static async global::System.Threading.Tasks.Task FeatureTearDownAsync() { + await global::Reqnroll.TestRunnerManager.ReleaseFeatureAsync(featureInfo); } - [NUnit.Framework.SetUpAttribute()] + [global::NUnit.Framework.SetUpAttribute()] public async global::System.Threading.Tasks.Task TestInitializeAsync() { testRunner = global::Reqnroll.TestRunnerManager.GetTestRunnerForAssembly(featureHint: featureInfo); @@ -72,7 +73,7 @@ public partial class EstateFeature } } - [NUnit.Framework.TearDownAttribute()] + [global::NUnit.Framework.TearDownAttribute()] public async global::System.Threading.Tasks.Task TestTearDownAsync() { if ((testRunner == null)) @@ -90,10 +91,10 @@ public partial class EstateFeature } } - public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) + public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo, global::Reqnroll.RuleInfo ruleInfo) { - testRunner.OnScenarioInitialize(scenarioInfo); - testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(NUnit.Framework.TestContext.CurrentContext); + testRunner.OnScenarioInitialize(scenarioInfo, ruleInfo); + testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(global::NUnit.Framework.TestContext.CurrentContext); } public async global::System.Threading.Tasks.Task ScenarioStartAsync() @@ -173,19 +174,27 @@ public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) #line hidden } - [NUnit.Framework.TestAttribute()] - [NUnit.Framework.DescriptionAttribute("Get Estate")] + private static global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages InitializeCucumberMessages() + { + return new global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages("Features/Estate.feature.ndjson", 4); + } + + [global::NUnit.Framework.TestAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Get Estate")] public async global::System.Threading.Tasks.Task GetEstate() { string[] tagsOfScenario = ((string[])(null)); global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary(); - global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Get Estate", null, tagsOfScenario, argumentsOfScenario, featureTags); + string pickleIndex = "0"; + global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Get Estate", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex); + string[] tagsOfRule = ((string[])(null)); + global::Reqnroll.RuleInfo ruleInfo = null; #line 26 -this.ScenarioInitialize(scenarioInfo); +this.ScenarioInitialize(scenarioInfo, ruleInfo); #line hidden if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags))) { - testRunner.SkipScenario(); + await testRunner.SkipScenarioAsync(); } else { @@ -319,19 +328,22 @@ await testRunner.WhenAsync("I get the estate \"Test Estate 1\" the estate securi await this.ScenarioCleanupAsync(); } - [NUnit.Framework.TestAttribute()] - [NUnit.Framework.DescriptionAttribute("Update Estate")] + [global::NUnit.Framework.TestAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Update Estate")] public async global::System.Threading.Tasks.Task UpdateEstate() { string[] tagsOfScenario = ((string[])(null)); global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary(); - global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Update Estate", null, tagsOfScenario, argumentsOfScenario, featureTags); + string pickleIndex = "1"; + global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Update Estate", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex); + string[] tagsOfRule = ((string[])(null)); + global::Reqnroll.RuleInfo ruleInfo = null; #line 68 -this.ScenarioInitialize(scenarioInfo); +this.ScenarioInitialize(scenarioInfo, ruleInfo); #line hidden if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags))) { - testRunner.SkipScenario(); + await testRunner.SkipScenarioAsync(); } else { diff --git a/TransactionProcessor.IntegrationTests/Features/LogonTransaction.feature.cs b/TransactionProcessor.IntegrationTests/Features/LogonTransaction.feature.cs index ce6e7363..6f3fb606 100644 --- a/TransactionProcessor.IntegrationTests/Features/LogonTransaction.feature.cs +++ b/TransactionProcessor.IntegrationTests/Features/LogonTransaction.feature.cs @@ -1,8 +1,8 @@ // ------------------------------------------------------------------------------ // -// This code was generated by Reqnroll (https://www.reqnroll.net/). -// Reqnroll Version:2.0.0.0 -// Reqnroll Generator Version:2.0.0.0 +// This code was generated by Reqnroll (https://reqnroll.net/). +// Reqnroll Version:3.0.0.0 +// Reqnroll Generator Version:3.0.0.0 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -15,13 +15,13 @@ namespace TransactionProcessor.IntegrationTests.Features { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "3.0.0.0")] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [NUnit.Framework.TestFixtureAttribute()] - [NUnit.Framework.DescriptionAttribute("LogonTransaction")] - [NUnit.Framework.FixtureLifeCycleAttribute(NUnit.Framework.LifeCycle.InstancePerTestCase)] - [NUnit.Framework.CategoryAttribute("base")] - [NUnit.Framework.CategoryAttribute("shared")] + [global::NUnit.Framework.TestFixtureAttribute()] + [global::NUnit.Framework.DescriptionAttribute("LogonTransaction")] + [global::NUnit.Framework.FixtureLifeCycleAttribute(global::NUnit.Framework.LifeCycle.InstancePerTestCase)] + [global::NUnit.Framework.CategoryAttribute("base")] + [global::NUnit.Framework.CategoryAttribute("shared")] public partial class LogonTransactionFeature { @@ -31,22 +31,23 @@ public partial class LogonTransactionFeature "base", "shared"}; - private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Features", "LogonTransaction", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags); + private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Features", "LogonTransaction", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags, InitializeCucumberMessages()); #line 1 "LogonTransaction.feature" #line hidden - [NUnit.Framework.OneTimeSetUpAttribute()] + [global::NUnit.Framework.OneTimeSetUpAttribute()] public static async global::System.Threading.Tasks.Task FeatureSetupAsync() { } - [NUnit.Framework.OneTimeTearDownAttribute()] + [global::NUnit.Framework.OneTimeTearDownAttribute()] public static async global::System.Threading.Tasks.Task FeatureTearDownAsync() { + await global::Reqnroll.TestRunnerManager.ReleaseFeatureAsync(featureInfo); } - [NUnit.Framework.SetUpAttribute()] + [global::NUnit.Framework.SetUpAttribute()] public async global::System.Threading.Tasks.Task TestInitializeAsync() { testRunner = global::Reqnroll.TestRunnerManager.GetTestRunnerForAssembly(featureHint: featureInfo); @@ -72,7 +73,7 @@ public partial class LogonTransactionFeature } } - [NUnit.Framework.TearDownAttribute()] + [global::NUnit.Framework.TearDownAttribute()] public async global::System.Threading.Tasks.Task TestTearDownAsync() { if ((testRunner == null)) @@ -90,10 +91,10 @@ public partial class LogonTransactionFeature } } - public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) + public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo, global::Reqnroll.RuleInfo ruleInfo) { - testRunner.OnScenarioInitialize(scenarioInfo); - testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(NUnit.Framework.TestContext.CurrentContext); + testRunner.OnScenarioInitialize(scenarioInfo, ruleInfo); + testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(global::NUnit.Framework.TestContext.CurrentContext); } public async global::System.Threading.Tasks.Task ScenarioStartAsync() @@ -326,21 +327,29 @@ await testRunner.GivenAsync("I have a token to access the estate management and #line hidden } - [NUnit.Framework.TestAttribute()] - [NUnit.Framework.DescriptionAttribute("Logon Transactions")] - [NUnit.Framework.CategoryAttribute("PRTest")] + private static global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages InitializeCucumberMessages() + { + return new global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages("Features/LogonTransaction.feature.ndjson", 3); + } + + [global::NUnit.Framework.TestAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Logon Transactions")] + [global::NUnit.Framework.CategoryAttribute("PRTest")] public async global::System.Threading.Tasks.Task LogonTransactions() { string[] tagsOfScenario = new string[] { "PRTest"}; global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary(); - global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Logon Transactions", null, tagsOfScenario, argumentsOfScenario, featureTags); + string pickleIndex = "0"; + global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Logon Transactions", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex); + string[] tagsOfRule = ((string[])(null)); + global::Reqnroll.RuleInfo ruleInfo = null; #line 57 -this.ScenarioInitialize(scenarioInfo); +this.ScenarioInitialize(scenarioInfo, ruleInfo); #line hidden if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags))) { - testRunner.SkipScenario(); + await testRunner.SkipScenarioAsync(); } else { diff --git a/TransactionProcessor.IntegrationTests/Features/Merchant.feature.cs b/TransactionProcessor.IntegrationTests/Features/Merchant.feature.cs index cdb5b3a3..4a7306be 100644 --- a/TransactionProcessor.IntegrationTests/Features/Merchant.feature.cs +++ b/TransactionProcessor.IntegrationTests/Features/Merchant.feature.cs @@ -1,8 +1,8 @@ // ------------------------------------------------------------------------------ // -// This code was generated by Reqnroll (https://www.reqnroll.net/). -// Reqnroll Version:2.0.0.0 -// Reqnroll Generator Version:2.0.0.0 +// This code was generated by Reqnroll (https://reqnroll.net/). +// Reqnroll Version:3.0.0.0 +// Reqnroll Generator Version:3.0.0.0 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -15,13 +15,13 @@ namespace TransactionProcessor.IntegrationTests.Features { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "3.0.0.0")] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [NUnit.Framework.TestFixtureAttribute()] - [NUnit.Framework.DescriptionAttribute("Merchant")] - [NUnit.Framework.FixtureLifeCycleAttribute(NUnit.Framework.LifeCycle.InstancePerTestCase)] - [NUnit.Framework.CategoryAttribute("base")] - [NUnit.Framework.CategoryAttribute("shared")] + [global::NUnit.Framework.TestFixtureAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Merchant")] + [global::NUnit.Framework.FixtureLifeCycleAttribute(global::NUnit.Framework.LifeCycle.InstancePerTestCase)] + [global::NUnit.Framework.CategoryAttribute("base")] + [global::NUnit.Framework.CategoryAttribute("shared")] public partial class MerchantFeature { @@ -31,22 +31,23 @@ public partial class MerchantFeature "base", "shared"}; - private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Features", "Merchant", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags); + private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Features", "Merchant", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags, InitializeCucumberMessages()); #line 1 "Merchant.feature" #line hidden - [NUnit.Framework.OneTimeSetUpAttribute()] + [global::NUnit.Framework.OneTimeSetUpAttribute()] public static async global::System.Threading.Tasks.Task FeatureSetupAsync() { } - [NUnit.Framework.OneTimeTearDownAttribute()] + [global::NUnit.Framework.OneTimeTearDownAttribute()] public static async global::System.Threading.Tasks.Task FeatureTearDownAsync() { + await global::Reqnroll.TestRunnerManager.ReleaseFeatureAsync(featureInfo); } - [NUnit.Framework.SetUpAttribute()] + [global::NUnit.Framework.SetUpAttribute()] public async global::System.Threading.Tasks.Task TestInitializeAsync() { testRunner = global::Reqnroll.TestRunnerManager.GetTestRunnerForAssembly(featureHint: featureInfo); @@ -72,7 +73,7 @@ public partial class MerchantFeature } } - [NUnit.Framework.TearDownAttribute()] + [global::NUnit.Framework.TearDownAttribute()] public async global::System.Threading.Tasks.Task TestTearDownAsync() { if ((testRunner == null)) @@ -90,10 +91,10 @@ public partial class MerchantFeature } } - public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) + public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo, global::Reqnroll.RuleInfo ruleInfo) { - testRunner.OnScenarioInitialize(scenarioInfo); - testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(NUnit.Framework.TestContext.CurrentContext); + testRunner.OnScenarioInitialize(scenarioInfo, ruleInfo); + testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(global::NUnit.Framework.TestContext.CurrentContext); } public async global::System.Threading.Tasks.Task ScenarioStartAsync() @@ -246,19 +247,27 @@ public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) #line hidden } - [NUnit.Framework.TestAttribute()] - [NUnit.Framework.DescriptionAttribute("Get Invalid Merchant - System Login")] + private static global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages InitializeCucumberMessages() + { + return new global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages("Features/Merchant.feature.ndjson", 8); + } + + [global::NUnit.Framework.TestAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Get Invalid Merchant - System Login")] public async global::System.Threading.Tasks.Task GetInvalidMerchant_SystemLogin() { string[] tagsOfScenario = ((string[])(null)); global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary(); - global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Get Invalid Merchant - System Login", null, tagsOfScenario, argumentsOfScenario, featureTags); + string pickleIndex = "0"; + global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Get Invalid Merchant - System Login", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex); + string[] tagsOfRule = ((string[])(null)); + global::Reqnroll.RuleInfo ruleInfo = null; #line 52 -this.ScenarioInitialize(scenarioInfo); +this.ScenarioInitialize(scenarioInfo, ruleInfo); #line hidden if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags))) { - testRunner.SkipScenario(); + await testRunner.SkipScenarioAsync(); } else { @@ -274,19 +283,22 @@ public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) await this.ScenarioCleanupAsync(); } - [NUnit.Framework.TestAttribute()] - [NUnit.Framework.DescriptionAttribute("Get Invalid Merchant - Estate User")] + [global::NUnit.Framework.TestAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Get Invalid Merchant - Estate User")] public async global::System.Threading.Tasks.Task GetInvalidMerchant_EstateUser() { string[] tagsOfScenario = ((string[])(null)); global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary(); - global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Get Invalid Merchant - Estate User", null, tagsOfScenario, argumentsOfScenario, featureTags); + string pickleIndex = "1"; + global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Get Invalid Merchant - Estate User", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex); + string[] tagsOfRule = ((string[])(null)); + global::Reqnroll.RuleInfo ruleInfo = null; #line 55 -this.ScenarioInitialize(scenarioInfo); +this.ScenarioInitialize(scenarioInfo, ruleInfo); #line hidden if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags))) { - testRunner.SkipScenario(); + await testRunner.SkipScenarioAsync(); } else { @@ -306,19 +318,22 @@ public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) await this.ScenarioCleanupAsync(); } - [NUnit.Framework.TestAttribute()] - [NUnit.Framework.DescriptionAttribute("Create Merchant - System Login")] + [global::NUnit.Framework.TestAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Create Merchant - System Login")] public async global::System.Threading.Tasks.Task CreateMerchant_SystemLogin() { string[] tagsOfScenario = ((string[])(null)); global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary(); - global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Create Merchant - System Login", null, tagsOfScenario, argumentsOfScenario, featureTags); + string pickleIndex = "2"; + global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Create Merchant - System Login", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex); + string[] tagsOfRule = ((string[])(null)); + global::Reqnroll.RuleInfo ruleInfo = null; #line 59 -this.ScenarioInitialize(scenarioInfo); +this.ScenarioInitialize(scenarioInfo, ruleInfo); #line hidden if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags))) { - testRunner.SkipScenario(); + await testRunner.SkipScenarioAsync(); } else { @@ -409,19 +424,22 @@ public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) await this.ScenarioCleanupAsync(); } - [NUnit.Framework.TestAttribute()] - [NUnit.Framework.DescriptionAttribute("Create Merchant - Estate User")] + [global::NUnit.Framework.TestAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Create Merchant - Estate User")] public async global::System.Threading.Tasks.Task CreateMerchant_EstateUser() { string[] tagsOfScenario = ((string[])(null)); global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary(); - global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Create Merchant - Estate User", null, tagsOfScenario, argumentsOfScenario, featureTags); + string pickleIndex = "3"; + global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Create Merchant - Estate User", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex); + string[] tagsOfRule = ((string[])(null)); + global::Reqnroll.RuleInfo ruleInfo = null; #line 76 -this.ScenarioInitialize(scenarioInfo); +this.ScenarioInitialize(scenarioInfo, ruleInfo); #line hidden if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags))) { - testRunner.SkipScenario(); + await testRunner.SkipScenarioAsync(); } else { @@ -700,21 +718,24 @@ public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) await this.ScenarioCleanupAsync(); } - [NUnit.Framework.TestAttribute()] - [NUnit.Framework.DescriptionAttribute("Get Merchants for Estate")] - [NUnit.Framework.CategoryAttribute("PRTest")] + [global::NUnit.Framework.TestAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Get Merchants for Estate")] + [global::NUnit.Framework.CategoryAttribute("PRTest")] public async global::System.Threading.Tasks.Task GetMerchantsForEstate() { string[] tagsOfScenario = new string[] { "PRTest"}; global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary(); - global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Get Merchants for Estate", null, tagsOfScenario, argumentsOfScenario, featureTags); + string pickleIndex = "4"; + global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Get Merchants for Estate", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex); + string[] tagsOfRule = ((string[])(null)); + global::Reqnroll.RuleInfo ruleInfo = null; #line 140 -this.ScenarioInitialize(scenarioInfo); +this.ScenarioInitialize(scenarioInfo, ruleInfo); #line hidden if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags))) { - testRunner.SkipScenario(); + await testRunner.SkipScenarioAsync(); } else { @@ -914,21 +935,24 @@ public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) await this.ScenarioCleanupAsync(); } - [NUnit.Framework.TestAttribute()] - [NUnit.Framework.DescriptionAttribute("Update Merchant")] - [NUnit.Framework.CategoryAttribute("PRTest")] + [global::NUnit.Framework.TestAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Update Merchant")] + [global::NUnit.Framework.CategoryAttribute("PRTest")] public async global::System.Threading.Tasks.Task UpdateMerchant() { string[] tagsOfScenario = new string[] { "PRTest"}; global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary(); - global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Update Merchant", null, tagsOfScenario, argumentsOfScenario, featureTags); + string pickleIndex = "5"; + global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Update Merchant", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex); + string[] tagsOfRule = ((string[])(null)); + global::Reqnroll.RuleInfo ruleInfo = null; #line 186 -this.ScenarioInitialize(scenarioInfo); +this.ScenarioInitialize(scenarioInfo, ruleInfo); #line hidden if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags))) { - testRunner.SkipScenario(); + await testRunner.SkipScenarioAsync(); } else { diff --git a/TransactionProcessor.IntegrationTests/Features/Operator.feature.cs b/TransactionProcessor.IntegrationTests/Features/Operator.feature.cs index baf283d7..f9131d7f 100644 --- a/TransactionProcessor.IntegrationTests/Features/Operator.feature.cs +++ b/TransactionProcessor.IntegrationTests/Features/Operator.feature.cs @@ -1,8 +1,8 @@ // ------------------------------------------------------------------------------ // -// This code was generated by Reqnroll (https://www.reqnroll.net/). -// Reqnroll Version:2.0.0.0 -// Reqnroll Generator Version:2.0.0.0 +// This code was generated by Reqnroll (https://reqnroll.net/). +// Reqnroll Version:3.0.0.0 +// Reqnroll Generator Version:3.0.0.0 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -15,13 +15,13 @@ namespace TransactionProcessor.IntegrationTests.Features { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "3.0.0.0")] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [NUnit.Framework.TestFixtureAttribute()] - [NUnit.Framework.DescriptionAttribute("Operator")] - [NUnit.Framework.FixtureLifeCycleAttribute(NUnit.Framework.LifeCycle.InstancePerTestCase)] - [NUnit.Framework.CategoryAttribute("base")] - [NUnit.Framework.CategoryAttribute("shared")] + [global::NUnit.Framework.TestFixtureAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Operator")] + [global::NUnit.Framework.FixtureLifeCycleAttribute(global::NUnit.Framework.LifeCycle.InstancePerTestCase)] + [global::NUnit.Framework.CategoryAttribute("base")] + [global::NUnit.Framework.CategoryAttribute("shared")] public partial class OperatorFeature { @@ -31,22 +31,23 @@ public partial class OperatorFeature "base", "shared"}; - private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Features", "Operator", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags); + private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Features", "Operator", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags, InitializeCucumberMessages()); #line 1 "Operator.feature" #line hidden - [NUnit.Framework.OneTimeSetUpAttribute()] + [global::NUnit.Framework.OneTimeSetUpAttribute()] public static async global::System.Threading.Tasks.Task FeatureSetupAsync() { } - [NUnit.Framework.OneTimeTearDownAttribute()] + [global::NUnit.Framework.OneTimeTearDownAttribute()] public static async global::System.Threading.Tasks.Task FeatureTearDownAsync() { + await global::Reqnroll.TestRunnerManager.ReleaseFeatureAsync(featureInfo); } - [NUnit.Framework.SetUpAttribute()] + [global::NUnit.Framework.SetUpAttribute()] public async global::System.Threading.Tasks.Task TestInitializeAsync() { testRunner = global::Reqnroll.TestRunnerManager.GetTestRunnerForAssembly(featureHint: featureInfo); @@ -72,7 +73,7 @@ public partial class OperatorFeature } } - [NUnit.Framework.TearDownAttribute()] + [global::NUnit.Framework.TearDownAttribute()] public async global::System.Threading.Tasks.Task TestTearDownAsync() { if ((testRunner == null)) @@ -90,10 +91,10 @@ public partial class OperatorFeature } } - public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) + public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo, global::Reqnroll.RuleInfo ruleInfo) { - testRunner.OnScenarioInitialize(scenarioInfo); - testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(NUnit.Framework.TestContext.CurrentContext); + testRunner.OnScenarioInitialize(scenarioInfo, ruleInfo); + testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(global::NUnit.Framework.TestContext.CurrentContext); } public async global::System.Threading.Tasks.Task ScenarioStartAsync() @@ -180,21 +181,29 @@ public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) #line hidden } - [NUnit.Framework.TestAttribute()] - [NUnit.Framework.DescriptionAttribute("Update Operator")] - [NUnit.Framework.CategoryAttribute("PRTest")] + private static global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages InitializeCucumberMessages() + { + return new global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages("Features/Operator.feature.ndjson", 3); + } + + [global::NUnit.Framework.TestAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Update Operator")] + [global::NUnit.Framework.CategoryAttribute("PRTest")] public async global::System.Threading.Tasks.Task UpdateOperator() { string[] tagsOfScenario = new string[] { "PRTest"}; global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary(); - global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Update Operator", null, tagsOfScenario, argumentsOfScenario, featureTags); + string pickleIndex = "0"; + global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Update Operator", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex); + string[] tagsOfRule = ((string[])(null)); + global::Reqnroll.RuleInfo ruleInfo = null; #line 31 -this.ScenarioInitialize(scenarioInfo); +this.ScenarioInitialize(scenarioInfo, ruleInfo); #line hidden if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags))) { - testRunner.SkipScenario(); + await testRunner.SkipScenarioAsync(); } else { diff --git a/TransactionProcessor.IntegrationTests/Features/ReconciliationFeature.feature.cs b/TransactionProcessor.IntegrationTests/Features/ReconciliationFeature.feature.cs index 543b1cb1..4c974ee5 100644 --- a/TransactionProcessor.IntegrationTests/Features/ReconciliationFeature.feature.cs +++ b/TransactionProcessor.IntegrationTests/Features/ReconciliationFeature.feature.cs @@ -1,8 +1,8 @@ // ------------------------------------------------------------------------------ // -// This code was generated by Reqnroll (https://www.reqnroll.net/). -// Reqnroll Version:2.0.0.0 -// Reqnroll Generator Version:2.0.0.0 +// This code was generated by Reqnroll (https://reqnroll.net/). +// Reqnroll Version:3.0.0.0 +// Reqnroll Generator Version:3.0.0.0 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -15,13 +15,13 @@ namespace TransactionProcessor.IntegrationTests.Features { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "3.0.0.0")] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [NUnit.Framework.TestFixtureAttribute()] - [NUnit.Framework.DescriptionAttribute("Reconciliation")] - [NUnit.Framework.FixtureLifeCycleAttribute(NUnit.Framework.LifeCycle.InstancePerTestCase)] - [NUnit.Framework.CategoryAttribute("base")] - [NUnit.Framework.CategoryAttribute("shared")] + [global::NUnit.Framework.TestFixtureAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Reconciliation")] + [global::NUnit.Framework.FixtureLifeCycleAttribute(global::NUnit.Framework.LifeCycle.InstancePerTestCase)] + [global::NUnit.Framework.CategoryAttribute("base")] + [global::NUnit.Framework.CategoryAttribute("shared")] public partial class ReconciliationFeature { @@ -31,22 +31,23 @@ public partial class ReconciliationFeature "base", "shared"}; - private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Features", "Reconciliation", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags); + private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Features", "Reconciliation", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags, InitializeCucumberMessages()); #line 1 "ReconciliationFeature.feature" #line hidden - [NUnit.Framework.OneTimeSetUpAttribute()] + [global::NUnit.Framework.OneTimeSetUpAttribute()] public static async global::System.Threading.Tasks.Task FeatureSetupAsync() { } - [NUnit.Framework.OneTimeTearDownAttribute()] + [global::NUnit.Framework.OneTimeTearDownAttribute()] public static async global::System.Threading.Tasks.Task FeatureTearDownAsync() { + await global::Reqnroll.TestRunnerManager.ReleaseFeatureAsync(featureInfo); } - [NUnit.Framework.SetUpAttribute()] + [global::NUnit.Framework.SetUpAttribute()] public async global::System.Threading.Tasks.Task TestInitializeAsync() { testRunner = global::Reqnroll.TestRunnerManager.GetTestRunnerForAssembly(featureHint: featureInfo); @@ -72,7 +73,7 @@ public partial class ReconciliationFeature } } - [NUnit.Framework.TearDownAttribute()] + [global::NUnit.Framework.TearDownAttribute()] public async global::System.Threading.Tasks.Task TestTearDownAsync() { if ((testRunner == null)) @@ -90,10 +91,10 @@ public partial class ReconciliationFeature } } - public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) + public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo, global::Reqnroll.RuleInfo ruleInfo) { - testRunner.OnScenarioInitialize(scenarioInfo); - testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(NUnit.Framework.TestContext.CurrentContext); + testRunner.OnScenarioInitialize(scenarioInfo, ruleInfo); + testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(global::NUnit.Framework.TestContext.CurrentContext); } public async global::System.Threading.Tasks.Task ScenarioStartAsync() @@ -391,21 +392,29 @@ await testRunner.GivenAsync("I have a token to access the estate management and #line hidden } - [NUnit.Framework.TestAttribute()] - [NUnit.Framework.DescriptionAttribute("Reconciliation Transactions")] - [NUnit.Framework.CategoryAttribute("PRTest")] + private static global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages InitializeCucumberMessages() + { + return new global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages("Features/ReconciliationFeature.feature.ndjson", 3); + } + + [global::NUnit.Framework.TestAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Reconciliation Transactions")] + [global::NUnit.Framework.CategoryAttribute("PRTest")] public async global::System.Threading.Tasks.Task ReconciliationTransactions() { string[] tagsOfScenario = new string[] { "PRTest"}; global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary(); - global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Reconciliation Transactions", null, tagsOfScenario, argumentsOfScenario, featureTags); + string pickleIndex = "0"; + global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Reconciliation Transactions", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex); + string[] tagsOfRule = ((string[])(null)); + global::Reqnroll.RuleInfo ruleInfo = null; #line 79 -this.ScenarioInitialize(scenarioInfo); +this.ScenarioInitialize(scenarioInfo, ruleInfo); #line hidden if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags))) { - testRunner.SkipScenario(); + await testRunner.SkipScenarioAsync(); } else { diff --git a/TransactionProcessor.IntegrationTests/Features/RedeemVoucher.feature.cs b/TransactionProcessor.IntegrationTests/Features/RedeemVoucher.feature.cs index 44e575ae..cc094c23 100644 --- a/TransactionProcessor.IntegrationTests/Features/RedeemVoucher.feature.cs +++ b/TransactionProcessor.IntegrationTests/Features/RedeemVoucher.feature.cs @@ -1,8 +1,8 @@ // ------------------------------------------------------------------------------ // -// This code was generated by Reqnroll (https://www.reqnroll.net/). -// Reqnroll Version:2.0.0.0 -// Reqnroll Generator Version:2.0.0.0 +// This code was generated by Reqnroll (https://reqnroll.net/). +// Reqnroll Version:3.0.0.0 +// Reqnroll Generator Version:3.0.0.0 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -15,13 +15,13 @@ namespace TransactionProcessor.IntegrationTests.Features { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "3.0.0.0")] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [NUnit.Framework.TestFixtureAttribute()] - [NUnit.Framework.DescriptionAttribute("RedeemVoucher")] - [NUnit.Framework.FixtureLifeCycleAttribute(NUnit.Framework.LifeCycle.InstancePerTestCase)] - [NUnit.Framework.CategoryAttribute("base")] - [NUnit.Framework.CategoryAttribute("shared")] + [global::NUnit.Framework.TestFixtureAttribute()] + [global::NUnit.Framework.DescriptionAttribute("RedeemVoucher")] + [global::NUnit.Framework.FixtureLifeCycleAttribute(global::NUnit.Framework.LifeCycle.InstancePerTestCase)] + [global::NUnit.Framework.CategoryAttribute("base")] + [global::NUnit.Framework.CategoryAttribute("shared")] public partial class RedeemVoucherFeature { @@ -31,22 +31,23 @@ public partial class RedeemVoucherFeature "base", "shared"}; - private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Features", "RedeemVoucher", "\tSimple calculator for adding two numbers", global::Reqnroll.ProgrammingLanguage.CSharp, featureTags); + private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Features", "RedeemVoucher", "\tSimple calculator for adding two numbers", global::Reqnroll.ProgrammingLanguage.CSharp, featureTags, InitializeCucumberMessages()); #line 1 "RedeemVoucher.feature" #line hidden - [NUnit.Framework.OneTimeSetUpAttribute()] + [global::NUnit.Framework.OneTimeSetUpAttribute()] public static async global::System.Threading.Tasks.Task FeatureSetupAsync() { } - [NUnit.Framework.OneTimeTearDownAttribute()] + [global::NUnit.Framework.OneTimeTearDownAttribute()] public static async global::System.Threading.Tasks.Task FeatureTearDownAsync() { + await global::Reqnroll.TestRunnerManager.ReleaseFeatureAsync(featureInfo); } - [NUnit.Framework.SetUpAttribute()] + [global::NUnit.Framework.SetUpAttribute()] public async global::System.Threading.Tasks.Task TestInitializeAsync() { testRunner = global::Reqnroll.TestRunnerManager.GetTestRunnerForAssembly(featureHint: featureInfo); @@ -72,7 +73,7 @@ public partial class RedeemVoucherFeature } } - [NUnit.Framework.TearDownAttribute()] + [global::NUnit.Framework.TearDownAttribute()] public async global::System.Threading.Tasks.Task TestTearDownAsync() { if ((testRunner == null)) @@ -90,10 +91,10 @@ public partial class RedeemVoucherFeature } } - public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) + public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo, global::Reqnroll.RuleInfo ruleInfo) { - testRunner.OnScenarioInitialize(scenarioInfo); - testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(NUnit.Framework.TestContext.CurrentContext); + testRunner.OnScenarioInitialize(scenarioInfo, ruleInfo); + testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(global::NUnit.Framework.TestContext.CurrentContext); } public async global::System.Threading.Tasks.Task ScenarioStartAsync() @@ -346,21 +347,29 @@ await testRunner.GivenAsync("I have a token to access the estate management and #line hidden } - [NUnit.Framework.TestAttribute()] - [NUnit.Framework.DescriptionAttribute("Redeem Vouchers")] - [NUnit.Framework.CategoryAttribute("PRTest")] + private static global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages InitializeCucumberMessages() + { + return new global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages("Features/RedeemVoucher.feature.ndjson", 3); + } + + [global::NUnit.Framework.TestAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Redeem Vouchers")] + [global::NUnit.Framework.CategoryAttribute("PRTest")] public async global::System.Threading.Tasks.Task RedeemVouchers() { string[] tagsOfScenario = new string[] { "PRTest"}; global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary(); - global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Redeem Vouchers", null, tagsOfScenario, argumentsOfScenario, featureTags); + string pickleIndex = "0"; + global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Redeem Vouchers", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex); + string[] tagsOfRule = ((string[])(null)); + global::Reqnroll.RuleInfo ruleInfo = null; #line 72 -this.ScenarioInitialize(scenarioInfo); +this.ScenarioInitialize(scenarioInfo, ruleInfo); #line hidden if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags))) { - testRunner.SkipScenario(); + await testRunner.SkipScenarioAsync(); } else { diff --git a/TransactionProcessor.IntegrationTests/Features/SaleTransactionFeature.feature.cs b/TransactionProcessor.IntegrationTests/Features/SaleTransactionFeature.feature.cs index 1c781c15..a1816050 100644 --- a/TransactionProcessor.IntegrationTests/Features/SaleTransactionFeature.feature.cs +++ b/TransactionProcessor.IntegrationTests/Features/SaleTransactionFeature.feature.cs @@ -1,8 +1,8 @@ // ------------------------------------------------------------------------------ // -// This code was generated by Reqnroll (https://www.reqnroll.net/). -// Reqnroll Version:2.0.0.0 -// Reqnroll Generator Version:2.0.0.0 +// This code was generated by Reqnroll (https://reqnroll.net/). +// Reqnroll Version:3.0.0.0 +// Reqnroll Generator Version:3.0.0.0 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -15,13 +15,13 @@ namespace TransactionProcessor.IntegrationTests.Features { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "3.0.0.0")] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [NUnit.Framework.TestFixtureAttribute()] - [NUnit.Framework.DescriptionAttribute("SaleTransaction")] - [NUnit.Framework.FixtureLifeCycleAttribute(NUnit.Framework.LifeCycle.InstancePerTestCase)] - [NUnit.Framework.CategoryAttribute("base")] - [NUnit.Framework.CategoryAttribute("shared")] + [global::NUnit.Framework.TestFixtureAttribute()] + [global::NUnit.Framework.DescriptionAttribute("SaleTransaction")] + [global::NUnit.Framework.FixtureLifeCycleAttribute(global::NUnit.Framework.LifeCycle.InstancePerTestCase)] + [global::NUnit.Framework.CategoryAttribute("base")] + [global::NUnit.Framework.CategoryAttribute("shared")] public partial class SaleTransactionFeature { @@ -31,22 +31,23 @@ public partial class SaleTransactionFeature "base", "shared"}; - private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Features", "SaleTransaction", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags); + private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Features", "SaleTransaction", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags, InitializeCucumberMessages()); #line 1 "SaleTransactionFeature.feature" #line hidden - [NUnit.Framework.OneTimeSetUpAttribute()] + [global::NUnit.Framework.OneTimeSetUpAttribute()] public static async global::System.Threading.Tasks.Task FeatureSetupAsync() { } - [NUnit.Framework.OneTimeTearDownAttribute()] + [global::NUnit.Framework.OneTimeTearDownAttribute()] public static async global::System.Threading.Tasks.Task FeatureTearDownAsync() { + await global::Reqnroll.TestRunnerManager.ReleaseFeatureAsync(featureInfo); } - [NUnit.Framework.SetUpAttribute()] + [global::NUnit.Framework.SetUpAttribute()] public async global::System.Threading.Tasks.Task TestInitializeAsync() { testRunner = global::Reqnroll.TestRunnerManager.GetTestRunnerForAssembly(featureHint: featureInfo); @@ -72,7 +73,7 @@ public partial class SaleTransactionFeature } } - [NUnit.Framework.TearDownAttribute()] + [global::NUnit.Framework.TearDownAttribute()] public async global::System.Threading.Tasks.Task TestTearDownAsync() { if ((testRunner == null)) @@ -90,10 +91,10 @@ public partial class SaleTransactionFeature } } - public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) + public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo, global::Reqnroll.RuleInfo ruleInfo) { - testRunner.OnScenarioInitialize(scenarioInfo); - testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(NUnit.Framework.TestContext.CurrentContext); + testRunner.OnScenarioInitialize(scenarioInfo, ruleInfo); + testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(global::NUnit.Framework.TestContext.CurrentContext); } public async global::System.Threading.Tasks.Task ScenarioStartAsync() @@ -662,21 +663,29 @@ await testRunner.GivenAsync("I have a token to access the estate management and #line hidden } - [NUnit.Framework.TestAttribute()] - [NUnit.Framework.DescriptionAttribute("Sale Transactions")] - [NUnit.Framework.CategoryAttribute("PRTest")] + private static global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages InitializeCucumberMessages() + { + return new global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages("Features/SaleTransactionFeature.feature.ndjson", 3); + } + + [global::NUnit.Framework.TestAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Sale Transactions")] + [global::NUnit.Framework.CategoryAttribute("PRTest")] public async global::System.Threading.Tasks.Task SaleTransactions() { string[] tagsOfScenario = new string[] { "PRTest"}; global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary(); - global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Sale Transactions", null, tagsOfScenario, argumentsOfScenario, featureTags); + string pickleIndex = "0"; + global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Sale Transactions", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex); + string[] tagsOfRule = ((string[])(null)); + global::Reqnroll.RuleInfo ruleInfo = null; #line 140 -this.ScenarioInitialize(scenarioInfo); +this.ScenarioInitialize(scenarioInfo, ruleInfo); #line hidden if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags))) { - testRunner.SkipScenario(); + await testRunner.SkipScenarioAsync(); } else { diff --git a/TransactionProcessor.IntegrationTests/Features/Settlement.feature.cs b/TransactionProcessor.IntegrationTests/Features/Settlement.feature.cs index 05d9a171..84b36d47 100644 --- a/TransactionProcessor.IntegrationTests/Features/Settlement.feature.cs +++ b/TransactionProcessor.IntegrationTests/Features/Settlement.feature.cs @@ -1,8 +1,8 @@ // ------------------------------------------------------------------------------ // -// This code was generated by Reqnroll (https://www.reqnroll.net/). -// Reqnroll Version:2.0.0.0 -// Reqnroll Generator Version:2.0.0.0 +// This code was generated by Reqnroll (https://reqnroll.net/). +// Reqnroll Version:3.0.0.0 +// Reqnroll Generator Version:3.0.0.0 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -15,13 +15,13 @@ namespace TransactionProcessor.IntegrationTests.Features { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "3.0.0.0")] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [NUnit.Framework.TestFixtureAttribute()] - [NUnit.Framework.DescriptionAttribute("Settlement")] - [NUnit.Framework.FixtureLifeCycleAttribute(NUnit.Framework.LifeCycle.InstancePerTestCase)] - [NUnit.Framework.CategoryAttribute("base")] - [NUnit.Framework.CategoryAttribute("shared")] + [global::NUnit.Framework.TestFixtureAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Settlement")] + [global::NUnit.Framework.FixtureLifeCycleAttribute(global::NUnit.Framework.LifeCycle.InstancePerTestCase)] + [global::NUnit.Framework.CategoryAttribute("base")] + [global::NUnit.Framework.CategoryAttribute("shared")] public partial class SettlementFeature { @@ -31,22 +31,23 @@ public partial class SettlementFeature "base", "shared"}; - private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Features", "Settlement", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags); + private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Features", "Settlement", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags, InitializeCucumberMessages()); #line 1 "Settlement.feature" #line hidden - [NUnit.Framework.OneTimeSetUpAttribute()] + [global::NUnit.Framework.OneTimeSetUpAttribute()] public static async global::System.Threading.Tasks.Task FeatureSetupAsync() { } - [NUnit.Framework.OneTimeTearDownAttribute()] + [global::NUnit.Framework.OneTimeTearDownAttribute()] public static async global::System.Threading.Tasks.Task FeatureTearDownAsync() { + await global::Reqnroll.TestRunnerManager.ReleaseFeatureAsync(featureInfo); } - [NUnit.Framework.SetUpAttribute()] + [global::NUnit.Framework.SetUpAttribute()] public async global::System.Threading.Tasks.Task TestInitializeAsync() { testRunner = global::Reqnroll.TestRunnerManager.GetTestRunnerForAssembly(featureHint: featureInfo); @@ -72,7 +73,7 @@ public partial class SettlementFeature } } - [NUnit.Framework.TearDownAttribute()] + [global::NUnit.Framework.TearDownAttribute()] public async global::System.Threading.Tasks.Task TestTearDownAsync() { if ((testRunner == null)) @@ -90,10 +91,10 @@ public partial class SettlementFeature } } - public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) + public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo, global::Reqnroll.RuleInfo ruleInfo) { - testRunner.OnScenarioInitialize(scenarioInfo); - testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(NUnit.Framework.TestContext.CurrentContext); + testRunner.OnScenarioInitialize(scenarioInfo, ruleInfo); + testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(global::NUnit.Framework.TestContext.CurrentContext); } public async global::System.Threading.Tasks.Task ScenarioStartAsync() @@ -279,19 +280,27 @@ await testRunner.GivenAsync("I have a token to access the estate management and #line hidden } - [NUnit.Framework.TestAttribute()] - [NUnit.Framework.DescriptionAttribute("Get Pending Settlement")] + private static global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages InitializeCucumberMessages() + { + return new global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages("Features/Settlement.feature.ndjson", 4); + } + + [global::NUnit.Framework.TestAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Get Pending Settlement")] public async global::System.Threading.Tasks.Task GetPendingSettlement() { string[] tagsOfScenario = ((string[])(null)); global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary(); - global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Get Pending Settlement", null, tagsOfScenario, argumentsOfScenario, featureTags); + string pickleIndex = "0"; + global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Get Pending Settlement", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex); + string[] tagsOfRule = ((string[])(null)); + global::Reqnroll.RuleInfo ruleInfo = null; #line 54 -this.ScenarioInitialize(scenarioInfo); +this.ScenarioInitialize(scenarioInfo, ruleInfo); #line hidden if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags))) { - testRunner.SkipScenario(); + await testRunner.SkipScenarioAsync(); } else { @@ -703,21 +712,24 @@ await testRunner.GivenAsync("I have a token to access the estate management and await this.ScenarioCleanupAsync(); } - [NUnit.Framework.TestAttribute()] - [NUnit.Framework.DescriptionAttribute("Process Settlement")] - [NUnit.Framework.CategoryAttribute("PRTest")] + [global::NUnit.Framework.TestAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Process Settlement")] + [global::NUnit.Framework.CategoryAttribute("PRTest")] public async global::System.Threading.Tasks.Task ProcessSettlement() { string[] tagsOfScenario = new string[] { "PRTest"}; global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary(); - global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Process Settlement", null, tagsOfScenario, argumentsOfScenario, featureTags); + string pickleIndex = "1"; + global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Process Settlement", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex); + string[] tagsOfRule = ((string[])(null)); + global::Reqnroll.RuleInfo ruleInfo = null; #line 123 -this.ScenarioInitialize(scenarioInfo); +this.ScenarioInitialize(scenarioInfo, ruleInfo); #line hidden if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags))) { - testRunner.SkipScenario(); + await testRunner.SkipScenarioAsync(); } else { diff --git a/TransactionProcessor.IntegrationTests/Features/SettlementReporting.feature.cs b/TransactionProcessor.IntegrationTests/Features/SettlementReporting.feature.cs index f7d94c1c..6b33ca79 100644 --- a/TransactionProcessor.IntegrationTests/Features/SettlementReporting.feature.cs +++ b/TransactionProcessor.IntegrationTests/Features/SettlementReporting.feature.cs @@ -1,8 +1,8 @@ // ------------------------------------------------------------------------------ // -// This code was generated by Reqnroll (https://www.reqnroll.net/). -// Reqnroll Version:2.0.0.0 -// Reqnroll Generator Version:2.0.0.0 +// This code was generated by Reqnroll (https://reqnroll.net/). +// Reqnroll Version:3.0.0.0 +// Reqnroll Generator Version:3.0.0.0 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -15,13 +15,13 @@ namespace TransactionProcessor.IntegrationTests.Features { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Reqnroll", "3.0.0.0")] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [NUnit.Framework.TestFixtureAttribute()] - [NUnit.Framework.DescriptionAttribute("SettlementReporting")] - [NUnit.Framework.FixtureLifeCycleAttribute(NUnit.Framework.LifeCycle.InstancePerTestCase)] - [NUnit.Framework.CategoryAttribute("base")] - [NUnit.Framework.CategoryAttribute("shared")] + [global::NUnit.Framework.TestFixtureAttribute()] + [global::NUnit.Framework.DescriptionAttribute("SettlementReporting")] + [global::NUnit.Framework.FixtureLifeCycleAttribute(global::NUnit.Framework.LifeCycle.InstancePerTestCase)] + [global::NUnit.Framework.CategoryAttribute("base")] + [global::NUnit.Framework.CategoryAttribute("shared")] public partial class SettlementReportingFeature { @@ -31,22 +31,23 @@ public partial class SettlementReportingFeature "base", "shared"}; - private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Features", "SettlementReporting", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags); + private static global::Reqnroll.FeatureInfo featureInfo = new global::Reqnroll.FeatureInfo(new global::System.Globalization.CultureInfo("en-US"), "Features", "SettlementReporting", null, global::Reqnroll.ProgrammingLanguage.CSharp, featureTags, InitializeCucumberMessages()); #line 1 "SettlementReporting.feature" #line hidden - [NUnit.Framework.OneTimeSetUpAttribute()] + [global::NUnit.Framework.OneTimeSetUpAttribute()] public static async global::System.Threading.Tasks.Task FeatureSetupAsync() { } - [NUnit.Framework.OneTimeTearDownAttribute()] + [global::NUnit.Framework.OneTimeTearDownAttribute()] public static async global::System.Threading.Tasks.Task FeatureTearDownAsync() { + await global::Reqnroll.TestRunnerManager.ReleaseFeatureAsync(featureInfo); } - [NUnit.Framework.SetUpAttribute()] + [global::NUnit.Framework.SetUpAttribute()] public async global::System.Threading.Tasks.Task TestInitializeAsync() { testRunner = global::Reqnroll.TestRunnerManager.GetTestRunnerForAssembly(featureHint: featureInfo); @@ -72,7 +73,7 @@ public partial class SettlementReportingFeature } } - [NUnit.Framework.TearDownAttribute()] + [global::NUnit.Framework.TearDownAttribute()] public async global::System.Threading.Tasks.Task TestTearDownAsync() { if ((testRunner == null)) @@ -90,10 +91,10 @@ public partial class SettlementReportingFeature } } - public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo) + public void ScenarioInitialize(global::Reqnroll.ScenarioInfo scenarioInfo, global::Reqnroll.RuleInfo ruleInfo) { - testRunner.OnScenarioInitialize(scenarioInfo); - testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(NUnit.Framework.TestContext.CurrentContext); + testRunner.OnScenarioInitialize(scenarioInfo, ruleInfo); + testRunner.ScenarioContext.ScenarioContainer.RegisterInstanceAs(global::NUnit.Framework.TestContext.CurrentContext); } public async global::System.Threading.Tasks.Task ScenarioStartAsync() @@ -749,23 +750,31 @@ await testRunner.GivenAsync("I have a token to access the estate management and #line hidden } - [NUnit.Framework.TestAttribute()] - [NUnit.Framework.DescriptionAttribute("Get Settlements - Merchant Filter")] - [NUnit.Framework.CategoryAttribute("settlement")] - [NUnit.Framework.CategoryAttribute("PRTest")] + private static global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages InitializeCucumberMessages() + { + return new global::Reqnroll.Formatters.RuntimeSupport.FeatureLevelCucumberMessages("Features/SettlementReporting.feature.ndjson", 3); + } + + [global::NUnit.Framework.TestAttribute()] + [global::NUnit.Framework.DescriptionAttribute("Get Settlements - Merchant Filter")] + [global::NUnit.Framework.CategoryAttribute("settlement")] + [global::NUnit.Framework.CategoryAttribute("PRTest")] public async global::System.Threading.Tasks.Task GetSettlements_MerchantFilter() { string[] tagsOfScenario = new string[] { "settlement", "PRTest"}; global::System.Collections.Specialized.OrderedDictionary argumentsOfScenario = new global::System.Collections.Specialized.OrderedDictionary(); - global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Get Settlements - Merchant Filter", null, tagsOfScenario, argumentsOfScenario, featureTags); + string pickleIndex = "0"; + global::Reqnroll.ScenarioInfo scenarioInfo = new global::Reqnroll.ScenarioInfo("Get Settlements - Merchant Filter", null, tagsOfScenario, argumentsOfScenario, featureTags, pickleIndex); + string[] tagsOfRule = ((string[])(null)); + global::Reqnroll.RuleInfo ruleInfo = null; #line 137 -this.ScenarioInitialize(scenarioInfo); +this.ScenarioInitialize(scenarioInfo, ruleInfo); #line hidden if ((global::Reqnroll.TagHelper.ContainsIgnoreTag(scenarioInfo.CombinedTags) || global::Reqnroll.TagHelper.ContainsIgnoreTag(featureTags))) { - testRunner.SkipScenario(); + await testRunner.SkipScenarioAsync(); } else { diff --git a/TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj b/TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj index e1279700..5a2f00ad 100644 --- a/TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj +++ b/TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj @@ -7,30 +7,30 @@ - - + + - - - - - - - + + + + + + + - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + diff --git a/TransactionProcessor.ProjectionEngine.Tests/TransactionProcessor.ProjectionEngine.Tests.csproj b/TransactionProcessor.ProjectionEngine.Tests/TransactionProcessor.ProjectionEngine.Tests.csproj index 8900cd8f..9972c500 100644 --- a/TransactionProcessor.ProjectionEngine.Tests/TransactionProcessor.ProjectionEngine.Tests.csproj +++ b/TransactionProcessor.ProjectionEngine.Tests/TransactionProcessor.ProjectionEngine.Tests.csproj @@ -9,16 +9,16 @@ - - - - - + + + + + - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/TransactionProcessor.ProjectionEngine/TransactionProcessor.ProjectionEngine.csproj b/TransactionProcessor.ProjectionEngine/TransactionProcessor.ProjectionEngine.csproj index 28a66a93..3e9da336 100644 --- a/TransactionProcessor.ProjectionEngine/TransactionProcessor.ProjectionEngine.csproj +++ b/TransactionProcessor.ProjectionEngine/TransactionProcessor.ProjectionEngine.csproj @@ -7,13 +7,13 @@ - - - - - - - + + + + + + + diff --git a/TransactionProcessor.Repository/ITransactionProcessorReadModelRepository.cs b/TransactionProcessor.Repository/ITransactionProcessorReadModelRepository.cs index 03b53a76..c62f6dc9 100644 --- a/TransactionProcessor.Repository/ITransactionProcessorReadModelRepository.cs +++ b/TransactionProcessor.Repository/ITransactionProcessorReadModelRepository.cs @@ -293,7 +293,7 @@ Task RecordTransactionTimings(TransactionDomainEvents.TransactionTimings [ExcludeFromCodeCoverage] public class TransactionProcessorReadModelRepository : ITransactionProcessorReadModelRepository { private readonly IDbContextResolver Resolver; - private readonly Shared.EntityFramework.IDbContextFactory DbContextFactory; + private readonly IDbContextFactory DbContextFactory; private static readonly String EstateManagementDatabaseName = "TransactionProcessorReadModel"; public TransactionProcessorReadModelRepository(IDbContextResolver resolver) { diff --git a/TransactionProcessor.Repository/TransactionProcessor.Repository.csproj b/TransactionProcessor.Repository/TransactionProcessor.Repository.csproj index 89ae037c..bc82c1b1 100644 --- a/TransactionProcessor.Repository/TransactionProcessor.Repository.csproj +++ b/TransactionProcessor.Repository/TransactionProcessor.Repository.csproj @@ -8,16 +8,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/TransactionProcessor.Testing/TransactionProcessor.Testing.csproj b/TransactionProcessor.Testing/TransactionProcessor.Testing.csproj index 7840f717..18b802dc 100644 --- a/TransactionProcessor.Testing/TransactionProcessor.Testing.csproj +++ b/TransactionProcessor.Testing/TransactionProcessor.Testing.csproj @@ -6,13 +6,13 @@ - + - - + + - - + + diff --git a/TransactionProcessor.Tests/ControllerTests/ControllerTests.cs b/TransactionProcessor.Tests/ControllerTests/ControllerTests.cs deleted file mode 100644 index 0ceef5e2..00000000 --- a/TransactionProcessor.Tests/ControllerTests/ControllerTests.cs +++ /dev/null @@ -1,68 +0,0 @@ -using System; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using Moq; -using Newtonsoft.Json; -using Shared.EventStore.EventHandling; -using Shouldly; -using TransactionProcessor.Controllers; -using TransactionProcessor.DomainEvents; -using Xunit; - -namespace TransactionProcessor.Tests.ControllerTests -{ - using System.Threading; - using Shared.General; - using Shared.Logger; - - public class ControllerTests - { - public ControllerTests() - { - Logger.Initialise(new NullLogger()); - } - [Fact] - public async Task DomainEventController_EventIdNotPresentInJson_ErrorThrown() - { - Mock resolver = new Mock(); - TypeMap.AddType("TransactionHasBeenCompletedEvent"); - DefaultHttpContext httpContext = new DefaultHttpContext(); - httpContext.Request.Headers["eventType"] = "TransactionHasBeenCompletedEvent"; - DomainEventController controller = new DomainEventController(resolver.Object) - { - ControllerContext = new ControllerContext() - { - HttpContext = httpContext - } - }; - String json = "{\r\n \"completedDateTime\": \"2022-11-08T15:40:07\",\r\n \"estateId\": \"435613ac-a468-47a3-ac4f-649d89764c22\",\r\n \"isAuthorised\": true,\r\n \"transactionAmount\": 35.0,\r\n \"merchantId\": \"8bc8434d-41f9-4cc3-83bc-e73f20c02e1d\",\r\n \"responseCode\": \"0000\",\r\n \"responseMessage\": \"SUCCESS\",\r\n \"transactionId\": \"626644c5-bb7b-40ca-821e-cf115488867b\",\r\n}"; - Object request = JsonConvert.DeserializeObject(json); - ArgumentException ex = Should.Throw(async () => { - await controller.PostEventAsync(request, CancellationToken.None); - }); - ex.Message.ShouldBe("Domain Event must contain an Event Id"); - } - - [Fact] - public async Task DomainEventController_EventIdPresentInJson_NoErrorThrown() - { - Mock resolver = new Mock(); - TypeMap.AddType("TransactionHasBeenCompletedEvent"); - DefaultHttpContext httpContext = new DefaultHttpContext(); - httpContext.Request.Headers["eventType"] = "TransactionHasBeenCompletedEvent"; - DomainEventController controller = new DomainEventController(resolver.Object) - { - ControllerContext = new ControllerContext() - { - HttpContext = httpContext - } - }; - String json = "{\r\n \"completedDateTime\": \"2022-11-08T15:40:07\",\r\n \"estateId\": \"435613ac-a468-47a3-ac4f-649d89764c22\",\r\n \"isAuthorised\": true,\r\n \"transactionAmount\": 35.0,\r\n \"merchantId\": \"8bc8434d-41f9-4cc3-83bc-e73f20c02e1d\",\r\n \"responseCode\": \"0000\",\r\n \"responseMessage\": \"SUCCESS\",\r\n \"transactionId\": \"626644c5-bb7b-40ca-821e-cf115488867b\",\r\n \"eventId\": \"9840045a-df9f-4ae3-879d-db205a744bf3\"\r\n}"; - Object request = JsonConvert.DeserializeObject(json); - Should.NotThrow(async () => { - await controller.PostEventAsync(request, CancellationToken.None); - }); - } - } -} diff --git a/TransactionProcessor.Tests/TransactionProcessor.Tests.csproj b/TransactionProcessor.Tests/TransactionProcessor.Tests.csproj index c9e864ee..87b2d859 100644 --- a/TransactionProcessor.Tests/TransactionProcessor.Tests.csproj +++ b/TransactionProcessor.Tests/TransactionProcessor.Tests.csproj @@ -7,23 +7,23 @@ - - - - - - - + + + + + + + - + - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/TransactionProcessor/Bootstrapper/RepositoryRegistry.cs b/TransactionProcessor/Bootstrapper/RepositoryRegistry.cs index 4e814764..7e2a700e 100644 --- a/TransactionProcessor/Bootstrapper/RepositoryRegistry.cs +++ b/TransactionProcessor/Bootstrapper/RepositoryRegistry.cs @@ -17,12 +17,10 @@ namespace TransactionProcessor.Bootstrapper using ProjectionEngine.State; using Shared.DomainDrivenDesign.EventSourcing; using Shared.EntityFramework; - using Shared.EntityFramework.ConnectionStringConfiguration; using Shared.EventStore.Aggregate; using Shared.EventStore.EventStore; using Shared.EventStore.SubscriptionWorker; using Shared.General; - using Shared.Repositories; using System; using System.Data.Common; using System.Diagnostics.CodeAnalysis; @@ -120,49 +118,4 @@ private void RegisterAggregateCachingFunc() { }); } } - - - [ExcludeFromCodeCoverage] - public class ConfigurationReaderConnectionStringRepository : IConnectionStringConfigurationRepository - { - #region Methods - - public async Task CreateConnectionString(String externalIdentifier, - String connectionStringIdentifier, - String connectionString, - CancellationToken cancellationToken) - { - throw new NotImplementedException("This is only required to complete the interface"); - } - - public async Task DeleteConnectionStringConfiguration(String externalIdentifier, - String connectionStringIdentifier, - CancellationToken cancellationToken) - { - throw new NotImplementedException("This is only required to complete the interface"); - } - - public async Task GetConnectionString(String externalIdentifier, - String connectionStringIdentifier, - CancellationToken cancellationToken) - { - String connectionString = string.Empty; - String databaseName = string.Empty; - - databaseName = $"{connectionStringIdentifier}{externalIdentifier}"; - connectionString = ConfigurationReader.GetConnectionString(connectionStringIdentifier); - - DbConnectionStringBuilder builder = null; - - // Default to SQL Server - builder = new SqlConnectionStringBuilder(connectionString) - { - InitialCatalog = databaseName - }; - - return builder.ToString(); - } - - #endregion - } } \ No newline at end of file diff --git a/TransactionProcessor/Controllers/DomainEventController.cs b/TransactionProcessor/Controllers/DomainEventController.cs index 5eb94afe..9e6286e3 100644 --- a/TransactionProcessor/Controllers/DomainEventController.cs +++ b/TransactionProcessor/Controllers/DomainEventController.cs @@ -119,14 +119,20 @@ private List GetDomainEventHandlers(IDomainEvent domainEven var resolver = Startup.Container.GetInstance(eventHandlerType); // We are being told by the caller to use a specific handler var allhandlers = resolver.GetDomainEventHandlers(domainEvent); - var handlers = allhandlers.Where(h => h.GetType().Name.Contains(eventHandler)); + + if (!allhandlers.IsFailed) + return new List(); + + var handlers = allhandlers.Data.Where(h => h.GetType().Name.Contains(eventHandler)); return handlers.ToList(); } - List eventHandlers = this.DomainEventHandlerResolver.GetDomainEventHandlers(domainEvent); - return eventHandlers; + var eventHandlersResult = this.DomainEventHandlerResolver.GetDomainEventHandlers(domainEvent); + if (eventHandlersResult.IsFailed) + return new List(); + return eventHandlersResult.Data; } private async Task GetDomainEvent(Object domainEvent) diff --git a/TransactionProcessor/TransactionProcessor.csproj b/TransactionProcessor/TransactionProcessor.csproj index a82bda69..7815593f 100644 --- a/TransactionProcessor/TransactionProcessor.csproj +++ b/TransactionProcessor/TransactionProcessor.csproj @@ -10,45 +10,45 @@ - - - + + + - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + - + - - - - - - - - - - - + + + + + + + + + + + - - + +