Skip to content

Commit 92e6d45

Browse files
bkoelmanbkoelman
committed
Simplify test assertions
1 parent a37ca56 commit 92e6d45

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

‎test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
7171
value.Links.Related.ShouldNotBeNull();
7272
});
7373

74-
var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
74+
var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).Which;
7575
postCaptured.Caption.Should().Be(post.Caption);
7676
postCaptured.Url.Should().BeNull();
7777
}
@@ -106,7 +106,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
106106
responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
107107
responseDocument.Data.ManyValue[0].Relationships.Should().BeNull();
108108

109-
var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
109+
var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).Which;
110110
postCaptured.Caption.Should().Be(post.Caption);
111111
postCaptured.Url.Should().BeNull();
112112
}
@@ -149,7 +149,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
149149
value.Links.Related.ShouldNotBeNull();
150150
});
151151

152-
var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
152+
var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).Which;
153153
postCaptured.Caption.Should().BeNull();
154154
postCaptured.Url.Should().BeNull();
155155
}
@@ -193,7 +193,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
193193
value.Links.Related.ShouldNotBeNull();
194194
});
195195

196-
var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).And.Subject.Single();
196+
var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).Which;
197197
blogCaptured.Id.Should().Be(blog.Id);
198198
blogCaptured.Title.Should().BeNull();
199199

@@ -240,7 +240,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
240240
value.Links.Related.ShouldNotBeNull();
241241
});
242242

243-
var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
243+
var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).Which;
244244
postCaptured.Url.Should().Be(post.Url);
245245
postCaptured.Caption.Should().BeNull();
246246
}
@@ -299,7 +299,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
299299
value.Links.Related.ShouldNotBeNull();
300300
});
301301

302-
var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
302+
var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).Which;
303303
postCaptured.Id.Should().Be(post.Id);
304304
postCaptured.Caption.Should().Be(post.Caption);
305305

@@ -361,7 +361,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
361361
value.Links.Related.ShouldNotBeNull();
362362
});
363363

364-
var accountCaptured = (WebAccount)store.Resources.Should().ContainSingle(resource => resource is WebAccount).And.Subject.Single();
364+
var accountCaptured = (WebAccount)store.Resources.Should().ContainSingle(resource => resource is WebAccount).Which;
365365
accountCaptured.Id.Should().Be(account.Id);
366366
accountCaptured.DisplayName.Should().Be(account.DisplayName);
367367

@@ -423,7 +423,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
423423
value.Links.Related.ShouldNotBeNull();
424424
});
425425

426-
var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).And.Subject.Single();
426+
var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).Which;
427427
blogCaptured.Id.Should().Be(blog.Id);
428428
blogCaptured.Owner.ShouldNotBeNull();
429429
blogCaptured.Owner.DisplayName.Should().Be(blog.Owner.DisplayName);
@@ -476,7 +476,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
476476
responseDocument.Included[0].Attributes.ShouldContainKey("color").With(value => value.Should().Be(post.Labels.Single().Color));
477477
responseDocument.Included[0].Relationships.Should().BeNull();
478478

479-
var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
479+
var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).Which;
480480
postCaptured.Id.Should().Be(post.Id);
481481
postCaptured.Caption.Should().Be(post.Caption);
482482

@@ -532,7 +532,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
532532
responseDocument.Included[1].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(blog.Owner.Posts[0].Caption));
533533
responseDocument.Included[1].Relationships.Should().BeNull();
534534

535-
var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).And.Subject.Single();
535+
var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).Which;
536536
blogCaptured.Id.Should().Be(blog.Id);
537537
blogCaptured.Title.Should().Be(blog.Title);
538538
blogCaptured.PlatformName.Should().BeNull();
@@ -620,7 +620,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
620620
value.Links.Related.ShouldNotBeNull();
621621
});
622622

623-
var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).And.Subject.Single();
623+
var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).Which;
624624
blogCaptured.Id.Should().Be(blog.Id);
625625
blogCaptured.Title.Should().Be(blog.Title);
626626
blogCaptured.PlatformName.Should().BeNull();
@@ -656,7 +656,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
656656
responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
657657
responseDocument.Data.ManyValue[0].Relationships.Should().BeNull();
658658

659-
var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
659+
var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).Which;
660660
postCaptured.Id.Should().Be(post.Id);
661661
postCaptured.Caption.Should().Be(post.Caption);
662662
postCaptured.Url.Should().BeNull();
@@ -691,7 +691,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
691691
responseDocument.Data.ManyValue[0].Attributes.Should().BeNull();
692692
responseDocument.Data.ManyValue[0].Relationships.Should().BeNull();
693693

694-
var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
694+
var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).Which;
695695
postCaptured.Id.Should().Be(post.Id);
696696
postCaptured.Url.Should().BeNull();
697697
}
@@ -824,7 +824,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
824824
responseDocument.Data.SingleValue.Attributes.ShouldContainKey("showAdvertisements").With(value => value.Should().Be(blog.ShowAdvertisements));
825825
responseDocument.Data.SingleValue.Relationships.Should().BeNull();
826826

827-
var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).And.Subject.Single();
827+
var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).Which;
828828
blogCaptured.ShowAdvertisements.Should().Be(blog.ShowAdvertisements);
829829
blogCaptured.IsPublished.Should().Be(blog.IsPublished);
830830
blogCaptured.Title.Should().Be(blog.Title);
@@ -869,7 +869,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
869869
value.Links.Related.ShouldNotBeNull();
870870
});
871871

872-
var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
872+
var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).Which;
873873
postCaptured.Id.Should().Be(post.Id);
874874
postCaptured.Caption.Should().Be(post.Caption);
875875
postCaptured.Url.Should().Be(post.Url);

0 commit comments

Comments
 (0)