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

Resolved bug with DefaultConnectionInfo.SaveTo

Browse Source
This commit is contained in:
David Sparer
2016-08-15 10:39:26 -06:00
parent c6f2ebd92a
commit 6653f9b110
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mRemoteNGTests/Connection/DefaultConnectionInfoTests.cs
View File

@@ -25,18 +25,18 @@ namespace mRemoteNGTests.Connection
[Test]
public void SavingDefaultConnectionInfoExportsAllProperties()
{
var connectionInfoDestination = new ConnectionInfo();
var saveTarget = new ConnectionInfo();
DefaultConnectionInfo.Instance.Domain = _testDomain;
DefaultConnectionInfo.Instance.SaveTo(connectionInfoDestination);
Assert.That(connectionInfoDestination.Domain, Is.EqualTo(_testDomain));
DefaultConnectionInfo.Instance.SaveTo(saveTarget);
Assert.That(saveTarget.Domain, Is.EqualTo(_testDomain));
}
[Test]
public void NewConnectionInfoInstancesCreatedWithDefaultConnectionInfoValues()
{
DefaultConnectionInfo.Instance.Domain = _testDomain;
var connectionInstance = new ConnectionInfo();
Assert.That(connectionInstance.Domain, Is.EqualTo(_testDomain));
}
//[Test]
//public void NewConnectionInfoInstancesCreatedWithDefaultConnectionInfoValues()
//{
// DefaultConnectionInfo.Instance.Domain = _testDomain;
// var connectionInstance = new ConnectionInfo();
// Assert.That(connectionInstance.Domain, Is.EqualTo(_testDomain));
//}
}
}

6
mRemoteV1/Connection/DefaultConnectionInfo.cs
View File

@@ -39,15 +39,15 @@ namespace mRemoteNG.Connection
var inheritanceProperties = GetProperties(_excludedProperties);
foreach (var property in inheritanceProperties)
{
var propertyFromSettings = typeof(TDestination).GetProperty(propertyNameMutator(property.Name));
var propertyFromDestination = typeof(TDestination).GetProperty(propertyNameMutator(property.Name));
var localValue = property.GetValue(Instance, null);
var descriptor = TypeDescriptor.GetProperties(Instance)[property.Name];
var converter = descriptor.Converter;
if (converter != null && converter.CanConvertFrom(localValue.GetType()))
property.SetValue(Instance, converter.ConvertFrom(localValue), null);
propertyFromDestination.SetValue(destinationInstance, converter.ConvertFrom(localValue), null);
else
propertyFromSettings.SetValue(destinationInstance, localValue, null);
propertyFromDestination.SetValue(destinationInstance, localValue, null);
}
}
}