Skip to content

Commit 3541038

Browse files
Sergio0694Sergio0694
authored
Merge pull request #1137 from CommunityToolkit/dev/update-mestest
Update MSTest to latest
2 parents 0b0e19c + 6e83642 commit 3541038

File tree

65 files changed

+1040
-1035
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1040
-1035
lines changed

‎build/Community.Toolkit.Common.targets‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,9 @@
1616
<None Include="$(RepositoryDirectory)ThirdPartyNotices.txt" Pack="true" PackagePath="\" Visible="False" />
1717
</ItemGroup>
1818

19+
<!-- Run tests in parallel by default -->
20+
<ItemGroup Condition="$(IsTestProject)">
21+
<AssemblyAttribute Include="Microsoft.VisualStudio.TestTools.UnitTesting.ParallelizeAttribute"/>
22+
</ItemGroup>
23+
1924
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="MSTest.TestAdapter" Version="3.11.0" />
9-
<PackageReference Include="MSTest.TestFramework" Version="3.11.0" />
8+
<PackageReference Include="MSTest.TestAdapter" Version="4.0.1" />
9+
<PackageReference Include="MSTest.TestFramework" Version="4.0.1" />
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1111
</ItemGroup>
1212

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void Test_TaskExtensions_Generic_ReferenceType()
3434
{
3535
TaskCompletionSource<string?> tcs = new();
3636

37-
Assert.AreEqual(null, tcs.Task.GetResultOrDefault());
37+
Assert.IsNull(tcs.Task.GetResultOrDefault());
3838

3939
tcs.SetResult(nameof(Test_TaskExtensions_Generic_ReferenceType));
4040

@@ -46,17 +46,17 @@ public void Test_TaskExtensions_ResultOrDefault()
4646
{
4747
TaskCompletionSource<int> tcs = new();
4848

49-
Assert.AreEqual(null, ((Task)tcs.Task).GetResultOrDefault());
49+
Assert.IsNull(((Task)tcs.Task).GetResultOrDefault());
5050

5151
tcs.SetCanceled();
5252

53-
Assert.AreEqual(null, ((Task)tcs.Task).GetResultOrDefault());
53+
Assert.IsNull(((Task)tcs.Task).GetResultOrDefault());
5454

5555
tcs = new TaskCompletionSource<int>();
5656

5757
tcs.SetException(new InvalidOperationException("Test"));
5858

59-
Assert.AreEqual(null, ((Task)tcs.Task).GetResultOrDefault());
59+
Assert.IsNull(((Task)tcs.Task).GetResultOrDefault());
6060

6161
tcs = new TaskCompletionSource<int>();
6262

@@ -68,7 +68,7 @@ public void Test_TaskExtensions_ResultOrDefault()
6868
[TestMethod]
6969
public void Test_TaskExtensions_ResultOrDefault_FromTaskCompleted()
7070
{
71-
Assert.AreEqual(null, Task.CompletedTask.GetResultOrDefault());
71+
Assert.IsNull(Task.CompletedTask.GetResultOrDefault());
7272
}
7373

7474
[TestMethod]
@@ -85,8 +85,8 @@ public async Task Test_TaskExtensions_ResultOrDefault_FromAsyncTaskMethodBuilder
8585

8686
_ = await taskFromBuilder;
8787

88-
Assert.AreEqual(((Task)taskFromBuilder).GetResultOrDefault(), "Test");
89-
Assert.AreEqual(taskFromBuilder.GetResultOrDefault(), "Test");
88+
Assert.AreEqual("Test", ((Task)taskFromBuilder).GetResultOrDefault());
89+
Assert.AreEqual("Test", taskFromBuilder.GetResultOrDefault());
9090
}
9191

9292
[TestMethod]
@@ -118,17 +118,17 @@ public void Test_TaskExtensions_ResultOrDefault_OfT_String()
118118
{
119119
TaskCompletionSource<string?> tcs = new();
120120

121-
Assert.AreEqual(null, tcs.Task.GetResultOrDefault());
121+
Assert.IsNull(tcs.Task.GetResultOrDefault());
122122

123123
tcs.SetCanceled();
124124

125-
Assert.AreEqual(null, tcs.Task.GetResultOrDefault());
125+
Assert.IsNull(tcs.Task.GetResultOrDefault());
126126

127127
tcs = new TaskCompletionSource<string?>();
128128

129129
tcs.SetException(new InvalidOperationException("Test"));
130130

131-
Assert.AreEqual(null, tcs.Task.GetResultOrDefault());
131+
Assert.IsNull(tcs.Task.GetResultOrDefault());
132132

133133
tcs = new TaskCompletionSource<string?>();
134134

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="MSTest.TestAdapter" Version="3.11.0" />
9-
<PackageReference Include="MSTest.TestFramework" Version="3.11.0" />
8+
<PackageReference Include="MSTest.TestAdapter" Version="4.0.1" />
9+
<PackageReference Include="MSTest.TestFramework" Version="4.0.1" />
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1111
</ItemGroup>
1212

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ public class Test_ValueTypeExtensions
1212
[TestMethod]
1313
public void Test_ValueTypeExtensions_ToHexString()
1414
{
15-
Assert.AreEqual(((byte)0).ToHexString(), "0x00");
16-
Assert.AreEqual(((byte)127).ToHexString(), "0x7F");
17-
Assert.AreEqual(((byte)255).ToHexString(), "0xFF");
18-
Assert.AreEqual(((ushort)6458).ToHexString(), "0x193A");
19-
Assert.AreEqual(6458.ToHexString(), "0x0000193A");
20-
Assert.AreEqual((-1).ToHexString(), "0xFFFFFFFF");
21-
Assert.AreEqual(true.ToHexString(), "0x01");
15+
Assert.AreEqual("0x00", ((byte)0).ToHexString());
16+
Assert.AreEqual("0x7F", ((byte)127).ToHexString());
17+
Assert.AreEqual("0xFF", ((byte)255).ToHexString());
18+
Assert.AreEqual("0x193A", ((ushort)6458).ToHexString());
19+
Assert.AreEqual("0x0000193A", 6458.ToHexString());
20+
Assert.AreEqual("0xFFFFFFFF", (-1).ToHexString());
21+
Assert.AreEqual("0x01", true.ToHexString());
2222
}
2323
}

‎tests/CommunityToolkit.Diagnostics.UnitTests/Test_Guard.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ public void Test_Guard_IsTrue_Fail_WithMessage()
351351
}
352352
catch (ArgumentException e)
353353
{
354-
Assert.IsTrue(e.Message.Contains("\"Hello world\""));
354+
Assert.Contains("\"Hello world\"", e.Message);
355355

356356
return;
357357
}
@@ -377,7 +377,7 @@ public void Test_Guard_IsTrue_WithHandler_Fail()
377377
}
378378
catch (ArgumentException e)
379379
{
380-
Assert.IsTrue(e.Message.Contains($"This is an interpolated message: {DateTime.Now.Year}, {"hello".AsSpan()}"));
380+
Assert.Contains($"This is an interpolated message: {DateTime.Now.Year}, {"hello".AsSpan()}", e.Message);
381381

382382
return;
383383
}
@@ -410,7 +410,7 @@ public void Test_Guard_IsFalse_Fail_WithMessage()
410410
}
411411
catch (ArgumentException e)
412412
{
413-
Assert.IsTrue(e.Message.Contains("\"Hello world\""));
413+
Assert.Contains("\"Hello world\"", e.Message);
414414

415415
return;
416416
}
@@ -434,7 +434,7 @@ public void Test_Guard_IsFalse_WithHandler_Fail()
434434
}
435435
catch (ArgumentException e)
436436
{
437-
Assert.IsTrue(e.Message.Contains($"This is an interpolated message: {DateTime.Now.Year}, {"hello".AsSpan()}"));
437+
Assert.Contains($"This is an interpolated message: {DateTime.Now.Year}, {"hello".AsSpan()}", e.Message);
438438

439439
return;
440440
}
@@ -731,7 +731,7 @@ public void Test_Guard_CallerArgumentExpression_1()
731731
}
732732
catch (ArgumentNullException e)
733733
{
734-
Assert.AreEqual(e.ParamName, nameof(thisStringShouldNotBeNull));
734+
Assert.AreEqual(nameof(thisStringShouldNotBeNull), e.ParamName);
735735

736736
return;
737737
}
@@ -751,7 +751,7 @@ public void Test_Guard_CallerArgumentExpression_2()
751751
}
752752
catch (ArgumentOutOfRangeException e)
753753
{
754-
Assert.AreEqual(e.ParamName, nameof(thisIndexIsOutOfRange));
754+
Assert.AreEqual(nameof(thisIndexIsOutOfRange), e.ParamName);
755755

756756
return;
757757
}
@@ -771,7 +771,7 @@ public void Test_Guard_CallerArgumentExpression_3()
771771
}
772772
catch (ArgumentException e)
773773
{
774-
Assert.AreEqual(e.ParamName, nameof(thisArrayShouldNotBeShorterThan10));
774+
Assert.AreEqual(nameof(thisArrayShouldNotBeShorterThan10), e.ParamName);
775775

776776
return;
777777
}

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -52,31 +52,31 @@ public void Test_ArrayPoolBufferWriterOfT_BufferSize(int request, int expected)
5252

5353
byte[] array = (byte[])arrayFieldInfo!.GetValue(writer)!;
5454

55-
Assert.AreEqual(array.Length, expected);
55+
Assert.HasCount(expected, array);
5656
}
5757

5858
[TestMethod]
5959
public void Test_ArrayPoolBufferWriterOfT_AllocateAndGetMemoryAndSpan()
6060
{
6161
ArrayPoolBufferWriter<byte>? writer = new();
6262

63-
Assert.AreEqual(writer.Capacity, 256);
64-
Assert.AreEqual(writer.FreeCapacity, 256);
65-
Assert.AreEqual(writer.WrittenCount, 0);
63+
Assert.AreEqual(256, writer.Capacity);
64+
Assert.AreEqual(256, writer.FreeCapacity);
65+
Assert.AreEqual(0, writer.WrittenCount);
6666
Assert.IsTrue(writer.WrittenMemory.IsEmpty);
6767
Assert.IsTrue(writer.WrittenSpan.IsEmpty);
6868

6969
Span<byte> span = writer.GetSpan(43);
7070

71-
Assert.IsTrue(span.Length >= 43);
71+
Assert.IsGreaterThanOrEqualTo(43, span.Length);
7272

7373
writer.Advance(43);
7474

75-
Assert.AreEqual(writer.Capacity, 256);
76-
Assert.AreEqual(writer.FreeCapacity, 256 - 43);
77-
Assert.AreEqual(writer.WrittenCount, 43);
78-
Assert.AreEqual(writer.WrittenMemory.Length, 43);
79-
Assert.AreEqual(writer.WrittenSpan.Length, 43);
75+
Assert.AreEqual(256, writer.Capacity);
76+
Assert.AreEqual(256 - 43, writer.FreeCapacity);
77+
Assert.AreEqual(43, writer.WrittenCount);
78+
Assert.AreEqual(43, writer.WrittenMemory.Length);
79+
Assert.AreEqual(43, writer.WrittenSpan.Length);
8080

8181
_ = Assert.ThrowsExactly<ArgumentOutOfRangeException>(() => writer.Advance(-1));
8282
_ = Assert.ThrowsExactly<ArgumentOutOfRangeException>(() => writer.GetMemory(-1));
@@ -99,25 +99,25 @@ public void Test_ArrayPoolBufferWriterOfT_AllocateFromCustomPoolAndGetMemoryAndS
9999

100100
using (ArrayPoolBufferWriter<byte>? writer = new(pool))
101101
{
102-
Assert.AreEqual(pool.RentedArrays.Count, 1);
102+
Assert.HasCount(1, pool.RentedArrays);
103103

104-
Assert.AreEqual(writer.Capacity, 256);
105-
Assert.AreEqual(writer.FreeCapacity, 256);
106-
Assert.AreEqual(writer.WrittenCount, 0);
104+
Assert.AreEqual(256, writer.Capacity);
105+
Assert.AreEqual(256, writer.FreeCapacity);
106+
Assert.AreEqual(0, writer.WrittenCount);
107107
Assert.IsTrue(writer.WrittenMemory.IsEmpty);
108108
Assert.IsTrue(writer.WrittenSpan.IsEmpty);
109109

110110
Span<byte> span = writer.GetSpan(43);
111111

112-
Assert.IsTrue(span.Length >= 43);
112+
Assert.IsGreaterThanOrEqualTo(43, span.Length);
113113

114114
writer.Advance(43);
115115

116-
Assert.AreEqual(writer.Capacity, 256);
117-
Assert.AreEqual(writer.FreeCapacity, 256 - 43);
118-
Assert.AreEqual(writer.WrittenCount, 43);
119-
Assert.AreEqual(writer.WrittenMemory.Length, 43);
120-
Assert.AreEqual(writer.WrittenSpan.Length, 43);
116+
Assert.AreEqual(256, writer.Capacity);
117+
Assert.AreEqual(256 - 43, writer.FreeCapacity);
118+
Assert.AreEqual(43, writer.WrittenCount);
119+
Assert.AreEqual(43, writer.WrittenMemory.Length);
120+
Assert.AreEqual(43, writer.WrittenSpan.Length);
121121

122122
_ = Assert.ThrowsExactly<ArgumentOutOfRangeException>(() => writer.Advance(-1));
123123
_ = Assert.ThrowsExactly<ArgumentOutOfRangeException>(() => writer.GetMemory(-1));
@@ -133,7 +133,7 @@ public void Test_ArrayPoolBufferWriterOfT_AllocateFromCustomPoolAndGetMemoryAndS
133133
_ = Assert.ThrowsExactly<ObjectDisposedException>(() => writer.Advance(1));
134134
}
135135

136-
Assert.AreEqual(pool.RentedArrays.Count, 0);
136+
Assert.IsEmpty(pool.RentedArrays);
137137
}
138138

139139
[TestMethod]
@@ -155,12 +155,12 @@ public void Test_ArrayPoolBufferWriterOfT_Clear()
155155

156156
writer.Advance(4);
157157

158-
Assert.AreEqual(writer.WrittenCount, 4);
158+
Assert.AreEqual(4, writer.WrittenCount);
159159
Assert.IsTrue(span.SequenceEqual(data));
160160

161161
writer.Clear();
162162

163-
Assert.AreEqual(writer.WrittenCount, 0);
163+
Assert.AreEqual(0, writer.WrittenCount);
164164
Assert.IsTrue(span.ToArray().All(b => b == 0));
165165
}
166166

@@ -191,13 +191,13 @@ public void Test_ArrayPoolBufferWriterOfT_AsStream()
191191
writeStream.Write(guid);
192192
}
193193

194-
Assert.AreEqual(writer.WrittenCount, GuidSize);
194+
Assert.AreEqual(GuidSize, writer.WrittenCount);
195195

196196
// Here we get a readable stream instead, and read from it to ensure
197197
// the previous data was written correctly from the writeable stream.
198198
using (Stream stream = writer.WrittenMemory.AsStream())
199199
{
200-
Assert.AreEqual(stream.Length, GuidSize);
200+
Assert.AreEqual(GuidSize, stream.Length);
201201

202202
byte[] result = new byte[GuidSize];
203203

@@ -230,8 +230,8 @@ public void Test_ArrayPoolBufferWriterOfT_AllocateAndGetArray()
230230
ArraySegment<int> segment = bufferWriter.DangerousGetArray();
231231

232232
Assert.IsNotNull(segment.Array);
233-
Assert.IsTrue(segment.Array.Length >= bufferWriter.WrittenSpan.Length);
234-
Assert.AreEqual(segment.Offset, 0);
233+
Assert.IsGreaterThanOrEqualTo(bufferWriter.WrittenSpan.Length, segment.Array.Length);
234+
Assert.AreEqual(0, segment.Offset);
235235
Assert.AreEqual(segment.Count, bufferWriter.WrittenSpan.Length);
236236

237237
_ = MemoryMarshal.TryGetArray(bufferWriter.WrittenMemory, out ArraySegment<int> writtenSegment);

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public void Test_MemoryBufferWriterOfT_AllocateAndGetMemoryAndSpan()
1919

2020
MemoryBufferWriter<byte>? writer = new(memory);
2121

22-
Assert.AreEqual(writer.Capacity, 256);
23-
Assert.AreEqual(writer.FreeCapacity, 256);
24-
Assert.AreEqual(writer.WrittenCount, 0);
22+
Assert.AreEqual(256, writer.Capacity);
23+
Assert.AreEqual(256, writer.FreeCapacity);
24+
Assert.AreEqual(0, writer.WrittenCount);
2525
Assert.IsTrue(writer.WrittenMemory.IsEmpty);
2626
Assert.IsTrue(writer.WrittenSpan.IsEmpty);
2727

@@ -31,11 +31,11 @@ public void Test_MemoryBufferWriterOfT_AllocateAndGetMemoryAndSpan()
3131

3232
writer.Advance(43);
3333

34-
Assert.AreEqual(writer.Capacity, 256);
35-
Assert.AreEqual(writer.FreeCapacity, 256 - 43);
36-
Assert.AreEqual(writer.WrittenCount, 43);
37-
Assert.AreEqual(writer.WrittenMemory.Length, 43);
38-
Assert.AreEqual(writer.WrittenSpan.Length, 43);
34+
Assert.AreEqual(256, writer.Capacity);
35+
Assert.AreEqual(256 - 43, writer.FreeCapacity);
36+
Assert.AreEqual(43, writer.WrittenCount);
37+
Assert.AreEqual(43, writer.WrittenMemory.Length);
38+
Assert.AreEqual(43, writer.WrittenSpan.Length);
3939

4040
Assert.AreEqual(memory.Length - 43, writer.GetSpan().Length);
4141
Assert.AreEqual(memory.Length - 43, writer.GetMemory().Length);
@@ -64,12 +64,12 @@ public void Test_MemoryBufferWriterOfT_Clear()
6464

6565
writer.Advance(4);
6666

67-
Assert.AreEqual(writer.WrittenCount, 4);
67+
Assert.AreEqual(4, writer.WrittenCount);
6868
Assert.IsTrue(span.SequenceEqual(data));
6969

7070
writer.Clear();
7171

72-
Assert.AreEqual(writer.WrittenCount, 0);
72+
Assert.AreEqual(0, writer.WrittenCount);
7373
Assert.IsTrue(span.ToArray().All(b => b == 0));
7474
}
7575
}

0 commit comments

Comments
 (0)