Updating to VS 2026

test/AMWD.Common.Tests/Logging/FileLoggerTest.cs

@@ -83,51 +83,39 @@ namespace AMWD.Common.Tests.Logging
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ObjectDisposedException))]
 		public void ShouldThrowDisposedOnIsEnabled()
 		{
 			// arrange
 			var logger = GetFileLogger();
-
-			// act
 			logger.Dispose();
-			logger.IsEnabled(LogLevel.Error);
 
-			// assert - ObjectDisposedException
-			Assert.Fail();
+			// act & assert
+			Assert.ThrowsExactly<ObjectDisposedException>(() => logger.IsEnabled(LogLevel.Error));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ObjectDisposedException))]
 		public void ShouldThrowDisposedOnLog()
 		{
 			// arrange
 			var logger = GetFileLogger();
-
-			// act
 			logger.Dispose();
-			logger.Log(LogLevel.None, "Some Message");
 
-			// assert - ObjectDisposedException
-			Assert.Fail();
+			// act & assert
+			Assert.ThrowsExactly<ObjectDisposedException>(() => logger.Log(LogLevel.None, "Some Message"));
 		}
 
 		[TestMethod]
-		[ExpectedException(typeof(ObjectDisposedException))]
 		public void ShouldThrowDisposedOnBeginScope()
 		{
 			// arrange
 			var logger = GetFileLogger();
-
-			// act
 			logger.Dispose();
-			logger.BeginScope("foo");
 
-			// assert - ObjectDisposedException
-			Assert.Fail();
+			// act & assert
+			Assert.ThrowsExactly<ObjectDisposedException>(() => logger.BeginScope("foo"));
 		}
 
-		[DataTestMethod]
+		[TestMethod]
 		[DataRow(LogLevel.Trace, false)]
 		[DataRow(LogLevel.Debug, false)]
 		[DataRow(LogLevel.Information, false)]