Update MSTest to latest

build/Community.Toolkit.Common.targets

@@ -16,4 +16,9 @@
     <None Include="$(RepositoryDirectory)ThirdPartyNotices.txt" Pack="true" PackagePath="\" Visible="False" />
   </ItemGroup>
 
+  <!-- Run tests in parallel by default -->
+  <ItemGroup Condition="$(IsTestProject)">
+    <AssemblyAttribute Include="Microsoft.VisualStudio.TestTools.UnitTesting.ParallelizeAttribute"/>
+  </ItemGroup>
+
 </Project>

tests/CommunityToolkit.Common.UnitTests/CommunityToolkit.Common.UnitTests.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="3.11.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.11.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="4.0.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="4.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
   </ItemGroup>
 

tests/CommunityToolkit.Common.UnitTests/Extensions/Test_TaskExtensions.cs

@@ -34,7 +34,7 @@ public void Test_TaskExtensions_Generic_ReferenceType()
     {
         TaskCompletionSource<string?> tcs = new();
 
-        Assert.AreEqual(null, tcs.Task.GetResultOrDefault());
+        Assert.IsNull(tcs.Task.GetResultOrDefault());
 
         tcs.SetResult(nameof(Test_TaskExtensions_Generic_ReferenceType));
 
@@ -46,17 +46,17 @@ public void Test_TaskExtensions_ResultOrDefault()
     {
         TaskCompletionSource<int> tcs = new();
 
-        Assert.AreEqual(null, ((Task)tcs.Task).GetResultOrDefault());
+        Assert.IsNull(((Task)tcs.Task).GetResultOrDefault());
 
         tcs.SetCanceled();
 
-        Assert.AreEqual(null, ((Task)tcs.Task).GetResultOrDefault());
+        Assert.IsNull(((Task)tcs.Task).GetResultOrDefault());
 
         tcs = new TaskCompletionSource<int>();
 
         tcs.SetException(new InvalidOperationException("Test"));
 
-        Assert.AreEqual(null, ((Task)tcs.Task).GetResultOrDefault());
+        Assert.IsNull(((Task)tcs.Task).GetResultOrDefault());
 
         tcs = new TaskCompletionSource<int>();
 
@@ -68,7 +68,7 @@ public void Test_TaskExtensions_ResultOrDefault()
     [TestMethod]
     public void Test_TaskExtensions_ResultOrDefault_FromTaskCompleted()
     {
-        Assert.AreEqual(null, Task.CompletedTask.GetResultOrDefault());
+        Assert.IsNull(Task.CompletedTask.GetResultOrDefault());
     }
 
     [TestMethod]
@@ -85,8 +85,8 @@ public async Task Test_TaskExtensions_ResultOrDefault_FromAsyncTaskMethodBuilder
 
         _ = await taskFromBuilder;
 
-        Assert.AreEqual(((Task)taskFromBuilder).GetResultOrDefault(), "Test");
-        Assert.AreEqual(taskFromBuilder.GetResultOrDefault(), "Test");
+        Assert.AreEqual("Test", ((Task)taskFromBuilder).GetResultOrDefault());
+        Assert.AreEqual("Test", taskFromBuilder.GetResultOrDefault());
     }
 
     [TestMethod]
@@ -118,17 +118,17 @@ public void Test_TaskExtensions_ResultOrDefault_OfT_String()
     {
         TaskCompletionSource<string?> tcs = new();
 
-        Assert.AreEqual(null, tcs.Task.GetResultOrDefault());
+        Assert.IsNull(tcs.Task.GetResultOrDefault());
 
         tcs.SetCanceled();
 
-        Assert.AreEqual(null, tcs.Task.GetResultOrDefault());
+        Assert.IsNull(tcs.Task.GetResultOrDefault());
 
         tcs = new TaskCompletionSource<string?>();
 
         tcs.SetException(new InvalidOperationException("Test"));
 
-        Assert.AreEqual(null, tcs.Task.GetResultOrDefault());
+        Assert.IsNull(tcs.Task.GetResultOrDefault());
 
         tcs = new TaskCompletionSource<string?>();
 

tests/CommunityToolkit.Diagnostics.UnitTests/CommunityToolkit.Diagnostics.UnitTests.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter" Version="3.11.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.11.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="4.0.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="4.0.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
   </ItemGroup>
 

tests/CommunityToolkit.Diagnostics.UnitTests/Extensions/Test_ValueTypeExtensions.cs

@@ -12,12 +12,12 @@ public class Test_ValueTypeExtensions
     [TestMethod]
     public void Test_ValueTypeExtensions_ToHexString()
     {
-        Assert.AreEqual(((byte)0).ToHexString(), "0x00");
-        Assert.AreEqual(((byte)127).ToHexString(), "0x7F");
-        Assert.AreEqual(((byte)255).ToHexString(), "0xFF");
-        Assert.AreEqual(((ushort)6458).ToHexString(), "0x193A");
-        Assert.AreEqual(6458.ToHexString(), "0x0000193A");
-        Assert.AreEqual((-1).ToHexString(), "0xFFFFFFFF");
-        Assert.AreEqual(true.ToHexString(), "0x01");
+        Assert.AreEqual("0x00", ((byte)0).ToHexString());
+        Assert.AreEqual("0x7F", ((byte)127).ToHexString());
+        Assert.AreEqual("0xFF", ((byte)255).ToHexString());
+        Assert.AreEqual("0x193A", ((ushort)6458).ToHexString());
+        Assert.AreEqual("0x0000193A", 6458.ToHexString());
+        Assert.AreEqual("0xFFFFFFFF", (-1).ToHexString());
+        Assert.AreEqual("0x01", true.ToHexString());
     }
 }

tests/CommunityToolkit.Diagnostics.UnitTests/Test_Guard.cs

@@ -351,7 +351,7 @@ public void Test_Guard_IsTrue_Fail_WithMessage()
         }
         catch (ArgumentException e)
         {
-            Assert.IsTrue(e.Message.Contains("\"Hello world\""));
+            Assert.Contains("\"Hello world\"", e.Message);
 
             return;
         }
@@ -377,7 +377,7 @@ public void Test_Guard_IsTrue_WithHandler_Fail()
         }
         catch (ArgumentException e)
         {
-            Assert.IsTrue(e.Message.Contains($"This is an interpolated message: {DateTime.Now.Year}, {"hello".AsSpan()}"));
+            Assert.Contains($"This is an interpolated message: {DateTime.Now.Year}, {"hello".AsSpan()}", e.Message);
 
             return;
         }
@@ -410,7 +410,7 @@ public void Test_Guard_IsFalse_Fail_WithMessage()
         }
         catch (ArgumentException e)
         {
-            Assert.IsTrue(e.Message.Contains("\"Hello world\""));
+            Assert.Contains("\"Hello world\"", e.Message);
 
             return;
         }
@@ -434,7 +434,7 @@ public void Test_Guard_IsFalse_WithHandler_Fail()
         }
         catch (ArgumentException e)
         {
-            Assert.IsTrue(e.Message.Contains($"This is an interpolated message: {DateTime.Now.Year}, {"hello".AsSpan()}"));
+            Assert.Contains($"This is an interpolated message: {DateTime.Now.Year}, {"hello".AsSpan()}", e.Message);
 
             return;
         }
@@ -731,7 +731,7 @@ public void Test_Guard_CallerArgumentExpression_1()
         }
         catch (ArgumentNullException e)
         {
-            Assert.AreEqual(e.ParamName, nameof(thisStringShouldNotBeNull));
+            Assert.AreEqual(nameof(thisStringShouldNotBeNull), e.ParamName);
 
             return;
         }
@@ -751,7 +751,7 @@ public void Test_Guard_CallerArgumentExpression_2()
         }
         catch (ArgumentOutOfRangeException e)
         {
-            Assert.AreEqual(e.ParamName, nameof(thisIndexIsOutOfRange));
+            Assert.AreEqual(nameof(thisIndexIsOutOfRange), e.ParamName);
 
             return;
         }
@@ -771,7 +771,7 @@ public void Test_Guard_CallerArgumentExpression_3()
         }
         catch (ArgumentException e)
         {
-            Assert.AreEqual(e.ParamName, nameof(thisArrayShouldNotBeShorterThan10));
+            Assert.AreEqual(nameof(thisArrayShouldNotBeShorterThan10), e.ParamName);
 
             return;
         }

tests/CommunityToolkit.HighPerformance.UnitTests/Buffers/Test_ArrayPoolBufferWriter{T}.cs

@@ -52,31 +52,31 @@ public void Test_ArrayPoolBufferWriterOfT_BufferSize(int request, int expected)
 
         byte[] array = (byte[])arrayFieldInfo!.GetValue(writer)!;
 
-        Assert.AreEqual(array.Length, expected);
+        Assert.HasCount(expected, array);
     }
 
     [TestMethod]
     public void Test_ArrayPoolBufferWriterOfT_AllocateAndGetMemoryAndSpan()
     {
         ArrayPoolBufferWriter<byte>? writer = new();
 
-        Assert.AreEqual(writer.Capacity, 256);
-        Assert.AreEqual(writer.FreeCapacity, 256);
-        Assert.AreEqual(writer.WrittenCount, 0);
+        Assert.AreEqual(256, writer.Capacity);
+        Assert.AreEqual(256, writer.FreeCapacity);
+        Assert.AreEqual(0, writer.WrittenCount);
         Assert.IsTrue(writer.WrittenMemory.IsEmpty);
         Assert.IsTrue(writer.WrittenSpan.IsEmpty);
 
         Span<byte> span = writer.GetSpan(43);
 
-        Assert.IsTrue(span.Length >= 43);
+        Assert.IsGreaterThanOrEqualTo(43, span.Length);
 
         writer.Advance(43);
 
-        Assert.AreEqual(writer.Capacity, 256);
-        Assert.AreEqual(writer.FreeCapacity, 256 - 43);
-        Assert.AreEqual(writer.WrittenCount, 43);
-        Assert.AreEqual(writer.WrittenMemory.Length, 43);
-        Assert.AreEqual(writer.WrittenSpan.Length, 43);
+        Assert.AreEqual(256, writer.Capacity);
+        Assert.AreEqual(256 - 43, writer.FreeCapacity);
+        Assert.AreEqual(43, writer.WrittenCount);
+        Assert.AreEqual(43, writer.WrittenMemory.Length);
+        Assert.AreEqual(43, writer.WrittenSpan.Length);
 
         _ = Assert.ThrowsExactly<ArgumentOutOfRangeException>(() => writer.Advance(-1));
         _ = Assert.ThrowsExactly<ArgumentOutOfRangeException>(() => writer.GetMemory(-1));
@@ -99,25 +99,25 @@ public void Test_ArrayPoolBufferWriterOfT_AllocateFromCustomPoolAndGetMemoryAndS
 
         using (ArrayPoolBufferWriter<byte>? writer = new(pool))
         {
-            Assert.AreEqual(pool.RentedArrays.Count, 1);
+            Assert.HasCount(1, pool.RentedArrays);
 
-            Assert.AreEqual(writer.Capacity, 256);
-            Assert.AreEqual(writer.FreeCapacity, 256);
-            Assert.AreEqual(writer.WrittenCount, 0);
+            Assert.AreEqual(256, writer.Capacity);
+            Assert.AreEqual(256, writer.FreeCapacity);
+            Assert.AreEqual(0, writer.WrittenCount);
             Assert.IsTrue(writer.WrittenMemory.IsEmpty);
             Assert.IsTrue(writer.WrittenSpan.IsEmpty);
 
             Span<byte> span = writer.GetSpan(43);
 
-            Assert.IsTrue(span.Length >= 43);
+            Assert.IsGreaterThanOrEqualTo(43, span.Length);
 
             writer.Advance(43);
 
-            Assert.AreEqual(writer.Capacity, 256);
-            Assert.AreEqual(writer.FreeCapacity, 256 - 43);
-            Assert.AreEqual(writer.WrittenCount, 43);
-            Assert.AreEqual(writer.WrittenMemory.Length, 43);
-            Assert.AreEqual(writer.WrittenSpan.Length, 43);
+            Assert.AreEqual(256, writer.Capacity);
+            Assert.AreEqual(256 - 43, writer.FreeCapacity);
+            Assert.AreEqual(43, writer.WrittenCount);
+            Assert.AreEqual(43, writer.WrittenMemory.Length);
+            Assert.AreEqual(43, writer.WrittenSpan.Length);
 
             _ = Assert.ThrowsExactly<ArgumentOutOfRangeException>(() => writer.Advance(-1));
             _ = Assert.ThrowsExactly<ArgumentOutOfRangeException>(() => writer.GetMemory(-1));
@@ -133,7 +133,7 @@ public void Test_ArrayPoolBufferWriterOfT_AllocateFromCustomPoolAndGetMemoryAndS
             _ = Assert.ThrowsExactly<ObjectDisposedException>(() => writer.Advance(1));
         }
 
-        Assert.AreEqual(pool.RentedArrays.Count, 0);
+        Assert.IsEmpty(pool.RentedArrays);
     }
 
     [TestMethod]
@@ -155,12 +155,12 @@ public void Test_ArrayPoolBufferWriterOfT_Clear()
 
         writer.Advance(4);
 
-        Assert.AreEqual(writer.WrittenCount, 4);
+        Assert.AreEqual(4, writer.WrittenCount);
         Assert.IsTrue(span.SequenceEqual(data));
 
         writer.Clear();
 
-        Assert.AreEqual(writer.WrittenCount, 0);
+        Assert.AreEqual(0, writer.WrittenCount);
         Assert.IsTrue(span.ToArray().All(b => b == 0));
     }
 
@@ -191,13 +191,13 @@ public void Test_ArrayPoolBufferWriterOfT_AsStream()
             writeStream.Write(guid);
         }
 
-        Assert.AreEqual(writer.WrittenCount, GuidSize);
+        Assert.AreEqual(GuidSize, writer.WrittenCount);
 
         // Here we get a readable stream instead, and read from it to ensure
         // the previous data was written correctly from the writeable stream.
         using (Stream stream = writer.WrittenMemory.AsStream())
         {
-            Assert.AreEqual(stream.Length, GuidSize);
+            Assert.AreEqual(GuidSize, stream.Length);
 
             byte[] result = new byte[GuidSize];
 
@@ -230,8 +230,8 @@ public void Test_ArrayPoolBufferWriterOfT_AllocateAndGetArray()
         ArraySegment<int> segment = bufferWriter.DangerousGetArray();
 
         Assert.IsNotNull(segment.Array);
-        Assert.IsTrue(segment.Array.Length >= bufferWriter.WrittenSpan.Length);
-        Assert.AreEqual(segment.Offset, 0);
+        Assert.IsGreaterThanOrEqualTo(bufferWriter.WrittenSpan.Length, segment.Array.Length);
+        Assert.AreEqual(0, segment.Offset);
         Assert.AreEqual(segment.Count, bufferWriter.WrittenSpan.Length);
 
         _ = MemoryMarshal.TryGetArray(bufferWriter.WrittenMemory, out ArraySegment<int> writtenSegment);

tests/CommunityToolkit.HighPerformance.UnitTests/Buffers/Test_MemoryBufferWriter{T}.cs

@@ -19,9 +19,9 @@ public void Test_MemoryBufferWriterOfT_AllocateAndGetMemoryAndSpan()
 
         MemoryBufferWriter<byte>? writer = new(memory);
 
-        Assert.AreEqual(writer.Capacity, 256);
-        Assert.AreEqual(writer.FreeCapacity, 256);
-        Assert.AreEqual(writer.WrittenCount, 0);
+        Assert.AreEqual(256, writer.Capacity);
+        Assert.AreEqual(256, writer.FreeCapacity);
+        Assert.AreEqual(0, writer.WrittenCount);
         Assert.IsTrue(writer.WrittenMemory.IsEmpty);
         Assert.IsTrue(writer.WrittenSpan.IsEmpty);
 
@@ -31,11 +31,11 @@ public void Test_MemoryBufferWriterOfT_AllocateAndGetMemoryAndSpan()
 
         writer.Advance(43);
 
-        Assert.AreEqual(writer.Capacity, 256);
-        Assert.AreEqual(writer.FreeCapacity, 256 - 43);
-        Assert.AreEqual(writer.WrittenCount, 43);
-        Assert.AreEqual(writer.WrittenMemory.Length, 43);
-        Assert.AreEqual(writer.WrittenSpan.Length, 43);
+        Assert.AreEqual(256, writer.Capacity);
+        Assert.AreEqual(256 - 43, writer.FreeCapacity);
+        Assert.AreEqual(43, writer.WrittenCount);
+        Assert.AreEqual(43, writer.WrittenMemory.Length);
+        Assert.AreEqual(43, writer.WrittenSpan.Length);
 
         Assert.AreEqual(memory.Length - 43, writer.GetSpan().Length);
         Assert.AreEqual(memory.Length - 43, writer.GetMemory().Length);
@@ -64,12 +64,12 @@ public void Test_MemoryBufferWriterOfT_Clear()
 
         writer.Advance(4);
 
-        Assert.AreEqual(writer.WrittenCount, 4);
+        Assert.AreEqual(4, writer.WrittenCount);
         Assert.IsTrue(span.SequenceEqual(data));
 
         writer.Clear();
 
-        Assert.AreEqual(writer.WrittenCount, 0);
+        Assert.AreEqual(0, writer.WrittenCount);
         Assert.IsTrue(span.ToArray().All(b => b == 0));
     }
 }