Skip to content

Commit 047899e

Browse files
bkoelmanbkoelman
committed
Cleanup in existing tests
1 parent 91b80ad commit 047899e

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

‎test/OpenApiNSwagClientTests/LegacyClient/ResponseTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ public async Task Posting_resource_translates_response()
310310

311311
// Assert
312312
document.Data.Attributes.Should().BeNull();
313-
document.Data.Relationships.Purser.Data.Should().NotBeNull();
313+
document.Data.Relationships.Purser.Data.ShouldNotBeNull();
314314
document.Data.Relationships.Purser.Data.Id.Should().Be(flightAttendantId);
315315
document.Data.Relationships.CabinCrewMembers.Data.Should().HaveCount(1);
316316
document.Data.Relationships.CabinCrewMembers.Data.First().Id.Should().Be(flightAttendantId);
@@ -449,7 +449,7 @@ public async Task Getting_secondary_resource_translates_response()
449449
FlightAttendantSecondaryResponseDocument document = await apiClient.GetFlightPurserAsync(flightId, null, null);
450450

451451
// Assert
452-
document.Data.Should().NotBeNull();
452+
document.Data.ShouldNotBeNull();
453453
document.Data.Id.Should().Be(purserId);
454454
document.Data.Attributes.EmailAddress.Should().Be(emailAddress);
455455
document.Data.Attributes.Age.Should().Be(int.Parse(age));
@@ -563,7 +563,7 @@ public async Task Getting_ToOne_relationship_translates_response()
563563
FlightAttendantIdentifierResponseDocument document = await apiClient.GetFlightPurserRelationshipAsync(flightId, null, null);
564564

565565
// Assert
566-
document.Data.Should().NotBeNull();
566+
document.Data.ShouldNotBeNull();
567567
document.Data.Id.Should().Be(purserId);
568568
document.Data.Type.Should().Be(FlightAttendantResourceType.FlightAttendants);
569569
}

‎test/OpenApiNSwagEndToEndTests/Headers/ETagTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,14 +174,14 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
174174
var apiClient = new HeadersClient(httpClient);
175175

176176
// Act
177-
ApiResponse<CountryCollectionResponseDocument?> response2 =
177+
ApiResponse<CountryCollectionResponseDocument?> response =
178178
await ApiResponse.TranslateAsync(() => apiClient.GetCountryCollectionAsync(null, "\"Not-a-matching-value\""));
179179

180180
// Assert
181-
response2.StatusCode.Should().Be((int)HttpStatusCode.OK);
181+
response.StatusCode.Should().Be((int)HttpStatusCode.OK);
182182

183-
response2.Headers.Should().ContainKey(HeaderNames.ETag).WhoseValue.Should().NotBeNullOrEmpty();
183+
response.Headers.Should().ContainKey(HeaderNames.ETag).WhoseValue.Should().NotBeNullOrEmpty();
184184

185-
response2.Result.ShouldNotBeNull();
185+
response.Result.ShouldNotBeNull();
186186
}
187187
}

‎test/OpenApiNSwagEndToEndTests/QueryStrings/FilterTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
5151
NodeCollectionResponseDocument response = await apiClient.GetNodeCollectionAsync(queryString, null);
5252

5353
// Assert
54-
response.Data.Should().HaveCount(1);
54+
response.Data.ShouldHaveCount(1);
5555
response.Data.ElementAt(0).Id.Should().Be(nodes[1].StringId);
5656
response.Data.ElementAt(0).Attributes.Name.Should().Be(nodes[1].Name);
5757
response.Data.ElementAt(0).Attributes.Comment.Should().Be(nodes[1].Comment);
@@ -87,7 +87,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
8787
NodeCollectionResponseDocument response = await apiClient.GetNodeChildrenAsync(node.StringId!, queryString, null);
8888

8989
// Assert
90-
response.Data.Should().HaveCount(1);
90+
response.Data.ShouldHaveCount(1);
9191
response.Data.ElementAt(0).Id.Should().Be(node.Children.ElementAt(1).StringId);
9292
response.Data.ElementAt(0).Attributes.Name.Should().Be(node.Children.ElementAt(1).Name);
9393
response.Data.ElementAt(0).Attributes.Comment.Should().Be(node.Children.ElementAt(1).Comment);
@@ -123,7 +123,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
123123
NodeIdentifierCollectionResponseDocument response = await apiClient.GetNodeChildrenRelationshipAsync(node.StringId!, queryString, null);
124124

125125
// Assert
126-
response.Data.Should().HaveCount(1);
126+
response.Data.ShouldHaveCount(1);
127127
response.Data.ElementAt(0).Id.Should().Be(node.Children.ElementAt(1).StringId);
128128
response.Meta.ShouldNotBeNull();
129129
response.Meta.ShouldContainKey("total").With(total => total.Should().Be(1));

‎test/OpenApiNSwagEndToEndTests/QueryStrings/IncludeTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
5252
response.Data.ShouldHaveCount(1);
5353
response.Data.ElementAt(0).Id.Should().Be(node.StringId);
5454

55-
response.Included.Should().HaveCount(2);
55+
response.Included.ShouldHaveCount(2);
5656
response.Included.Should().ContainSingle(include => include is NameValuePairDataInResponse && include.Id == node.Values.ElementAt(0).StringId);
5757
response.Included.Should().ContainSingle(include => include is NameValuePairDataInResponse && include.Id == node.Values.ElementAt(1).StringId);
5858
}
@@ -86,7 +86,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
8686
// Assert
8787
response.Data.Id.Should().Be(node.StringId);
8888

89-
response.Included.Should().HaveCount(3);
89+
response.Included.ShouldHaveCount(3);
9090
response.Included.Should().ContainSingle(include => include is NodeDataInResponse && include.Id == node.Children.ElementAt(0).StringId);
9191
response.Included.Should().ContainSingle(include => include is NodeDataInResponse && include.Id == node.Children.ElementAt(1).StringId);
9292
response.Included.Should().ContainSingle(include => include is NameValuePairDataInResponse && include.Id == node.Values[0].StringId);
@@ -156,7 +156,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
156156
response.Data.ShouldNotBeNull();
157157
response.Data.Id.Should().Be(node.Parent.StringId);
158158

159-
response.Included.Should().HaveCount(1);
159+
response.Included.ShouldHaveCount(1);
160160

161161
NodeDataInResponse? include = response.Included.ElementAt(0).Should().BeOfType<NodeDataInResponse>().Subject;
162162
include.Id.Should().Be(node.Parent.Parent.StringId);

‎test/OpenApiNSwagEndToEndTests/QueryStrings/PaginationTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
5050
NodeCollectionResponseDocument response = await apiClient.GetNodeCollectionAsync(queryString, null);
5151

5252
// Assert
53-
response.Data.Should().HaveCount(1);
53+
response.Data.ShouldHaveCount(1);
5454
response.Data.ElementAt(0).Id.Should().Be(nodes[1].StringId);
5555
response.Meta.ShouldNotBeNull();
5656
response.Meta.ShouldContainKey("total").With(total => total.Should().Be(3));
@@ -83,7 +83,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
8383
NodeCollectionResponseDocument response = await apiClient.GetNodeChildrenAsync(node.StringId!, queryString, null);
8484

8585
// Assert
86-
response.Data.Should().HaveCount(2);
86+
response.Data.ShouldHaveCount(2);
8787
response.Data.ElementAt(0).Id.Should().Be(node.Children.ElementAt(0).StringId);
8888
response.Data.ElementAt(1).Id.Should().Be(node.Children.ElementAt(1).StringId);
8989
response.Meta.ShouldNotBeNull();
@@ -117,7 +117,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
117117
NodeIdentifierCollectionResponseDocument response = await apiClient.GetNodeChildrenRelationshipAsync(node.StringId!, queryString, null);
118118

119119
// Assert
120-
response.Data.Should().HaveCount(1);
120+
response.Data.ShouldHaveCount(1);
121121
response.Data.ElementAt(0).Id.Should().Be(node.Children.ElementAt(2).StringId);
122122
response.Meta.ShouldNotBeNull();
123123
response.Meta.ShouldContainKey("total").With(total => total.Should().Be(3));

‎test/OpenApiNSwagEndToEndTests/QueryStrings/SortTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
5151
NodeCollectionResponseDocument response = await apiClient.GetNodeCollectionAsync(queryString, null);
5252

5353
// Assert
54-
response.Data.Should().HaveCount(2);
54+
response.Data.ShouldHaveCount(2);
5555
response.Data.ElementAt(0).Id.Should().Be(nodes[1].StringId);
5656
response.Data.ElementAt(1).Id.Should().Be(nodes[0].StringId);
5757
}
@@ -84,7 +84,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
8484
NodeCollectionResponseDocument response = await apiClient.GetNodeChildrenAsync(node.StringId!, queryString, null);
8585

8686
// Assert
87-
response.Data.Should().HaveCount(2);
87+
response.Data.ShouldHaveCount(2);
8888
response.Data.ElementAt(0).Id.Should().Be(node.Children.ElementAt(1).StringId);
8989
response.Data.ElementAt(1).Id.Should().Be(node.Children.ElementAt(0).StringId);
9090
}
@@ -117,7 +117,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
117117
NodeIdentifierCollectionResponseDocument response = await apiClient.GetNodeChildrenRelationshipAsync(node.StringId!, queryString, null);
118118

119119
// Assert
120-
response.Data.Should().HaveCount(2);
120+
response.Data.ShouldHaveCount(2);
121121
response.Data.ElementAt(0).Id.Should().Be(node.Children.ElementAt(0).StringId);
122122
response.Data.ElementAt(1).Id.Should().Be(node.Children.ElementAt(1).StringId);
123123
}

‎test/OpenApiNSwagEndToEndTests/QueryStrings/SparseFieldSetTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
4848
NodeCollectionResponseDocument response = await apiClient.GetNodeCollectionAsync(queryString, null);
4949

5050
// Assert
51-
response.Data.Should().HaveCount(1);
51+
response.Data.ShouldHaveCount(1);
5252
response.Data.ElementAt(0).Id.Should().Be(node.StringId);
5353
response.Data.ElementAt(0).Attributes.Name.Should().Be(node.Name);
5454
response.Data.ElementAt(0).Attributes.Comment.Should().BeNull();
@@ -82,7 +82,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
8282
response.Data.Id.Should().Be(node.StringId);
8383
response.Data.Attributes.Name.Should().BeNull();
8484
response.Data.Attributes.Comment.Should().Be(node.Comment);
85-
response.Data.Relationships.Parent.Should().NotBeNull();
85+
response.Data.Relationships.Parent.ShouldNotBeNull();
8686
response.Data.Relationships.Children.Should().BeNull();
8787
}
8888

@@ -112,12 +112,12 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
112112
NodeCollectionResponseDocument response = await apiClient.GetNodeChildrenAsync(node.StringId!, queryString, null);
113113

114114
// Assert
115-
response.Data.Should().HaveCount(1);
115+
response.Data.ShouldHaveCount(1);
116116
response.Data.ElementAt(0).Id.Should().Be(node.Children.ElementAt(0).StringId);
117117
response.Data.ElementAt(0).Attributes.Name.Should().BeNull();
118118
response.Data.ElementAt(0).Attributes.Comment.Should().Be(node.Children.ElementAt(0).Comment);
119119
response.Data.ElementAt(0).Relationships.Parent.Should().BeNull();
120-
response.Data.ElementAt(0).Relationships.Children.Should().NotBeNull();
120+
response.Data.ElementAt(0).Relationships.Children.ShouldNotBeNull();
121121
}
122122

123123
[Fact]
@@ -150,7 +150,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
150150
response.Data.Attributes.Name.Should().BeNull();
151151
response.Data.Attributes.Comment.Should().Be(node.Parent.Comment);
152152
response.Data.Relationships.Parent.Should().BeNull();
153-
response.Data.Relationships.Children.Should().NotBeNull();
153+
response.Data.Relationships.Children.ShouldNotBeNull();
154154
}
155155

156156
[Fact]

0 commit comments

Comments
 (0)