Skip to content

Commit efbf3aa

Browse files
tl-Roberto-Mancinellitl-Roberto-Mancinelli
authored
Test improvements (#225)
1 parent 774594c commit efbf3aa

26 files changed

+371
-364
lines changed

‎test/TrueLayer.AcceptanceTests/AuthTests.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Net;
22
using System.Threading.Tasks;
3-
using Shouldly;
3+
using FluentAssertions;
44
using TrueLayer.Auth;
55
using Xunit;
66

@@ -21,14 +21,14 @@ public async Task Can_get_auth_token()
2121
ApiResponse<GetAuthTokenResponse> apiResponse
2222
= await _fixture.Client.Auth.GetAuthToken(new GetAuthTokenRequest());
2323

24-
apiResponse.IsSuccessful.ShouldBeTrue();
25-
apiResponse.StatusCode.ShouldBe(HttpStatusCode.OK);
26-
apiResponse.Data.ShouldNotBeNull();
24+
apiResponse.IsSuccessful.Should().BeTrue();
25+
apiResponse.StatusCode.Should().Be(HttpStatusCode.OK);
26+
apiResponse.Data.Should().NotBeNull();
2727

28-
apiResponse.Data.AccessToken.ShouldNotBeNullOrWhiteSpace();
29-
apiResponse.Data.TokenType.ShouldBe("Bearer");
30-
apiResponse.Data.Scope.ShouldNotBeNullOrWhiteSpace();
31-
apiResponse.Data.ExpiresIn.ShouldBeGreaterThan(0);
28+
apiResponse.Data!.AccessToken.Should().NotBeNullOrWhiteSpace();
29+
apiResponse.Data.TokenType.Should().Be("Bearer");
30+
apiResponse.Data.Scope.Should().NotBeNullOrWhiteSpace();
31+
apiResponse.Data.ExpiresIn.Should().BeGreaterThan(0);
3232
}
3333

3434
[Fact]
@@ -37,8 +37,8 @@ public async Task Can_get_scoped_access_token()
3737
GetAuthTokenResponse? apiResponse
3838
= await _fixture.Client.Auth.GetAuthToken(new GetAuthTokenRequest("payments"));
3939

40-
apiResponse.ShouldNotBeNull();
41-
apiResponse.Scope.ShouldBe("payments");
40+
apiResponse.Should().NotBeNull();
41+
apiResponse!.Scope.Should().Be("payments");
4242
}
4343
}
4444
}

‎test/TrueLayer.AcceptanceTests/MandatesTests.cs

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
using System.Collections.Generic;
33
using System.Net;
44
using System.Threading.Tasks;
5+
using FluentAssertions;
56
using OneOf;
6-
using Shouldly;
77
using TrueLayer.Mandates.Model;
88
using TrueLayer.Payments.Model;
99
using Xunit;
@@ -61,8 +61,8 @@ public async Task Can_create_mandate(CreateMandateRequest mandateRequest)
6161
mandateRequest, idempotencyKey: Guid.NewGuid().ToString());
6262

6363
// Assert
64-
response.StatusCode.ShouldBe(HttpStatusCode.Created);
65-
response.Data!.User.Id.ShouldBe(mandateRequest.User!.Id);
64+
response.StatusCode.Should().Be(HttpStatusCode.Created);
65+
response.Data!.User.Id.Should().Be(mandateRequest.User!.Id);
6666
}
6767

6868

@@ -76,15 +76,15 @@ public async Task Can_get_mandate(CreateMandateRequest mandateRequest)
7676
// Arrange
7777
var createResponse = await _fixture.Client.Mandates.CreateMandate(
7878
mandateRequest, idempotencyKey: Guid.NewGuid().ToString());
79-
createResponse.StatusCode.ShouldBe(HttpStatusCode.Created);
79+
createResponse.StatusCode.Should().Be(HttpStatusCode.Created);
8080
var mandateId = createResponse.Data!.Id;
8181

8282
// Act
8383
var response = await _fixture.Client.Mandates.GetMandate(mandateId, MandateType.Sweeping);
8484

8585
// Assert
86-
response.StatusCode.ShouldBe(HttpStatusCode.OK);
87-
response.Data.AsT0.User!.Id.ShouldBe(createResponse.Data.User!.Id);
86+
response.StatusCode.Should().Be(HttpStatusCode.OK);
87+
response.Data.AsT0.User!.Id.Should().Be(createResponse.Data.User!.Id);
8888
}
8989

9090
[Theory]
@@ -97,14 +97,14 @@ public async Task Can_list_mandate(CreateMandateRequest mandateRequest)
9797
// Arrange
9898
var createResponse = await _fixture.Client.Mandates.CreateMandate(
9999
mandateRequest, idempotencyKey: Guid.NewGuid().ToString());
100-
createResponse.StatusCode.ShouldBe(HttpStatusCode.Created);
100+
createResponse.StatusCode.Should().Be(HttpStatusCode.Created);
101101

102102
// Act
103103
var response = await _fixture.Client.Mandates.ListMandates(new ListMandatesQuery(createResponse.Data!.User.Id, null, 10), MandateType.Sweeping);
104104

105105
// Assert
106-
response.StatusCode.ShouldBe(HttpStatusCode.OK);
107-
response.Data!.Items.Count().ShouldBeLessThanOrEqualTo(10);
106+
response.StatusCode.Should().Be(HttpStatusCode.OK);
107+
response.Data!.Items.Count().Should().BeLessThanOrEqualTo(10);
108108
}
109109

110110
[Theory]
@@ -126,9 +126,9 @@ public async Task Can_start_authorization(CreateMandateRequest mandateRequest)
126126
var mandate = await WaitForMandateToBeAuthorized(mandateId);
127127

128128
// Assert
129-
response.StatusCode.ShouldBe(HttpStatusCode.OK);
130-
mandate.AsT2.Status.ShouldBe("authorized");
131-
createResponse.StatusCode.ShouldBe(HttpStatusCode.Created);
129+
response.StatusCode.Should().Be(HttpStatusCode.OK);
130+
mandate.AsT2.Status.Should().Be("authorized");
131+
createResponse.StatusCode.Should().Be(HttpStatusCode.Created);
132132
}
133133

134134
[Theory]
@@ -151,8 +151,8 @@ await _fixture.Client.Mandates.StartAuthorizationFlow(
151151
mandateId, request, idempotencyKey: Guid.NewGuid().ToString(), MandateType.Sweeping);
152152

153153
// Assert
154-
response.StatusCode.ShouldBe(HttpStatusCode.OK);
155-
createResponse.StatusCode.ShouldBe(HttpStatusCode.Created);
154+
response.StatusCode.Should().Be(HttpStatusCode.OK);
155+
createResponse.StatusCode.Should().Be(HttpStatusCode.Created);
156156
}
157157

158158
[Theory]
@@ -187,7 +187,7 @@ await _fixture.Client.Mandates.SubmitProviderSelection(
187187
mandateId, idempotencyKey: Guid.NewGuid().ToString(), mandateType);
188188

189189
// Assert
190-
response.StatusCode.ShouldBe(HttpStatusCode.OK);
190+
response.StatusCode.Should().Be(HttpStatusCode.OK);
191191
}
192192

193193
[Theory]
@@ -210,9 +210,9 @@ public async Task Can_Get_Funds(CreateMandateRequest mandateRequest)
210210
var fundsResponse = await _fixture.Client.Mandates.GetConfirmationOfFunds(mandateId, 1, "GBP", MandateType.Sweeping);
211211

212212
// Assert
213-
fundsResponse.StatusCode.ShouldBe(HttpStatusCode.OK);
214-
fundsResponse.Data!.ConfirmedAt.Date.ShouldBe(DateTime.UtcNow.Date);
215-
fundsResponse.Data!.Confirmed.ShouldBeTrue();
213+
fundsResponse.StatusCode.Should().Be(HttpStatusCode.OK);
214+
fundsResponse.Data!.ConfirmedAt.Date.Should().Be(DateTime.UtcNow.Date);
215+
fundsResponse.Data!.Confirmed.Should().BeTrue();
216216
}
217217

218218
[Theory]
@@ -230,7 +230,7 @@ public async Task Can_get_mandate_constraints(CreateMandateRequest mandateReques
230230
sweepingMandate => MandateType.Sweeping));
231231

232232
// Assert
233-
response.StatusCode.ShouldBe(HttpStatusCode.OK);
233+
response.StatusCode.Should().Be(HttpStatusCode.OK);
234234
}
235235

236236
[Theory]
@@ -249,7 +249,7 @@ public async Task Can_revoke_mandate(CreateMandateRequest mandateRequest)
249249
sweepingMandate => MandateType.Sweeping));
250250

251251
// Assert
252-
response.StatusCode.ShouldBe(HttpStatusCode.NoContent);
252+
response.StatusCode.Should().Be(HttpStatusCode.NoContent);
253253
}
254254

255255
[Theory]
@@ -267,13 +267,13 @@ public async Task Can_create_mandate_payment(CreateMandateRequest mandateRequest
267267
idempotencyKey: Guid.NewGuid().ToString());
268268

269269
// Assert
270-
response.StatusCode.ShouldBe(HttpStatusCode.Created);
271-
response.Data.IsT1.ShouldBeTrue();
272-
response.Data.AsT1.Id.ShouldNotBeNullOrWhiteSpace();
273-
response.Data.AsT1.ResourceToken.ShouldNotBeNullOrWhiteSpace();
274-
response.Data.AsT1.User.ShouldNotBeNull();
275-
response.Data.AsT1.User.Id.ShouldNotBeNullOrWhiteSpace();
276-
response.Data.AsT1.Status.ShouldBe("authorized");
270+
response.StatusCode.Should().Be(HttpStatusCode.Created);
271+
response.Data.IsT1.Should().BeTrue();
272+
response.Data.AsT1.Id.Should().NotBeNullOrWhiteSpace();
273+
response.Data.AsT1.ResourceToken.Should().NotBeNullOrWhiteSpace();
274+
response.Data.AsT1.User.Should().NotBeNull();
275+
response.Data.AsT1.User.Id.Should().NotBeNullOrWhiteSpace();
276+
response.Data.AsT1.Status.Should().Be("authorized");
277277
}
278278

279279
private static CreateMandateRequest CreateTestMandateRequest(
@@ -331,7 +331,7 @@ await client.PostAsync(
331331
authUri,
332332
new StringContent(jsonPayload, Encoding.UTF8, "application/json"));
333333

334-
submitProviderParamsResponse.IsSuccessStatusCode.ShouldBeTrue();
334+
submitProviderParamsResponse.IsSuccessStatusCode.Should().BeTrue();
335335
}
336336

337337
private async Task<MandateDetailUnion> WaitForMandateToBeAuthorized(string mandateId)
@@ -354,7 +354,7 @@ private async Task<string> CreateAuthorizedSweepingMandate(CreateMandateRequest
354354
mandateRequest, idempotencyKey: Guid.NewGuid().ToString());
355355
var mandateId = createResponse.Data!.Id;
356356

357-
createResponse.StatusCode.ShouldBe(HttpStatusCode.Created);
357+
createResponse.StatusCode.Should().Be(HttpStatusCode.Created);
358358

359359
StartAuthorizationFlowRequest authorizationRequest = new(
360360
new ProviderSelectionRequest(),
@@ -367,7 +367,7 @@ private async Task<string> CreateAuthorizedSweepingMandate(CreateMandateRequest
367367
return mandateId;
368368
}
369369

370-
private static IEnumerable<CreateMandateRequest[]> CreateTestSweepingPreselectedMandateRequests()
370+
public static IEnumerable<object[]> CreateTestSweepingPreselectedMandateRequests()
371371
{
372372
yield return new[]
373373
{
@@ -381,7 +381,7 @@ private static IEnumerable<CreateMandateRequest[]> CreateTestSweepingPreselected
381381
};
382382
}
383383

384-
private static IEnumerable<CreateMandateRequest[]> CreateTestCommercialPreselectedMandateRequests()
384+
public static IEnumerable<object[]> CreateTestCommercialPreselectedMandateRequests()
385385
{
386386
yield return new[]
387387
{
@@ -395,7 +395,7 @@ private static IEnumerable<CreateMandateRequest[]> CreateTestCommercialPreselect
395395
};
396396
}
397397

398-
private static IEnumerable<CreateMandateRequest[]> CreateTestSweepingUserSelectedMandateRequests()
398+
public static IEnumerable<object[]> CreateTestSweepingUserSelectedMandateRequests()
399399
{
400400
yield return new[]
401401
{
@@ -412,7 +412,7 @@ private static IEnumerable<CreateMandateRequest[]> CreateTestSweepingUserSelecte
412412
};
413413
}
414414

415-
private static IEnumerable<CreateMandateRequest[]> CreateTestCommercialUserSelectedMandateRequests()
415+
public static IEnumerable<object[]> CreateTestCommercialUserSelectedMandateRequests()
416416
{
417417
yield return new[]
418418
{

0 commit comments

Comments
 (0)