Merge pull request #811 from TransactionProcessing/nightly/#807_fix_nightly

Enhance error handling in estate retrieval process

Author: StuartFerguson

TransactionProcessor.IntegrationTesting.Helpers/TransactionProcessorSteps.cs

@@ -995,12 +995,13 @@ public async Task WhenIGetTheEstateTheEstateSecurityUserDetailsAreReturnedAsFoll
         }
     }
 
-    public async Task WhenIGetTheEstateAnErrorIsReturned(String accessToken, String estateName, List<EstateDetails> estateDetailsList)
+    public async Task WhenIGetTheEstateAnErrorIsReturned(String accessToken, String estateName, List<EstateDetails> estateDetailsList, String errorStatus)
     {
         Guid estateId = Guid.NewGuid();
         Result<EstateResponse>? result = await this.TransactionProcessorClient.GetEstate(accessToken, estateId, CancellationToken.None).ConfigureAwait(false);
         result.IsSuccess.ShouldBeFalse();
-        result.Status.ShouldBe(ResultStatus.NotFound);
+        ResultStatus status = Enum.Parse<ResultStatus>(errorStatus);
+        result.Status.ShouldBe(status);
     }
 
     public async Task WhenIRemoveTheOperatorFromEstateTheOperatorIsRemoved(String accessToken, List<EstateDetails> estateDetailsList, String estateName, String operatorName)

TransactionProcessor.IntegrationTests/Features/Estate.feature

@@ -50,7 +50,7 @@ Scenario: Get Estate
 	| EmailAddress                  |
 	| estateuser1@testestate1.co.uk |
 	| estateuser2@testestate1.co.uk |
-	When I get the estate "Test Estate 2" an error is returned
+	When I get the estate "Test Estate 2" a "NotFound" error is returned
 	Given I am logged in as "[email protected]" with password "123456" for Estate "Test Estate 1" with client "estateClient"
 	When I get the estate "Test Estate 1" the estate details are returned as follows
 	| EstateName    |
@@ -63,7 +63,7 @@ Scenario: Get Estate
 	| EmailAddress                  |
 	| estateuser1@testestate1.co.uk |
 	| estateuser2@testestate1.co.uk |
-	When I get the estate "Test Estate 2" an error is returned
+	When I get the estate "Test Estate 2" a "Failure" error is returned
 
 Scenario: Update Estate
 	Given I have created the following estates

TransactionProcessor.IntegrationTests/Features/Estate.feature.cs

@@ -467,12 +467,19 @@ public async Task WhenIGetTheEstateTheEstateSecurityUserDetailsAreReturnedAsFoll
             await this.TransactionProcessorSteps.WhenIGetTheEstateTheEstateSecurityUserDetailsAreReturnedAsFollows(this.TestingContext.AccessToken, estateName, this.TestingContext.Estates, securityUsers);
         }
 
-        [When(@"I get the estate ""(.*)"" an error is returned")]
-        public async Task WhenIGetTheEstateAnErrorIsReturned(String estateName)
+        //[When(@"I get the estate ""(.*)"" an error is returned")]
+        //public async Task WhenIGetTheEstateAnErrorIsReturned(String estateName)
+        //{
+        //    await this.TransactionProcessorSteps.WhenIGetTheEstateAnErrorIsReturned(this.TestingContext.AccessToken, estateName, this.TestingContext.Estates);
+        //}
+
+        [When("I get the estate {string} a {string} error is returned")]
+        public async Task WhenIGetTheEstateAErrorIsReturned(String estateName, string errorStatus)
         {
-            await this.TransactionProcessorSteps.WhenIGetTheEstateAnErrorIsReturned(this.TestingContext.AccessToken, estateName, this.TestingContext.Estates);
+            await this.TransactionProcessorSteps.WhenIGetTheEstateAnErrorIsReturned(this.TestingContext.AccessToken, estateName, this.TestingContext.Estates, errorStatus);
         }
 
+
         [Given(@"I am logged in as ""(.*)"" with password ""(.*)"" for Estate ""(.*)"" with client ""(.*)""")]
         public async Task GivenIAmLoggedInAsWithPasswordForEstate(String username,
                                                                   String password,