From 0f35ccbfdeecb14084fd156e6d45f7a6f95ba795 Mon Sep 17 00:00:00 2001
From: Ed Ball <ed.ball@faithlife.com>
Date: Thu, 11 Jan 2024 16:09:20 -0800
Subject: [PATCH] Upgrade to NUnit 4.

---
 .editorconfig                                 |  1 +
 Directory.Packages.props                      |  3 ++-
 .../ValidatorTests.cs                         | 20 +++++++++----------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index fbd00a0..32e3ef9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -205,6 +205,7 @@ dotnet_diagnostic.IDE0170.severity = suggestion
 dotnet_diagnostic.IDE0180.severity = warning
 dotnet_diagnostic.IDE0290.severity = suggestion
 dotnet_diagnostic.IDE1005.severity = suggestion
+dotnet_diagnostic.NUnit2045.severity = suggestion
 dotnet_diagnostic.SA0001.severity = none
 dotnet_diagnostic.SA1003.severity = none
 dotnet_diagnostic.SA1008.severity = none
diff --git a/Directory.Packages.props b/Directory.Packages.props
index b68791e..ed32e09 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,13 +4,14 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageVersion Include="NUnit" Version="3.14.0" />
+    <PackageVersion Include="NUnit" Version="4.0.1" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageVersion Include="XmlDocMarkdown.Core" Version="2.9.0" />
   </ItemGroup>
   <ItemGroup>
     <GlobalPackageReference Include="Faithlife.Analyzers" Version="1.4.0" />
+    <GlobalPackageReference Include="NUnit.Analyzers" Version="3.10.0" />
     <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tests/Faithlife.DataAnnotations.Tests/ValidatorTests.cs b/tests/Faithlife.DataAnnotations.Tests/ValidatorTests.cs
index a1d7be7..8eaf976 100644
--- a/tests/Faithlife.DataAnnotations.Tests/ValidatorTests.cs
+++ b/tests/Faithlife.DataAnnotations.Tests/ValidatorTests.cs
@@ -16,8 +16,8 @@ public void ValidateNull()
 	[TestCase("")]
 	public void ValidateNotValidatable(object value)
 	{
-		Assert.IsTrue(ValidatorUtility.IsValid(value));
-		Assert.IsEmpty(ValidatorUtility.GetValidationResults(value));
+		Assert.That(ValidatorUtility.IsValid(value));
+		Assert.That(ValidatorUtility.GetValidationResults(value), Is.Empty);
 		ValidatorUtility.Validate(value);
 	}
 
@@ -27,23 +27,23 @@ public void ValidateRequired()
 		var validatable = new ValidatableDto();
 
 		var results = ValidatorUtility.GetValidationResults(validatable);
-		Assert.AreEqual(nameof(ValidatableDto.Required), results.Single().MemberNames.Single());
+		Assert.That(results.Single().MemberNames.Single(), Is.EqualTo(nameof(ValidatableDto.Required)));
 		var exception = Assert.Throws<ValidationException>(() => ValidatorUtility.Validate(validatable));
-		Assert.AreEqual(nameof(ValidatableDto.Required), exception!.ValidationResult.MemberNames.Single());
+		Assert.That(exception!.ValidationResult.MemberNames.Single(), Is.EqualTo(nameof(ValidatableDto.Required)));
 
 		validatable.Required = "";
 		results = ValidatorUtility.GetValidationResults(validatable);
-		Assert.AreEqual(nameof(ValidatableDto.Required), results.Single().MemberNames.Single());
+		Assert.That(results.Single().MemberNames.Single(), Is.EqualTo(nameof(ValidatableDto.Required)));
 		Assert.Throws<ValidationException>(() => ValidatorUtility.Validate(validatable));
 
 		validatable.Required = " ";
 		results = ValidatorUtility.GetValidationResults(validatable);
-		Assert.AreEqual(nameof(ValidatableDto.Required), results.Single().MemberNames.Single());
+		Assert.That(results.Single().MemberNames.Single(), Is.EqualTo(nameof(ValidatableDto.Required)));
 		Assert.Throws<ValidationException>(() => ValidatorUtility.Validate(validatable));
 
 		validatable.Required = "x";
 		results = ValidatorUtility.GetValidationResults(validatable);
-		Assert.IsEmpty(results);
+		Assert.That(results, Is.Empty);
 		ValidatorUtility.Validate(validatable);
 	}
 
@@ -54,15 +54,15 @@ public void ValidateRecursive()
 		var validatable = new ValidatableDto { Required = "x", Validatable = invalid };
 
 		var results = ValidatorUtility.GetValidationResults(validatable);
-		Assert.AreEqual(nameof(ValidatableDto.Validatable), results.Single().MemberNames.Single());
+		Assert.That(results.Single().MemberNames.Single(), Is.EqualTo(nameof(ValidatableDto.Validatable)));
 
 		validatable.Validatable = new ValidatableDto { Required = "x", Validatable = invalid };
 		results = ValidatorUtility.GetValidationResults(validatable);
-		Assert.AreEqual(nameof(ValidatableDto.Validatable), results.Single().MemberNames.Single());
+		Assert.That(results.Single().MemberNames.Single(), Is.EqualTo(nameof(ValidatableDto.Validatable)));
 
 		validatable.Validatable.Validatable = new ValidatableDto { Required = "x" };
 		results = ValidatorUtility.GetValidationResults(validatable);
-		Assert.IsEmpty(results);
+		Assert.That(results, Is.Empty);
 	}
 
 	private sealed class ValidatableDto