diff options
author | Dimitrij <kvarkas@gmail.com> | 2022-01-11 23:16:00 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-11 23:16:00 +0300 |
commit | b54afb88239bee0d00a58b6b5f678d8910c8525d (patch) | |
tree | 8bfcf64a9a77e805565a619e2551498c212440e8 | |
parent | 3866ff76f9e20e2608c4aa0333841557ad0499e0 (diff) | |
parent | 22e611c63b67bfc0ba583342c5458c9dd7933348 (diff) |
Merge pull request #2115 from Vest/fix_2100
Fix tests that were broken by PR #2100
-rw-r--r-- | mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs | 56 |
1 files changed, 42 insertions, 14 deletions
diff --git a/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs b/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs index 66ecb391..bb5a1aae 100644 --- a/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs +++ b/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading; @@ -115,9 +115,9 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests _configWindow.SelectedTreeNode = selectedObject; var shouldBeAvailable = selectedObject != null && - !(selectedObject is RootNodeInfo) && - !(selectedObject is PuttySessionInfo) && - !(selectedObject.Parent is RootNodeInfo); + selectedObject is not RootNodeInfo && + selectedObject is not PuttySessionInfo && + selectedObject.Parent is not RootNodeInfo; Assert.That(_configWindow.CanShowInheritance, Is.EqualTo(shouldBeAvailable)); } @@ -170,9 +170,9 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests .Concat(new[] { new TestCaseData(new RootNodeInfo(RootNodeType.Connection)).SetName("RootNode"), - new TestCaseData(new RootPuttySessionsNodeInfo()).SetName("RootPuttyNode"), - new TestCaseData(new PuttySessionInfo()).SetName("PuttyNode"), - new TestCaseData(null).SetName("Null"), + new TestCaseData(new RootPuttySessionsNodeInfo()).SetName("RootPuttyNode"), + new TestCaseData(new PuttySessionInfo()).SetName("PuttyNode"), + new TestCaseData(null).SetName("Null") }); } @@ -181,7 +181,7 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests // build connection info. set certain connection properties so // that toggled properties are hidden in the property grid. We // will test those separately in the special protocol tests. - var node = isContainer + var node = isContainer ? new ContainerInfo() : new ConnectionInfo(); @@ -258,21 +258,41 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests nameof(ConnectionInfo.RedirectSmartCards), nameof(ConnectionInfo.RedirectSound), nameof(ConnectionInfo.RedirectAudioCapture), - nameof(ConnectionInfo.RdpVersion), + nameof(ConnectionInfo.RdpVersion), nameof(ConnectionInfo.RDPStartProgram), - nameof(ConnectionInfo.RDPStartProgramWorkDir) + nameof(ConnectionInfo.RDPStartProgramWorkDir), + nameof(ConnectionInfo.UserViaAPI), + nameof(ConnectionInfo.EC2InstanceId), + nameof(ConnectionInfo.EC2Region) }); break; case ProtocolType.VNC: expectedProperties.AddRange(new [] { + nameof(ConnectionInfo.Username), nameof(ConnectionInfo.Password), nameof(ConnectionInfo.Port), nameof(ConnectionInfo.VNCSmartSizeMode), nameof(ConnectionInfo.VNCViewOnly), + nameof(ConnectionInfo.UserViaAPI), + nameof(ConnectionInfo.EC2InstanceId), + nameof(ConnectionInfo.EC2Region) }); break; case ProtocolType.SSH1: + expectedProperties.AddRange(new[] + { + nameof(ConnectionInfo.Username), + nameof(ConnectionInfo.Password), + nameof(ConnectionInfo.Port), + nameof(ConnectionInfo.SSHOptions), + nameof(ConnectionInfo.PuttySession), + nameof(ConnectionInfo.OpeningCommand), + nameof(ConnectionInfo.UserViaAPI), + nameof(ConnectionInfo.EC2InstanceId), + nameof(ConnectionInfo.EC2Region) + }); + break; case ProtocolType.SSH2: expectedProperties.AddRange(new [] { @@ -281,7 +301,12 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests nameof(ConnectionInfo.Port), nameof(ConnectionInfo.SSHOptions), nameof(ConnectionInfo.PuttySession), - nameof(ConnectionInfo.OpeningCommand) + nameof(ConnectionInfo.OpeningCommand), + nameof(ConnectionInfo.EC2InstanceId), + nameof(ConnectionInfo.EC2Region), + nameof(ConnectionInfo.UserViaAPI), + nameof(ConnectionInfo.EC2InstanceId), + nameof(ConnectionInfo.EC2Region) }); break; case ProtocolType.Telnet: @@ -297,7 +322,8 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests case ProtocolType.HTTPS: expectedProperties.AddRange(new [] { - nameof(ConnectionInfo.Username), + nameof(ConnectionInfo.UserViaAPI), + nameof(ConnectionInfo.Username), nameof(ConnectionInfo.Password), nameof(ConnectionInfo.Port), nameof(ConnectionInfo.RenderingEngine), @@ -306,7 +332,8 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests case ProtocolType.PowerShell: expectedProperties.AddRange(new[] { - nameof(ConnectionInfo.Username), + nameof(ConnectionInfo.UserViaAPI), + nameof(ConnectionInfo.Username), nameof(ConnectionInfo.Password), nameof(ConnectionInfo.Domain), nameof(ConnectionInfo.Port), @@ -315,7 +342,8 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests case ProtocolType.IntApp: expectedProperties.AddRange(new[] { - nameof(ConnectionInfo.Username), + nameof(ConnectionInfo.UserViaAPI), + nameof(ConnectionInfo.Username), nameof(ConnectionInfo.Password), nameof(ConnectionInfo.Domain), nameof(ConnectionInfo.Port), |