diff --git a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs deleted file mode 100644 index 639f4a13..00000000 --- a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs +++ /dev/null @@ -1,276 +0,0 @@ -using mRemoteNG.Config.Serializers; -using mRemoteNG.Connection.Protocol; -using mRemoteNG.Connection.Protocol.RDP; -using mRemoteNG.Container; -using mRemoteNGTests.Properties; -using NUnit.Framework; -using System.IO; -using System.Linq; - -namespace mRemoteNGTests.Config.Serializers.MiscSerializers -{ - public class RemoteDesktopConnectionManager27DeserializerTests - { - private string _connectionFileContents; - private RemoteDesktopConnectionManagerDeserializer _deserializer; - private SerializationResult _serializationResult; - private ContainerInfo _rootContainerInfo; - private const string ExpectedName = "server1_displayname"; - private const string ExpectedHostname = "server1"; - private const string ExpectedDescription = "Comment text here"; - private const string ExpectedUsername = "myusername1"; - private const string ExpectedDomain = "mydomain"; - private const string ExpectedPassword = "passwordHere!"; - private const bool ExpectedUseConsoleSession = true; - private const int ExpectedPort = 9933; - private const RdpProtocol.RDGatewayUsageMethod ExpectedGatewayUsageMethod = RdpProtocol.RDGatewayUsageMethod.Always; - private const string ExpectedGatewayHostname = "gatewayserverhost.innerdomain.net"; - private const string ExpectedGatewayUsername = "gatewayusername"; - private const string ExpectedGatewayDomain = "innerdomain"; - private const string ExpectedGatewayPassword = "gatewayPassword123"; - private const RdpProtocol.RDPResolutions ExpectedRdpResolution = RdpProtocol.RDPResolutions.FitToWindow; - private const RdpProtocol.RDPColors ExpectedRdpColorDepth = RdpProtocol.RDPColors.Colors24Bit; - private const RdpProtocol.RDPSounds ExpectedAudioRedirection = RdpProtocol.RDPSounds.DoNotPlay; - private const bool ExpectedKeyRedirection = true; - private const bool ExpectedSmartcardRedirection = true; - private const bool ExpectedDriveRedirection = true; - private const bool ExpectedPortRedirection = true; - private const bool ExpectedPrinterRedirection = true; - private const RdpProtocol.AuthenticationLevel ExpectedAuthLevel = RdpProtocol.AuthenticationLevel.WarnOnFailedAuth; - - - [OneTimeSetUp] - public void OnetimeSetup() - { - _connectionFileContents = Resources.test_rdcman_v2_7_schema3; - _deserializer = new RemoteDesktopConnectionManagerDeserializer(); - _serializationResult = _deserializer.Deserialize(_connectionFileContents); - _rootContainerInfo = _serializationResult.ConnectionRecords.OfType().First(); - } - - [Test] - public void AllSubRootFoldersImported() - { - var rootNodeContents = _rootContainerInfo.Children.Count(node => node.Name == "Group1" || node.Name == "Group2"); - Assert.That(rootNodeContents, Is.EqualTo(2)); - } - - [Test] - public void ConnectionDisplayNameImported() - { - var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.Name, Is.EqualTo(ExpectedName)); - } - - [Test] - public void ConnectionHostnameImported() - { - var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.Hostname, Is.EqualTo(ExpectedHostname)); - } - - [Test] - public void ConnectionDescriptionImported() - { - var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.Description, Is.EqualTo(ExpectedDescription)); - } - - [Test] - public void CredentialIdCorrectlySet() - { - var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - var cred = _serializationResult.ConnectionToCredentialMap.DistinctCredentialRecords.First(); - Assert.That(connection.CredentialRecordId.FirstOrDefault(), Is.EqualTo(cred.Id)); - } - - [Test] - public void ConnectionUsernameImported() - { - var cred = _serializationResult.ConnectionToCredentialMap.DistinctCredentialRecords.First(); - Assert.That(cred.Username, Is.EqualTo(ExpectedUsername)); - } - - [Test] - public void ConnectionDomainImported() - { - var cred = _serializationResult.ConnectionToCredentialMap.DistinctCredentialRecords.First(); - Assert.That(cred.Domain, Is.EqualTo(ExpectedDomain)); - } - - // Since password is encrypted with a machine key, cant test decryption on another machine - //[Test] - //public void ConnectionPasswordImported() - //{ - // var rootNode = _connectionTreeModel.RootNodes.First(); - // var importedRdcmanRootNode = rootNode.Children.OfType().First(); - // var group1 = importedRdcmanRootNode.Children.OfType().First(node => node.Name == "Group1"); - // var connection = group1.Children.First(); - // Assert.That(connection.Password, Is.EqualTo(ExpectedPassword)); - //} - - [Test] - public void ConnectionProtocolSetToRdp() - { - var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.Protocol, Is.EqualTo(ProtocolType.RDP)); - } - - [Test] - public void ConnectionUseConsoleSessionImported() - { - var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.UseConsoleSession, Is.EqualTo(ExpectedUseConsoleSession)); - } - - [Test] - public void ConnectionPortImported() - { - var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.Port, Is.EqualTo(ExpectedPort)); - } - - [Test] - public void ConnectionGatewayUsageMethodImported() - { - var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.RDGatewayUsageMethod, Is.EqualTo(ExpectedGatewayUsageMethod)); - } - - [Test] - public void ConnectionGatewayHostnameImported() - { - var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.RDGatewayHostname, Is.EqualTo(ExpectedGatewayHostname)); - } - - [Test] - public void ConnectionGatewayUsernameImported() - { - var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.RDGatewayUsername, Is.EqualTo(ExpectedGatewayUsername)); - } - - // Since password is encrypted with a machine key, cant test decryption on another machine - //[Test] - //public void ConnectionGatewayPasswordImported() - //{ - // var rootNode = _connectionTreeModel.RootNodes.First(); - // var importedRdcmanRootNode = rootNode.Children.OfType().First(); - // var group1 = importedRdcmanRootNode.Children.OfType().First(node => node.Name == "Group1"); - // var connection = group1.Children.First(); - // Assert.That(connection.RDGatewayPassword, Is.EqualTo(ExpectedGatewayPassword)); - //} - - [Test] - public void ConnectionGatewayDomainImported() - { - var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.RDGatewayDomain, Is.EqualTo(ExpectedGatewayDomain)); - } - - [Test] - public void ConnectionResolutionImported() - { - var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.Resolution, Is.EqualTo(ExpectedRdpResolution)); - } - - [Test] - public void ConnectionColorDepthImported() - { - var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.Colors, Is.EqualTo(ExpectedRdpColorDepth)); - } - - [Test] - public void ConnectionAudioRedirectionImported() - { - var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.RedirectSound, Is.EqualTo(ExpectedAudioRedirection)); - } - - [Test] - public void ConnectionKeyRedirectionImported() - { - var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.RedirectKeys, Is.EqualTo(ExpectedKeyRedirection)); - } - - [Test] - public void ConnectionDriveRedirectionImported() - { - var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.RedirectDiskDrives, Is.EqualTo(ExpectedDriveRedirection)); - } - - [Test] - public void ConnectionPortRedirectionImported() - { - var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.RedirectPorts, Is.EqualTo(ExpectedPortRedirection)); - } - - [Test] - public void ConnectionPrinterRedirectionImported() - { - var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.RedirectPrinters, Is.EqualTo(ExpectedPrinterRedirection)); - } - - [Test] - public void ConnectionSmartcardRedirectionImported() - { - var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.RedirectSmartCards, Is.EqualTo(ExpectedSmartcardRedirection)); - } - - [Test] - public void ConnectionauthenticationLevelImported() - { - var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.RDPAuthenticationLevel, Is.EqualTo(ExpectedAuthLevel)); - } - - [Test] - public void ExceptionThrownOnBadSchemaVersion() - { - var badFileContents = Resources.test_rdcman_v2_2_badschemaversion; - Assert.That(() => _deserializer.Deserialize(badFileContents), Throws.TypeOf()); - } - - [Test] - public void ExceptionThrownOnUnsupportedVersion() - { - var badFileContents = Resources.test_rdcman_badVersionNumber; - Assert.That(() => _deserializer.Deserialize(badFileContents), Throws.TypeOf()); - } - - [Test] - public void ExceptionThrownOnNoVersion() - { - var badFileContents = Resources.test_rdcman_noversion; - Assert.That(() => _deserializer.Deserialize(badFileContents), Throws.TypeOf()); - } - } -} \ No newline at end of file diff --git a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs index cf2bef3b..e3c02ee7 100644 --- a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs @@ -1,4 +1,5 @@ -using mRemoteNG.Config.Serializers; +using System.Collections.Generic; +using mRemoteNG.Config.Serializers; using mRemoteNG.Connection.Protocol; using mRemoteNG.Connection.Protocol.RDP; using mRemoteNG.Container; @@ -6,14 +7,16 @@ using mRemoteNGTests.Properties; using NUnit.Framework; using System.IO; using System.Linq; +using mRemoteNGTests.Tools; namespace mRemoteNGTests.Config.Serializers.MiscSerializers { + [TestFixtureSource(nameof(TestFixtureData))] public class RemoteDesktopConnectionManagerDeserializerTests { - private string _connectionFileContents; - private RemoteDesktopConnectionManagerDeserializer _deserializer; - private SerializationResult _serializationResult; + private readonly RemoteDesktopConnectionManagerDeserializer _deserializer; + private readonly SerializationResult _serializationResult; + private readonly ContainerInfo _rootContainerInfo; private const string ExpectedName = "server1_displayname"; private const string ExpectedHostname = "server1"; private const string ExpectedDescription = "Comment text here"; @@ -35,28 +38,35 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers private const bool ExpectedDriveRedirection = true; private const bool ExpectedPortRedirection = true; private const bool ExpectedPrinterRedirection = true; - private const RdpProtocol.AuthenticationLevel ExpectedAuthLevel = RdpProtocol.AuthenticationLevel.AuthRequired; + private const RdpProtocol.AuthenticationLevel ExpectedAuthLevel = RdpProtocol.AuthenticationLevel.WarnOnFailedAuth; - - [OneTimeSetUp] - public void OnetimeSetup() + private static IEnumerable TestFixtureData() + { + return new[] + { + new TestFixtureData(Resources.test_rdcman_v2_2_schema1).SetName("RDCM_v2_2"), + new TestFixtureData(Resources.test_rdcman_v2_7_schema3).SetName("RDCM_v2_7"), + }; + } + + public RemoteDesktopConnectionManagerDeserializerTests(string rdcmFileContents) { - _connectionFileContents = Resources.test_rdcman_v2_2_schema1; _deserializer = new RemoteDesktopConnectionManagerDeserializer(); - _serializationResult = _deserializer.Deserialize(_connectionFileContents); + _serializationResult = _deserializer.Deserialize(rdcmFileContents); + _rootContainerInfo = _serializationResult.ConnectionRecords.OfType().First(); } [Test] public void AllSubRootFoldersImported() { - var rootNodeContents = _serializationResult.ConnectionRecords.Count(node => node.Name == "Group1" || node.Name == "Group2"); + var rootNodeContents = _rootContainerInfo.Children.Count(node => node.Name == "Group1" || node.Name == "Group2"); Assert.That(rootNodeContents, Is.EqualTo(2)); } [Test] public void ConnectionDisplayNameImported() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); var connection = group1.Children.First(); Assert.That(connection.Name, Is.EqualTo(ExpectedName)); } @@ -64,7 +74,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers [Test] public void ConnectionHostnameImported() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); var connection = group1.Children.First(); Assert.That(connection.Hostname, Is.EqualTo(ExpectedHostname)); } @@ -72,25 +82,32 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers [Test] public void ConnectionDescriptionImported() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); var connection = group1.Children.First(); Assert.That(connection.Description, Is.EqualTo(ExpectedDescription)); } + [Test] + public void CredentialIdCorrectlySet() + { + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); + var connection = group1.Children.First(); + var cred = _serializationResult.ConnectionToCredentialMap.DistinctCredentialRecords.First(); + Assert.That(connection.CredentialRecordId.FirstOrDefault(), Is.EqualTo(cred.Id)); + } + [Test] public void ConnectionUsernameImported() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.CredentialRecord.Username, Is.EqualTo(ExpectedUsername)); + var cred = _serializationResult.ConnectionToCredentialMap.DistinctCredentialRecords.First(); + Assert.That(cred.Username, Is.EqualTo(ExpectedUsername)); } [Test] public void ConnectionDomainImported() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); - var connection = group1.Children.First(); - Assert.That(connection.CredentialRecord.Domain, Is.EqualTo(ExpectedDomain)); + var cred = _serializationResult.ConnectionToCredentialMap.DistinctCredentialRecords.First(); + Assert.That(cred.Domain, Is.EqualTo(ExpectedDomain)); } // Since password is encrypted with a machine key, cant test decryption on another machine @@ -99,7 +116,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers //{ // var rootNode = _connectionTreeModel.RootNodes.First(); // var importedRdcmanRootNode = rootNode.Children.OfType().First(); - // var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + // var group1 = importedRdcmanRootNode.Children.OfType().First(node => node.Name == "Group1"); // var connection = group1.Children.First(); // Assert.That(connection.Password, Is.EqualTo(ExpectedPassword)); //} @@ -107,7 +124,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers [Test] public void ConnectionProtocolSetToRdp() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); var connection = group1.Children.First(); Assert.That(connection.Protocol, Is.EqualTo(ProtocolType.RDP)); } @@ -115,7 +132,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers [Test] public void ConnectionUseConsoleSessionImported() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); var connection = group1.Children.First(); Assert.That(connection.UseConsoleSession, Is.EqualTo(ExpectedUseConsoleSession)); } @@ -123,7 +140,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers [Test] public void ConnectionPortImported() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); var connection = group1.Children.First(); Assert.That(connection.Port, Is.EqualTo(ExpectedPort)); } @@ -131,7 +148,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers [Test] public void ConnectionGatewayUsageMethodImported() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); var connection = group1.Children.First(); Assert.That(connection.RDGatewayUsageMethod, Is.EqualTo(ExpectedGatewayUsageMethod)); } @@ -139,15 +156,24 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers [Test] public void ConnectionGatewayHostnameImported() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); var connection = group1.Children.First(); Assert.That(connection.RDGatewayHostname, Is.EqualTo(ExpectedGatewayHostname)); } + [Test] + public void CredentialIdSetCorrectly() + { + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); + var connection = group1.Children.First(); + var cred = _serializationResult.ConnectionToCredentialMap.DistinctCredentialRecords.FirstOrDefault(); + Assert.That(connection.CredentialRecordId.FirstOrDefault(), Is.EqualTo(cred?.Id)); + } + [Test] public void ConnectionGatewayUsernameImported() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); var connection = group1.Children.First(); Assert.That(connection.RDGatewayUsername, Is.EqualTo(ExpectedGatewayUsername)); } @@ -158,7 +184,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers //{ // var rootNode = _connectionTreeModel.RootNodes.First(); // var importedRdcmanRootNode = rootNode.Children.OfType().First(); - // var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + // var group1 = importedRdcmanRootNode.Children.OfType().First(node => node.Name == "Group1"); // var connection = group1.Children.First(); // Assert.That(connection.RDGatewayPassword, Is.EqualTo(ExpectedGatewayPassword)); //} @@ -166,7 +192,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers [Test] public void ConnectionGatewayDomainImported() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); var connection = group1.Children.First(); Assert.That(connection.RDGatewayDomain, Is.EqualTo(ExpectedGatewayDomain)); } @@ -174,7 +200,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers [Test] public void ConnectionResolutionImported() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); var connection = group1.Children.First(); Assert.That(connection.Resolution, Is.EqualTo(ExpectedRdpResolution)); } @@ -182,7 +208,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers [Test] public void ConnectionColorDepthImported() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); var connection = group1.Children.First(); Assert.That(connection.Colors, Is.EqualTo(ExpectedRdpColorDepth)); } @@ -190,7 +216,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers [Test] public void ConnectionAudioRedirectionImported() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); var connection = group1.Children.First(); Assert.That(connection.RedirectSound, Is.EqualTo(ExpectedAudioRedirection)); } @@ -198,7 +224,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers [Test] public void ConnectionKeyRedirectionImported() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); var connection = group1.Children.First(); Assert.That(connection.RedirectKeys, Is.EqualTo(ExpectedKeyRedirection)); } @@ -206,7 +232,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers [Test] public void ConnectionDriveRedirectionImported() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); var connection = group1.Children.First(); Assert.That(connection.RedirectDiskDrives, Is.EqualTo(ExpectedDriveRedirection)); } @@ -214,7 +240,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers [Test] public void ConnectionPortRedirectionImported() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); var connection = group1.Children.First(); Assert.That(connection.RedirectPorts, Is.EqualTo(ExpectedPortRedirection)); } @@ -222,7 +248,7 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers [Test] public void ConnectionPrinterRedirectionImported() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); var connection = group1.Children.First(); Assert.That(connection.RedirectPrinters, Is.EqualTo(ExpectedPrinterRedirection)); } @@ -230,15 +256,15 @@ namespace mRemoteNGTests.Config.Serializers.MiscSerializers [Test] public void ConnectionSmartcardRedirectionImported() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); var connection = group1.Children.First(); Assert.That(connection.RedirectSmartCards, Is.EqualTo(ExpectedSmartcardRedirection)); } [Test] - public void ConnectionauthenticationLevelImported() + public void ConnectionAuthenticationLevelImported() { - var group1 = _serializationResult.ConnectionRecords.OfType().First(node => node.Name == "Group1"); + var group1 = _rootContainerInfo.Children.OfType().First(node => node.Name == "Group1"); var connection = group1.Children.First(); Assert.That(connection.RDPAuthenticationLevel, Is.EqualTo(ExpectedAuthLevel)); } diff --git a/mRemoteNGTests/Resources/test_rdcman_v2_2_schema1.rdg b/mRemoteNGTests/Resources/test_rdcman_v2_2_schema1.rdg index 74986a40..18045f4c 100644 --- a/mRemoteNGTests/Resources/test_rdcman_v2_2_schema1.rdg +++ b/mRemoteNGTests/Resources/test_rdcman_v2_2_schema1.rdg @@ -70,7 +70,7 @@ True - 1 + 2 1 diff --git a/mRemoteNGTests/Tools/NunitExtensions.cs b/mRemoteNGTests/Tools/NunitExtensions.cs new file mode 100644 index 00000000..7d7855fa --- /dev/null +++ b/mRemoteNGTests/Tools/NunitExtensions.cs @@ -0,0 +1,19 @@ +using NUnit.Framework; + +namespace mRemoteNGTests.Tools +{ + public static class NunitExtensions + { + /// + /// Set the name of the fixture created by this + /// + /// + /// + /// + public static TestFixtureData SetName(this TestFixtureData fixtureData, string name) + { + fixtureData.TestName = name; + return fixtureData; + } + } +} diff --git a/mRemoteNGTests/mRemoteNGTests.csproj b/mRemoteNGTests/mRemoteNGTests.csproj index 52173a9a..72c17a34 100644 --- a/mRemoteNGTests/mRemoteNGTests.csproj +++ b/mRemoteNGTests/mRemoteNGTests.csproj @@ -132,7 +132,6 @@ - @@ -181,6 +180,7 @@ +