From 8cad0173fdddccced88dbb8ce2267eb319693e2d Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Thu, 16 Feb 2023 13:06:45 +0100 Subject: [PATCH] Simplify assertions (ShouldContainKey already checks for null) --- .../Meta/TopLevelCountTests.cs | 4 ---- .../ResourceInheritanceReadTests.cs | 24 +++++-------------- test/NoEntityFrameworkTests/WorkItemTests.cs | 1 - 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs index eee8fa75e3..f9639c99bc 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs @@ -52,8 +52,6 @@ public async Task Renders_resource_count_for_collection() // Assert httpResponse.ShouldHaveStatusCode(HttpStatusCode.OK); - responseDocument.Meta.ShouldNotBeNull(); - responseDocument.Meta.ShouldContainKey("total").With(value => { JsonElement element = value.Should().BeOfType().Subject; @@ -78,8 +76,6 @@ public async Task Renders_resource_count_for_empty_collection() // Assert httpResponse.ShouldHaveStatusCode(HttpStatusCode.OK); - responseDocument.Meta.ShouldNotBeNull(); - responseDocument.Meta.ShouldContainKey("total").With(value => { JsonElement element = value.Should().BeOfType().Subject; diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceInheritanceReadTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceInheritanceReadTests.cs index ebca28dac9..ee974e0756 100644 --- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceInheritanceReadTests.cs +++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceInheritanceReadTests.cs @@ -614,9 +614,7 @@ public async Task Can_get_secondary_resources_at_abstract_base_endpoint() 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")) @@ -624,9 +622,7 @@ public async Task Can_get_secondary_resources_at_abstract_base_endpoint() 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,9 +682,7 @@ public async Task Can_get_secondary_resources_at_concrete_base_endpoint() 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")) @@ -696,9 +690,7 @@ public async Task Can_get_secondary_resources_at_concrete_base_endpoint() 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,9 +744,7 @@ public async Task Can_get_secondary_resources_at_concrete_derived_endpoint() 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")) @@ -762,9 +752,7 @@ public async Task Can_get_secondary_resources_at_concrete_derived_endpoint() 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 --git a/test/NoEntityFrameworkTests/WorkItemTests.cs b/test/NoEntityFrameworkTests/WorkItemTests.cs index 623f05ed1d..7bf09d35aa 100644 --- a/test/NoEntityFrameworkTests/WorkItemTests.cs +++ b/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));