diff --git a/mRemoteNGTests/UI/ConnectionTreeViewBuilderTests.cs b/mRemoteNGTests/UI/ConnectionTreeViewBuilderTests.cs deleted file mode 100644 index a9e7de669..000000000 --- a/mRemoteNGTests/UI/ConnectionTreeViewBuilderTests.cs +++ /dev/null @@ -1,195 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using System.Windows.Forms; -using mRemoteNG.Connection; -using mRemoteNG.Container; -using mRemoteNG.Tree; -using mRemoteNG.Tree.Root; -using mRemoteNG.UI; -using NUnit.Framework; - - -namespace mRemoteNGTests.UI -{ - public class ConnectionTreeViewBuilderTests - { - private ConnectionTreeModel _connectionTreeModel; - private ConnectionTreeViewBuilder _connectionTreeViewBuilder; - - [SetUp] - public void Setup() - { - _connectionTreeModel = new ConnectionTreeModel(); - _connectionTreeViewBuilder = new ConnectionTreeViewBuilder(_connectionTreeModel); - } - - [TearDown] - public void Teardown() - { - _connectionTreeModel = null; - _connectionTreeViewBuilder = null; - } - - [Test] - public void RootNodeGetsAddedToTreeView() - { - CreateRootNode(); - _connectionTreeViewBuilder.Build(); - var rootTreeNode = _connectionTreeViewBuilder.RootNode; - Assert.That(rootTreeNode, Is.Not.Null); - } - - [Test] - public void BuildTreeWithSingleConnection() - { - /** - * Root - * -- con1 - */ - var root = CreateRootNode(); - var con1 = new ConnectionInfo(); - root.AddChild(con1); - _connectionTreeViewBuilder.Build(); - var rootTreeNode = _connectionTreeViewBuilder.RootNode; - Assert.That(rootTreeNode.Nodes[0].Tag, Is.EqualTo(con1)); - } - - [Test] - public void BuildTreeWithSingleFolder() - { - /** - * Root - * -- folder1 - */ - var root = CreateRootNode(); - var folder1 = new ContainerInfo(); - root.AddChild(folder1); - _connectionTreeViewBuilder.Build(); - var rootTreeNode = _connectionTreeViewBuilder.RootNode; - Assert.That(rootTreeNode.Nodes[0].Tag, Is.EqualTo(folder1)); - } - - [Test] - public void BuildTreeWithTwoConnectionsUnderRoot() - { - /** - * Root - * -- con1 - * -- con2 - */ - var root = CreateRootNode(); - var con1 = new ConnectionInfo(); - var con2 = new ConnectionInfo(); - root.AddChildRange(new []{con1, con2}); - _connectionTreeViewBuilder.Build(); - var rootTreeNode = _connectionTreeViewBuilder.RootNode; - Assert.That(GetTreeNodeTags(rootTreeNode.Nodes), Is.EquivalentTo(new[] { con1, con2 })); - } - - [Test] - public void BuildTreeWithConnectionInFolder() - { - /* - * Root - * -- folder1 - * ---- con1 - */ - var root = CreateRootNode(); - var folder1 = new ContainerInfo(); - var con1 = new ConnectionInfo(); - root.AddChild(folder1); - folder1.AddChild(con1); - _connectionTreeViewBuilder.Build(); - var rootTreeNode = _connectionTreeViewBuilder.RootNode; - Assert.That(rootTreeNode.Nodes[0].Tag, Is.EqualTo(folder1)); - Assert.That(rootTreeNode.Nodes[0].Nodes[0].Tag, Is.EqualTo(con1)); - } - - [Test] - public void BuildTreeWithTwoFoldersAndFolderOneHasAConnection() - { - /** - * Root - * -- folder1 - * ---- con1 - * -- folder2 - */ - var root = CreateRootNode(); - var folder1 = new ContainerInfo(); - var con1 = new ConnectionInfo(); - var folder2 = new ContainerInfo(); - root.AddChild(folder1); - folder1.AddChild(con1); - root.AddChild(folder2); - _connectionTreeViewBuilder.Build(); - var rootTreeNode = _connectionTreeViewBuilder.RootNode; - Assert.That(rootTreeNode.Nodes[0].Tag, Is.EqualTo(folder1)); - Assert.That(rootTreeNode.Nodes[0].Nodes[0].Tag, Is.EqualTo(con1)); - Assert.That(rootTreeNode.Nodes[1].Tag, Is.EqualTo(folder2)); - } - - [Test] - public void BuildTreeWithConnectionNestedTwoLevelsDeep() - { - /** - * Root - * -- folder1 - * ---- folder2 - * ------ con1 - */ - var root = CreateRootNode(); - var folder1 = new ContainerInfo(); - var folder2 = new ContainerInfo(); - var con1 = new ConnectionInfo(); - root.AddChild(folder1); - folder1.AddChild(folder2); - folder2.AddChild(con1); - _connectionTreeViewBuilder.Build(); - var rootTreeNode = _connectionTreeViewBuilder.RootNode; - Assert.That(rootTreeNode.Nodes[0].Nodes[0].Nodes[0].Tag, Is.EqualTo(con1)); - } - - [Test] - public void BuildTreeWithMultipleDeepRecursion() - { - /** - * Root - * -- folder1 - * ---- folder2 - * ------ con1 - * -- folder3 - * ---- folder4 - * ------ con2 - */ - var root = CreateRootNode(); - var folder1 = new ContainerInfo(); - var folder2 = new ContainerInfo(); - var con1 = new ConnectionInfo(); - var folder3 = new ContainerInfo(); - var folder4 = new ContainerInfo(); - var con2 = new ConnectionInfo(); - root.AddChild(folder1); - folder1.AddChild(folder2); - folder2.AddChild(con1); - root.AddChild(folder3); - folder3.AddChild(folder4); - folder4.AddChild(con2); - _connectionTreeViewBuilder.Build(); - var rootTreeNode = _connectionTreeViewBuilder.RootNode; - Assert.That(rootTreeNode.Nodes[0].Nodes[0].Nodes[0].Tag, Is.EqualTo(con1)); - Assert.That(rootTreeNode.Nodes[1].Nodes[0].Nodes[0].Tag, Is.EqualTo(con2)); - } - - private IEnumerable GetTreeNodeTags(TreeNodeCollection treeNodes) - { - return (from TreeNode node in treeNodes select (ConnectionInfo) node.Tag).ToList(); - } - - private RootNodeInfo CreateRootNode() - { - var root = new RootNodeInfo(RootNodeType.Connection); - _connectionTreeModel.AddRootNode(root); - return root; - } - } -} \ No newline at end of file diff --git a/mRemoteNGTests/mRemoteNGTests.csproj b/mRemoteNGTests/mRemoteNGTests.csproj index d1910f750..8a07545b9 100644 --- a/mRemoteNGTests/mRemoteNGTests.csproj +++ b/mRemoteNGTests/mRemoteNGTests.csproj @@ -136,7 +136,6 @@ - Form diff --git a/mRemoteV1/Tree/TreeImageType.cs b/mRemoteV1/Tree/TreeImageType.cs deleted file mode 100644 index 19beba369..000000000 --- a/mRemoteV1/Tree/TreeImageType.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace mRemoteNG.Tree -{ - public enum TreeImageType - { - Root = 0, - Container = 1, - ConnectionOpen = 2, - ConnectionClosed = 3, - PuttySessions = 4 - } -} \ No newline at end of file diff --git a/mRemoteV1/UI/ConnectionTreeViewBuilder.cs b/mRemoteV1/UI/ConnectionTreeViewBuilder.cs deleted file mode 100644 index 60f21e7f7..000000000 --- a/mRemoteV1/UI/ConnectionTreeViewBuilder.cs +++ /dev/null @@ -1,88 +0,0 @@ -using System.Linq; -using System.Windows.Forms; -using mRemoteNG.Connection; -using mRemoteNG.Container; -using mRemoteNG.Tree; -using mRemoteNG.Tree.Root; - - -namespace mRemoteNG.UI -{ - public class ConnectionTreeViewBuilder - { - private readonly ConnectionTreeModel _connectionTreeModel; - - public TreeNode RootNode { get; private set; } - public ConnectionList ConnectionList { get; set; } - public ContainerList ContainerList { get; set; } - - public ConnectionTreeViewBuilder(ConnectionTreeModel connectionTreeModel) - { - _connectionTreeModel = connectionTreeModel; - ConnectionList = new ConnectionList(); - ContainerList = new ContainerList(); - } - - public void AppendTo(TreeView foreignTreeView) - { - foreignTreeView.BeginUpdate(); - foreignTreeView.Nodes.Add(RootNode); - foreignTreeView.EndUpdate(); - } - - public void Build() - { - var rootNodeInfo = _connectionTreeModel.RootNodes.First(a => a is RootNodeInfo); - InitRootNode((RootNodeInfo)rootNodeInfo); - BuildTreeViewFromConnectionTree(rootNodeInfo, RootNode); - } - - private void InitRootNode(RootNodeInfo rootNodeInfo) - { - RootNode = new TreeNode(rootNodeInfo.Name) - { - Name = rootNodeInfo.Name, - Tag = rootNodeInfo - }; - RootNode.Expand(); - } - - private void BuildTreeViewFromConnectionTree(ContainerInfo parentContainer, TreeNode parentTreeNode) - { - if (!parentContainer.Children.Any()) return; - foreach (var child in parentContainer.Children) - { - var treeNode = new TreeNode(child.Name) {Name = child.Name}; - parentTreeNode.Nodes.Add(treeNode); - - if (child is ContainerInfo) - { - AddContainerToList((ContainerInfo) child, treeNode); - BuildTreeViewFromConnectionTree((ContainerInfo)child, treeNode); - } - else - { - AddConnectionToList(child, treeNode); - } - } - } - - private void AddConnectionToList(ConnectionInfo connectionInfo, TreeNode treeNode) - { - connectionInfo.TreeNode = treeNode; - ConnectionList.Add(connectionInfo); - treeNode.Tag = connectionInfo; - treeNode.ImageIndex = (int)TreeImageType.ConnectionClosed; - treeNode.SelectedImageIndex = (int)TreeImageType.ConnectionClosed; - } - - private void AddContainerToList(ContainerInfo containerInfo, TreeNode treeNode) - { - containerInfo.TreeNode = treeNode; - ContainerList.Add(containerInfo); - treeNode.Tag = containerInfo; - treeNode.ImageIndex = (int)TreeImageType.Container; - treeNode.SelectedImageIndex = (int)TreeImageType.Container; - } - } -} \ No newline at end of file diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj index 3e5b37955..f92cb1e8d 100644 --- a/mRemoteV1/mRemoteV1.csproj +++ b/mRemoteV1/mRemoteV1.csproj @@ -208,7 +208,6 @@ - Component @@ -348,7 +347,6 @@ Form - True True