Updating to VS 2026

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

@@ -11,19 +11,19 @@ namespace AMWD.Common.Tests.Extensions
 		{
 			// Arrange
 			var item = new TestItem { Number = 10, Text = "Ten" };
-			ICollection<TestItem> list = new List<TestItem>
-			{
+			ICollection<TestItem> list =
+			[
 				new() {
 					Number = 1,
 					Text = "One"
 				}
-			};
+			];
 
 			// Act
 			list.AddIfNotNull(item);
 
 			// Assert
-			Assert.AreEqual(2, list.Count);
+			Assert.HasCount(2, list);
 		}
 
 		[TestMethod]
@@ -31,105 +31,95 @@ namespace AMWD.Common.Tests.Extensions
 		{
 			// Arrange
 			TestItem item = null;
-			ICollection<TestItem> list = new List<TestItem>
-			{
+			ICollection<TestItem> list =
+			[
 				new() {
 					Number = 1,
 					Text = "One"
 				}
-			};
+			];
 
 			// Act
 			list.AddIfNotNull(item);
 
 			// Assert
-			Assert.AreEqual(1, list.Count);
+			Assert.HasCount(1, list);
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullExceptionForNullList()
 		{
 			// Arrange
 			var item = new TestItem { Number = 10, Text = "Ten" };
 			ICollection<TestItem> list = null;
 
-			// Act
-			list.AddIfNotNull(item);
-
-			// Assert - ArgumentNullException
+			// Act & Assert
+			Assert.ThrowsExactly<ArgumentNullException>(() => list.AddIfNotNull(item));
 		}
 
 		[TestMethod]
 		public void ShouldAddRange()
 		{
 			// Arrange
-			ICollection<TestItem> items = new List<TestItem>
-			{
+			ICollection<TestItem> items =
+			[
 				new() { Number = 10, Text = "Ten" },
 				new() { Number = 11, Text = "Eleven" },
-			};
-			ICollection<TestItem> list = new List<TestItem>
-			{
+			];
+			ICollection<TestItem> list =
+			[
 				new() { Number = 1, Text = "One" },
-			};
-
-			// Act
-			list.AddRange(items);
+				// Act
+				.. items,
+			];
 
 			// Assert
-			Assert.AreEqual(3, list.Count);
+			Assert.HasCount(3, list);
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullExceptionForList()
 		{
 			// Arrange
-			ICollection<TestItem> items = new List<TestItem>
-			{
+			ICollection<TestItem> items =
+			[
 				new() { Number = 10, Text = "Ten" },
 				new() { Number = 11, Text = "Eleven" },
-			};
+			];
 			ICollection<TestItem> list = null;
 
-			// Act
-			list.AddRange(items);
-
-			// Assert - ArgumentNullException
+			// Act & Assert
+			Assert.ThrowsExactly<ArgumentNullException>(() => list.AddRange(items));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ArgumentNullException))]
 		public void ShouldThrowArgumentNullExceptionForItems()
 		{
 			// Arrange
 			ICollection<TestItem> items = null;
-			ICollection<TestItem> list = new List<TestItem>
-			{
+			ICollection<TestItem> list =
+			[
 				new() { Number = 1, Text = "One" },
-			};
+			];
 
-			// Act
-			list.AddRange(items);
-
-			// Assert - ArgumentNullException
+			// Act & Assert
+			Assert.ThrowsExactly<ArgumentNullException>(() => list.AddRange(items));
 		}
 
 		[TestMethod]
 		public void ShouldNotAddRange()
 		{
 			// Arrange
-			ICollection<TestItem> list = new List<TestItem>
-			{
+			ICollection<TestItem> list =
+			[
 				new() { Number = 1, Text = "One" },
-			};
+			];
 
 			// Act
 			list.AddRange(list);
 
 			// Assert
-			Assert.AreEqual(1, list.Count);
+			Assert.HasCount(1, list);
 		}
 
 		private class TestItem