Replace custom TestMethodForPlatformAttribute with MSTest OSCondition (#1766)

Copilot · Rob-Hague · web-flow · commit 41dde35d74ec · 2026-03-01T18:02:08.000+01:00
* Initial plan

* Replace TestMethodForPlatformAttribute with OSCondition attribute

Co-authored-by: Rob-Hague &lt;5132141+Rob-Hague@users.noreply.github.com&gt;

---------

Co-authored-by: copilot-swe-agent[bot] &lt;198982749+Copilot@users.noreply.github.com&gt;
Co-authored-by: Rob-Hague &lt;5132141+Rob-Hague@users.noreply.github.com&gt;
diff --git a/test/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_TimeoutConnectingToServer.cs b/test/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_TimeoutConnectingToServer.cs
@@ -3,14 +3,12 @@
 using System.Globalization;
 using System.Net;
 using System.Net.Sockets;
-using System.Runtime.InteropServices;
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using Moq;
 
 using Renci.SshNet.Common;
-using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes.Connection
 {
@@ -72,23 +70,26 @@ protected override void Act()
             }
         }
 
-        [TestMethodForPlatform(nameof(OSPlatform.Windows))]
+        [TestMethod]
+        [OSCondition(OperatingSystems.Windows)]
         public void ConnectShouldHaveThrownSshOperationTimeoutExceptionOnWindows()
         {
             Assert.IsNull(_actualException.InnerException);
             Assert.IsInstanceOfType<SshOperationTimeoutException>(_actualException);
             Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Connection failed to establish within {0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
         }
 
-        [TestMethodForPlatform(nameof(OSPlatform.Linux))]
+        [TestMethod]
+        [OSCondition(OperatingSystems.Linux)]
         public void ConnectShouldHaveThrownSocketExceptionOnLinux()
         {
             Assert.IsNull(_actualException.InnerException);
             Assert.IsInstanceOfType<SocketException>(_actualException);
             Assert.AreEqual("Connection refused", _actualException.Message);
         }
 
-        [TestMethodForPlatform(nameof(OSPlatform.Windows))]
+        [TestMethod]
+        [OSCondition(OperatingSystems.Windows)]
         public void ConnectShouldHaveRespectedTimeoutOnWindows()
         {
             var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
diff --git a/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutConnectingToProxy.cs b/test/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutConnectingToProxy.cs
@@ -3,14 +3,12 @@
 using System.Globalization;
 using System.Net;
 using System.Net.Sockets;
-using System.Runtime.InteropServices;
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using Moq;
 
 using Renci.SshNet.Common;
-using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes.Connection
 {
@@ -82,23 +80,26 @@ protected override void Act()
             }
         }
 
-        [TestMethodForPlatform(nameof(OSPlatform.Windows))]
+        [TestMethod]
+        [OSCondition(OperatingSystems.Windows)]
         public void ConnectShouldHaveThrownSshOperationTimeoutExceptionOnWindows()
         {
             Assert.IsNull(_actualException.InnerException);
             Assert.IsInstanceOfType<SshOperationTimeoutException>(_actualException);
             Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Connection failed to establish within {0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
         }
 
-        [TestMethodForPlatform(nameof(OSPlatform.Linux))]
+        [TestMethod]
+        [OSCondition(OperatingSystems.Linux)]
         public void ConnectShouldHaveThrownSshOperationTimeoutExceptionOnLinux()
         {
             Assert.IsNull(_actualException.InnerException);
             Assert.IsInstanceOfType<SocketException>(_actualException);
             Assert.AreEqual("Connection refused", _actualException.Message);
         }
 
-        [TestMethodForPlatform(nameof(OSPlatform.Windows))]
+        [TestMethod]
+        [OSCondition(OperatingSystems.Windows)]
         public void ConnectShouldHaveRespectedTimeoutOnWindows()
         {
             var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
diff --git a/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutConnectingToProxy.cs b/test/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutConnectingToProxy.cs
@@ -2,14 +2,12 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.Net.Sockets;
-using System.Runtime.InteropServices;
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using Moq;
 
 using Renci.SshNet.Common;
-using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes.Connection
 {
@@ -70,23 +68,26 @@ protected override void Act()
             }
         }
 
-        [TestMethodForPlatform(nameof(OSPlatform.Windows))]
+        [TestMethod]
+        [OSCondition(OperatingSystems.Windows)]
         public void ConnectShouldHaveThrownSshOperationTimeoutExceptionOnWindows()
         {
             Assert.IsNull(_actualException.InnerException);
             Assert.IsInstanceOfType<SshOperationTimeoutException>(_actualException);
             Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Connection failed to establish within {0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
         }
 
-        [TestMethodForPlatform(nameof(OSPlatform.Linux))]
+        [TestMethod]
+        [OSCondition(OperatingSystems.Linux)]
         public void ConnectShouldHaveThrownSshOperationTimeoutExceptionOnLinux()
         {
             Assert.IsNull(_actualException.InnerException);
             Assert.IsInstanceOfType<SocketException>(_actualException);
             Assert.AreEqual("Connection refused", _actualException.Message);
         }
 
-        [TestMethodForPlatform(nameof(OSPlatform.Windows))]
+        [TestMethod]
+        [OSCondition(OperatingSystems.Windows)]
         public void ConnectShouldHaveRespectedTimeoutOnWindows()
         {
             var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
diff --git a/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_TimeoutConnectingToProxy.cs b/test/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_TimeoutConnectingToProxy.cs
@@ -2,14 +2,12 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.Net.Sockets;
-using System.Runtime.InteropServices;
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using Moq;
 
 using Renci.SshNet.Common;
-using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes.Connection
 {
@@ -71,23 +69,26 @@ protected override void Act()
             }
         }
 
-        [TestMethodForPlatform(nameof(OSPlatform.Windows))]
+        [TestMethod]
+        [OSCondition(OperatingSystems.Windows)]
         public void ConnectShouldHaveThrownSshOperationTimeoutExceptionOnWindows()
         {
             Assert.IsNull(_actualException.InnerException);
             Assert.IsInstanceOfType<SshOperationTimeoutException>(_actualException);
             Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Connection failed to establish within {0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
         }
 
-        [TestMethodForPlatform(nameof(OSPlatform.Linux))]
+        [TestMethod]
+        [OSCondition(OperatingSystems.Linux)]
         public void ConnectShouldHaveThrownSshOperationTimeoutExceptionOnLinux()
         {
             Assert.IsNull(_actualException.InnerException);
             Assert.IsInstanceOfType<SocketException>(_actualException);
             Assert.AreEqual("Connection refused", _actualException.Message);
         }
 
-        [TestMethodForPlatform(nameof(OSPlatform.Windows))]
+        [TestMethod]
+        [OSCondition(OperatingSystems.Windows)]
         public void ConnectShouldHaveRespectedTimeoutOnWindows()
         {
             var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
diff --git a/test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Dispose_PortStarted_ChannelNotBound.cs b/test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Dispose_PortStarted_ChannelNotBound.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
-using System.Runtime.InteropServices;
 using System.Threading;
 
 using Microsoft.Extensions.Logging.Abstractions;
@@ -12,7 +11,6 @@
 
 using Renci.SshNet.Channels;
 using Renci.SshNet.Common;
-using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes
 {
@@ -108,7 +106,8 @@ public void ForwardedPortShouldRefuseNewConnections()
         }
 
         // TODO We should investigate why this method doesn't work on Linux
-        [TestMethodForPlatform(nameof(OSPlatform.Windows))]
+        [TestMethod]
+        [OSCondition(OperatingSystems.Windows)]
         public void ExistingConnectionShouldBeClosed()
         {
             try
diff --git a/test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Stop_PortStarted_ChannelNotBound.cs b/test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Stop_PortStarted_ChannelNotBound.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
-using System.Runtime.InteropServices;
 using System.Threading;
 
 using Microsoft.Extensions.Logging.Abstractions;
@@ -12,7 +11,6 @@
 
 using Renci.SshNet.Channels;
 using Renci.SshNet.Common;
-using Renci.SshNet.Tests.Common;
 
 namespace Renci.SshNet.Tests.Classes
 {
@@ -112,7 +110,8 @@ public void ForwardedPortShouldRefuseNewConnections()
         }
 
         // TODO We should investigate why this method doesn't work on Linux
-        [TestMethodForPlatform(nameof(OSPlatform.Windows))]
+        [TestMethod]
+        [OSCondition(OperatingSystems.Windows)]
         public void ExistingConnectionShouldBeClosed()
         {
             try
diff --git a/test/Renci.SshNet.Tests/Common/TestMethodForPlatformAttribute.cs b/test/Renci.SshNet.Tests/Common/TestMethodForPlatformAttribute.cs

Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,12 @@`
`3`	`3`	`using System.Globalization;`
`4`	`4`	`using System.Net;`
`5`	`5`	`using System.Net.Sockets;`
`6`		`-using System.Runtime.InteropServices;`
`7`	`6`
`8`	`7`	`using Microsoft.VisualStudio.TestTools.UnitTesting;`
`9`	`8`
`10`	`9`	`using Moq;`
`11`	`10`
`12`	`11`	`using Renci.SshNet.Common;`
`13`		`-using Renci.SshNet.Tests.Common;`
`14`	`12`
`15`	`13`	`namespace Renci.SshNet.Tests.Classes.Connection`
`16`	`14`	`{`
`@@ -72,23 +70,26 @@ protected override void Act()`
`72`	`70`	`}`
`73`	`71`	`}`
`74`	`72`
`75`		`- [TestMethodForPlatform(nameof(OSPlatform.Windows))]`
	`73`	`+ [TestMethod]`
	`74`	`+ [OSCondition(OperatingSystems.Windows)]`
`76`	`75`	`public void ConnectShouldHaveThrownSshOperationTimeoutExceptionOnWindows()`
`77`	`76`	`{`
`78`	`77`	`Assert.IsNull(_actualException.InnerException);`
`79`	`78`	`Assert.IsInstanceOfType<SshOperationTimeoutException>(_actualException);`
`80`	`79`	`Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Connection failed to establish within {0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);`
`81`	`80`	`}`
`82`	`81`
`83`		`- [TestMethodForPlatform(nameof(OSPlatform.Linux))]`
	`82`	`+ [TestMethod]`
	`83`	`+ [OSCondition(OperatingSystems.Linux)]`
`84`	`84`	`public void ConnectShouldHaveThrownSocketExceptionOnLinux()`
`85`	`85`	`{`
`86`	`86`	`Assert.IsNull(_actualException.InnerException);`
`87`	`87`	`Assert.IsInstanceOfType<SocketException>(_actualException);`
`88`	`88`	`Assert.AreEqual("Connection refused", _actualException.Message);`
`89`	`89`	`}`
`90`	`90`
`91`		`- [TestMethodForPlatform(nameof(OSPlatform.Windows))]`
	`91`	`+ [TestMethod]`
	`92`	`+ [OSCondition(OperatingSystems.Windows)]`
`92`	`93`	`public void ConnectShouldHaveRespectedTimeoutOnWindows()`
`93`	`94`	`{`
`94`	`95`	`var errorText = string.Format("Elapsed: {0}, Timeout: {1}",`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,12 @@`
`2`	`2`	`using System.Diagnostics;`
`3`	`3`	`using System.Globalization;`
`4`	`4`	`using System.Net.Sockets;`
`5`		`-using System.Runtime.InteropServices;`
`6`	`5`
`7`	`6`	`using Microsoft.VisualStudio.TestTools.UnitTesting;`
`8`	`7`
`9`	`8`	`using Moq;`
`10`	`9`
`11`	`10`	`using Renci.SshNet.Common;`
`12`		`-using Renci.SshNet.Tests.Common;`
`13`	`11`
`14`	`12`	`namespace Renci.SshNet.Tests.Classes.Connection`
`15`	`13`	`{`
`@@ -70,23 +68,26 @@ protected override void Act()`
`70`	`68`	`}`
`71`	`69`	`}`
`72`	`70`
`73`		`- [TestMethodForPlatform(nameof(OSPlatform.Windows))]`
	`71`	`+ [TestMethod]`
	`72`	`+ [OSCondition(OperatingSystems.Windows)]`
`74`	`73`	`public void ConnectShouldHaveThrownSshOperationTimeoutExceptionOnWindows()`
`75`	`74`	`{`
`76`	`75`	`Assert.IsNull(_actualException.InnerException);`
`77`	`76`	`Assert.IsInstanceOfType<SshOperationTimeoutException>(_actualException);`
`78`	`77`	`Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Connection failed to establish within {0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);`
`79`	`78`	`}`
`80`	`79`
`81`		`- [TestMethodForPlatform(nameof(OSPlatform.Linux))]`
	`80`	`+ [TestMethod]`
	`81`	`+ [OSCondition(OperatingSystems.Linux)]`
`82`	`82`	`public void ConnectShouldHaveThrownSshOperationTimeoutExceptionOnLinux()`
`83`	`83`	`{`
`84`	`84`	`Assert.IsNull(_actualException.InnerException);`
`85`	`85`	`Assert.IsInstanceOfType<SocketException>(_actualException);`
`86`	`86`	`Assert.AreEqual("Connection refused", _actualException.Message);`
`87`	`87`	`}`
`88`	`88`
`89`		`- [TestMethodForPlatform(nameof(OSPlatform.Windows))]`
	`89`	`+ [TestMethod]`
	`90`	`+ [OSCondition(OperatingSystems.Windows)]`
`90`	`91`	`public void ConnectShouldHaveRespectedTimeoutOnWindows()`
`91`	`92`	`{`
`92`	`93`	`var errorText = string.Format("Elapsed: {0}, Timeout: {1}",`