Skip to content

Commit 12ae36b

Browse files
Sergio0694Sergio0694
committed
Refactor unit tests to use new assertion helpers
Replaces usages of Assert.AreEqual, Assert.IsTrue, and similar assertions with new helper methods such as Assert.HasCount, Assert.IsEmpty, Assert.IsNull, and Assert.IsGreaterThanOrEqualTo across multiple test files. This improves test readability and consistency with updated assertion APIs.
1 parent e88c524 commit 12ae36b

31 files changed

Lines changed: 243 additions & 243 deletions

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

Lines changed: 8 additions & 8 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]
@@ -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/Test_Guard.cs‎

Lines changed: 4 additions & 4 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
}

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

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

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

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

5858
[TestMethod]
@@ -68,7 +68,7 @@ public void Test_ArrayPoolBufferWriterOfT_AllocateAndGetMemoryAndSpan()
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

@@ -99,7 +99,7 @@ public void Test_ArrayPoolBufferWriterOfT_AllocateFromCustomPoolAndGetMemoryAndS
9999

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

104104
Assert.AreEqual(256, writer.Capacity);
105105
Assert.AreEqual(256, writer.FreeCapacity);
@@ -109,7 +109,7 @@ public void Test_ArrayPoolBufferWriterOfT_AllocateFromCustomPoolAndGetMemoryAndS
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

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

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

139139
[TestMethod]
@@ -230,7 +230,7 @@ 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);
233+
Assert.IsGreaterThanOrEqualTo(bufferWriter.WrittenSpan.Length, segment.Array.Length);
234234
Assert.AreEqual(0, segment.Offset);
235235
Assert.AreEqual(segment.Count, bufferWriter.WrittenSpan.Length);
236236

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ public void Test_MemoryOwnerOfT_AllocateAndGetMemoryAndSpan()
1818
{
1919
using MemoryOwner<int>? buffer = MemoryOwner<int>.Allocate(127);
2020

21-
Assert.IsTrue(buffer.Length == 127);
22-
Assert.IsTrue(buffer.Memory.Length == 127);
23-
Assert.IsTrue(buffer.Span.Length == 127);
21+
Assert.AreEqual(127, buffer.Length);
22+
Assert.AreEqual(127, buffer.Memory.Length);
23+
Assert.AreEqual(127, buffer.Span.Length);
2424

2525
buffer.Span.Fill(42);
2626

@@ -35,19 +35,19 @@ public void Test_MemoryOwnerOfT_AllocateFromCustomPoolAndGetMemoryAndSpan()
3535

3636
using (MemoryOwner<int>? buffer = MemoryOwner<int>.Allocate(127, pool))
3737
{
38-
Assert.AreEqual(1, pool.RentedArrays.Count);
38+
Assert.HasCount(1, pool.RentedArrays);
3939

40-
Assert.IsTrue(buffer.Length == 127);
41-
Assert.IsTrue(buffer.Memory.Length == 127);
42-
Assert.IsTrue(buffer.Span.Length == 127);
40+
Assert.AreEqual(127, buffer.Length);
41+
Assert.AreEqual(127, buffer.Memory.Length);
42+
Assert.AreEqual(127, buffer.Span.Length);
4343

4444
buffer.Span.Fill(42);
4545

4646
Assert.IsTrue(buffer.Memory.Span.ToArray().All(i => i == 42));
4747
Assert.IsTrue(buffer.Span.ToArray().All(i => i == 42));
4848
}
4949

50-
Assert.AreEqual(0, pool.RentedArrays.Count);
50+
Assert.IsEmpty(pool.RentedArrays);
5151
}
5252

5353
[TestMethod]
@@ -127,7 +127,7 @@ public void Test_MemoryOwnerOfT_AllocateAndGetArray()
127127
ArraySegment<int> segment = buffer.DangerousGetArray();
128128

129129
Assert.IsNotNull(segment.Array);
130-
Assert.IsTrue(segment.Array.Length >= buffer.Length);
130+
Assert.IsGreaterThanOrEqualTo(buffer.Length, segment.Array.Length);
131131
Assert.AreEqual(0, segment.Offset);
132132
Assert.AreEqual(segment.Count, buffer.Length);
133133

@@ -142,7 +142,7 @@ public void Test_MemoryOwnerOfT_AllocateAndGetArray()
142142

143143
// Same as before, but we now also verify the initial offset != 0, as we used Slice
144144
Assert.IsNotNull(segment.Array);
145-
Assert.IsTrue(segment.Array.Length >= second.Length);
145+
Assert.IsGreaterThanOrEqualTo(second.Length, segment.Array.Length);
146146
Assert.AreEqual(10, segment.Offset);
147147
Assert.AreEqual(segment.Count, second.Length);
148148

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ public void Test_SpanOwnerOfT_AllocateAndGetMemoryAndSpan()
1818
{
1919
using SpanOwner<int> buffer = SpanOwner<int>.Allocate(127);
2020

21-
Assert.IsTrue(buffer.Length == 127);
22-
Assert.IsTrue(buffer.Span.Length == 127);
21+
Assert.AreEqual(127, buffer.Length);
22+
Assert.AreEqual(127, buffer.Span.Length);
2323

2424
buffer.Span.Fill(42);
2525

@@ -33,17 +33,17 @@ public void Test_SpanOwnerOfT_AllocateFromCustomPoolAndGetMemoryAndSpan()
3333

3434
using (SpanOwner<int> buffer = SpanOwner<int>.Allocate(127, pool))
3535
{
36-
Assert.AreEqual(1, pool.RentedArrays.Count);
36+
Assert.HasCount(1, pool.RentedArrays);
3737

38-
Assert.IsTrue(buffer.Length == 127);
39-
Assert.IsTrue(buffer.Span.Length == 127);
38+
Assert.AreEqual(127, buffer.Length);
39+
Assert.AreEqual(127, buffer.Span.Length);
4040

4141
buffer.Span.Fill(42);
4242

4343
Assert.IsTrue(buffer.Span.ToArray().All(i => i == 42));
4444
}
4545

46-
Assert.AreEqual(0, pool.RentedArrays.Count);
46+
Assert.IsEmpty(pool.RentedArrays);
4747
}
4848

4949
[TestMethod]
@@ -86,7 +86,7 @@ public void Test_SpanOwnerOfT_AllocateAndGetArray()
8686
// with the assumption that usages after dispose are undefined behavior. This
8787
// is all documented in the XML docs for the SpanOwner<T> type.
8888
Assert.IsNotNull(segment.Array);
89-
Assert.IsTrue(segment.Array.Length >= buffer.Length);
89+
Assert.IsGreaterThanOrEqualTo(buffer.Length, segment.Array.Length);
9090
Assert.AreEqual(0, segment.Offset);
9191
Assert.AreEqual(segment.Count, buffer.Length);
9292
}

‎tests/CommunityToolkit.HighPerformance.UnitTests/Buffers/Test_StringPool.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ public void Test_StringPool_Cctor_Ok(int minimumSize, int x, int y, int size)
3737

3838
Array maps = (Array)typeof(StringPool).GetField("maps", BindingFlags.Instance | BindingFlags.NonPublic)!.GetValue(pool)!;
3939

40-
Assert.AreEqual(x, maps.Length);
40+
Assert.HasCount(x, maps);
4141

4242
Type bucketType = Type.GetType("CommunityToolkit.HighPerformance.Buffers.StringPool+FixedSizePriorityMap, CommunityToolkit.HighPerformance")!;
4343

4444
int[] buckets = (int[])bucketType.GetField("buckets", BindingFlags.Instance | BindingFlags.NonPublic)!.GetValue(maps.GetValue(0))!;
4545

46-
Assert.AreEqual(y, buckets.Length);
46+
Assert.HasCount(y, buckets);
4747
}
4848

4949
[TestMethod]

‎tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_ArrayExtensions.2D.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ public void Test_ArrayExtensions_2D_AsSpan_Empty()
428428
Span<int> span = array.AsSpan();
429429

430430
// Check that the empty array was loaded properly
431-
Assert.AreEqual(span.Length, array.Length);
431+
Assert.HasCount(span.Length, array);
432432
Assert.IsTrue(span.IsEmpty);
433433
}
434434

@@ -445,7 +445,7 @@ public void Test_ArrayExtensions_2D_AsSpan_Populated()
445445
Span<int> span = array.AsSpan();
446446

447447
// Test the total length of the span
448-
Assert.AreEqual(span.Length, array.Length);
448+
Assert.HasCount(span.Length, array);
449449

450450
ref int r0 = ref array[0, 0];
451451
ref int r1 = ref span[0];

‎tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_ArrayPoolExtensions.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void Test_ArrayPoolExtensions_Resize_NewArray()
2929
ArrayPool<int>.Shared.Resize(ref array, 10);
3030

3131
Assert.IsNotNull(array);
32-
Assert.IsTrue(array.Length >= 10);
32+
Assert.IsGreaterThanOrEqualTo(10, array.Length);
3333
}
3434

3535
[TestMethod]
@@ -54,7 +54,7 @@ public void Test_ArrayPoolExtensions_Resize_Expand()
5454
ArrayPool<int>.Shared.Resize(ref array, 32);
5555

5656
Assert.AreNotSame(array, backup);
57-
Assert.IsTrue(array.Length >= 32);
57+
Assert.IsGreaterThanOrEqualTo(32, array.Length);
5858
Assert.IsTrue(array.AsSpan(0, 16).ToArray().All(i => i == 7));
5959
}
6060

@@ -69,7 +69,7 @@ public void Test_ArrayPoolExtensions_Resize_Shrink()
6969
ArrayPool<int>.Shared.Resize(ref array, 16);
7070

7171
Assert.AreNotSame(array, backup);
72-
Assert.IsTrue(array.Length >= 16);
72+
Assert.IsGreaterThanOrEqualTo(16, array.Length);
7373
Assert.IsTrue(array.AsSpan(0, 16).ToArray().All(i => i == 7));
7474
}
7575

@@ -103,7 +103,7 @@ public void Test_ArrayPoolExtensions_EnsureCapacity_IdenticalCapacity()
103103

104104
ArrayPool<int>.Shared.EnsureCapacity(ref array, 10);
105105
Assert.AreSame(backup, array);
106-
Assert.IsTrue(array.Length >= 10);
106+
Assert.IsGreaterThanOrEqualTo(10, array.Length);
107107
}
108108

109109
[TestMethod]
@@ -114,13 +114,13 @@ public void Test_ArrayPoolExtensions_EnsureCapacity_NewArray()
114114
ArrayPool<int>.Shared.EnsureCapacity(ref array, 7);
115115

116116
Assert.IsNotNull(array);
117-
Assert.IsTrue(array.Length >= 7);
117+
Assert.IsGreaterThanOrEqualTo(7, array.Length);
118118
int[]? backup = array;
119119

120120
ArrayPool<int>.Shared.EnsureCapacity(ref array, 64);
121121

122122
Assert.AreNotSame(backup, array);
123-
Assert.IsTrue(array.Length >= 64);
123+
Assert.IsGreaterThanOrEqualTo(64, array.Length);
124124
}
125125

126126
[TestMethod]
@@ -152,6 +152,6 @@ public void Test_ArrayPoolExtensions_EnsureCapacity_ClearArray()
152152

153153
Assert.AreNotSame(backup, array);
154154
Assert.IsTrue(backup.All(i => i == default));
155-
Assert.IsTrue(array.Length >= 256);
155+
Assert.IsGreaterThanOrEqualTo(256, array.Length);
156156
}
157157
}

‎tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_MemoryExtensions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public void Test_MemoryExtensions_FromArray_CastFromByteAndBack()
150150
Assert.IsTrue(MemoryMarshal.TryGetArray(memoryBack, out ArraySegment<byte> segment));
151151
Assert.AreSame(segment.Array!, data);
152152
Assert.AreEqual(0, segment.Offset);
153-
Assert.AreEqual(segment.Count, data.Length);
153+
Assert.HasCount(segment.Count, data);
154154

155155
Assert.IsTrue(memoryOfBytes.Equals(memoryBack));
156156

@@ -253,7 +253,7 @@ public void Test_MemoryExtensions_FromArray_CastFromByteAndBack_WithSlice()
253253
Assert.IsTrue(MemoryMarshal.TryGetArray(memoryBack, out ArraySegment<byte> segment));
254254
Assert.AreSame(segment.Array!, data);
255255
Assert.AreEqual(128, segment.Offset);
256-
Assert.AreEqual(128, segment.Count);
256+
Assert.HasCount(128, segment);
257257

258258
Assert.IsTrue(memoryOfBytes.Equals(memoryBack));
259259

‎tests/CommunityToolkit.HighPerformance.UnitTests/Extensions/Test_StreamExtensions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void Test_StreamExtensions_ReadWrite()
2929

3030
stream.Position = 0;
3131

32-
Assert.AreEqual(true, stream.Read<bool>());
32+
Assert.IsTrue(stream.Read<bool>());
3333
Assert.AreEqual(42, stream.Read<int>());
3434
Assert.AreEqual(3.14f, stream.Read<float>());
3535
Assert.AreEqual(unchecked(uint.MaxValue * 324823489204ul), stream.Read<ulong>());
@@ -50,7 +50,7 @@ public void Test_StreamExtensions_ReadWrite_WithBufferedStream()
5050

5151
stream.Position = 0;
5252

53-
Assert.AreEqual(true, stream.Read<bool>());
53+
Assert.IsTrue(stream.Read<bool>());
5454
Assert.AreEqual(42, stream.Read<int>());
5555
Assert.AreEqual(3.14f, stream.Read<float>());
5656
Assert.AreEqual(unchecked(uint.MaxValue * 324823489204ul), stream.Read<ulong>());

0 commit comments

Comments
 (0)