MSTest new APIs (stylecop, build fix)

Author: hakenr

Havit.Blazor.Components.Web.Bootstrap.Tests/Forms/HxInputDateRangeTests.cs

@@ -43,6 +43,6 @@ public void HxInputDateRange_EnabledShouldOverrideFormStateForNestedControls_Iss
 		{
 			Assert.IsFalse(button.Find("button").HasAttribute("disabled"), $"Button {button.Instance.Text} should not be disabled.");
 		}
-		Assert.IsFalse(cut.Markup.Contains("disabled"), "There should be no disabled attribute in the rendered markup.");
+		Assert.DoesNotContain("disabled", cut.Markup, "There should be no disabled attribute in the rendered markup.");
 	}
 }

Havit.Blazor.Components.Web.Bootstrap.Tests/Forms/HxInputDateTests.cs

@@ -44,7 +44,7 @@ public void HxInputDate_EnabledShouldOverrideFormStateForNestedControls_Issue877
 		{
 			Assert.IsFalse(button.Find("button").HasAttribute("disabled"), $"Button {button.Instance.Text} should not be disabled.");
 		}
-		Assert.IsFalse(cut.Markup.Contains("disabled"), "There should be no disabled attribute in the rendered markup.");
+		Assert.DoesNotContain("disabled", cut.Markup, "There should be no disabled attribute in the rendered markup.");
 	}
 
 	[TestMethod]

Havit.Blazor.Components.Web.Bootstrap.Tests/Forms/HxInputNumberTests.cs

@@ -11,7 +11,7 @@ namespace Havit.Blazor.Components.Web.Bootstrap.Tests.Forms;
 [TestClass]
 public class HxInputNumberTests : BunitTestBase
 {
-	[DataTestMethod]
+	[TestMethod]
 	[DataRow("en-US", "123", 123.0, "123.00")]
 	[DataRow("en-US", "123,123", 123123.0, "123123.00")]
 	[DataRow("cs-CZ", "123,123", 123.12, "123,12")] // Decimals = 2 (rounding)

Havit.Blazor.Components.Web.Bootstrap.Tests/Forms/HxInputTextTests.cs

@@ -29,7 +29,7 @@ public void HxInputText_BindingToArrayOfString_Issue874()
 		var cut = Render(componentRenderer);
 
 		// Assert			
-		Assert.IsFalse(cut.Markup.Contains("maxlength"));
+		Assert.DoesNotContain("maxlength", cut.Markup);
 	}
 
 	[TestMethod]
@@ -51,7 +51,7 @@ public void HxInputText_BindingToListOfString_Issue874()
 		var cut = Render(componentRenderer);
 
 		// Assert			
-		Assert.IsFalse(cut.Markup.Contains("maxlength"));
+		Assert.DoesNotContain("maxlength", cut.Markup);
 	}
 
 	[TestMethod]
@@ -73,7 +73,7 @@ public void HxInputText_BindingToArrayOfModel_Issue874()
 		var cut = Render(componentRenderer);
 
 		// Assert			
-		Assert.IsTrue(cut.Markup.Contains("maxlength=\"100\""));
+		Assert.Contains("maxlength=\"100\"", cut.Markup);
 	}
 
 	[TestMethod]
@@ -95,7 +95,7 @@ public void HxInputText_BindingToListOfModel_Issue874()
 		var cut = Render(componentRenderer);
 
 		// Assert			
-		Assert.IsTrue(cut.Markup.Contains("maxlength=\"100\""));
+		Assert.Contains("maxlength=\"100\"", cut.Markup);
 	}
 
 	private record FormData

Havit.Blazor.Components.Web.Bootstrap.Tests/Grids/GridDataProviderRequestExtensionsTests.cs

@@ -34,7 +34,7 @@ public void GridDataProviderRequestExtensions_ApplyGridDataProviderRequest_InMem
 		var result = source.ApplyGridDataProviderRequest(gridDataProviderRequest).ToList();
 
 		// Assert
-		Assert.AreEqual(3, result.Count);
+		Assert.HasCount(3, result);
 		Assert.AreEqual(new Item { A = "1", B = 2 }, result[0]);
 		Assert.AreEqual(new Item { A = "1", B = 1 }, result[1]);
 		Assert.AreEqual(new Item { A = "2", B = 3 }, result[2]);

Havit.Blazor.Components.Web.Bootstrap.Tests/Grids/GridInternalStateSortingItemHelperTests.cs

@@ -22,7 +22,7 @@ public void GridInternalStateSortingItemHelper_ApplyColumnToSorting_OnEmptySorti
 		var newSorting = GridInternalStateSortingItemHelper.ApplyColumnToSorting(null, mockColumn.Object);
 
 		// Assert
-		Assert.AreEqual(1, newSorting.Length);
+		Assert.HasCount(1, newSorting);
 		Assert.AreSame(mockColumn.Object, newSorting.Single().Column);
 		Assert.IsFalse(newSorting.Single().ReverseDirection);
 	}
@@ -47,7 +47,7 @@ public void GridInternalStateSortingItemHelper_ApplyColumnToSorting_TakesColumnT
 		var newSorting = GridInternalStateSortingItemHelper.ApplyColumnToSorting(currentSorting, mockColumn2.Object);
 
 		// Assert
-		Assert.AreEqual(2, newSorting.Length);
+		Assert.HasCount(2, newSorting);
 
 		Assert.AreSame(mockColumn2.Object, newSorting[0].Column);
 		Assert.IsFalse(newSorting[0].ReverseDirection);
@@ -73,7 +73,7 @@ public void GridInternalStateSortingItemHelper_ApplyColumnToSorting_TogglesRever
 		var newSorting = GridInternalStateSortingItemHelper.ApplyColumnToSorting(currentSorting, mockColumn1.Object);
 
 		// Assert
-		Assert.AreEqual(1, newSorting.Length);
+		Assert.HasCount(1, newSorting);
 
 		Assert.AreSame(mockColumn1.Object, newSorting[0].Column);
 		Assert.IsTrue(newSorting[0].ReverseDirection);
@@ -102,7 +102,7 @@ public void GridInternalStateSortingItemHelper_ToSortingItems_TwoSimpleColumns()
 		var sortingItems = GridInternalStateSortingItemHelper.ToSortingItems(currentSorting);
 
 		// Assert
-		Assert.AreEqual(2, sortingItems.Count);
+		Assert.HasCount(2, sortingItems);
 		Assert.AreEqual("A", sortingItems[0].SortString);
 		Assert.AreEqual(SortDirection.Ascending, sortingItems[0].SortDirection);
 		Assert.AreEqual("B", sortingItems[1].SortString);
@@ -135,7 +135,7 @@ public void GridInternalStateSortingItemHelper_ToSortingItems_TwoOverlappingColu
 		var sortingItems = GridInternalStateSortingItemHelper.ToSortingItems(currentSorting);
 
 		// Assert
-		Assert.AreEqual(2, sortingItems.Count);
+		Assert.HasCount(2, sortingItems);
 		Assert.AreEqual("A", sortingItems[0].SortString);
 		Assert.AreEqual(SortDirection.Ascending, sortingItems[0].SortDirection);
 		Assert.AreEqual("B", sortingItems[1].SortString);
@@ -165,7 +165,7 @@ public void GridInternalStateSortingItemHelper_ToSortingItems_TwoSameColumns()
 		var sortingItems = GridInternalStateSortingItemHelper.ToSortingItems(currentSorting);
 
 		// Assert
-		Assert.AreEqual(1, sortingItems.Count);
+		Assert.HasCount(1, sortingItems);
 		Assert.AreEqual("A", sortingItems[0].SortString);
 		Assert.AreEqual(SortDirection.Ascending, sortingItems[0].SortDirection);
 	}

Havit.Blazor.Components.Web.Tests/HxDynamicElementTests.cs

@@ -26,7 +26,7 @@ public void HxDynamicElement_OnClickNotSet_ShouldNotSubscribeToClickEvent()
 
 		// Act + Assert
 		var ex = Assert.ThrowsExactly<MissingEventHandlerException>(() => cut.Find("span").Click());
-		Assert.IsTrue(ex.Message.Contains("The element does not have an event handler for the event 'onclick'"));
+		Assert.Contains("The element does not have an event handler for the event 'onclick'", ex.Message);
 	}
 
 	[TestMethod]

Havit.Blazor.Documentation.Tests/DemosSmokeTests.cs

@@ -11,7 +11,7 @@ namespace Havit.Blazor.Documentation.Tests;
 [TestClass]
 public class DemosSmokeTests
 {
-	[DataTestMethod]
+	[TestMethod]
 	[DynamicData(nameof(GetDemos), DynamicDataSourceType.Method)]
 	public void DocumentationDemo_SmokeTest(Type demoComponent)
 	{

Havit.Blazor.Documentation.Tests/Services/ApiHelperTests.cs

@@ -6,7 +6,7 @@ namespace Havit.Blazor.Documentation.Tests.Services;
 [TestClass]
 public class ApiHelperTests
 {
-	[DataTestMethod]
+	[TestMethod]
 	[DataRow("AutosuggestDataProviderDelegate", true)]
 	[DataRow("GridDataProviderDelegate", true)]
 	[DataRow("InputTagsDataProviderDelegate", true)]

Havit.SourceGenerators.StrongApiStringLocalizers.Tests/StrongApiStringLocalizersGeneratorTests.cs

@@ -8,6 +8,8 @@ namespace Havit.SourceGenerators.StrongApiStringLocalizers.Tests;
 [TestClass]
 public class StrongApiStringLocalizersGeneratorTests
 {
+	private readonly TestContext _testContext;
+
 	[TestMethod]
 	public async Task StrongApiStringLocalizersGenerator_Test()
 	{
@@ -119,6 +121,11 @@ public static IServiceCollection AddGeneratedResourceWrappers(this IServiceColle
 "));
 
 		// Act + Assert
-		await test.RunAsync();
+		await test.RunAsync(_testContext.CancellationTokenSource.Token);
+	}
+
+	public StrongApiStringLocalizersGeneratorTests(TestContext testContext)
+	{
+		_testContext = testContext;
 	}
 }