Skip to content

Commit 80caebe

Browse files
author
Robin L. Velte
committed
refactor: update tests to reference DotBahn.Common
1 parent d1b57dd commit 80caebe

22 files changed

Lines changed: 71 additions & 284 deletions

‎tests/DotBahn.Tests.Facilities/Client/FacilityClientTests.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
using System.Net;
2-
2+
using DotBahn.Common.Parsing;
3+
using DotBahn.Common.Transformer;
34
using DotBahn.Facilities;
45
using DotBahn.Facilities.Internal.Contracts;
56
using DotBahn.Facilities.Models;
67
using DotBahn.Facilities.Models.Enumerations;
7-
using DotBahn.Shared.Parsing;
8-
using DotBahn.Shared.Transformer;
98
using DotBahn.Tests.Shared;
10-
119
using Moq;
1210

1311
namespace DotBahn.Tests.Facilities.Client;
@@ -77,8 +75,7 @@ public async Task GetFacilitiesAsync_WithNullQuery_ThrowsArgumentNullException()
7775
HttpClient,
7876
AuthorizationMock.Object,
7977
_parserMock.Object,
80-
_transformerMock.Object,
81-
CacheMock.Object);
78+
_transformerMock.Object);
8279

8380
/// <summary>
8481
/// Configures default behaviors for parser and transformer mocks

‎tests/DotBahn.Tests.Facilities/DotBahn.Tests.Facilities.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717
<ItemGroup>
1818
<ProjectReference Include="../../source/DotBahn.Facilities/DotBahn.Facilities.csproj" />
19-
<ProjectReference Include="../../source/DotBahn.Shared/DotBahn.Shared.csproj" />
19+
<ProjectReference Include="..\..\source\DotBahn.Common\DotBahn.Common.csproj" />
2020
<ProjectReference Include="..\DotBahn.Tests.Shared\DotBahn.Tests.Shared.csproj" />
2121
</ItemGroup>
2222
</Project>

tests/DotBahn.Tests.Facilities/Enumerations/EnumMapperTests.cs renamed to tests/DotBahn.Tests.Facilities/Enumerations/EnumUtilTests.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
1+
using DotBahn.Common.Utilities;
12
using DotBahn.Facilities.Models.Enumerations;
2-
using DotBahn.Shared.Enumerations;
33

44
using FacilitiesJsonContext = DotBahn.Facilities.Internal.Json.FacilitiesJsonContext;
55

66
namespace DotBahn.Tests.Facilities.Enumerations;
77

8-
public class EnumMapperTests {
8+
public class EnumUtilTests {
99
[Theory]
1010
[InlineData("ACTIVE", FacilityState.Active)]
1111
[InlineData("INACTIVE", FacilityState.Inactive)]
1212
[InlineData("UNKNOWN", FacilityState.Unknown)]
1313
public void Parse_WithExactCaseValue_ReturnsCorrectEnum(string value, FacilityState expected) {
14-
var result = EnumMapper.Parse(value, FacilityState.Unknown, FacilitiesJsonContext.Default.FacilityState);
14+
var result = EnumUtil.Parse(value, FacilityState.Unknown, FacilitiesJsonContext.Default.FacilityState);
1515

1616
Assert.Equal(expected, result);
1717
}
1818

1919
[Fact]
2020
public void Parse_WithNull_ReturnsDefault() {
21-
var result = EnumMapper.Parse(null, FacilityState.Unknown, FacilitiesJsonContext.Default.FacilityState);
21+
var result = EnumUtil.Parse(null, FacilityState.Unknown, FacilitiesJsonContext.Default.FacilityState);
2222

2323
Assert.Equal(FacilityState.Unknown, result);
2424
}
2525

2626
[Fact]
2727
public void Parse_WithEmptyString_ReturnsDefault() {
28-
var result = EnumMapper.Parse(string.Empty, FacilityState.Unknown, FacilitiesJsonContext.Default.FacilityState);
28+
var result = EnumUtil.Parse(string.Empty, FacilityState.Unknown, FacilitiesJsonContext.Default.FacilityState);
2929

3030
Assert.Equal(FacilityState.Unknown, result);
3131
}
3232

3333
[Fact]
3434
public void Parse_WithUnknownValue_ReturnsDefault() {
35-
var result = EnumMapper.Parse("NONEXISTENT", FacilityState.Unknown, FacilitiesJsonContext.Default.FacilityState);
35+
var result = EnumUtil.Parse("NONEXISTENT", FacilityState.Unknown, FacilitiesJsonContext.Default.FacilityState);
3636

3737
Assert.Equal(FacilityState.Unknown, result);
3838
}
3939

4040
[Fact]
4141
public void Format_WithValidEnum_ReturnsCorrectString() {
42-
var result = EnumMapper.Format(FacilityState.Active, FacilitiesJsonContext.Default.FacilityState);
42+
var result = EnumUtil.Format(FacilityState.Active, FacilitiesJsonContext.Default.FacilityState);
4343

4444
Assert.Equal("ACTIVE", result);
4545
}
4646

4747
[Fact]
4848
public void Format_WithNull_ReturnsNull() {
4949
FacilityState? nullState = null;
50-
var result = EnumMapper.Format(nullState, FacilitiesJsonContext.Default.FacilityState);
50+
var result = EnumUtil.Format(nullState, FacilitiesJsonContext.Default.FacilityState);
5151

5252
Assert.Null(result);
5353
}
5454

5555
[Fact]
5656
public void Format_WithInactive_ReturnsInactiveString() {
57-
var result = EnumMapper.Format(FacilityState.Inactive, FacilitiesJsonContext.Default.FacilityState);
57+
var result = EnumUtil.Format(FacilityState.Inactive, FacilitiesJsonContext.Default.FacilityState);
5858

5959
Assert.Equal("INACTIVE", result);
6060
}
@@ -63,7 +63,7 @@ public void Format_WithInactive_ReturnsInactiveString() {
6363
[InlineData(FacilityType.Elevator, "ELEVATOR")]
6464
[InlineData(FacilityType.Escalator, "ESCALATOR")]
6565
public void Format_FacilityType_ReturnsCorrectString(FacilityType value, string expected) {
66-
var result = EnumMapper.Format(value, FacilitiesJsonContext.Default.FacilityType);
66+
var result = EnumUtil.Format(value, FacilitiesJsonContext.Default.FacilityType);
6767

6868
Assert.Equal(expected, result);
6969
}
@@ -72,14 +72,14 @@ public void Format_FacilityType_ReturnsCorrectString(FacilityType value, string
7272
[InlineData("ELEVATOR", FacilityType.Elevator)]
7373
[InlineData("ESCALATOR", FacilityType.Escalator)]
7474
public void Parse_FacilityType_ReturnsCorrectEnum(string value, FacilityType expected) {
75-
var result = EnumMapper.Parse(value, FacilityType.Unknown, FacilitiesJsonContext.Default.FacilityType);
75+
var result = EnumUtil.Parse(value, FacilityType.Unknown, FacilitiesJsonContext.Default.FacilityType);
7676

7777
Assert.Equal(expected, result);
7878
}
7979

8080
[Fact]
8181
public void Parse_FacilityType_UnknownValue_ReturnsDefault() {
82-
var result = EnumMapper.Parse("BOGEY", FacilityType.Unknown, FacilitiesJsonContext.Default.FacilityType);
82+
var result = EnumUtil.Parse("BOGEY", FacilityType.Unknown, FacilitiesJsonContext.Default.FacilityType);
8383

8484
Assert.Equal(FacilityType.Unknown, result);
8585
}

‎tests/DotBahn.Tests.Shared/ClientTestBase.cs‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,18 @@
1-
using DotBahn.Modules.Authorization;
2-
using DotBahn.Modules.Cache;
1+
using DotBahn.Common.Auth;
32

43
using Moq;
54

65
namespace DotBahn.Tests.Shared;
76

8-
/// <summary>
9-
/// Base class for client tests, providing common mock setup and assertion helpers.
10-
/// </summary>
117
public abstract class ClientTestBase : IDisposable {
128
protected MockHttpHandler HttpHandler { get; } = new();
139
protected HttpClient HttpClient { get; }
1410
protected Mock<IAuthorization> AuthorizationMock { get; } = new();
15-
protected Mock<ICache> CacheMock { get; } = new();
1611

17-
/// <summary>
18-
/// Initializes a new instance of the <see cref="ClientTestBase"/> class.
19-
/// </summary>
2012
protected ClientTestBase() {
2113
HttpClient = new HttpClient(HttpHandler, disposeHandler: false);
2214
}
2315

24-
/// <summary>
25-
/// Asserts that a request was sent with the specified method and URL.
26-
/// </summary>
27-
/// <param name="method">The expected HTTP method.</param>
28-
/// <param name="relativeUrl">The expected relative URL (without a base address).</param>
29-
/// <param name="acceptHeader">The expected Accept header value.</param>
30-
/// <param name="expectedCount">The expected number of matching requests (default: 1).</param>
3116
protected void AssertRequest(HttpMethod method, string relativeUrl, string? acceptHeader = null, int? expectedCount = 1) {
3217
var count = expectedCount ?? 1;
3318
var matchingRequests = HttpHandler.SentRequests
@@ -44,7 +29,6 @@ protected void AssertRequest(HttpMethod method, string relativeUrl, string? acce
4429
Assert.True(hasAcceptHeader, $"Expected Accept header '{acceptHeader}' not found. Actual headers: {string.Join(", ", matchingRequests[0].Headers.Accept.Select(h => h.MediaType))}");
4530
}
4631

47-
/// <inheritdoc />
4832
public void Dispose() {
4933
HttpClient.Dispose();
5034
HttpHandler.Dispose();

‎tests/DotBahn.Tests.Shared/DotBahn.Tests.Shared.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
<Using Include="Xunit" />
1717
</ItemGroup>
1818
<ItemGroup>
19-
<ProjectReference Include="../../source/DotBahn.Shared/DotBahn.Shared.csproj" />
20-
<ProjectReference Include="../../source/DotBahn.Modules/DotBahn.Modules.Authorization/DotBahn.Modules.Authorization.csproj" />
21-
<ProjectReference Include="../../source/DotBahn.Modules/DotBahn.Modules.Cache/DotBahn.Modules.Cache.csproj" />
19+
<ProjectReference Include="..\..\source\DotBahn.Common\DotBahn.Common.csproj" />
2220
</ItemGroup>
2321
</Project>

‎tests/DotBahn.Tests.Stations/Authorization/ApiKeyAuthorizationTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using DotBahn.Modules.Authorization;
1+
using DotBahn.Common.Auth;
22

33
namespace DotBahn.Tests.Stations.Authorization;
44

‎tests/DotBahn.Tests.Stations/Client/StationClientTests.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
using System.Net;
2-
2+
using DotBahn.Common.Parsing;
3+
using DotBahn.Common.Transformer;
34
using DotBahn.Stations;
4-
using DotBahn.Shared.Transformer;
5-
using DotBahn.Shared.Parsing;
65
using DotBahn.Stations.Internal.Contracts;
76
using DotBahn.Stations.Models;
87
using DotBahn.Tests.Shared;
9-
108
using Moq;
119

1210
namespace DotBahn.Tests.Stations.Client;
@@ -85,7 +83,7 @@ await Assert.ThrowsAsync<ArgumentNullException>(() =>
8583
}
8684

8785
private StationClient CreateClient() =>
88-
new(HttpClient, AuthorizationMock.Object, _parserMock.Object, _transformerMock.Object, CacheMock.Object);
86+
new(HttpClient, AuthorizationMock.Object, _parserMock.Object, _transformerMock.Object);
8987

9088
private void SetupMocks(StationsResponseContract contract) {
9189
_parserMock.Setup(p => p.Parse(It.IsAny<string>())).Returns(contract);

‎tests/DotBahn.Tests.Stations/DotBahn.Tests.Stations.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
<Using Include="Xunit" />
1717
</ItemGroup>
1818
<ItemGroup>
19-
<ProjectReference Include="../../source/DotBahn.Shared/DotBahn.Shared.csproj" />
19+
<ProjectReference Include="..\..\source\DotBahn.Common\DotBahn.Common.csproj" />
2020
<ProjectReference Include="../../source/DotBahn.Stations/DotBahn.Stations.csproj" />
21-
<ProjectReference Include="../../source/DotBahn.Modules/DotBahn.Modules.Authorization/DotBahn.Modules.Authorization.csproj" />
2221
<ProjectReference Include="../DotBahn.Tests.Shared/DotBahn.Tests.Shared.csproj" />
2322
</ItemGroup>
2423
</Project>

‎tests/DotBahn.Tests.Stations/Models/StationTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using DotBahn.Shared.Models;
2-
using DotBahn.Stations.Models.Enumerations;
1+
using DotBahn.Common.Models;
32
using DotBahn.Stations.Models;
3+
using DotBahn.Stations.Models.Enumerations;
44

55
namespace DotBahn.Tests.Stations.Models;
66

‎tests/DotBahn.Tests.Timetables/Cache/InMemoryCacheTests.cs‎

Lines changed: 0 additions & 96 deletions
This file was deleted.

0 commit comments

Comments
 (0)