Skip to content

Commit 4b59cd5

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #323 from TransactionProcessing/task/#322_nugets_update
Update dependencies and refactor tests and methods
2 parents f61f4c5 + 36e79c9 commit 4b59cd5

15 files changed

Lines changed: 45 additions & 33 deletions

File tree

‎ClientProxyBase/ClientProxyBase.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<ItemGroup>
88
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
9-
<PackageReference Include="SimpleResults" Version="3.0.1" />
9+
<PackageReference Include="SimpleResults" Version="4.0.0" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎Driver/Driver.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="8.0.1" />
1111
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.13" />
1212
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.13" />
13+
<PackageReference Include="SimpleResults" Version="4.0.0" />
1314
</ItemGroup>
1415

1516
<ItemGroup>

‎Shared.EventStore.Tests/AggregateRepositoryTests.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public async Task AggregateRepository_SaveChanges_NoChangesMade_ChangesAreSaved(
113113
AggregateRepository<TestAggregate, DomainEvent> testAggregateRepository = new AggregateRepository<TestAggregate, DomainEvent>(context.Object, factory);
114114
Result<TestAggregate> testAggregate = await testAggregateRepository.GetLatestVersionFromLastEvent(TestData.AggregateId, CancellationToken.None);
115115

116-
Result result = await testAggregateRepository.SaveChanges(testAggregate, CancellationToken.None);
116+
Result result = await testAggregateRepository.SaveChanges(testAggregate.Data, CancellationToken.None);
117117
result.IsSuccess.ShouldBeTrue();
118118
}
119119

@@ -134,7 +134,7 @@ public async Task AggregateRepository_SaveChanges_ErrorsOnInsert_FailedResult()
134134
AggregateRepository<TestAggregate, DomainEvent> testAggregateRepository = new AggregateRepository<TestAggregate, DomainEvent>(context.Object, factory);
135135
Result<TestAggregate> testAggregate = await testAggregateRepository.GetLatestVersionFromLastEvent(TestData.AggregateId, CancellationToken.None);
136136
testAggregate.Data.SetAggregateName("New name", Guid.NewGuid());
137-
Result result = await testAggregateRepository.SaveChanges(testAggregate, CancellationToken.None);
137+
Result result = await testAggregateRepository.SaveChanges(testAggregate.Data, CancellationToken.None);
138138
result.IsFailed.ShouldBeTrue();
139139
}
140140

@@ -172,7 +172,8 @@ public async Task AggregateRepository_SaveChanges_ChangesMade_ChangesAreSaved()
172172
context.Setup(c => c.GetEventsBackward(It.IsAny<String>(), It.IsAny<Int32>(), It.IsAny<CancellationToken>())).ReturnsAsync(e);
173173

174174
AggregateRepository<TestAggregate, DomainEvent> testAggregateRepository = new AggregateRepository<TestAggregate, DomainEvent>(context.Object, factory);
175-
TestAggregate testAggregate = await testAggregateRepository.GetLatestVersionFromLastEvent(TestData.AggregateId, CancellationToken.None);
175+
Result<TestAggregate> testAggregaterResult = await testAggregateRepository.GetLatestVersionFromLastEvent(TestData.AggregateId, CancellationToken.None);
176+
var testAggregate = testAggregaterResult.Data;
176177
testAggregate.SetAggregateName("New name", Guid.NewGuid());
177178
Result result = await testAggregateRepository.SaveChanges(testAggregate, CancellationToken.None);
178179
result.IsSuccess.ShouldBeTrue();

‎Shared.EventStore.Tests/Shared.EventStore.Tests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<PackageReference Include="Moq" Version="4.20.72" />
2424
<PackageReference Include="Pose" Version="1.2.1" />
2525
<PackageReference Include="Shouldly" Version="4.3.0" />
26+
<PackageReference Include="SimpleResults" Version="4.0.0" />
2627
<PackageReference Include="xunit" Version="2.9.3" />
2728
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
2829
<PrivateAssets>all</PrivateAssets>

‎Shared.EventStore/Shared.EventStore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.13" />
1717
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1818
<PackageReference Include="NLog.Extensions.Logging" Version="5.4.0" />
19-
<PackageReference Include="SimpleResults" Version="3.0.1" />
19+
<PackageReference Include="SimpleResults" Version="4.0.0" />
2020
<FrameworkReference Include="Microsoft.AspNetCore.App" />
2121
</ItemGroup>
2222

‎Shared.EventStoreContext.Tests/EventStoreContextTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ public async Task EventStoreContext_RunTransientQuery_QueryIsRun(Boolean secureE
295295
var definition = new{
296296
estates = new List<String>()
297297
};
298-
var result = JsonConvert.DeserializeAnonymousType(queryResult, definition);
298+
var result = JsonConvert.DeserializeAnonymousType(queryResult.Data, definition);
299299

300300
result.estates.Contains(event1.EstateName).ShouldBeTrue();
301301
result.estates.Contains(event2.EstateName).ShouldBeTrue();

‎Shared.EventStoreContext.Tests/Shared.EventStoreContext.Tests.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1717
<PackageReference Include="NUnit" Version="4.3.2" />
1818
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
19-
<PackageReference Include="NUnit.Analyzers" Version="4.6.0">
19+
<PackageReference Include="NUnit.Analyzers" Version="4.7.0">
2020
<PrivateAssets>all</PrivateAssets>
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
</PackageReference>
2323
<PackageReference Include="coverlet.collector" Version="6.0.4">
2424
<PrivateAssets>all</PrivateAssets>
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2626
</PackageReference>
27+
<PackageReference Include="SimpleResults" Version="4.0.0" />
2728
</ItemGroup>
2829

2930
<ItemGroup>

‎Shared.IntegrationTesting.Tests/Shared.IntegrationTesting.Tests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2525
<PrivateAssets>all</PrivateAssets>
2626
</PackageReference>
27+
<PackageReference Include="SimpleResults" Version="4.0.0" />
2728
</ItemGroup>
2829

2930
<ItemGroup>

‎Shared.IntegrationTesting.UnitTests/Shared.IntegrationTesting.UnitTests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.13" />
1616
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.13" />
1717
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
18+
<PackageReference Include="SimpleResults" Version="4.0.0" />
1819
<PackageReference Include="xunit" Version="2.9.3" />
1920
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
2021
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎Shared.IntegrationTesting/BaseDockerHelper.cs‎

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
namespace Shared.IntegrationTesting;
22

3-
using System;
4-
using System.Collections.Generic;
5-
using System.Data;
6-
using System.Diagnostics;
7-
using System.IO;
8-
using System.Linq;
9-
using System.Net;
10-
using System.Net.Http;
11-
using System.Net.Security;
12-
using System.Threading;
13-
using System.Threading.Tasks;
143
using Ductus.FluentDocker.Builders;
154
using Ductus.FluentDocker.Commands;
165
using Ductus.FluentDocker.Common;
@@ -25,8 +14,20 @@
2514
using Logger;
2615
using Microsoft.Data.SqlClient;
2716
using Microsoft.EntityFrameworkCore.Diagnostics;
17+
using Microsoft.Extensions.Diagnostics.HealthChecks;
2818
using Newtonsoft.Json;
2919
using Shouldly;
20+
using System;
21+
using System.Collections.Generic;
22+
using System.Data;
23+
using System.Diagnostics;
24+
using System.IO;
25+
using System.Linq;
26+
using System.Net;
27+
using System.Net.Http;
28+
using System.Net.Security;
29+
using System.Threading;
30+
using System.Threading.Tasks;
3031

3132
public enum DockerEnginePlatform{
3233
Unknown,
@@ -783,8 +784,8 @@ await Retry.For(async () =>
783784
});
784785
}
785786

786-
protected async Task DoHealthCheck(ContainerType containerType){
787-
(String, Int32) containerDetails = containerType switch{
787+
protected async Task DoHealthCheck(ContainerType containerType) {
788+
(String, Int32) containerDetails = containerType switch {
788789
ContainerType.CallbackHandler => ("http", this.CallbackHandlerPort),
789790
ContainerType.FileProcessor => ("http", this.FileProcessorPort),
790791
ContainerType.MessagingService => ("http", this.MessagingServicePort),
@@ -799,20 +800,23 @@ protected async Task DoHealthCheck(ContainerType containerType){
799800
return;
800801

801802
await Retry.For(async () => {
802-
this.Trace($"About to do health check for {containerType}");
803+
this.Trace($"About to do health check for {containerType}");
803804

804-
String healthCheck =
805-
await this.HealthCheckClient.PerformHealthCheck(containerDetails.Item1, "127.0.0.1", containerDetails.Item2, CancellationToken.None);
805+
SimpleResults.Result<String> healthCheckResult = await this.HealthCheckClient.PerformHealthCheck(containerDetails.Item1, "127.0.0.1", containerDetails.Item2, CancellationToken.None);
806806

807-
HealthCheckResult result = JsonConvert.DeserializeObject<HealthCheckResult>(healthCheck);
807+
if (healthCheckResult.IsSuccess) {
808+
HealthChecks.HealthCheckResult result = JsonConvert.DeserializeObject<HealthChecks.HealthCheckResult>(healthCheckResult.Data);
808809

809-
this.Trace($"health check complete for {containerType} result is [{healthCheck}]");
810+
this.Trace($"health check complete for {containerType} result is [{healthCheckResult.Data}]");
810811

811-
result.Status.ShouldBe(HealthCheckStatus.Healthy.ToString(), $"Service Type: {containerType} Details {healthCheck}");
812-
this.Trace($"health check complete for {containerType}");
813-
},
814-
TimeSpan.FromMinutes(3),
815-
TimeSpan.FromSeconds(20));
812+
result.Status.ShouldBe(HealthCheckStatus.Healthy.ToString(), $"Service Type: {containerType} Details {healthCheckResult.Data}");
813+
this.Trace($"health check complete for {containerType}");
814+
}
815+
else {
816+
this.Trace($"health check failed for {containerType}");
817+
throw new Exception($"Health check failed for {containerType} [{healthCheckResult.Message}]");
818+
}
819+
}, TimeSpan.FromMinutes(3), TimeSpan.FromSeconds(20));
816820
}
817821

818822
protected void Error(String message, Exception ex){

0 commit comments

Comments
 (0)