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 #2341 from BlueBlock/fix_broken_tests

Browse Source 
Fix broken tests
This commit is contained in:
Dimitrij
2023-02-04 16:26:34 +00:00
committed by GitHub
parent 575ad7664f 0113f549c5
commit 8cf0f50565
4 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mRemoteNGTests/UI/Forms/OptionsPages/OptionsConnectionsPageTests.cs
View File

@@ -13,14 +13,14 @@ namespace mRemoteNGTests.UI.Forms.OptionsPages
public void ConnectionsPageLinkExistsInListView()
{
ListViewTester listViewTester = new ListViewTester("lstOptionPages", _optionsForm);
Assert.That(listViewTester.Items[4].Text, Does.Match("Connections"));
Assert.That(listViewTester.Items[2].Text, Does.Match("Connections"));
}
[Test]
public void ConnectionsIconShownInListView()
{
ListViewTester listViewTester = new ListViewTester("lstOptionPages", _optionsForm);
Assert.That(listViewTester.Items[4].ImageList, Is.Not.Null);
Assert.That(listViewTester.Items[2].ImageList, Is.Not.Null);
}
[Test]

4
mRemoteNGTests/UI/Forms/OptionsPages/OptionsTabsPanelPageTests.cs
View File

@@ -13,14 +13,14 @@ namespace mRemoteNGTests.UI.Forms.OptionsPages
public void TabsPanelPageLinkExistsInListView()
{
ListViewTester listViewTester = new ListViewTester("lstOptionPages", _optionsForm);
Assert.That(listViewTester.Items[2].Text, Does.Match("Tabs & Panels"));
Assert.That(listViewTester.Items[3].Text, Does.Match("Tabs & Panels"));
}
[Test]
public void TabsPanelIconShownInListView()
{
ListViewTester listViewTester = new ListViewTester("lstOptionPages", _optionsForm);
Assert.That(listViewTester.Items[2].ImageList, Is.Not.Null);
Assert.That(listViewTester.Items[3].ImageList, Is.Not.Null);
}
[Test]

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

@@ -263,11 +263,10 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
nameof(ConnectionInfo.RdpVersion),
nameof(ConnectionInfo.RDPStartProgram),
nameof(ConnectionInfo.RDPStartProgramWorkDir),
nameof(ConnectionInfo.ExternalCredentialProvider),
nameof(ConnectionInfo.UserViaAPI),
nameof(ConnectionInfo.RDGatewayExternalCredentialProvider),
nameof(ConnectionInfo.RDGatewayUserViaAPI),
nameof(ConnectionInfo.ExternalCredentialProvider),
nameof(ConnectionInfo.ExternalAddressProvider),
nameof(ConnectionInfo.EC2InstanceId),
nameof(ConnectionInfo.EC2Region)
});
break;
case ProtocolType.VNC:
@@ -289,7 +288,6 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
nameof(ConnectionInfo.PuttySession),
nameof(ConnectionInfo.OpeningCommand),
nameof(ConnectionInfo.ExternalCredentialProvider),
nameof(ConnectionInfo.UserViaAPI),
});
break;
case ProtocolType.SSH2:
@@ -302,10 +300,7 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
nameof(ConnectionInfo.PuttySession),
nameof(ConnectionInfo.OpeningCommand),
nameof(ConnectionInfo.ExternalAddressProvider),
nameof(ConnectionInfo.EC2InstanceId),
nameof(ConnectionInfo.EC2Region),
nameof(ConnectionInfo.ExternalCredentialProvider),
nameof(ConnectionInfo.UserViaAPI),
});
break;
case ProtocolType.Telnet:
@@ -321,8 +316,6 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
case ProtocolType.HTTPS:
expectedProperties.AddRange(new []
{
nameof(ConnectionInfo.ExternalCredentialProvider),
nameof(ConnectionInfo.UserViaAPI),
nameof(ConnectionInfo.Password),
nameof(ConnectionInfo.Port),
nameof(ConnectionInfo.RenderingEngine),
@@ -331,8 +324,6 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
case ProtocolType.PowerShell:
expectedProperties.AddRange(new[]
{
nameof(ConnectionInfo.ExternalCredentialProvider),
nameof(ConnectionInfo.UserViaAPI),
nameof(ConnectionInfo.Password),
nameof(ConnectionInfo.Domain),
nameof(ConnectionInfo.Port),
@@ -341,8 +332,6 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
case ProtocolType.IntApp:
expectedProperties.AddRange(new[]
{
nameof(ConnectionInfo.ExternalCredentialProvider),
nameof(ConnectionInfo.UserViaAPI),
nameof(ConnectionInfo.Password),
nameof(ConnectionInfo.Domain),
nameof(ConnectionInfo.Port),

36
mRemoteNGTests/UI/Window/ConfigWindowTests/ConfigWindowRdpSpecialTests.cs
View File

@@ -25,12 +25,14 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
{
ConnectionInfo.RDGatewayUsageMethod = gatewayUsageMethod;
ConnectionInfo.RDGatewayUseConnectionCredentials = RDGatewayUseConnectionCredentials.Yes;
ExpectedPropertyList.AddRange(new []
ExpectedPropertyList.AddRange(new[]
{
nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayHostname),
nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayUseConnectionCredentials)
nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayUseConnectionCredentials),
});
ExpectedPropertyList.Remove(nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayUserViaAPI));
ExpectedPropertyList.Remove(nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayExternalCredentialProvider));
RunVerification();
}
@@ -40,14 +42,28 @@ namespace mRemoteNGTests.UI.Window.ConfigWindowTests
{
ConnectionInfo.RDGatewayUsageMethod = RDGatewayUsageMethod.Always;
ConnectionInfo.RDGatewayUseConnectionCredentials = useConnectionCredentials;
ExpectedPropertyList.AddRange(new []
switch (useConnectionCredentials)
{
nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayHostname),
nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayUsername),
nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayPassword),
nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayDomain),
nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayUseConnectionCredentials)
});
case RDGatewayUseConnectionCredentials.No:
ExpectedPropertyList.AddRange(new[]
{
nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayHostname),
nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayUsername),
nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayPassword),
nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayDomain),
nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayUseConnectionCredentials)
});
break;
case RDGatewayUseConnectionCredentials.SmartCard:
ExpectedPropertyList.AddRange(new[]
{
nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayHostname),
nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayUseConnectionCredentials)
});
ExpectedPropertyList.Remove(nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayUserViaAPI));
ExpectedPropertyList.Remove(nameof(mRemoteNG.Connection.ConnectionInfo.RDGatewayExternalCredentialProvider));
break;
}
RunVerification();
}