From b7cdf816656c9079f4b5ba64ed93eef784c888bd Mon Sep 17 00:00:00 2001 From: David Sparer Date: Wed, 20 Jun 2018 16:20:51 -0500 Subject: [PATCH] ensure putty root node returns correct tree node type. Related to #998 --- mRemoteNGTests/Tree/RootNodeInfoTests.cs | 11 ++++++++++- mRemoteV1/Tree/Root/RootNodeInfo.cs | 4 +++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/mRemoteNGTests/Tree/RootNodeInfoTests.cs b/mRemoteNGTests/Tree/RootNodeInfoTests.cs index 355a7333..4baf33ee 100644 --- a/mRemoteNGTests/Tree/RootNodeInfoTests.cs +++ b/mRemoteNGTests/Tree/RootNodeInfoTests.cs @@ -1,4 +1,5 @@ -using mRemoteNG.Tree.Root; +using mRemoteNG.Tree; +using mRemoteNG.Tree.Root; using NUnit.Framework; @@ -46,5 +47,13 @@ namespace mRemoteNGTests.Tree _rootNodeInfo.PasswordString = password; Assert.That(_rootNodeInfo.PasswordString, Is.EqualTo(password)); } + + [TestCase(RootNodeType.Connection, TreeNodeType.Root)] + [TestCase(RootNodeType.PuttySessions, TreeNodeType.PuttyRoot)] + public void RootNodeHasCorrectTreeNodeType(RootNodeType rootNodeType, TreeNodeType expectedTreeNodeType) + { + var rootNode = new RootNodeInfo(rootNodeType); + Assert.That(rootNode.GetTreeNodeType(), Is.EqualTo(expectedTreeNodeType)); + } } } \ No newline at end of file diff --git a/mRemoteV1/Tree/Root/RootNodeInfo.cs b/mRemoteV1/Tree/Root/RootNodeInfo.cs index ed9798bb..47e863a7 100644 --- a/mRemoteV1/Tree/Root/RootNodeInfo.cs +++ b/mRemoteV1/Tree/Root/RootNodeInfo.cs @@ -66,7 +66,9 @@ namespace mRemoteNG.Tree.Root public override TreeNodeType GetTreeNodeType() { - return TreeNodeType.Root; + return Type == RootNodeType.Connection + ? TreeNodeType.Root + : TreeNodeType.PuttyRoot; } #endregion