diff options
author | Vest <Vest@users.noreply.github.com> | 2022-01-11 17:45:40 +0300 |
---|---|---|
committer | Vest <Vest@users.noreply.github.com> | 2022-01-11 17:47:18 +0300 |
commit | a4e66b3d1144f09eee405941818a02df4e633417 (patch) | |
tree | bcbcdd6738c9dc90876951749f28f091deb85add | |
parent | 47c6f53b4378ad372b4a009ac759c1611b93f1b3 (diff) |
Fix tests that were broken by PR #2100.
Signed-off-by: Vest <Vest@users.noreply.github.com>
-rw-r--r-- | mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs | 41 |
1 files changed, 29 insertions, 12 deletions
diff --git a/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs b/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs index 66ecb391..5bbbad4f 100644 --- a/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs +++ b/mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs @@ -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(); @@ -260,7 +260,10 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests nameof(ConnectionInfo.RedirectAudioCapture), nameof(ConnectionInfo.RdpVersion), nameof(ConnectionInfo.RDPStartProgram), - nameof(ConnectionInfo.RDPStartProgramWorkDir) + nameof(ConnectionInfo.RDPStartProgramWorkDir), + nameof(ConnectionInfo.EC2InstanceId), + nameof(ConnectionInfo.EC2Region), + nameof(ConnectionInfo.UserViaAPI) }); break; case ProtocolType.VNC: @@ -273,6 +276,17 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests }); 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) + }); + break; case ProtocolType.SSH2: expectedProperties.AddRange(new [] { @@ -281,7 +295,10 @@ 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) }); break; case ProtocolType.Telnet: @@ -297,7 +314,7 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests case ProtocolType.HTTPS: expectedProperties.AddRange(new [] { - nameof(ConnectionInfo.Username), + nameof(ConnectionInfo.UserViaAPI), nameof(ConnectionInfo.Password), nameof(ConnectionInfo.Port), nameof(ConnectionInfo.RenderingEngine), @@ -306,7 +323,7 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests case ProtocolType.PowerShell: expectedProperties.AddRange(new[] { - nameof(ConnectionInfo.Username), + nameof(ConnectionInfo.UserViaAPI), nameof(ConnectionInfo.Password), nameof(ConnectionInfo.Domain), nameof(ConnectionInfo.Port), @@ -315,7 +332,7 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests case ProtocolType.IntApp: expectedProperties.AddRange(new[] { - nameof(ConnectionInfo.Username), + nameof(ConnectionInfo.UserViaAPI), nameof(ConnectionInfo.Password), nameof(ConnectionInfo.Domain), nameof(ConnectionInfo.Port), |