Skip to content

Commit fc4632a

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #272 from TransactionProcessing/task/#262_net6update
Changes for net6 update
2 parents f5f51ce + a8c9b7b commit fc4632a

61 files changed

Lines changed: 331 additions & 480 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public class TransactionDomainEventHandlerTests
7676

7777
private Mock<ITransactionAggregateManager> TransactionAggregateManager;
7878

79-
private Mock<IAggregateRepository<SettlementAggregate, DomainEventRecord.DomainEvent>> SettlementAggregateRepository;
79+
private Mock<IAggregateRepository<SettlementAggregate, DomainEvent>> SettlementAggregateRepository;
8080

8181
private Mock<IFeeCalculationManager> FeeCalculationManager;
8282

@@ -90,7 +90,7 @@ public class TransactionDomainEventHandlerTests
9090
public TransactionDomainEventHandlerTests()
9191
{
9292
this.TransactionAggregateManager = new Mock<ITransactionAggregateManager>();
93-
this.SettlementAggregateRepository = new Mock<IAggregateRepository<SettlementAggregate, DomainEventRecord.DomainEvent>>();
93+
this.SettlementAggregateRepository = new Mock<IAggregateRepository<SettlementAggregate, DomainEvent>>();
9494
this.FeeCalculationManager = new Mock<IFeeCalculationManager>();
9595
this.EstateClient = new Mock<IEstateClient>();
9696
this.SecurityServiceClient = new Mock<ISecurityServiceClient>();

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ public async Task TransactionDomainService_ProcessSettlement_SettlementIsProcess
2727
Logger.Initialise(NullLogger.Instance);
2828

2929
Mock<ITransactionAggregateManager> transactionAggregateManager = new Mock<ITransactionAggregateManager>();
30-
Mock<IAggregateRepository<SettlementAggregate, DomainEventRecord.DomainEvent>> settlementAggregateRepository =
31-
new Mock<IAggregateRepository<SettlementAggregate, DomainEventRecord.DomainEvent>>();
30+
Mock<IAggregateRepository<SettlementAggregate, DomainEvent>> settlementAggregateRepository =
31+
new Mock<IAggregateRepository<SettlementAggregate, DomainEvent>>();
3232
settlementAggregateRepository.Setup(s => s.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
3333
.ReturnsAsync(TestData.GetSettlementAggregateWithPendingMerchantFees(10));
3434

@@ -54,8 +54,8 @@ public async Task TransactionDomainService_ProcessSettlement_SettlementAggregate
5454
Logger.Initialise(NullLogger.Instance);
5555

5656
Mock<ITransactionAggregateManager> transactionAggregateManager = new Mock<ITransactionAggregateManager>();
57-
Mock<IAggregateRepository<SettlementAggregate, DomainEventRecord.DomainEvent>> settlementAggregateRepository =
58-
new Mock<IAggregateRepository<SettlementAggregate, DomainEventRecord.DomainEvent>>();
57+
Mock<IAggregateRepository<SettlementAggregate, DomainEvent>> settlementAggregateRepository =
58+
new Mock<IAggregateRepository<SettlementAggregate, DomainEvent>>();
5959
settlementAggregateRepository.Setup(s => s.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
6060
.ReturnsAsync(TestData.GetEmptySettlementAggregate);
6161

@@ -82,8 +82,8 @@ public async Task TransactionDomainService_ProcessSettlement_SettlementAggregate
8282
Logger.Initialise(NullLogger.Instance);
8383

8484
Mock<ITransactionAggregateManager> transactionAggregateManager = new Mock<ITransactionAggregateManager>();
85-
Mock<IAggregateRepository<SettlementAggregate, DomainEventRecord.DomainEvent>> settlementAggregateRepository =
86-
new Mock<IAggregateRepository<SettlementAggregate, DomainEventRecord.DomainEvent>>();
85+
Mock<IAggregateRepository<SettlementAggregate, DomainEvent>> settlementAggregateRepository =
86+
new Mock<IAggregateRepository<SettlementAggregate, DomainEvent>>();
8787
settlementAggregateRepository.Setup(s => s.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
8888
.ReturnsAsync(TestData.GetCreatedSettlementAggregate);
8989

@@ -117,8 +117,8 @@ public async Task TransactionDomainService_ProcessSettlement_AddSettledFeeThrown
117117
It.IsAny<DateTime>(),
118118
It.IsAny<CancellationToken>())).ThrowsAsync(new Exception());
119119

120-
Mock<IAggregateRepository<SettlementAggregate, DomainEventRecord.DomainEvent>> settlementAggregateRepository =
121-
new Mock<IAggregateRepository<SettlementAggregate, DomainEventRecord.DomainEvent>>();
120+
Mock<IAggregateRepository<SettlementAggregate, DomainEvent>> settlementAggregateRepository =
121+
new Mock<IAggregateRepository<SettlementAggregate, DomainEvent>>();
122122
settlementAggregateRepository.Setup(s => s.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
123123
.ReturnsAsync(TestData.GetSettlementAggregateWithPendingMerchantFees(10));
124124

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class TransactionAggregateManagerTests
2323
[Fact]
2424
public async Task TransactionAggregateManager_AuthoriseTransaction_TransactionAuthorised()
2525
{
26-
Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>>();
26+
Mock<IAggregateRepository<TransactionAggregate, DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEvent>>();
2727
aggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetStartedTransactionAggregate());
2828
TransactionAggregateManager transactionAggregateManager = new TransactionAggregateManager(aggregateRepository.Object);
2929

@@ -39,7 +39,7 @@ await transactionAggregateManager.AuthoriseTransaction(TestData.EstateId,
3939
[Fact]
4040
public async Task TransactionAggregateManager_AuthoriseTransactionLocally_TransactionLocallyAuthorised()
4141
{
42-
Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>>();
42+
Mock<IAggregateRepository<TransactionAggregate, DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEvent>>();
4343
aggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetStartedTransactionAggregate());
4444
TransactionAggregateManager transactionAggregateManager = new TransactionAggregateManager(aggregateRepository.Object);
4545

@@ -53,7 +53,7 @@ await transactionAggregateManager.AuthoriseTransactionLocally(TestData.EstateId,
5353
[Fact]
5454
public async Task TransactionAggregateManager_DeclineTransaction_TransactionDeclined()
5555
{
56-
Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>>();
56+
Mock<IAggregateRepository<TransactionAggregate, DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEvent>>();
5757
aggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetStartedTransactionAggregate());
5858
TransactionAggregateManager transactionAggregateManager = new TransactionAggregateManager(aggregateRepository.Object);
5959

@@ -69,7 +69,7 @@ await transactionAggregateManager.DeclineTransaction(TestData.EstateId,
6969
[Fact]
7070
public async Task TransactionAggregateManager_DeclineTransactionLocally_TransactionLocallyDeclined()
7171
{
72-
Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>>();
72+
Mock<IAggregateRepository<TransactionAggregate, DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEvent>>();
7373
aggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetStartedTransactionAggregate());
7474
TransactionAggregateManager transactionAggregateManager = new TransactionAggregateManager(aggregateRepository.Object);
7575

@@ -82,7 +82,7 @@ await transactionAggregateManager.DeclineTransactionLocally(TestData.EstateId,
8282
[Fact]
8383
public async Task TransactionAggregateManager_GetAggregate_AggregateReturned()
8484
{
85-
Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>>();
85+
Mock<IAggregateRepository<TransactionAggregate, DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEvent>>();
8686
aggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetCompletedLogonTransactionAggregate);
8787
TransactionAggregateManager transactionAggregateManager = new TransactionAggregateManager(aggregateRepository.Object);
8888

@@ -96,7 +96,7 @@ public async Task TransactionAggregateManager_GetAggregate_AggregateReturned()
9696
[Fact]
9797
public async Task TransactionAggregateManager_RecordAdditionalRequestData_AdditionalRequestDataRecorded()
9898
{
99-
Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>>();
99+
Mock<IAggregateRepository<TransactionAggregate, DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEvent>>();
100100
aggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetStartedTransactionAggregate());
101101
TransactionAggregateManager transactionAggregateManager = new TransactionAggregateManager(aggregateRepository.Object);
102102

@@ -110,7 +110,7 @@ await transactionAggregateManager.RecordAdditionalRequestData(TestData.EstateId,
110110
[Fact]
111111
public async Task TransactionAggregateManager_RecordAdditionalRequestData_NullAdditionalRequestData_NoActionPerformed()
112112
{
113-
Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>>();
113+
Mock<IAggregateRepository<TransactionAggregate, DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEvent>>();
114114
aggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetStartedTransactionAggregate());
115115
TransactionAggregateManager transactionAggregateManager = new TransactionAggregateManager(aggregateRepository.Object);
116116

@@ -124,7 +124,7 @@ await transactionAggregateManager.RecordAdditionalRequestData(TestData.EstateId,
124124
[Fact]
125125
public async Task TransactionAggregateManager_RecordAdditionalRequestData_EmptyAdditionalRequestData_NoActionPerformed()
126126
{
127-
Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>>();
127+
Mock<IAggregateRepository<TransactionAggregate, DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEvent>>();
128128
aggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetStartedTransactionAggregate());
129129
TransactionAggregateManager transactionAggregateManager = new TransactionAggregateManager(aggregateRepository.Object);
130130

@@ -138,7 +138,7 @@ await transactionAggregateManager.RecordAdditionalRequestData(TestData.EstateId,
138138
[Fact]
139139
public async Task TransactionAggregateManager_RecordAdditionalResponseData_AdditionalResponseDataRecorded()
140140
{
141-
Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>>();
141+
Mock<IAggregateRepository<TransactionAggregate, DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEvent>>();
142142
aggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetStartedTransactionAggregate());
143143
TransactionAggregateManager transactionAggregateManager = new TransactionAggregateManager(aggregateRepository.Object);
144144

@@ -152,7 +152,7 @@ await transactionAggregateManager.RecordAdditionalResponseData(TestData.EstateId
152152
[Fact]
153153
public async Task TransactionAggregateManager_RecordAdditionalResponseData_NullAdditionalResponseData_NoActionPerformed()
154154
{
155-
Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>>();
155+
Mock<IAggregateRepository<TransactionAggregate, DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEvent>>();
156156
aggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetStartedTransactionAggregate());
157157
TransactionAggregateManager transactionAggregateManager = new TransactionAggregateManager(aggregateRepository.Object);
158158

@@ -166,7 +166,7 @@ await transactionAggregateManager.RecordAdditionalResponseData(TestData.EstateId
166166
[Fact]
167167
public async Task TransactionAggregateManager_RecordAdditionalResponseData_EmptyAdditionalResponseData_NoActionPerformed()
168168
{
169-
Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>>();
169+
Mock<IAggregateRepository<TransactionAggregate, DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEvent>>();
170170
aggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetStartedTransactionAggregate());
171171
TransactionAggregateManager transactionAggregateManager = new TransactionAggregateManager(aggregateRepository.Object);
172172

@@ -182,7 +182,7 @@ await transactionAggregateManager.RecordAdditionalResponseData(TestData.EstateId
182182
[InlineData(TransactionType.Sale)]
183183
public async Task TransactionAggregateManager_StartTransaction_TransactionStarted(TransactionType transactionType)
184184
{
185-
Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>>();
185+
Mock<IAggregateRepository<TransactionAggregate, DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEvent>>();
186186
aggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetEmptyTransactionAggregate);
187187
TransactionAggregateManager transactionAggregateManager = new TransactionAggregateManager(aggregateRepository.Object);
188188

@@ -201,7 +201,7 @@ await transactionAggregateManager.StartTransaction(TestData.TransactionId,
201201
[Fact]
202202
public async Task TransactionAggregateManager_CompleteTransaction_TransactionCompleted()
203203
{
204-
Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>>();
204+
Mock<IAggregateRepository<TransactionAggregate, DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEvent>>();
205205
aggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetLocallyAuthorisedTransactionAggregate);
206206
TransactionAggregateManager transactionAggregateManager = new TransactionAggregateManager(aggregateRepository.Object);
207207

@@ -213,7 +213,7 @@ await transactionAggregateManager.CompleteTransaction(TestData.EstateId,
213213
[Fact]
214214
public async Task TransactionAggregateManager_RequestEmailReceipt_EmailRecieptRequested()
215215
{
216-
Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>>();
216+
Mock<IAggregateRepository<TransactionAggregate, DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEvent>>();
217217
aggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetCompletedLogonTransactionAggregate);
218218
TransactionAggregateManager transactionAggregateManager = new TransactionAggregateManager(aggregateRepository.Object);
219219

@@ -226,7 +226,7 @@ await transactionAggregateManager.RequestEmailReceipt(TestData.EstateId,
226226
[Fact]
227227
public async Task TransactionAggregateManager_AddProductDetails_ProductDetailsAddedToTransaction()
228228
{
229-
Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>>();
229+
Mock<IAggregateRepository<TransactionAggregate, DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEvent>>();
230230
aggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetStartedTransactionAggregate());
231231
TransactionAggregateManager transactionAggregateManager = new TransactionAggregateManager(aggregateRepository.Object);
232232

@@ -240,7 +240,7 @@ await transactionAggregateManager.AddProductDetails(TestData.EstateId,
240240
[Fact]
241241
public async Task TransactionAggregateManager_AddFee_FeeAddedToTransaction()
242242
{
243-
Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>>();
243+
Mock<IAggregateRepository<TransactionAggregate, DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEvent>>();
244244
aggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetCompletedAuthorisedSaleTransactionAggregate);
245245
TransactionAggregateManager transactionAggregateManager = new TransactionAggregateManager(aggregateRepository.Object);
246246

@@ -253,7 +253,7 @@ await transactionAggregateManager.AddFee(TestData.EstateId,
253253
[Fact]
254254
public async Task TransactionAggregateManager_AddSettledFee_FeeAddedToTransaction()
255255
{
256-
Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEventRecord.DomainEvent>>();
256+
Mock<IAggregateRepository<TransactionAggregate, DomainEvent>> aggregateRepository = new Mock<IAggregateRepository<TransactionAggregate, DomainEvent>>();
257257
aggregateRepository.Setup(a => a.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.GetCompletedAuthorisedSaleTransactionAggregate);
258258
TransactionAggregateManager transactionAggregateManager = new TransactionAggregateManager(aggregateRepository.Object);
259259

0 commit comments

Comments
 (0)