Skip to content

Commit 45fef9c

Browse files
author
Bart Koelman
committed
Use Should() replacements that flow nullability
1 parent aac7719 commit 45fef9c

File tree

117 files changed

+1737
-1650
lines changed

Some content is hidden

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

117 files changed

+1737
-1650
lines changed

‎test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using Microsoft.Extensions.Logging;
1414
using Microsoft.Extensions.Logging.Abstractions;
1515
using Moq;
16+
using TestBuildingBlocks;
1617
using Xunit;
1718

1819
namespace DiscoveryTests
@@ -59,10 +60,10 @@ public void Can_add_resources_from_assembly_to_graph()
5960
IResourceGraph resourceGraph = _resourceGraphBuilder.Build();
6061

6162
ResourceType personType = resourceGraph.FindResourceType(typeof(Person));
62-
personType.Should().NotBeNull();
63+
personType.ShouldNotBeNull();
6364

6465
ResourceType todoItemType = resourceGraph.FindResourceType(typeof(TodoItem));
65-
todoItemType.Should().NotBeNull();
66+
todoItemType.ShouldNotBeNull();
6667
}
6768

6869
[Fact]
@@ -79,7 +80,7 @@ public void Can_add_resource_from_current_assembly_to_graph()
7980
IResourceGraph resourceGraph = _resourceGraphBuilder.Build();
8081

8182
ResourceType testResourceType = resourceGraph.FindResourceType(typeof(TestResource));
82-
testResourceType.Should().NotBeNull();
83+
testResourceType.ShouldNotBeNull();
8384
}
8485

8586
[Fact]

‎test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/ArchiveTests.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
5454
// Assert
5555
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
5656

57-
responseDocument.Data.SingleValue.Should().NotBeNull();
57+
responseDocument.Data.SingleValue.ShouldNotBeNull();
5858
responseDocument.Data.SingleValue.Id.Should().Be(broadcast.StringId);
5959
responseDocument.Data.SingleValue.Attributes["archivedAt"].As<DateTimeOffset?>().Should().BeCloseTo(broadcast.ArchivedAt.GetValueOrDefault());
6060
}
@@ -80,7 +80,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
8080
// Assert
8181
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
8282

83-
responseDocument.Data.SingleValue.Should().NotBeNull();
83+
responseDocument.Data.SingleValue.ShouldNotBeNull();
8484
responseDocument.Data.SingleValue.Id.Should().Be(broadcast.StringId);
8585
responseDocument.Data.SingleValue.Attributes["archivedAt"].As<DateTimeOffset?>().Should().BeNull();
8686
}
@@ -107,7 +107,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
107107
// Assert
108108
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
109109

110-
responseDocument.Data.ManyValue.Should().HaveCount(1);
110+
responseDocument.Data.ManyValue.ShouldHaveCount(1);
111111
responseDocument.Data.ManyValue[0].Id.Should().Be(broadcasts[1].StringId);
112112
responseDocument.Data.ManyValue[0].Attributes["archivedAt"].As<DateTimeOffset?>().Should().BeNull();
113113
}
@@ -134,7 +134,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
134134
// Assert
135135
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
136136

137-
responseDocument.Data.ManyValue.Should().HaveCount(2);
137+
responseDocument.Data.ManyValue.ShouldHaveCount(2);
138138
responseDocument.Data.ManyValue[0].Id.Should().Be(broadcasts[0].StringId);
139139
responseDocument.Data.ManyValue[0].Attributes["archivedAt"].As<DateTimeOffset?>().Should().BeCloseTo(broadcasts[0].ArchivedAt.GetValueOrDefault());
140140
responseDocument.Data.ManyValue[1].Id.Should().Be(broadcasts[1].StringId);
@@ -163,10 +163,10 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
163163
// Assert
164164
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
165165

166-
responseDocument.Data.SingleValue.Should().NotBeNull();
166+
responseDocument.Data.SingleValue.ShouldNotBeNull();
167167
responseDocument.Data.SingleValue.Id.Should().Be(station.StringId);
168168

169-
responseDocument.Included.Should().HaveCount(1);
169+
responseDocument.Included.ShouldHaveCount(1);
170170
responseDocument.Included[0].Id.Should().Be(station.Broadcasts.ElementAt(1).StringId);
171171
responseDocument.Included[0].Attributes["archivedAt"].Should().BeNull();
172172
}
@@ -196,10 +196,10 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
196196

197197
DateTimeOffset archivedAt0 = station.Broadcasts.ElementAt(0).ArchivedAt.GetValueOrDefault();
198198

199-
responseDocument.Data.SingleValue.Should().NotBeNull();
199+
responseDocument.Data.SingleValue.ShouldNotBeNull();
200200
responseDocument.Data.SingleValue.Id.Should().Be(station.StringId);
201201

202-
responseDocument.Included.Should().HaveCount(2);
202+
responseDocument.Included.ShouldHaveCount(2);
203203
responseDocument.Included[0].Id.Should().Be(station.Broadcasts.ElementAt(0).StringId);
204204
responseDocument.Included[0].Attributes["archivedAt"].As<DateTimeOffset?>().Should().BeCloseTo(archivedAt0);
205205
responseDocument.Included[1].Id.Should().Be(station.Broadcasts.ElementAt(1).StringId);
@@ -229,7 +229,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
229229

230230
DateTimeOffset archivedAt = comment.AppliesTo.ArchivedAt.GetValueOrDefault();
231231

232-
responseDocument.Data.SingleValue.Should().NotBeNull();
232+
responseDocument.Data.SingleValue.ShouldNotBeNull();
233233
responseDocument.Data.SingleValue.Id.Should().Be(comment.AppliesTo.StringId);
234234
responseDocument.Data.SingleValue.Attributes["archivedAt"].As<DateTimeOffset?>().Should().BeCloseTo(archivedAt);
235235
}
@@ -256,7 +256,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
256256
// Assert
257257
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
258258

259-
responseDocument.Data.ManyValue.Should().HaveCount(1);
259+
responseDocument.Data.ManyValue.ShouldHaveCount(1);
260260
responseDocument.Data.ManyValue[0].Id.Should().Be(station.Broadcasts.ElementAt(1).StringId);
261261
responseDocument.Data.ManyValue[0].Attributes["archivedAt"].Should().BeNull();
262262
}
@@ -285,7 +285,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
285285

286286
DateTimeOffset archivedAt0 = station.Broadcasts.ElementAt(0).ArchivedAt.GetValueOrDefault();
287287

288-
responseDocument.Data.ManyValue.Should().HaveCount(2);
288+
responseDocument.Data.ManyValue.ShouldHaveCount(2);
289289
responseDocument.Data.ManyValue[0].Id.Should().Be(station.Broadcasts.ElementAt(0).StringId);
290290
responseDocument.Data.ManyValue[0].Attributes["archivedAt"].As<DateTimeOffset?>().Should().BeCloseTo(archivedAt0);
291291
responseDocument.Data.ManyValue[1].Id.Should().Be(station.Broadcasts.ElementAt(1).StringId);
@@ -315,10 +315,10 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
315315
// Assert
316316
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
317317

318-
responseDocument.Data.ManyValue.Should().HaveCount(1);
318+
responseDocument.Data.ManyValue.ShouldHaveCount(1);
319319
responseDocument.Data.ManyValue[0].Id.Should().Be(network.Stations.ElementAt(0).StringId);
320320

321-
responseDocument.Included.Should().HaveCount(1);
321+
responseDocument.Included.ShouldHaveCount(1);
322322
responseDocument.Included[0].Id.Should().Be(network.Stations.ElementAt(0).Broadcasts.ElementAt(1).StringId);
323323
responseDocument.Included[0].Attributes["archivedAt"].Should().BeNull();
324324
}
@@ -348,10 +348,10 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
348348

349349
DateTimeOffset archivedAt0 = network.Stations.ElementAt(0).Broadcasts.ElementAt(0).ArchivedAt.GetValueOrDefault();
350350

351-
responseDocument.Data.ManyValue.Should().HaveCount(1);
351+
responseDocument.Data.ManyValue.ShouldHaveCount(1);
352352
responseDocument.Data.ManyValue[0].Id.Should().Be(network.Stations.ElementAt(0).StringId);
353353

354-
responseDocument.Included.Should().HaveCount(2);
354+
responseDocument.Included.ShouldHaveCount(2);
355355
responseDocument.Included[0].Id.Should().Be(network.Stations.ElementAt(0).Broadcasts.ElementAt(0).StringId);
356356
responseDocument.Included[0].Attributes["archivedAt"].As<DateTimeOffset?>().Should().BeCloseTo(archivedAt0);
357357
responseDocument.Included[1].Id.Should().Be(network.Stations.ElementAt(0).Broadcasts.ElementAt(1).StringId);
@@ -380,7 +380,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
380380
// Assert
381381
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
382382

383-
responseDocument.Data.ManyValue.Should().HaveCount(1);
383+
responseDocument.Data.ManyValue.ShouldHaveCount(1);
384384
responseDocument.Data.ManyValue[0].Id.Should().Be(station.Broadcasts.ElementAt(1).StringId);
385385
}
386386

@@ -406,7 +406,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
406406
// Assert
407407
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
408408

409-
responseDocument.Data.ManyValue.Should().HaveCount(2);
409+
responseDocument.Data.ManyValue.ShouldHaveCount(2);
410410
responseDocument.Data.ManyValue[0].Id.Should().Be(station.Broadcasts.ElementAt(0).StringId);
411411
responseDocument.Data.ManyValue[1].Id.Should().Be(station.Broadcasts.ElementAt(1).StringId);
412412
}
@@ -438,7 +438,7 @@ public async Task Can_create_unarchived_resource()
438438
// Assert
439439
httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
440440

441-
responseDocument.Data.SingleValue.Should().NotBeNull();
441+
responseDocument.Data.SingleValue.ShouldNotBeNull();
442442
responseDocument.Data.SingleValue.Attributes["title"].Should().Be(newBroadcast.Title);
443443
responseDocument.Data.SingleValue.Attributes["airedAt"].As<DateTimeOffset>().Should().BeCloseTo(newBroadcast.AiredAt);
444444
responseDocument.Data.SingleValue.Attributes["archivedAt"].Should().BeNull();
@@ -472,7 +472,7 @@ public async Task Cannot_create_archived_resource()
472472
// Assert
473473
httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
474474

475-
responseDocument.Errors.Should().HaveCount(1);
475+
responseDocument.Errors.ShouldHaveCount(1);
476476

477477
ErrorObject error = responseDocument.Errors[0];
478478
error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
@@ -604,7 +604,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
604604
// Assert
605605
httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
606606

607-
responseDocument.Errors.Should().HaveCount(1);
607+
responseDocument.Errors.ShouldHaveCount(1);
608608

609609
ErrorObject error = responseDocument.Errors[0];
610610
error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
@@ -663,7 +663,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
663663
// Assert
664664
httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
665665

666-
responseDocument.Errors.Should().HaveCount(1);
666+
responseDocument.Errors.ShouldHaveCount(1);
667667

668668
ErrorObject error = responseDocument.Errors[0];
669669
error.StatusCode.Should().Be(HttpStatusCode.Forbidden);

‎test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/AtomicConstrainedOperationsControllerTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public async Task Can_create_resources_for_matching_resource_type()
6969
// Assert
7070
httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
7171

72-
responseDocument.Results.Should().HaveCount(2);
72+
responseDocument.Results.ShouldHaveCount(2);
7373
}
7474

7575
[Fact]
@@ -102,7 +102,7 @@ public async Task Cannot_create_resource_for_mismatching_resource_type()
102102
// Assert
103103
httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
104104

105-
responseDocument.Errors.Should().HaveCount(1);
105+
responseDocument.Errors.ShouldHaveCount(1);
106106

107107
ErrorObject error = responseDocument.Errors[0];
108108
error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
@@ -150,7 +150,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
150150
// Assert
151151
httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
152152

153-
responseDocument.Errors.Should().HaveCount(1);
153+
responseDocument.Errors.ShouldHaveCount(1);
154154

155155
ErrorObject error = responseDocument.Errors[0];
156156
error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
@@ -205,7 +205,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
205205
// Assert
206206
httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
207207

208-
responseDocument.Errors.Should().HaveCount(1);
208+
responseDocument.Errors.ShouldHaveCount(1);
209209

210210
ErrorObject error = responseDocument.Errors[0];
211211
error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);

0 commit comments

Comments
 (0)