Skip to content

Commit e88c524

Browse files
Sergio0694Sergio0694
committed
Refactor unit tests to use expected-first Assert.AreEqual
Updated all unit tests to consistently use the expected value as the first argument in Assert.AreEqual calls. This improves readability and aligns with best practices for test assertions.
1 parent 2cf609c commit e88c524

48 files changed

Lines changed: 879 additions & 879 deletions

File tree

Some content is hidden

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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]

‎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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,17 @@ 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.AreEqual(expected, array.Length);
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

@@ -72,11 +72,11 @@ public void Test_ArrayPoolBufferWriterOfT_AllocateAndGetMemoryAndSpan()
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,11 +99,11 @@ public void Test_ArrayPoolBufferWriterOfT_AllocateFromCustomPoolAndGetMemoryAndS
9999

100100
using (ArrayPoolBufferWriter<byte>? writer = new(pool))
101101
{
102-
Assert.AreEqual(pool.RentedArrays.Count, 1);
102+
Assert.AreEqual(1, pool.RentedArrays.Count);
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

@@ -113,11 +113,11 @@ public void Test_ArrayPoolBufferWriterOfT_AllocateFromCustomPoolAndGetMemoryAndS
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.AreEqual(0, pool.RentedArrays.Count);
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

@@ -231,7 +231,7 @@ public void Test_ArrayPoolBufferWriterOfT_AllocateAndGetArray()
231231

232232
Assert.IsNotNull(segment.Array);
233233
Assert.IsTrue(segment.Array.Length >= bufferWriter.WrittenSpan.Length);
234-
Assert.AreEqual(segment.Offset, 0);
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
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void Test_MemoryOwnerOfT_AllocateFromCustomPoolAndGetMemoryAndSpan()
3535

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

4040
Assert.IsTrue(buffer.Length == 127);
4141
Assert.IsTrue(buffer.Memory.Length == 127);
@@ -47,7 +47,7 @@ public void Test_MemoryOwnerOfT_AllocateFromCustomPoolAndGetMemoryAndSpan()
4747
Assert.IsTrue(buffer.Span.ToArray().All(i => i == 42));
4848
}
4949

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

5353
[TestMethod]
@@ -128,7 +128,7 @@ public void Test_MemoryOwnerOfT_AllocateAndGetArray()
128128

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

134134
MemoryOwner<int>? second = buffer.Slice(10, 80);
@@ -143,7 +143,7 @@ public void Test_MemoryOwnerOfT_AllocateAndGetArray()
143143
// Same as before, but we now also verify the initial offset != 0, as we used Slice
144144
Assert.IsNotNull(segment.Array);
145145
Assert.IsTrue(segment.Array.Length >= second.Length);
146-
Assert.AreEqual(segment.Offset, 10);
146+
Assert.AreEqual(10, segment.Offset);
147147
Assert.AreEqual(segment.Count, second.Length);
148148

149149
second.Dispose();

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void Test_SpanOwnerOfT_AllocateFromCustomPoolAndGetMemoryAndSpan()
3333

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

3838
Assert.IsTrue(buffer.Length == 127);
3939
Assert.IsTrue(buffer.Span.Length == 127);
@@ -43,7 +43,7 @@ public void Test_SpanOwnerOfT_AllocateFromCustomPoolAndGetMemoryAndSpan()
4343
Assert.IsTrue(buffer.Span.ToArray().All(i => i == 42));
4444
}
4545

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

4949
[TestMethod]
@@ -87,7 +87,7 @@ public void Test_SpanOwnerOfT_AllocateAndGetArray()
8787
// is all documented in the XML docs for the SpanOwner<T> type.
8888
Assert.IsNotNull(segment.Array);
8989
Assert.IsTrue(segment.Array.Length >= buffer.Length);
90-
Assert.AreEqual(segment.Offset, 0);
90+
Assert.AreEqual(0, segment.Offset);
9191
Assert.AreEqual(segment.Count, buffer.Length);
9292
}
9393
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ public void Test_IMemoryOwnerExtensions_EmptyIMemoryOwnerStream()
1919
Stream stream = buffer.AsStream();
2020

2121
Assert.IsNotNull(stream);
22-
Assert.AreEqual(buffer.Length, 0);
23-
Assert.AreEqual(stream.Length, 0);
22+
Assert.AreEqual(0, buffer.Length);
23+
Assert.AreEqual(0, stream.Length);
2424
Assert.IsTrue(stream.CanWrite);
2525
}
2626

0 commit comments

Comments
 (0)