X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/f63f3a5360ae6381d4b332bf86ef52b4e22107fb..eabdb7bdd468b09c633ddb8b33fd8095ad27bb60:/src/models/tree.test.ts

diff --git a/src/models/tree.test.ts b/src/models/tree.test.ts
index 375a0120..3c7fdca9 100644
--- a/src/models/tree.test.ts
+++ b/src/models/tree.test.ts
@@ -3,6 +3,8 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as Tree from './tree';
+import { initTreeNode } from './tree';
+import { pipe } from 'lodash/fp';
 
 describe('Tree', () => {
     let tree: Tree.Tree<string>;
@@ -12,77 +14,89 @@ describe('Tree', () => {
     });
 
     it('sets new node', () => {
-        const newTree = Tree.setNode({ children: [], id: 'Node 1', parent: '', value: 'Value 1' })(tree);
-        expect(Tree.getNode('Node 1')(newTree)).toEqual({ children: [], id: 'Node 1', parent: '', value: 'Value 1' });
+        const newTree = Tree.setNode(initTreeNode({ id: 'Node 1', value: 'Value 1' }))(tree);
+        expect(Tree.getNode('Node 1')(newTree)).toEqual(initTreeNode({ id: 'Node 1', value: 'Value 1' }));
+    });
+
+    it('appends a subtree', () => {
+        const newTree = Tree.setNode(initTreeNode({ id: 'Node 1', value: 'Value 1' }))(tree);
+        const subtree = Tree.setNode(initTreeNode({ id: 'Node 2', value: 'Value 2' }))(Tree.createTree());
+        const mergedTree = Tree.appendSubtree('Node 1', subtree)(newTree);
+        expect(Tree.getNode('Node 1')(mergedTree)).toBeDefined();
+        expect(Tree.getNode('Node 2')(mergedTree)).toBeDefined();
     });
 
     it('adds new node reference to parent children', () => {
-        const [newTree] = [tree]
-            .map(Tree.setNode({ children: [], id: 'Node 1', parent: '', value: 'Value 1' }))
-            .map(Tree.setNode({ children: [], id: 'Node 2', parent: 'Node 1', value: 'Value 2' }));
+        const newTree = pipe(
+            Tree.setNode(initTreeNode({ id: 'Node 1', parent: '', value: 'Value 1' })),
+            Tree.setNode(initTreeNode({ id: 'Node 2', parent: 'Node 1', value: 'Value 2' })),
+        )(tree);
 
-        expect(Tree.getNode('Node 1')(newTree)).toEqual({ children: ['Node 2'], id: 'Node 1', parent: '', value: 'Value 1' });
+        expect(Tree.getNode('Node 1')(newTree)).toEqual({
+            ...initTreeNode({ id: 'Node 1', parent: '', value: 'Value 1' }),
+            children: ['Node 2']
+        });
     });
 
     it('gets node ancestors', () => {
         const newTree = [
-            { children: [], id: 'Node 1', parent: '', value: 'Value 1' },
-            { children: [], id: 'Node 2', parent: 'Node 1', value: 'Value 1' },
-            { children: [], id: 'Node 3', parent: 'Node 2', value: 'Value 1' }
+            initTreeNode({ id: 'Node 1', parent: '', value: 'Value 1' }),
+            initTreeNode({ id: 'Node 2', parent: 'Node 1', value: 'Value 1' }),
+            initTreeNode({ id: 'Node 3', parent: 'Node 2', value: 'Value 1' }),
         ].reduce((tree, node) => Tree.setNode(node)(tree), tree);
         expect(Tree.getNodeAncestorsIds('Node 3')(newTree)).toEqual(['Node 1', 'Node 2']);
     });
 
     it('gets node descendants', () => {
         const newTree = [
-            { children: [], id: 'Node 1', parent: '', value: 'Value 1' },
-            { children: [], id: 'Node 2', parent: 'Node 1', value: 'Value 1' },
-            { children: [], id: 'Node 2.1', parent: 'Node 2', value: 'Value 1' },
-            { children: [], id: 'Node 3', parent: 'Node 1', value: 'Value 1' },
-            { children: [], id: 'Node 3.1', parent: 'Node 3', value: 'Value 1' }
+            initTreeNode({ id: 'Node 1', parent: '', value: 'Value 1' }),
+            initTreeNode({ id: 'Node 2', parent: 'Node 1', value: 'Value 1' }),
+            initTreeNode({ id: 'Node 2.1', parent: 'Node 2', value: 'Value 1' }),
+            initTreeNode({ id: 'Node 3', parent: 'Node 1', value: 'Value 1' }),
+            initTreeNode({ id: 'Node 3.1', parent: 'Node 3', value: 'Value 1' }),
         ].reduce((tree, node) => Tree.setNode(node)(tree), tree);
         expect(Tree.getNodeDescendantsIds('Node 1')(newTree)).toEqual(['Node 2', 'Node 3', 'Node 2.1', 'Node 3.1']);
     });
 
     it('gets root descendants', () => {
         const newTree = [
-            { children: [], id: 'Node 1', parent: '', value: 'Value 1' },
-            { children: [], id: 'Node 2', parent: 'Node 1', value: 'Value 1' },
-            { children: [], id: 'Node 2.1', parent: 'Node 2', value: 'Value 1' },
-            { children: [], id: 'Node 3', parent: 'Node 1', value: 'Value 1' },
-            { children: [], id: 'Node 3.1', parent: 'Node 3', value: 'Value 1' }
+            initTreeNode({ id: 'Node 1', parent: '', value: 'Value 1' }),
+            initTreeNode({ id: 'Node 2', parent: 'Node 1', value: 'Value 1' }),
+            initTreeNode({ id: 'Node 2.1', parent: 'Node 2', value: 'Value 1' }),
+            initTreeNode({ id: 'Node 3', parent: 'Node 1', value: 'Value 1' }),
+            initTreeNode({ id: 'Node 3.1', parent: 'Node 3', value: 'Value 1' }),
         ].reduce((tree, node) => Tree.setNode(node)(tree), tree);
         expect(Tree.getNodeDescendantsIds('')(newTree)).toEqual(['Node 1', 'Node 2', 'Node 3', 'Node 2.1', 'Node 3.1']);
     });
 
     it('gets node children', () => {
         const newTree = [
-            { children: [], id: 'Node 1', parent: '', value: 'Value 1' },
-            { children: [], id: 'Node 2', parent: 'Node 1', value: 'Value 1' },
-            { children: [], id: 'Node 2.1', parent: 'Node 2', value: 'Value 1' },
-            { children: [], id: 'Node 3', parent: 'Node 1', value: 'Value 1' },
-            { children: [], id: 'Node 3.1', parent: 'Node 3', value: 'Value 1' }
+            initTreeNode({ id: 'Node 1', parent: '', value: 'Value 1' }),
+            initTreeNode({ id: 'Node 2', parent: 'Node 1', value: 'Value 1' }),
+            initTreeNode({ id: 'Node 2.1', parent: 'Node 2', value: 'Value 1' }),
+            initTreeNode({ id: 'Node 3', parent: 'Node 1', value: 'Value 1' }),
+            initTreeNode({ id: 'Node 3.1', parent: 'Node 3', value: 'Value 1' }),
         ].reduce((tree, node) => Tree.setNode(node)(tree), tree);
         expect(Tree.getNodeChildrenIds('Node 1')(newTree)).toEqual(['Node 2', 'Node 3']);
     });
 
     it('gets root children', () => {
         const newTree = [
-            { children: [], id: 'Node 1', parent: '', value: 'Value 1' },
-            { children: [], id: 'Node 2', parent: 'Node 1', value: 'Value 1' },
-            { children: [], id: 'Node 2.1', parent: 'Node 2', value: 'Value 1' },
-            { children: [], id: 'Node 3', parent: '', value: 'Value 1' },
-            { children: [], id: 'Node 3.1', parent: 'Node 3', value: 'Value 1' }
+            initTreeNode({ id: 'Node 1', parent: '', value: 'Value 1' }),
+            initTreeNode({ id: 'Node 2', parent: 'Node 1', value: 'Value 1' }),
+            initTreeNode({ id: 'Node 2.1', parent: 'Node 2', value: 'Value 1' }),
+            initTreeNode({ id: 'Node 3', parent: '', value: 'Value 1' }),
+            initTreeNode({ id: 'Node 3.1', parent: 'Node 3', value: 'Value 1' }),
         ].reduce((tree, node) => Tree.setNode(node)(tree), tree);
         expect(Tree.getNodeChildrenIds('')(newTree)).toEqual(['Node 1', 'Node 3']);
     });
 
     it('maps tree', () => {
         const newTree = [
-            { children: [], id: 'Node 1', parent: '', value: 'Value 1' },
-            { children: [], id: 'Node 2', parent: 'Node 1', value: 'Value 2' },
+            initTreeNode({ id: 'Node 1', parent: '', value: 'Value 1' }),
+            initTreeNode({ id: 'Node 2', parent: 'Node 1', value: 'Value 2' }),
         ].reduce((tree, node) => Tree.setNode(node)(tree), tree);
         const mappedTree = Tree.mapTreeValues<string, number>(value => parseInt(value.split(' ')[1], 10))(newTree);
-        expect(Tree.getNode('Node 2')(mappedTree)).toEqual({ children: [], id: 'Node 2', parent: 'Node 1', value: 2 }, );
+        expect(Tree.getNode('Node 2')(mappedTree)).toEqual(initTreeNode({ id: 'Node 2', parent: 'Node 1', value: 2 }));
     });
-});
\ No newline at end of file
+});