Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use AssertExtensions.SequenceEqual in a few places #52054

Merged
merged 1 commit into from
May 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ public async Task AcceptReceive_Success()
sender.Send(new byte[] { 42 });

(_, byte[] recvBuffer) = await acceptTask;
Assert.Equal(new byte[] { 42 }, recvBuffer);
AssertExtensions.SequenceEqual(new byte[] { 42 }, recvBuffer);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ private void SendPackets(SendPacketsElement[] elements, SocketError expectedResu
bytesReceived += sock.Receive(contentActual, bytesReceived, bytesExpected-bytesReceived, SocketFlags.None);
}
Assert.Equal(bytesExpected, bytesReceived);
Assert.Equal(contentExpected, contentActual);
AssertExtensions.SequenceEqual(contentExpected, contentActual);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ public async Task SendRecv_Stream_TCP_MultipleConcurrentSends(IPAddress listenAt
Assert.Equal(5000000, receivedTotal);
if (GuaranteedSendOrdering)
{
Assert.Equal(sendData, receiveBuffer);
AssertExtensions.SequenceEqual(sendData, receiveBuffer);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,10 +240,10 @@ public async Task Socket_ReceiveFlags_Success()
var tcs = new TaskCompletionSource();
SocketAsyncEventArgs args = new SocketAsyncEventArgs();

var receiveBufer = new byte[600];
receiveBufer[0] = data[499] = 0;
var receiveBuffer = new byte[600];
receiveBuffer[0] = data[499] = 0;

args.SetBuffer(receiveBufer, 0, receiveBufer.Length);
args.SetBuffer(receiveBuffer, 0, receiveBuffer.Length);
args.Completed += delegate { tcs.SetResult(); };

// First peek at the message.
Expand All @@ -253,9 +253,9 @@ public async Task Socket_ReceiveFlags_Success()
await tcs.Task.WaitAsync(TimeSpan.FromMilliseconds(TestSettings.PassingTestTimeout));
}
Assert.Equal(SocketFlags.None, args.SocketFlags);
Assert.Equal(1, receiveBufer[0]);
Assert.Equal(1, receiveBufer[499]);
receiveBufer[0] = receiveBufer[499] = 0;
Assert.Equal(1, receiveBuffer[0]);
Assert.Equal(1, receiveBuffer[499]);
receiveBuffer[0] = receiveBuffer[499] = 0;

// Now, we should be able to get same message again.
tcs = new TaskCompletionSource();
Expand All @@ -265,19 +265,19 @@ public async Task Socket_ReceiveFlags_Success()
await tcs.Task.WaitAsync(TimeSpan.FromMilliseconds(TestSettings.PassingTestTimeout));
}
Assert.Equal(SocketFlags.None, args.SocketFlags);
Assert.Equal(1, receiveBufer[0]);
Assert.Equal(1, receiveBufer[499]);
receiveBufer[0] = receiveBufer[499] = 0;
Assert.Equal(1, receiveBuffer[0]);
Assert.Equal(1, receiveBuffer[499]);
receiveBuffer[0] = receiveBuffer[499] = 0;

// Set buffer smaller than message.
tcs = new TaskCompletionSource();
args.SetBuffer(receiveBufer, 0, 100);
args.SetBuffer(receiveBuffer, 0, 100);
if (receiver.ReceiveAsync(args))
{
await tcs.Task.WaitAsync(TimeSpan.FromMilliseconds(TestSettings.PassingTestTimeout));
}
Assert.Equal(SocketFlags.Truncated, args.SocketFlags);
Assert.Equal(2, receiveBufer[0]);
Assert.Equal(2, receiveBuffer[0]);

// There should be no more data.
Assert.Equal(0, receiver.Available);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -577,18 +577,13 @@ public void AcceptAsync_WithReceiveBuffer_Success()
client.Shutdown(SocketShutdown.Both);
}

Assert.True(
accepted.WaitOne(TestSettings.PassingTestTimeout), "Test completed in allotted time");
Assert.True(accepted.WaitOne(TestSettings.PassingTestTimeout), "Test completed in allotted time");

Assert.Equal(
SocketError.Success, acceptArgs.SocketError);
Assert.Equal(SocketError.Success, acceptArgs.SocketError);

Assert.Equal(
acceptBufferDataSize, acceptArgs.BytesTransferred);
Assert.Equal(acceptBufferDataSize, acceptArgs.BytesTransferred);

Assert.Equal(
new ArraySegment<byte>(sendBuffer),
new ArraySegment<byte>(acceptArgs.Buffer, 0, acceptArgs.BytesTransferred));
AssertExtensions.SequenceEqual(sendBuffer, acceptArgs.Buffer.AsSpan().Slice(0, acceptArgs.BytesTransferred));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ public async Task Socket_SendReceiveAsync_PropagateToStream_Success(int iteratio
}

Assert.Equal(writeBuffer.Length, readData.Length);
Assert.Equal(writeBuffer, readData.ToArray());
AssertExtensions.SequenceEqual(writeBuffer, readData.ToArray());
}
finally
{
Expand Down Expand Up @@ -345,7 +345,7 @@ public async Task ConcurrentSendReceive(bool forceNonBlocking)
}
await TestSettings.WhenAllOrAnyFailedWithTimeout(writes.Concat(reads).ToArray());

Assert.Equal(sendData.OrderBy(i => i), receiveData.OrderBy(i => i));
AssertExtensions.SequenceEqual(sendData.OrderBy(i => i).ToArray(), receiveData.OrderBy(i => i).ToArray());
}
}

Expand Down Expand Up @@ -383,7 +383,7 @@ public async Task ConcurrentSendReceiveAsync()

await TestSettings.WhenAllOrAnyFailedWithTimeout(writes.Concat(reads).ToArray());

Assert.Equal(sendData, receiveData);
AssertExtensions.SequenceEqual(sendData, receiveData);
}
}

Expand Down