Updating to VS 2026

test/AMWD.Common.Tests/Extensions/StringExtensionsTest.cs

@@ -9,16 +9,13 @@ namespace AMWD.Common.Tests.Extensions
 	public class StringExtensionsTest
 	{
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullExceptionWhenNull()
 		{
 			// arrange
 			string hex = null;
 
-			// act
-			var bytes = hex.HexToBytes();
-
-			// assert - ArgumentNullException
+			// act & assert
+			Assert.ThrowsExactly<ArgumentNullException>(() => hex.HexToBytes());
 		}
 
 		[TestMethod]
@@ -35,19 +32,16 @@ namespace AMWD.Common.Tests.Extensions
 			Assert.IsFalse(bytes.Any());
 		}
 
-		[DataTestMethod]
+		[TestMethod]
 		[DataRow("aff", null)]
 		[DataRow("de:ad:be:e", ":")]
 		[DataRow("hell", "")]
-		[ExpectedException(typeof(FormatException))]
 		public void ShouldThrowFormatExceptionWhenInvalid(string hex, string delimiter)
 		{
 			// arrange
 
-			// act
-			var bytes = hex.HexToBytes(delimiter);
-
-			// assert - FormatException
+			// act & assert
+			Assert.ThrowsExactly<FormatException>(() => hex.HexToBytes(delimiter));
 		}
 
 		[TestMethod]
@@ -308,8 +302,8 @@ namespace AMWD.Common.Tests.Extensions
 			var nameserver = new IPEndPoint(IPAddress.Parse("1.1.1.1"), 53);
 
 			// act
-			bool valid = validEmail.IsValidEmailAddress(new[] { nameserver });
-			bool invalid = !invalidEmail.IsValidEmailAddress(new[] { nameserver });
+			bool valid = validEmail.IsValidEmailAddress([nameserver]);
+			bool invalid = !invalidEmail.IsValidEmailAddress([nameserver]);
 
 			// assert
 			Assert.IsTrue(valid);
@@ -349,7 +343,7 @@ namespace AMWD.Common.Tests.Extensions
 
 			// assert
 			Assert.AreEqual($"{value}\r{value}\r", sb.ToString());
-			Assert.IsFalse(sb.ToString().Contains('\n'));
+			Assert.DoesNotContain('\n', sb.ToString());
 		}
 	}
 }