Skip to content

Commit 1bb3647

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #658 from TransactionProcessing/task/#657_update_security_client
Task/#657 update security client
2 parents d235549 + 9edc85a commit 1bb3647

File tree

34 files changed

+163
-238
lines changed

34 files changed

+163
-238
lines changed

‎TransactionProcessor.BusinessLogic.Tests/DomainEventHandlers/VoucherDomainEventHandlerTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public async Task VoucherDomainEventHandler_VoucherIssuedEvent_WithEmailAddress_
6666
Logger.Initialise(NullLogger.Instance);
6767

6868
Mock<ISecurityServiceClient> securityServiceClient = new Mock<ISecurityServiceClient>();
69-
securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
69+
securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
7070

7171
Mock<IAggregateRepository<VoucherAggregate, DomainEvent>> voucherAggregateRepository = new Mock<IAggregateRepository<VoucherAggregate, DomainEvent>>();
7272
voucherAggregateRepository.Setup(t => t.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
@@ -115,7 +115,7 @@ public async Task VoucherDomainEventHandler_VoucherIssuedEvent_WithRecipientMobi
115115
Logger.Initialise(NullLogger.Instance);
116116

117117
Mock<ISecurityServiceClient> securityServiceClient = new Mock<ISecurityServiceClient>();
118-
securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
118+
securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
119119

120120
Mock<IAggregateRepository<VoucherAggregate, DomainEvent>> voucherAggregateRepository = new Mock<IAggregateRepository<VoucherAggregate, DomainEvent>>();
121121
voucherAggregateRepository.Setup(t => t.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))

‎TransactionProcessor.BusinessLogic.Tests/Services/FloatDomainServiceTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public FloatDomainServiceTests(){
5555
[Fact]
5656
public async Task FloatDomainService_CreateFloatForContractProduct_FloatCreated(){
5757

58-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
58+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
5959

6060
this.EstateClient.Setup(e => e.GetEstate(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
6161
.ReturnsAsync(TestData.GetEstateResponseWithOperator1);
@@ -85,7 +85,7 @@ public async Task FloatDomainService_CreateFloatForContractProduct_FloatCreated(
8585
public async Task FloatDomainService_CreateFloatForContractProduct_InvalidEstate_ErrorThrown()
8686
{
8787

88-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
88+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
8989

9090
this.FloatAggregateRepository.Setup(f => f.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(new FloatAggregate());
9191
this.EstateClient
@@ -115,7 +115,7 @@ public async Task FloatDomainService_CreateFloatForContractProduct_InvalidEstate
115115
public async Task FloatDomainService_CreateFloatForContractProduct_InvalidContract_ErrorThrown()
116116
{
117117

118-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
118+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
119119

120120
this.EstateClient.Setup(e => e.GetEstate(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
121121
.ReturnsAsync(TestData.GetEstateResponseWithOperator1);
@@ -133,7 +133,7 @@ public async Task FloatDomainService_CreateFloatForContractProduct_InvalidContra
133133
public async Task FloatDomainService_CreateFloatForContractProduct_InvalidContractProduct_ErrorThrown()
134134
{
135135

136-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
136+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
137137

138138
this.EstateClient.Setup(e => e.GetEstate(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
139139
.ReturnsAsync(TestData.GetEstateResponseWithOperator1);

‎TransactionProcessor.BusinessLogic.Tests/Services/SettlementDomainServiceTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public async Task SettlementDomainService_ProcessSettlement_SettlementIsProcesse
8585
.ReturnsAsync(Result.Success());
8686

8787

88-
this.securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
88+
this.securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
8989

9090
this.estateClient.Setup(e => e.GetMerchant(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
9191
.ReturnsAsync(TestData.GetMerchantResponseWithOperator1);
@@ -127,7 +127,7 @@ public async Task SettlementDomainService_ProcessSettlement_SettlementAggregateN
127127
this.settlementAggregateRepository
128128
.Setup(s => s.SaveChanges(It.IsAny<SettlementAggregate>(), It.IsAny<CancellationToken>()))
129129
.ReturnsAsync(Result.Success);
130-
this.securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
130+
this.securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
131131

132132
this.estateClient.Setup(e => e.GetMerchant(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
133133
.ReturnsAsync(TestData.GetMerchantResponseWithOperator1);
@@ -149,7 +149,7 @@ public async Task SettlementDomainService_ProcessSettlement_AddSettledFeeThrownE
149149
this.settlementAggregateRepository
150150
.Setup(s => s.SaveChanges(It.IsAny<SettlementAggregate>(), It.IsAny<CancellationToken>()))
151151
.ReturnsAsync(Result.Success);
152-
this.securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
152+
this.securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
153153

154154
this.transactionAggregateRepository.SetupSequence(s => s.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
155155
.ReturnsAsync(TestData.GetCompletedAuthorisedSaleTransactionAggregateWithPendingFee(TestData.FeeIds.GetValueOrDefault(0)))

‎TransactionProcessor.BusinessLogic.Tests/Services/TransactionDomainServiceTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public async Task TransactionDomainService_ProcessLogonTransaction_DeviceNeedsAd
100100
It.IsAny<CancellationToken>()))
101101
.ReturnsAsync(Result.Success());
102102

103-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
103+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
104104

105105
this.TransactionValidationService.Setup(t => t.ValidateLogonTransactionX(It.IsAny<Guid>(),
106106
It.IsAny<Guid>(),
@@ -240,7 +240,7 @@ public async Task TransactionDomainService_ProcessReconciliationTransaction_Vali
240240

241241
[Fact]
242242
public async Task TransactionDomainService_ProcessSaleTransaction_DeclinedByOperator_TransactionIsProcessed(){
243-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
243+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
244244

245245
this.EstateClient.Setup(e => e.GetMerchant(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
246246
.ReturnsAsync(TestData.GetMerchantResponseWithOperator1);
@@ -295,7 +295,7 @@ public async Task TransactionDomainService_ProcessSaleTransaction_DeclinedByOper
295295

296296
[Fact]
297297
public async Task TransactionDomainService_ProcessSaleTransaction_TransactionIsProcessed(){
298-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
298+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
299299

300300
this.EstateClient.Setup(e => e.GetMerchant(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
301301
.ReturnsAsync(TestData.GetMerchantResponseWithOperator1);
@@ -359,7 +359,7 @@ public async Task TransactionDomainService_ProcessSaleTransaction_TransactionIsP
359359
[Fact]
360360
public async Task TransactionDomainService_ProcessSaleTransaction_NoFloatFound_TransactionIsProcessed()
361361
{
362-
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.TokenResponse);
362+
this.SecurityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse()));
363363

364364
this.EstateClient.Setup(e => e.GetMerchant(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
365365
.ReturnsAsync(TestData.GetMerchantResponseWithOperator1);

0 commit comments

Comments
 (0)