Merge pull request #1258 from bart-vmware/assertions-cleanup

Simplify assertions (ShouldContainKey already checks for null)

Author: bkoelman

Diff for: test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs

@@ -52,8 +52,6 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         // Assert
         httpResponse.ShouldHaveStatusCode(HttpStatusCode.OK);
 
-        responseDocument.Meta.ShouldNotBeNull();
-
         responseDocument.Meta.ShouldContainKey("total").With(value =>
         {
             JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
@@ -78,8 +76,6 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
         // Assert
         httpResponse.ShouldHaveStatusCode(HttpStatusCode.OK);
 
-        responseDocument.Meta.ShouldNotBeNull();
-
         responseDocument.Meta.ShouldContainKey("total").With(value =>
         {
             JsonElement element = value.Should().BeOfType<JsonElement>().Subject;

Diff for: test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceInheritanceReadTests.cs

@@ -614,19 +614,15 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             resource.Links.ShouldNotBeNull();
             resource.Links.Self.Should().Be($"/chromeWheels/{resource.Id}");
 
-            resource.Attributes.ShouldHaveCount(2);
-            resource.Attributes.ShouldContainKey("radius");
-            resource.Attributes.ShouldContainKey("paintColor");
+            resource.Attributes.ShouldOnlyContainKeys("radius", "paintColor");
         }
 
         foreach (ResourceObject resource in responseDocument.Data.ManyValue.Where(value => value.Type == "carbonWheels"))
         {
             resource.Links.ShouldNotBeNull();
             resource.Links.Self.Should().Be($"/carbonWheels/{resource.Id}");
 
-            resource.Attributes.ShouldHaveCount(2);
-            resource.Attributes.ShouldContainKey("radius");
-            resource.Attributes.ShouldContainKey("hasTube");
+            resource.Attributes.ShouldOnlyContainKeys("radius", "hasTube");
         }
 
         foreach (ResourceObject resource in responseDocument.Data.ManyValue)
@@ -686,19 +682,15 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             resource.Links.ShouldNotBeNull();
             resource.Links.Self.Should().Be($"/chromeWheels/{resource.Id}");
 
-            resource.Attributes.ShouldHaveCount(2);
-            resource.Attributes.ShouldContainKey("radius");
-            resource.Attributes.ShouldContainKey("paintColor");
+            resource.Attributes.ShouldOnlyContainKeys("radius", "paintColor");
         }
 
         foreach (ResourceObject resource in responseDocument.Data.ManyValue.Where(value => value.Type == "carbonWheels"))
         {
             resource.Links.ShouldNotBeNull();
             resource.Links.Self.Should().Be($"/carbonWheels/{resource.Id}");
 
-            resource.Attributes.ShouldHaveCount(2);
-            resource.Attributes.ShouldContainKey("radius");
-            resource.Attributes.ShouldContainKey("hasTube");
+            resource.Attributes.ShouldOnlyContainKeys("radius", "hasTube");
         }
 
         foreach (ResourceObject resource in responseDocument.Data.ManyValue)
@@ -752,19 +744,15 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             resource.Links.ShouldNotBeNull();
             resource.Links.Self.Should().Be($"/chromeWheels/{resource.Id}");
 
-            resource.Attributes.ShouldHaveCount(2);
-            resource.Attributes.ShouldContainKey("radius");
-            resource.Attributes.ShouldContainKey("paintColor");
+            resource.Attributes.ShouldOnlyContainKeys("radius", "paintColor");
         }
 
         foreach (ResourceObject resource in responseDocument.Data.ManyValue.Where(value => value.Type == "carbonWheels"))
         {
             resource.Links.ShouldNotBeNull();
             resource.Links.Self.Should().Be($"/carbonWheels/{resource.Id}");
 
-            resource.Attributes.ShouldHaveCount(2);
-            resource.Attributes.ShouldContainKey("radius");
-            resource.Attributes.ShouldContainKey("hasTube");
+            resource.Attributes.ShouldOnlyContainKeys("radius", "hasTube");
         }
 
         foreach (ResourceObject resource in responseDocument.Data.ManyValue)

Diff for: test/NoEntityFrameworkTests/WorkItemTests.cs

@@ -119,7 +119,6 @@ public async Task Can_create_WorkItem()
         httpResponse.ShouldHaveStatusCode(HttpStatusCode.Created);
 
         responseDocument.Data.SingleValue.ShouldNotBeNull();
-        responseDocument.Data.SingleValue.Attributes.ShouldNotBeEmpty();
         responseDocument.Data.SingleValue.Attributes.ShouldContainKey("isBlocked").With(value => value.Should().Be(newWorkItem.IsBlocked));
         responseDocument.Data.SingleValue.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newWorkItem.Title));
         responseDocument.Data.SingleValue.Attributes.ShouldContainKey("durationInHours").With(value => value.Should().Be(newWorkItem.DurationInHours));