Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2115 from Vest/fix_2100

Browse Source 
Fix tests that were broken by PR #2100
This commit is contained in:
Dimitrij
2022-01-11 20:16:00 +00:00
committed by GitHub
parent 3866ff76f9 22e611c63b
commit b54afb8823
1 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowGeneralTests.cs
View File

@@ -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),