Skip to content

Commit 5a34ed3

Browse files
bkoelmanbkoelman
committed
Remove usages of ShouldHaveCount
1 parent 520e5a0 commit 5a34ed3

42 files changed

Lines changed: 206 additions & 205 deletions

Some content is hidden

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

‎test/OpenApiKiotaEndToEndTests/AtomicOperations/AtomicCreateResourceTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public async Task Can_create_resource_with_attributes()
6363
// Assert
6464
response.ShouldNotBeNull();
6565

66-
response.AtomicResults.ShouldHaveCount(1);
66+
response.AtomicResults.Should().HaveCount(1);
6767
TeacherDataInResponse teacherDataInResponse = response.AtomicResults.ElementAt(0).Data.Should().BeOfType<TeacherDataInResponse>().Which;
6868

6969
teacherDataInResponse.Attributes.ShouldNotBeNull();
@@ -142,7 +142,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
142142
// Assert
143143
response.ShouldNotBeNull();
144144

145-
response.AtomicResults.ShouldHaveCount(1);
145+
response.AtomicResults.Should().HaveCount(1);
146146
EnrollmentDataInResponse enrollmentDataInResponse = response.AtomicResults.ElementAt(0).Data.Should().BeOfType<EnrollmentDataInResponse>().Which;
147147

148148
enrollmentDataInResponse.Attributes.ShouldNotBeNull();

‎test/OpenApiKiotaEndToEndTests/AtomicOperations/AtomicLocalIdTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public async Task Can_use_local_IDs()
174174
// Assert
175175
response.ShouldNotBeNull();
176176

177-
response.AtomicResults.ShouldHaveCount(7);
177+
response.AtomicResults.Should().HaveCount(7);
178178

179179
TeacherDataInResponse teacherInResponse = response.AtomicResults.ElementAt(0).Data.Should().BeOfType<TeacherDataInResponse>().Which;
180180
teacherInResponse.Attributes.ShouldNotBeNull();

‎test/OpenApiKiotaEndToEndTests/AtomicOperations/AtomicRelationshipTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
142142
{
143143
Teacher teacherInDatabase = await dbContext.Teachers.Include(teacher => teacher.Teaches).FirstWithIdAsync(existingTeacher.Id);
144144

145-
teacherInDatabase.Teaches.ShouldHaveCount(2);
145+
teacherInDatabase.Teaches.Should().HaveCount(2);
146146
teacherInDatabase.Teaches.Should().ContainSingle(course => course.Id == existingCourses.ElementAt(0).Id);
147147
teacherInDatabase.Teaches.Should().ContainSingle(course => course.Id == existingCourses.ElementAt(1).Id);
148148
});
@@ -206,7 +206,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
206206
{
207207
Teacher teacherInDatabase = await dbContext.Teachers.Include(teacher => teacher.Teaches).FirstWithIdAsync(existingTeacher.Id);
208208

209-
teacherInDatabase.Teaches.ShouldHaveCount(3);
209+
teacherInDatabase.Teaches.Should().HaveCount(3);
210210
teacherInDatabase.Teaches.Should().ContainSingle(course => course.Id == existingTeacher.Teaches.ElementAt(0).Id);
211211
teacherInDatabase.Teaches.Should().ContainSingle(course => course.Id == existingCourses.ElementAt(0).Id);
212212
teacherInDatabase.Teaches.Should().ContainSingle(course => course.Id == existingCourses.ElementAt(1).Id);
@@ -269,7 +269,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
269269
{
270270
Teacher teacherInDatabase = await dbContext.Teachers.Include(teacher => teacher.Teaches).FirstWithIdAsync(existingTeacher.Id);
271271

272-
teacherInDatabase.Teaches.ShouldHaveCount(1);
272+
teacherInDatabase.Teaches.Should().HaveCount(1);
273273
teacherInDatabase.Teaches.ElementAt(0).Id.Should().Be(existingTeacher.Teaches.ElementAt(1).Id);
274274
});
275275
}

‎test/OpenApiKiotaEndToEndTests/AtomicOperations/AtomicUpdateResourceTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
7777
// Assert
7878
response.ShouldNotBeNull();
7979

80-
response.AtomicResults.ShouldHaveCount(1);
80+
response.AtomicResults.Should().HaveCount(1);
8181
StudentDataInResponse studentDataInResponse = response.AtomicResults.ElementAt(0).Data.Should().BeOfType<StudentDataInResponse>().Which;
8282

8383
studentDataInResponse.Id.Should().Be(existingStudent.StringId);
@@ -141,7 +141,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
141141
// Assert
142142
response.ShouldNotBeNull();
143143

144-
response.AtomicResults.ShouldHaveCount(1);
144+
response.AtomicResults.Should().HaveCount(1);
145145
StudentDataInResponse studentDataInResponse = response.AtomicResults.ElementAt(0).Data.Should().BeOfType<StudentDataInResponse>().Which;
146146

147147
studentDataInResponse.Id.Should().Be(existingStudent.StringId);
@@ -224,7 +224,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
224224
// Assert
225225
response.ShouldNotBeNull();
226226

227-
response.AtomicResults.ShouldHaveCount(1);
227+
response.AtomicResults.Should().HaveCount(1);
228228
EnrollmentDataInResponse enrollmentDataInResponse = response.AtomicResults.ElementAt(0).Data.Should().BeOfType<EnrollmentDataInResponse>().Which;
229229

230230
enrollmentDataInResponse.Id.Should().Be(existingEnrollment.StringId);

‎test/OpenApiKiotaEndToEndTests/ClientIdGenerationModes/ClientIdGenerationModesTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public async Task Cannot_create_resource_without_ID_when_supplying_ID_is_require
5757
ErrorResponseDocument exception = (await action.Should().ThrowExactlyAsync<ErrorResponseDocument>()).Which;
5858
exception.ResponseStatusCode.Should().Be((int)HttpStatusCode.UnprocessableEntity);
5959
exception.Message.Should().Be($"Exception of type '{typeof(ErrorResponseDocument).FullName}' was thrown.");
60-
exception.Errors.ShouldHaveCount(1);
60+
exception.Errors.Should().HaveCount(1);
6161

6262
ErrorObject error = exception.Errors[0];
6363
error.Status.Should().Be("422");
@@ -219,7 +219,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
219219
ErrorResponseDocument exception = (await action.Should().ThrowExactlyAsync<ErrorResponseDocument>()).Which;
220220
exception.ResponseStatusCode.Should().Be((int)HttpStatusCode.Conflict);
221221
exception.Message.Should().Be($"Exception of type '{typeof(ErrorResponseDocument).FullName}' was thrown.");
222-
exception.Errors.ShouldHaveCount(1);
222+
exception.Errors.Should().HaveCount(1);
223223

224224
ErrorObject error = exception.Errors.ElementAt(0);
225225
error.Status.Should().Be("409");

‎test/OpenApiKiotaEndToEndTests/Headers/ETagTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
5454

5555
// Assert
5656
string[] eTagHeaderValues = headerInspector.ResponseHeaders.Should().ContainKey(HeaderNames.ETag).WhoseValue.ToArray();
57-
eTagHeaderValues.ShouldHaveCount(1);
57+
eTagHeaderValues.Should().HaveCount(1);
5858
eTagHeaderValues[0].Should().Match("\"*\"");
5959
}
6060

@@ -86,7 +86,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
8686
response.ShouldNotBeNull();
8787

8888
string[] eTagHeaderValues = headerInspector.ResponseHeaders.Should().ContainKey(HeaderNames.ETag).WhoseValue.ToArray();
89-
eTagHeaderValues.ShouldHaveCount(1);
89+
eTagHeaderValues.Should().HaveCount(1);
9090
eTagHeaderValues[0].Should().Match("\"*\"");
9191
}
9292

@@ -111,7 +111,7 @@ public async Task Returns_no_ETag_for_failed_GET_request()
111111
ErrorResponseDocument exception = (await action.Should().ThrowExactlyAsync<ErrorResponseDocument>()).Which;
112112
exception.ResponseStatusCode.Should().Be((int)HttpStatusCode.NotFound);
113113
exception.Message.Should().Be($"Exception of type '{typeof(ErrorResponseDocument).FullName}' was thrown.");
114-
exception.Errors.ShouldHaveCount(1);
114+
exception.Errors.Should().HaveCount(1);
115115

116116
ErrorObject error = exception.Errors.ElementAt(0);
117117
error.Status.Should().Be("404");
@@ -197,7 +197,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
197197
exception.ResponseStatusCode.Should().Be((int)HttpStatusCode.NotModified);
198198

199199
string[] eTagHeaderValues = headerInspector.ResponseHeaders.Should().ContainKey(HeaderNames.ETag).WhoseValue.ToArray();
200-
eTagHeaderValues.ShouldHaveCount(1);
200+
eTagHeaderValues.Should().HaveCount(1);
201201
eTagHeaderValues[0].Should().Be(responseETag);
202202
}
203203

@@ -233,7 +233,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
233233
response.ShouldNotBeNull();
234234

235235
string[] eTagHeaderValues = headerInspector.ResponseHeaders.Should().ContainKey(HeaderNames.ETag).WhoseValue.ToArray();
236-
eTagHeaderValues.ShouldHaveCount(1);
236+
eTagHeaderValues.Should().HaveCount(1);
237237
eTagHeaderValues[0].Should().Match("\"*\"");
238238
}
239239

‎test/OpenApiKiotaEndToEndTests/Headers/HeaderTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public async Task Returns_Location_for_post_resource_request()
6262
response.Data.ShouldNotBeNull();
6363

6464
string[] locationHeaderValues = headerInspector.ResponseHeaders.Should().ContainKey(HeaderNames.Location).WhoseValue.ToArray();
65-
locationHeaderValues.ShouldHaveCount(1);
65+
locationHeaderValues.Should().HaveCount(1);
6666
locationHeaderValues[0].Should().Be($"/countries/{response.Data.Id}");
6767
}
6868

@@ -92,7 +92,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
9292

9393
// Assert
9494
string[] contentLengthHeaderValues = headerInspector.ResponseHeaders.Should().ContainKey(HeaderNames.ContentLength).WhoseValue.ToArray();
95-
contentLengthHeaderValues.ShouldHaveCount(1);
95+
contentLengthHeaderValues.Should().HaveCount(1);
9696
long.Parse(contentLengthHeaderValues[0]).Should().BeGreaterThan(0);
9797
}
9898

@@ -121,7 +121,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
121121

122122
// Assert
123123
string[] contentLengthHeaderValues = headerInspector.ResponseHeaders.Should().ContainKey(HeaderNames.ContentLength).WhoseValue.ToArray();
124-
contentLengthHeaderValues.ShouldHaveCount(1);
124+
contentLengthHeaderValues.Should().HaveCount(1);
125125
long.Parse(contentLengthHeaderValues[0]).Should().BeGreaterThan(0);
126126
}
127127

@@ -151,7 +151,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
151151

152152
// Assert
153153
string[] contentLengthHeaderValues = headerInspector.ResponseHeaders.Should().ContainKey(HeaderNames.ContentLength).WhoseValue.ToArray();
154-
contentLengthHeaderValues.ShouldHaveCount(1);
154+
contentLengthHeaderValues.Should().HaveCount(1);
155155
long.Parse(contentLengthHeaderValues[0]).Should().BeGreaterThan(0);
156156
}
157157

@@ -181,7 +181,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
181181

182182
// Assert
183183
string[] contentLengthHeaderValues = headerInspector.ResponseHeaders.Should().ContainKey(HeaderNames.ContentLength).WhoseValue.ToArray();
184-
contentLengthHeaderValues.ShouldHaveCount(1);
184+
contentLengthHeaderValues.Should().HaveCount(1);
185185
long.Parse(contentLengthHeaderValues[0]).Should().BeGreaterThan(0);
186186
}
187187

‎test/OpenApiKiotaEndToEndTests/ModelStateValidation/ModelStateValidationTests.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public async Task Cannot_exceed_length_constraint(string firstName)
6060

6161
// Assert
6262
ErrorResponseDocument document = (await action.Should().ThrowExactlyAsync<ErrorResponseDocument>()).Which;
63-
document.Errors.ShouldHaveCount(1);
63+
document.Errors.Should().HaveCount(1);
6464

6565
ErrorObject errorObject = document.Errors.First();
6666
errorObject.Title.Should().Be("Input validation failed.");
@@ -98,7 +98,7 @@ public async Task Cannot_exceed_string_length_constraint(string userName)
9898

9999
// Assert
100100
ErrorResponseDocument document = (await action.Should().ThrowExactlyAsync<ErrorResponseDocument>()).Which;
101-
document.Errors.ShouldHaveCount(1);
101+
document.Errors.Should().HaveCount(1);
102102

103103
ErrorObject errorObject = document.Errors.First();
104104
errorObject.Title.Should().Be("Input validation failed.");
@@ -134,7 +134,7 @@ public async Task Cannot_violate_regular_expression_constraint()
134134

135135
// Assert
136136
ErrorResponseDocument document = (await action.Should().ThrowExactlyAsync<ErrorResponseDocument>()).Which;
137-
document.Errors.ShouldHaveCount(1);
137+
document.Errors.Should().HaveCount(1);
138138

139139
ErrorObject errorObject = document.Errors.First();
140140
errorObject.Title.Should().Be("Input validation failed.");
@@ -170,7 +170,7 @@ public async Task Cannot_use_invalid_credit_card_number()
170170

171171
// Assert
172172
ErrorResponseDocument document = (await action.Should().ThrowExactlyAsync<ErrorResponseDocument>()).Which;
173-
document.Errors.ShouldHaveCount(1);
173+
document.Errors.Should().HaveCount(1);
174174

175175
ErrorObject errorObject = document.Errors.First();
176176
errorObject.Title.Should().Be("Input validation failed.");
@@ -206,7 +206,7 @@ public async Task Cannot_use_invalid_email_address()
206206

207207
// Assert
208208
ErrorResponseDocument document = (await action.Should().ThrowExactlyAsync<ErrorResponseDocument>()).Which;
209-
document.Errors.ShouldHaveCount(1);
209+
document.Errors.Should().HaveCount(1);
210210

211211
ErrorObject errorObject = document.Errors.First();
212212
errorObject.Title.Should().Be("Input validation failed.");
@@ -243,7 +243,7 @@ public async Task Cannot_exceed_min_length_constraint()
243243

244244
// Assert
245245
ErrorResponseDocument document = (await action.Should().ThrowExactlyAsync<ErrorResponseDocument>()).Which;
246-
document.Errors.ShouldHaveCount(1);
246+
document.Errors.Should().HaveCount(1);
247247

248248
const int minCharsInBase64 = SocialMediaAccount.MinPasswordCharsInBase64;
249249

@@ -281,7 +281,7 @@ public async Task Cannot_exceed_max_length_constraint()
281281

282282
// Assert
283283
ErrorResponseDocument document = (await action.Should().ThrowExactlyAsync<ErrorResponseDocument>()).Which;
284-
document.Errors.ShouldHaveCount(1);
284+
document.Errors.Should().HaveCount(1);
285285

286286
const int maxCharsInBase64 = SocialMediaAccount.MaxPasswordCharsInBase64;
287287

@@ -319,7 +319,7 @@ public async Task Cannot_use_invalid_base64()
319319

320320
// Assert
321321
ErrorResponseDocument document = (await action.Should().ThrowExactlyAsync<ErrorResponseDocument>()).Which;
322-
document.Errors.ShouldHaveCount(1);
322+
document.Errors.Should().HaveCount(1);
323323

324324
ErrorObject errorObject = document.Errors.First();
325325
errorObject.Title.Should().Be("Input validation failed.");
@@ -359,7 +359,7 @@ public async Task Cannot_use_double_outside_of_valid_range(double age)
359359

360360
// Assert
361361
ErrorResponseDocument document = (await action.Should().ThrowExactlyAsync<ErrorResponseDocument>()).Which;
362-
document.Errors.ShouldHaveCount(1);
362+
document.Errors.Should().HaveCount(1);
363363

364364
ErrorObject errorObject = document.Errors.First();
365365
errorObject.Title.Should().Be("Input validation failed.");
@@ -395,7 +395,7 @@ public async Task Cannot_use_relative_url()
395395

396396
// Assert
397397
ErrorResponseDocument document = (await action.Should().ThrowExactlyAsync<ErrorResponseDocument>()).Which;
398-
document.Errors.ShouldHaveCount(1);
398+
document.Errors.Should().HaveCount(1);
399399

400400
ErrorObject errorObject = document.Errors.First();
401401
errorObject.Title.Should().Be("Input validation failed.");
@@ -433,7 +433,7 @@ public async Task Cannot_exceed_collection_length_constraint(int length)
433433

434434
// Assert
435435
ErrorResponseDocument document = (await action.Should().ThrowExactlyAsync<ErrorResponseDocument>()).Which;
436-
document.Errors.ShouldHaveCount(1);
436+
document.Errors.Should().HaveCount(1);
437437

438438
ErrorObject errorObject = document.Errors.First();
439439
errorObject.Title.Should().Be("Input validation failed.");
@@ -469,7 +469,7 @@ public async Task Cannot_use_non_allowed_value()
469469

470470
// Assert
471471
ErrorResponseDocument document = (await action.Should().ThrowExactlyAsync<ErrorResponseDocument>()).Which;
472-
document.Errors.ShouldHaveCount(1);
472+
document.Errors.Should().HaveCount(1);
473473

474474
ErrorObject errorObject = document.Errors.First();
475475
errorObject.Title.Should().Be("Input validation failed.");
@@ -505,7 +505,7 @@ public async Task Cannot_use_denied_value()
505505

506506
// Assert
507507
ErrorResponseDocument document = (await action.Should().ThrowExactlyAsync<ErrorResponseDocument>()).Which;
508-
document.Errors.ShouldHaveCount(1);
508+
document.Errors.Should().HaveCount(1);
509509

510510
ErrorObject errorObject = document.Errors.First();
511511
errorObject.Title.Should().Be("Input validation failed.");
@@ -541,7 +541,7 @@ public async Task Cannot_use_TimeSpan_outside_of_valid_range()
541541

542542
// Assert
543543
ErrorResponseDocument document = (await action.Should().ThrowExactlyAsync<ErrorResponseDocument>()).Which;
544-
document.Errors.ShouldHaveCount(1);
544+
document.Errors.Should().HaveCount(1);
545545

546546
ErrorObject errorObject = document.Errors.First();
547547
errorObject.Title.Should().Be("Input validation failed.");

‎test/OpenApiKiotaEndToEndTests/QueryStrings/FilterTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
5555

5656
// Assert
5757
response.ShouldNotBeNull();
58-
response.Data.ShouldHaveCount(1);
58+
response.Data.Should().HaveCount(1);
5959
response.Data.ElementAt(0).Id.Should().Be(nodes[1].StringId);
6060

6161
response.Data.ElementAt(0).Attributes.ShouldNotBeNull().With(attributes =>
@@ -100,7 +100,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
100100

101101
// Assert
102102
response.ShouldNotBeNull();
103-
response.Data.ShouldHaveCount(1);
103+
response.Data.Should().HaveCount(1);
104104
response.Data.ElementAt(0).Id.Should().Be(node.Children.ElementAt(1).StringId);
105105

106106
response.Data.ElementAt(0).Attributes.ShouldNotBeNull().With(attributes =>
@@ -145,7 +145,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
145145

146146
// Assert
147147
response.ShouldNotBeNull();
148-
response.Data.ShouldHaveCount(1);
148+
response.Data.Should().HaveCount(1);
149149
response.Data.ElementAt(0).Id.Should().Be(node.Children.ElementAt(1).StringId);
150150
response.Meta.ShouldNotBeNull();
151151
response.Meta.AdditionalData.ShouldContainKey("total").With(total => total.Should().Be(1));
@@ -177,7 +177,7 @@ public async Task Cannot_use_empty_filter()
177177
exception.Message.Should().Be($"Exception of type '{typeof(ErrorResponseDocument).FullName}' was thrown.");
178178
exception.Links.ShouldNotBeNull();
179179
exception.Links.Describedby.Should().Be("/swagger/v1/swagger.json");
180-
exception.Errors.ShouldHaveCount(1);
180+
exception.Errors.Should().HaveCount(1);
181181

182182
ErrorObject error = exception.Errors[0];
183183
error.Status.Should().Be("400");

0 commit comments

Comments
 (0)