Skip to content

Commit ab0bd2a

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #118 from StuartFerguson/task/#117_updatetoes20.06
Upgrade to ES 20.06
2 parents 82d94fe + 2076f10 commit ab0bd2a

29 files changed

Lines changed: 301 additions & 358 deletions

‎EstateManagement.BusinessLogic.Tests/EstateManagement.BusinessLogic.Tests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="coverlet.msbuild" Version="2.8.1">
10+
<PackageReference Include="coverlet.msbuild" Version="2.9.0">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
15-
<PackageReference Include="Moq" Version="4.14.1" />
16-
<PackageReference Include="Shared.EventStore" Version="0.0.14" />
15+
<PackageReference Include="Moq" Version="4.14.4" />
16+
<PackageReference Include="Shared.EventStore" Version="0.0.15.7" />
1717
<PackageReference Include="Shouldly" Version="3.0.2" />
1818
<PackageReference Include="xunit" Version="2.4.1" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
19+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
2020
<PrivateAssets>all</PrivateAssets>
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
</PackageReference>

‎EstateManagement.BusinessLogic.Tests/Manager/EstateManagementManagerTests.cs‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ namespace EstateManagement.BusinessLogic.Tests.Manager
1616
using Models.Merchant;
1717
using Moq;
1818
using Repository;
19-
using Shared.DomainDrivenDesign.EventStore;
2019
using Shared.EventStore.EventStore;
2120
using Shared.Exceptions;
2221
using Shouldly;
@@ -25,30 +24,27 @@ namespace EstateManagement.BusinessLogic.Tests.Manager
2524

2625
public class EstateManagementManagerTests
2726
{
28-
private readonly Mock<IAggregateRepositoryManager> AggregateRepositoryManager;
2927
private readonly Mock<IAggregateRepository<EstateAggregate>> EstateAggregateRepository;
3028
private readonly Mock<IAggregateRepository<MerchantAggregate>> MerchantAggregateRepository;
3129
private readonly Mock<IEstateManagementRepository> EstateManagementRepository;
32-
private readonly Mock<IEventStoreContextManager> EventStoreContextManager;
30+
private readonly Mock<IEventStoreContext> EventStoreContext;
3331
private readonly Mock<IModelFactory> ModelFactory;
3432

3533
private readonly EstateManagementManager EstateManagementManager;
3634

3735
public EstateManagementManagerTests()
3836
{
39-
Mock<IAggregateRepositoryManager> aggregateRepositoryManager = new Mock<IAggregateRepositoryManager>();
4037
this.EstateAggregateRepository = new Mock<IAggregateRepository<EstateAggregate>>();
4138
this.MerchantAggregateRepository = new Mock<IAggregateRepository<MerchantAggregate>>();
4239
this.EstateManagementRepository = new Mock<IEstateManagementRepository>();
43-
this.EventStoreContextManager = new Mock<IEventStoreContextManager>();
40+
this.EventStoreContext = new Mock<IEventStoreContext>();
4441

4542
this.ModelFactory = new Mock<IModelFactory>();
46-
47-
aggregateRepositoryManager.Setup(x => x.GetAggregateRepository<EstateAggregate>(It.IsAny<Guid>())).Returns(this.EstateAggregateRepository.Object);
48-
aggregateRepositoryManager.Setup(x => x.GetAggregateRepository<MerchantAggregate>(It.IsAny<Guid>())).Returns(this.MerchantAggregateRepository.Object);
49-
43+
5044
this.EstateManagementManager =
51-
new EstateManagementManager(aggregateRepositoryManager.Object, this.EstateManagementRepository.Object, this.EventStoreContextManager.Object, this.ModelFactory.Object);
45+
new EstateManagementManager(this.EstateAggregateRepository.Object,
46+
this.MerchantAggregateRepository.Object,
47+
this.EstateManagementRepository.Object, this.EventStoreContext.Object, this.ModelFactory.Object);
5248
}
5349

5450
[Fact]
@@ -121,12 +117,9 @@ public async Task EstateManagementManager_GetMerchant_WithContact_MerchantIsRetu
121117
[Fact]
122118
public async Task EstateManagementManager_GetMerchantBalance_MerchantBalanceIsReturned()
123119
{
124-
Mock<IEventStoreContext> eventStoreContext = new Mock<IEventStoreContext>();
125-
126120
String projectionState = "{\r\n \"merchants\": {\r\n \"" + $"{TestData.MerchantId}" + "\": {\r\n \"MerchantId\": \"b3054488-ccfc-4bfe-9b0c-ad7ac10b16e8\",\r\n \"MerchantName\": \"Test Merchant 2\",\r\n \"AvailableBalance\": 1000.00,\r\n \"Balance\": 1000.00,\r\n \"LastDepositDateTime\": null,\r\n \"LastSaleDateTime\": null,\r\n \"PendingBalanceUpdates\": []\r\n }\r\n },\r\n \"debug\": []\r\n}";
127121

128-
eventStoreContext.Setup(e => e.GetPartitionStateFromProjection(It.IsAny<String>(), It.IsAny<String>())).ReturnsAsync(projectionState);
129-
this.EventStoreContextManager.Setup(m => m.GetEventStoreContext(It.IsAny<String>())).Returns(eventStoreContext.Object);
122+
this.EventStoreContext.Setup(e => e.GetPartitionStateFromProjection(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(projectionState);
130123

131124
var merchantBalanceModel = await this.EstateManagementManager.GetMerchantBalance(TestData.EstateId, TestData.MerchantId, CancellationToken.None);
132125

‎EstateManagement.BusinessLogic.Tests/RequestHandler/EstateRequestHandlerTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
using RequestHandlers;
1212
using Requests;
1313
using Shared.DomainDrivenDesign.CommandHandling;
14-
using Shared.DomainDrivenDesign.EventStore;
1514
using Shared.EventStore.EventStore;
1615
using Shouldly;
1716
using Testing;

‎EstateManagement.BusinessLogic.Tests/Services/EstateDomainServiceTests.cs‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ namespace EstateManagement.BusinessLogic.Tests.Services
1111
using Moq;
1212
using SecurityService.Client;
1313
using SecurityService.DataTransferObjects;
14-
using Shared.DomainDrivenDesign.EventStore;
1514
using Shared.EventStore.EventStore;
1615
using Shouldly;
1716
using Testing;
@@ -26,12 +25,9 @@ public async Task EstateDomainService_CreateEstate_EstateIsCreated()
2625
estateAggregateRepository.Setup(m => m.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(new EstateAggregate());
2726
estateAggregateRepository.Setup(m => m.SaveChanges(It.IsAny<EstateAggregate>(), It.IsAny<CancellationToken>())).Returns(Task.CompletedTask);
2827

29-
Mock<IAggregateRepositoryManager> aggregateRepositoryManager = new Mock<IAggregateRepositoryManager>();
30-
aggregateRepositoryManager.Setup(x => x.GetAggregateRepository<EstateAggregate>(It.IsAny<Guid>())).Returns(estateAggregateRepository.Object);
31-
3228
Mock<ISecurityServiceClient> securityServiceClient = new Mock<ISecurityServiceClient>();
3329

34-
EstateDomainService domainService = new EstateDomainService(aggregateRepositoryManager.Object, securityServiceClient.Object);
30+
EstateDomainService domainService = new EstateDomainService(estateAggregateRepository.Object, securityServiceClient.Object);
3531

3632
Should.NotThrow(async () =>
3733
{
@@ -48,12 +44,9 @@ public async Task EstateDomainService_AddOperatorEstate_OperatorIsAdded()
4844
estateAggregateRepository.Setup(m => m.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.CreatedEstateAggregate);
4945
estateAggregateRepository.Setup(m => m.SaveChanges(It.IsAny<EstateAggregate>(), It.IsAny<CancellationToken>())).Returns(Task.CompletedTask);
5046

51-
Mock<IAggregateRepositoryManager> aggregateRepositoryManager = new Mock<IAggregateRepositoryManager>();
52-
aggregateRepositoryManager.Setup(x => x.GetAggregateRepository<EstateAggregate>(It.IsAny<Guid>())).Returns(estateAggregateRepository.Object);
53-
5447
Mock<ISecurityServiceClient> securityServiceClient = new Mock<ISecurityServiceClient>();
5548

56-
EstateDomainService domainService = new EstateDomainService(aggregateRepositoryManager.Object, securityServiceClient.Object);
49+
EstateDomainService domainService = new EstateDomainService(estateAggregateRepository.Object, securityServiceClient.Object);
5750

5851
Should.NotThrow(async () =>
5952
{
@@ -72,17 +65,14 @@ public async Task EstateDomainService_CreateEstateUser_EstateUserIsCreated()
7265
Mock<IAggregateRepository<EstateAggregate>> estateAggregateRepository = new Mock<IAggregateRepository<EstateAggregate>>();
7366
estateAggregateRepository.Setup(m => m.GetLatestVersion(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(TestData.CreatedEstateAggregate);
7467
estateAggregateRepository.Setup(m => m.SaveChanges(It.IsAny<EstateAggregate>(), It.IsAny<CancellationToken>())).Returns(Task.CompletedTask);
75-
76-
Mock<IAggregateRepositoryManager> aggregateRepositoryManager = new Mock<IAggregateRepositoryManager>();
77-
aggregateRepositoryManager.Setup(x => x.GetAggregateRepository<EstateAggregate>(It.IsAny<Guid>())).Returns(estateAggregateRepository.Object);
78-
68+
7969
Mock<ISecurityServiceClient> securityServiceClient = new Mock<ISecurityServiceClient>();
8070
securityServiceClient.Setup(s => s.CreateUser(It.IsAny<CreateUserRequest>(), It.IsAny<CancellationToken>())).ReturnsAsync(new CreateUserResponse
8171
{
8272
UserId = Guid.NewGuid()
8373
});
8474

85-
EstateDomainService domainService = new EstateDomainService(aggregateRepositoryManager.Object, securityServiceClient.Object);
75+
EstateDomainService domainService = new EstateDomainService(estateAggregateRepository.Object, securityServiceClient.Object);
8676

8777
Should.NotThrow(async () =>
8878
{

0 commit comments

Comments
 (0)