Skip to content

Commit c14599a

Browse files
committed
refactor: improve test assertion clarity by using discard assignments for await results and named multiple assertion scopes.
1 parent aa5247b commit c14599a

2 files changed

Lines changed: 33 additions & 33 deletions

File tree

src/ApiService/BookStore.ApiService.Tests/ConfigurationValidationTests.cs

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public async Task PaginationOptions_DefaultPageSizeNegative_FailsValidation()
4141
var results = ValidateModel(options);
4242

4343
// Assert
44-
using var _ = Assert.Multiple();
45-
await Assert.That(results).Count().IsEqualTo(1);
46-
await Assert.That(results[0].ErrorMessage).Contains("DefaultPageSize must be between 1 and 1000");
44+
using var scope = Assert.Multiple();
45+
_ = await Assert.That(results).Count().IsEqualTo(1);
46+
_ = await Assert.That(results[0].ErrorMessage).Contains("DefaultPageSize must be between 1 and 1000");
4747
}
4848

4949
[Test]
@@ -62,8 +62,8 @@ public async Task PaginationOptions_DefaultPageSizeZero_FailsValidation()
6262

6363
// Assert
6464
using var scope = Assert.Multiple();
65-
await Assert.That(results).Count().IsEqualTo(1);
66-
await Assert.That(results[0].ErrorMessage).Contains("DefaultPageSize must be between 1 and 1000");
65+
_ = await Assert.That(results).Count().IsEqualTo(1);
66+
_ = await Assert.That(results[0].ErrorMessage).Contains("DefaultPageSize must be between 1 and 1000");
6767
}
6868

6969
[Test]
@@ -81,9 +81,9 @@ public async Task PaginationOptions_DefaultPageSizeTooLarge_FailsValidation()
8181
var results = ValidateModel(options);
8282

8383
// Assert
84-
using var _ = Assert.Multiple();
85-
await Assert.That(results).Count().IsGreaterThanOrEqualTo(1);
86-
await Assert.That(results.Any(r => r.ErrorMessage!.Contains("DefaultPageSize must be between 1 and 1000"))).IsTrue();
84+
using var scope = Assert.Multiple();
85+
_ = await Assert.That(results).Count().IsGreaterThanOrEqualTo(1);
86+
_ = await Assert.That(results.Any(r => r.ErrorMessage!.Contains("DefaultPageSize must be between 1 and 1000"))).IsTrue();
8787
}
8888

8989
[Test]
@@ -102,8 +102,8 @@ public async Task PaginationOptions_MaxPageSizeNegative_FailsValidation()
102102

103103
// Assert
104104
using var scope = Assert.Multiple();
105-
await Assert.That(results).Count().IsEqualTo(1);
106-
await Assert.That(results[0].ErrorMessage).Contains("MaxPageSize must be between 1 and 1000");
105+
_ = await Assert.That(results).Count().IsEqualTo(1);
106+
_ = await Assert.That(results[0].ErrorMessage).Contains("MaxPageSize must be between 1 and 1000");
107107
}
108108

109109
[Test]
@@ -122,8 +122,8 @@ public async Task PaginationOptions_MaxPageSizeZero_FailsValidation()
122122

123123
// Assert
124124
using var scope = Assert.Multiple();
125-
await Assert.That(results).Count().IsEqualTo(1);
126-
await Assert.That(results[0].ErrorMessage).Contains("MaxPageSize must be between 1 and 1000");
125+
_ = await Assert.That(results).Count().IsEqualTo(1);
126+
_ = await Assert.That(results[0].ErrorMessage).Contains("MaxPageSize must be between 1 and 1000");
127127
}
128128

129129
[Test]
@@ -141,9 +141,9 @@ public async Task PaginationOptions_DefaultPageSizeGreaterThanMaxPageSize_FailsV
141141
var results = ValidateModel(options);
142142

143143
// Assert
144-
using var _ = Assert.Multiple();
145-
await Assert.That(results).Count().IsEqualTo(1);
146-
await Assert.That(results[0].ErrorMessage).Contains("DefaultPageSize (100) cannot be greater than MaxPageSize (50)");
144+
using var scope = Assert.Multiple();
145+
_ = await Assert.That(results).Count().IsEqualTo(1);
146+
_ = await Assert.That(results[0].ErrorMessage).Contains("DefaultPageSize (100) cannot be greater than MaxPageSize (50)");
147147
}
148148

149149
[Test]
@@ -161,7 +161,7 @@ public async Task LocalizationOptions_ValidConfiguration_PassesValidation()
161161
var results = ValidateModel(options);
162162

163163
// Assert
164-
await Assert.That(results).IsEmpty();
164+
_ = await Assert.That(results).IsEmpty();
165165
}
166166

167167
[Test]
@@ -179,9 +179,9 @@ public async Task LocalizationOptions_DefaultCultureEmpty_FailsValidation()
179179
var results = ValidateModel(options);
180180

181181
// Assert
182-
using var _ = Assert.Multiple();
183-
await Assert.That(results).IsNotEmpty();
184-
await Assert.That(results.Any(r => r.ErrorMessage!.Contains("DefaultCulture"))).IsTrue();
182+
using var scope = Assert.Multiple();
183+
_ = await Assert.That(results).IsNotEmpty();
184+
_ = await Assert.That(results.Any(r => r.ErrorMessage!.Contains("DefaultCulture"))).IsTrue();
185185
}
186186

187187
[Test]
@@ -199,9 +199,9 @@ public async Task LocalizationOptions_SupportedCulturesEmpty_FailsValidation()
199199
var results = ValidateModel(options);
200200

201201
// Assert
202-
using var _ = Assert.Multiple();
203-
await Assert.That(results).IsNotEmpty();
204-
await Assert.That(results.Any(r => r.ErrorMessage!.Contains("At least one supported culture"))).IsTrue();
202+
using var scope = Assert.Multiple();
203+
_ = await Assert.That(results).IsNotEmpty();
204+
_ = await Assert.That(results.Any(r => r.ErrorMessage!.Contains("At least one supported culture"))).IsTrue();
205205
}
206206

207207
[Test]
@@ -219,9 +219,9 @@ public async Task LocalizationOptions_DefaultCultureNotInSupportedCultures_Fails
219219
var results = ValidateModel(options);
220220

221221
// Assert
222-
using var _ = Assert.Multiple();
223-
await Assert.That(results).Count().IsEqualTo(1);
224-
await Assert.That(results[0].ErrorMessage).Contains("DefaultCulture 'en-US' must be included in SupportedCultures");
222+
using var scope = Assert.Multiple();
223+
_ = await Assert.That(results).Count().IsEqualTo(1);
224+
_ = await Assert.That(results[0].ErrorMessage).Contains("DefaultCulture 'en-US' must be included in SupportedCultures");
225225
}
226226

227227
[Test]
@@ -239,7 +239,7 @@ public async Task LocalizationOptions_DefaultCultureInSupportedCulturesCaseInsen
239239
var results = ValidateModel(options);
240240

241241
// Assert
242-
await Assert.That(results).IsEmpty();
242+
_ = await Assert.That(results).IsEmpty();
243243
}
244244

245245
/// <summary>

src/ApiService/BookStore.ApiService.Tests/CultureCacheTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ public async Task IsValidCultureCode_CaseInsensitive_ReturnsTrue()
8080
var result2 = Infrastructure.CultureCache.IsValidCultureCode("PT");
8181

8282
// Assert
83-
using var _ = Assert.Multiple();
84-
await Assert.That(result1).IsTrue();
85-
await Assert.That(result2).IsTrue();
83+
using var scope = Assert.Multiple();
84+
_ = await Assert.That(result1).IsTrue();
85+
_ = await Assert.That(result2).IsTrue();
8686
}
8787

8888
[Test]
@@ -143,10 +143,10 @@ public async Task GetInvalidCodes_SomeInvalid_ReturnsInvalidOnes()
143143
var invalidCodes = Infrastructure.CultureCache.GetInvalidCodes(codes);
144144

145145
// Assert
146-
using var _ = Assert.Multiple();
147-
await Assert.That(invalidCodes).Count().IsEqualTo(2);
148-
await Assert.That(invalidCodes).Contains("xx-XX");
149-
await Assert.That(invalidCodes).Contains("invalid");
146+
using var scope = Assert.Multiple();
147+
_ = await Assert.That(invalidCodes).Count().IsEqualTo(2);
148+
_ = await Assert.That(invalidCodes).Contains("xx-XX");
149+
_ = await Assert.That(invalidCodes).Contains("invalid");
150150
}
151151

152152
[Test]

0 commit comments

Comments
 (0)