Skip to content

Commit 4cc23d4

Browse files
committed
Replace Assert.AreEqual with Assert.HasCount in tests
Updated unit tests in Test_ObservableValidator.cs to use Assert.HasCount instead of Assert.AreEqual for collection count assertions. This improves clarity and consistency in test assertions.
1 parent d8d3d07 commit 4cc23d4

1 file changed

Lines changed: 15 additions & 15 deletions

File tree

tests/CommunityToolkit.Mvvm.UnitTests/Test_ObservableValidator.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -195,14 +195,14 @@ public void Test_ObservableValidator_TrySetProperty()
195195

196196
// Errors should now be present
197197
Assert.IsTrue(model.HasErrors);
198-
Assert.AreEqual(1, events.Count);
198+
Assert.HasCount(1, events);
199199
Assert.IsTrue(model.GetErrors(nameof(Person.Name)).Any());
200200
Assert.IsTrue(model.HasErrors);
201201

202202
// Trying to set a correct property should clear the errors
203203
Assert.IsTrue(model.TrySetName("This is fine", out errors));
204204
Assert.IsEmpty(errors);
205-
Assert.AreEqual(2, events.Count);
205+
Assert.HasCount(2, events);
206206
Assert.IsFalse(model.HasErrors);
207207
Assert.AreEqual("This is fine", model.Name);
208208
}
@@ -276,7 +276,7 @@ public void Test_ObservableValidator_ClearErrors()
276276
model.ClearErrors(nameof(Person.Age));
277277

278278
Assert.IsFalse(model.HasErrors);
279-
Assert.AreEqual(2, events.Count);
279+
Assert.HasCount(2, events);
280280

281281
model.Age = 200;
282282
model.Name = "Bo";
@@ -290,7 +290,7 @@ public void Test_ObservableValidator_ClearErrors()
290290
Assert.IsFalse(model.HasErrors);
291291
Assert.IsFalse(model.GetErrors(nameof(Person.Age)).Any());
292292
Assert.IsFalse(model.GetErrors(nameof(Person.Name)).Any());
293-
Assert.AreEqual(2, events.Count);
293+
Assert.HasCount(2, events);
294294
Assert.AreEqual(nameof(Person.Age), events[0].PropertyName);
295295
Assert.AreEqual(nameof(Person.Name), events[1].PropertyName);
296296
}
@@ -306,7 +306,7 @@ public void Test_ObservableValidator_ValidateAllProperties()
306306
model.ValidateAllProperties();
307307

308308
Assert.IsTrue(model.HasErrors);
309-
Assert.AreEqual(2, events.Count);
309+
Assert.HasCount(2, events);
310310

311311
// Note: we can't use an index here because the order used to return properties
312312
// from reflection APIs is an implementation detail and might change at any time.
@@ -321,7 +321,7 @@ public void Test_ObservableValidator_ValidateAllProperties()
321321
model.ValidateAllProperties();
322322

323323
Assert.IsFalse(model.HasErrors);
324-
Assert.AreEqual(2, events.Count);
324+
Assert.HasCount(2, events);
325325
Assert.IsTrue(events.Any(e => e.PropertyName == nameof(Person.Name)));
326326
Assert.IsTrue(events.Any(e => e.PropertyName == nameof(Person.Age)));
327327

@@ -332,7 +332,7 @@ public void Test_ObservableValidator_ValidateAllProperties()
332332
model.ValidateAllProperties();
333333

334334
Assert.IsTrue(model.HasErrors);
335-
Assert.AreEqual(1, events.Count);
335+
Assert.HasCount(1, events);
336336
Assert.IsTrue(events.Any(e => e.PropertyName == nameof(Person.Age)));
337337
}
338338

@@ -352,7 +352,7 @@ public void Test_ObservableValidator_ValidateAllProperties_WithFallback()
352352
validationAction(model);
353353

354354
Assert.IsTrue(model.HasErrors);
355-
Assert.AreEqual(2, events.Count);
355+
Assert.HasCount(2, events);
356356

357357
// Note: we can't use an index here because the order used to return properties
358358
// from reflection APIs is an implementation detail and might change at any time.
@@ -367,7 +367,7 @@ public void Test_ObservableValidator_ValidateAllProperties_WithFallback()
367367
validationAction(model);
368368

369369
Assert.IsFalse(model.HasErrors);
370-
Assert.AreEqual(2, events.Count);
370+
Assert.HasCount(2, events);
371371
Assert.IsTrue(events.Any(e => e.PropertyName == nameof(Person.Name)));
372372
Assert.IsTrue(events.Any(e => e.PropertyName == nameof(Person.Age)));
373373

@@ -378,7 +378,7 @@ public void Test_ObservableValidator_ValidateAllProperties_WithFallback()
378378
validationAction(model);
379379

380380
Assert.IsTrue(model.HasErrors);
381-
Assert.AreEqual(1, events.Count);
381+
Assert.HasCount(1, events);
382382
Assert.IsTrue(events.Any(e => e.PropertyName == nameof(Person.Age)));
383383
}
384384

@@ -394,7 +394,7 @@ public void Test_ObservableValidator_ValidateAllProperties_WithinPartialClassDec
394394
model.ValidateAllProperties();
395395

396396
Assert.IsTrue(model.HasErrors);
397-
Assert.AreEqual(2, events.Count);
397+
Assert.HasCount(2, events);
398398

399399
Assert.IsTrue(events.Any(e => e.PropertyName == nameof(PersonWithPartialDeclaration.Name)));
400400
Assert.IsTrue(events.Any(e => e.PropertyName == nameof(PersonWithPartialDeclaration.Number)));
@@ -407,7 +407,7 @@ public void Test_ObservableValidator_ValidateAllProperties_WithinPartialClassDec
407407
model.ValidateAllProperties();
408408

409409
Assert.IsFalse(model.HasErrors);
410-
Assert.AreEqual(2, events.Count);
410+
Assert.HasCount(2, events);
411411
Assert.IsTrue(events.Any(e => e.PropertyName == nameof(PersonWithPartialDeclaration.Name)));
412412
Assert.IsTrue(events.Any(e => e.PropertyName == nameof(PersonWithPartialDeclaration.Number)));
413413
}
@@ -577,7 +577,7 @@ public void Test_ObservableValidator_ValidateAllProperties_IncludeInheritedPrope
577577
model.ValidateAllProperties();
578578

579579
Assert.IsTrue(model.HasErrors);
580-
Assert.AreEqual(2, events.Count);
580+
Assert.HasCount(2, events);
581581

582582
Assert.IsTrue(events.Any(e => e.PropertyName == nameof(DerivedModelWithValidatableProperties.Name)));
583583
Assert.IsTrue(events.Any(e => e.PropertyName == nameof(DerivedModelWithValidatableProperties.Number)));
@@ -589,7 +589,7 @@ public void Test_ObservableValidator_ValidateAllProperties_IncludeInheritedPrope
589589
model.ValidateAllProperties();
590590

591591
Assert.IsTrue(model.HasErrors);
592-
Assert.AreEqual(2, events.Count);
592+
Assert.HasCount(2, events);
593593

594594
Assert.IsTrue(events.Any(e => e.PropertyName == nameof(DerivedModelWithValidatableProperties.Name)));
595595
Assert.IsTrue(events.Any(e => e.PropertyName == nameof(DerivedModelWithValidatableProperties.Number)));
@@ -605,7 +605,7 @@ public void Test_ObservableValidator_ValidateAllProperties_IncludeInheritedPrope
605605
model.ValidateAllProperties();
606606

607607
Assert.IsFalse(model.HasErrors);
608-
Assert.AreEqual(1, events.Count);
608+
Assert.HasCount(1, events);
609609

610610
Assert.IsTrue(events.Any(e => e.PropertyName == nameof(DerivedModelWithValidatableProperties.Name)));
611611
}

0 commit comments

Comments
 (0)