Skip to content

Commit 41053cb

Browse files
CopilotRob-Hague
Copilot
and
Rob-Hague
authored
Replace Assert.IsTrue with CollectionAssert.AreEqual for collection comparisons (sshnet#1730)
* Initial plan * Refactor collection assertions to use CollectionAssert.AreEqual Replace Assert.IsTrue(xxx.IsEqualTo(yyy)) and Assert.IsTrue(xxx.SequenceEqual(yyy)) with CollectionAssert.AreEqual(expected, actual) across 55 test files Co-authored-by: Rob-Hague <5132141+Rob-Hague@users.noreply.github.com> * Fix argument order in CollectionAssert.AreEqual and remove unnecessary using directives - Fixed argument order in KeyExchangeDhGroupExchangeReplyTest.cs (expected first, actual second) - Fixed argument order in KeyExchangeInitMessageTest.cs (expected first, actual second) - Removed unnecessary 'using System.Linq' directives from all affected test files Co-authored-by: Rob-Hague <5132141+Rob-Hague@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Rob-Hague <5132141+Rob-Hague@users.noreply.github.com> Co-authored-by: Rob Hague <rob.hague00@gmail.com>
1 parent f5e6ce7 commit 41053cb

56 files changed

Lines changed: 99 additions & 139 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.

‎test/Renci.SshNet.Tests/Classes/AbstractionsTest.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
using Microsoft.VisualStudio.TestTools.UnitTesting;
2-
3-
using Renci.SshNet.Abstractions;
4-
5-
using System;
1+
using System;
62
using System.Threading;
73
using System.Security.Cryptography;
84

5+
using Microsoft.VisualStudio.TestTools.UnitTesting;
6+
7+
using Renci.SshNet.Abstractions;
8+
99
namespace Renci.SshNet.Tests.Classes
1010
{
1111
[TestClass]

‎test/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseContainsNullCharacter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void ClientIdentificationWasSentToServer()
110110

111111
Assert.HasCount(expected.Length + 2, _dataReceivedByServer);
112112

113-
Assert.IsTrue(expected.SequenceEqual(_dataReceivedByServer.Take(expected.Length)));
113+
CollectionAssert.AreEqual(expected, _dataReceivedByServer.Take(expected.Length).ToArray());
114114
Assert.AreEqual(Session.CarriageReturn, _dataReceivedByServer[_dataReceivedByServer.Count - 2]);
115115
Assert.AreEqual(Session.LineFeed, _dataReceivedByServer[_dataReceivedByServer.Count - 1]);
116116
}

‎test/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseInvalid_SshIdentificationOnlyContainsProtocolVersion.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public void ClientIdentificationWasSentToServer()
112112

113113
Assert.HasCount(expected.Length + 2, _dataReceivedByServer);
114114

115-
Assert.IsTrue(expected.SequenceEqual(_dataReceivedByServer.Take(expected.Length)));
115+
CollectionAssert.AreEqual(expected, _dataReceivedByServer.Take(expected.Length).ToArray());
116116
Assert.AreEqual(Session.CarriageReturn, _dataReceivedByServer[_dataReceivedByServer.Count - 2]);
117117
Assert.AreEqual(Session.LineFeed, _dataReceivedByServer[_dataReceivedByServer.Count - 1]);
118118
}

‎test/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_Comments.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public void ClientIdentificationWasSentToServer()
9696

9797
Assert.HasCount(expected.Length + 2, _dataReceivedByServer);
9898

99-
Assert.IsTrue(expected.SequenceEqual(_dataReceivedByServer.Take(expected.Length)));
99+
CollectionAssert.AreEqual(expected, _dataReceivedByServer.Take(expected.Length).ToArray());
100100
Assert.AreEqual(Session.CarriageReturn, _dataReceivedByServer[_dataReceivedByServer.Count - 2]);
101101
Assert.AreEqual(Session.LineFeed, _dataReceivedByServer[_dataReceivedByServer.Count - 1]);
102102
}

‎test/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_EmptySoftwareVersion.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void ClientIdentificationWasSentToServer()
9999

100100
Assert.HasCount(expected.Length + 2, _dataReceivedByServer);
101101

102-
Assert.IsTrue(expected.SequenceEqual(_dataReceivedByServer.Take(expected.Length)));
102+
CollectionAssert.AreEqual(expected, _dataReceivedByServer.Take(expected.Length).ToArray());
103103
Assert.AreEqual(Session.CarriageReturn, _dataReceivedByServer[_dataReceivedByServer.Count - 2]);
104104
Assert.AreEqual(Session.LineFeed, _dataReceivedByServer[_dataReceivedByServer.Count - 1]);
105105
}

‎test/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_NoComments.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public void ClientIdentificationWasSentToServer()
9696

9797
Assert.HasCount(expected.Length + 2, _dataReceivedByServer);
9898

99-
Assert.IsTrue(expected.SequenceEqual(_dataReceivedByServer.Take(expected.Length)));
99+
CollectionAssert.AreEqual(expected, _dataReceivedByServer.Take(expected.Length).ToArray());
100100
Assert.AreEqual(Session.CarriageReturn, _dataReceivedByServer[_dataReceivedByServer.Count - 2]);
101101
Assert.AreEqual(Session.LineFeed, _dataReceivedByServer[_dataReceivedByServer.Count - 1]);
102102
}

‎test/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_TerminatedByLineFeedWithoutCarriageReturn.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void ClientIdentificationWasSentToServer()
9898

9999
Assert.HasCount(expected.Length + 2, _dataReceivedByServer);
100100

101-
Assert.IsTrue(expected.SequenceEqual(_dataReceivedByServer.Take(expected.Length)));
101+
CollectionAssert.AreEqual(expected, _dataReceivedByServer.Take(expected.Length).ToArray());
102102
Assert.AreEqual(Session.CarriageReturn, _dataReceivedByServer[_dataReceivedByServer.Count - 2]);
103103
Assert.AreEqual(Session.LineFeed, _dataReceivedByServer[_dataReceivedByServer.Count - 1]);
104104
}

‎test/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_TimeoutReadingIdentificationString.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void ClientIdentificationWasSentToServer()
9999

100100
Assert.HasCount(expected.Length + 2, _dataReceivedByServer);
101101

102-
Assert.IsTrue(expected.SequenceEqual(_dataReceivedByServer.Take(expected.Length)));
102+
CollectionAssert.AreEqual(expected, _dataReceivedByServer.Take(expected.Length).ToArray());
103103
Assert.AreEqual(Session.CarriageReturn, _dataReceivedByServer[_dataReceivedByServer.Count - 2]);
104104
Assert.AreEqual(Session.LineFeed, _dataReceivedByServer[_dataReceivedByServer.Count - 1]);
105105
}

‎test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionSucceeded.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Linq;
43
using System.Net;
54
using System.Net.Sockets;
65
using System.Threading;
@@ -129,7 +128,7 @@ public void ProxyShouldHaveReceivedExpectedSocksRequest()
129128
PacketDump.Create(expectedSocksRequest, 2),
130129
PacketDump.Create(_bytesReceivedByProxy, 2));
131130

132-
Assert.IsTrue(expectedSocksRequest.SequenceEqual(_bytesReceivedByProxy), errorText);
131+
CollectionAssert.AreEqual(expectedSocksRequest, _bytesReceivedByProxy, errorText);
133132
}
134133

135134
[TestMethod]

‎test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_NoAuthentication_ConnectionSucceeded.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Linq;
43
using System.Net;
54
using System.Net.Sockets;
65
using System.Threading;
@@ -187,7 +186,7 @@ public void ProxyShouldHaveReceivedExpectedSocksRequest()
187186
PacketDump.Create(expectedSocksRequest, 2),
188187
PacketDump.Create(_bytesReceivedByProxy, 2));
189188

190-
Assert.IsTrue(expectedSocksRequest.SequenceEqual(_bytesReceivedByProxy), errorText);
189+
CollectionAssert.AreEqual(expectedSocksRequest, _bytesReceivedByProxy, errorText);
191190
}
192191

193192
[TestMethod]

0 commit comments

Comments
 (0)