data-structure-typed 1.52.4 → 1.52.6

package/test/unit/data-structures/binary-tree/binary-tree.test.ts

@@ -1,4 +1,4 @@
-import { BinaryTree, BinaryTreeNode } from '../../../../src';
+import { BinaryTree, BinaryTreeNode, BTNEntry } from '../../../../src';
 import { getRandomIntArray } from '../../../utils';
 // import { isDebugTest } from '../../../config';
 
@@ -86,6 +86,27 @@ describe('BinaryTreeNode', () => {
   });
 });
 
+describe('BinaryTree addMany', () => {
+  it('should addMany', () => {
+    const tree = new BinaryTree<number, number, { id: number; name: number }>([], {
+      toEntryFn: ({ id, name }) => [id, name]
+    });
+    tree.addMany(
+      [
+        { id: 1, name: 1 },
+        { id: 2, name: 2 },
+        { id: 4, name: 4 },
+        { id: 3, name: 3 }
+      ],
+      [undefined, 22, 44, 33]
+    );
+    expect(tree.getNodeByKey(2)?.value).toBe(22);
+    expect(tree.getNodeByKey(3)?.value).toBe(33);
+    expect(tree.getNodeByKey(4)?.value).toBe(44);
+    expect(tree.getNodeByKey(1)?.value).toBe(1);
+  });
+});
+
 describe('BinaryTree', () => {
   let tree: BinaryTree<number>;
 
@@ -258,15 +279,6 @@ describe('BinaryTree', () => {
     expect(inOrder).toEqual([1, 2, 3, 4, 5, 6, 7]);
   });
 
-  it('should getLeftMost', () => {
-    tree.addMany([4, 2, 6, 1, 3, 5, 7]);
-
-    const leftMost = tree.getLeftMost(tree.root, 'RECURSIVE');
-    expect(leftMost?.key).toEqual(1);
-    const rightMost = tree.getRightMost(tree.root, 'RECURSIVE');
-    expect(rightMost?.key).toEqual(7);
-  });
-
   it('should isSubtreeBST', () => {
     tree.addMany([
       new BinaryTreeNode(4, 4),
@@ -285,36 +297,359 @@ describe('BinaryTree', () => {
 
   it('should isSubtreeBST', () => {
     tree.addMany([4, 2, 6, 1, 3, 5, 7, 4]);
+    expect(tree.print()).toBe(
+      '    ___4___    \n' +
+        '   /       \\   \n' +
+        '  _2_     _6_  \n' +
+        ' /   \\   /   \\ \n' +
+        ' 1   3   5   7 \n' +
+        '               \n'
+    );
 
     expect(tree.isBST(tree.getNode(4), 'RECURSIVE')).toBe(true);
     expect(tree.isBST(tree.getNode(4), 'ITERATIVE')).toBe(true);
     expect(tree.getNodes(2, undefined, false, null)).toEqual([]);
+    expect(tree.getNodes(undefined)).toEqual([]);
     expect(tree.getNodes(tree.getNodeByKey(2), undefined, false, tree.root)).toEqual([tree.getNodeByKey(2)]);
   });
 
+  describe('should isKey', () => {
+    describe('primitive types', () => {
+      it('numbers should be a key', () => {
+        expect(tree.isKey(42)).toBe(true);
+        expect(tree.isKey(0)).toBe(true);
+        expect(tree.isKey(-1)).toBe(true);
+        expect(tree.isKey(Infinity)).toBe(true);
+        expect(tree.isKey(-Infinity)).toBe(true);
+      });
+
+      it('NaN should not be a key', () => {
+        expect(tree.isKey(NaN)).toBe(false);
+      });
+
+      it('strings should be a key', () => {
+        expect(tree.isKey('hello')).toBe(true);
+        expect(tree.isKey('')).toBe(true);
+        expect(tree.isKey('123')).toBe(true);
+      });
+
+      it('BigInt should be a key', () => {
+        expect(tree.isKey(BigInt(42))).toBe(true);
+        expect(tree.isKey(BigInt(0))).toBe(true);
+        expect(tree.isKey(BigInt(-1))).toBe(true);
+      });
+
+      it('boolean should not be a key', () => {
+        expect(tree.isKey(true)).toBe(true);
+        expect(tree.isKey(false)).toBe(true);
+      });
+
+      it('null and undefined should not be a key', () => {
+        expect(tree.isKey(null)).toBe(true);
+        expect(tree.isKey(undefined)).toBe(false);
+      });
+
+      it('symbols should not be a key', () => {
+        expect(tree.isKey(Symbol('test'))).toBe(false);
+        expect(tree.isKey(Symbol.for('test'))).toBe(false);
+      });
+    });
+
+    describe('Date objects', () => {
+      it('valid Date objects should be a key', () => {
+        expect(tree.isKey(new Date())).toBe(true);
+        expect(tree.isKey(new Date('2024-01-01'))).toBe(true);
+      });
+
+      it('invalid Date objects should not be a key', () => {
+        expect(tree.isKey(new Date('invalid'))).toBe(false);
+      });
+    });
+
+    describe('arrays', () => {
+      it('arrays should be a key as they convert to string', () => {
+        expect(tree.isKey([])).toBe(true);
+        expect(tree.isKey([1, 2, 3])).toBe(true);
+        expect(tree.isKey(['a', 'b', 'c'])).toBe(true);
+      });
+    });
+
+    describe('plain objects', () => {
+      it('plain objects should not be a key', () => {
+        expect(tree.isKey({})).toBe(false);
+        expect(tree.isKey({ a: 1 })).toBe(false);
+      });
+    });
+
+    describe('custom objects', () => {
+      it('objects with numeric valueOf should be a key', () => {
+        expect(tree.isKey({ valueOf: () => 42 })).toBe(true);
+      });
+
+      it('objects with string valueOf should be a key', () => {
+        expect(tree.isKey({ valueOf: () => 'test' })).toBe(true);
+      });
+
+      it('objects with boolean valueOf should not be a key', () => {
+        expect(tree.isKey({ valueOf: () => true })).toBe(true);
+      });
+
+      it('objects with nested valueOf/toString should be a key', () => {
+        expect(
+          tree.isKey({
+            valueOf: () => ({ toString: () => '42' })
+          })
+        ).toBe(true);
+      });
+    });
+
+    describe('deeply nested objects', () => {
+      it('objects with deeply nested valueOf should be a key', () => {
+        const deeplyNested = {
+          valueOf: () => ({
+            valueOf: () => 42
+          })
+        };
+        expect(tree.isKey(deeplyNested)).toBe(true);
+      });
+
+      it('objects with very deeply nested conversion should be a key', () => {
+        const veryDeeplyNested = {
+          valueOf: () => ({
+            valueOf: () => ({
+              toString: () => '42'
+            })
+          })
+        };
+        expect(tree.isKey(veryDeeplyNested)).toBe(true);
+      });
+
+      it('objects with circular references should not be a key', () => {
+        const circular: any = {
+          valueOf: () => circular
+        };
+        expect(tree.isKey(circular)).toBe(false);
+      });
+    });
+
+    describe('edge cases', () => {
+      it('objects returning non-primitive values should be handled correctly', () => {
+        const complexObject = {
+          valueOf: () => ({
+            toString: () => ({
+              valueOf: () => 'valid'
+            })
+          })
+        };
+        expect(tree.isKey(complexObject)).toBe(false);
+      });
+
+      it('objects returning primitive values should be handled correctly', () => {
+        const complexObject = {
+          valueOf: () => ({
+            valueOf: () => ({
+              valueOf: () => ({
+                valueOf: () => ({
+                  toString: () => `{
+                                   valueOf: () => 'valid'
+                                 }`
+                })
+              })
+            })
+          })
+        };
+        expect(tree.isKey(complexObject)).toBe(true);
+      });
+    });
+
+    describe('type checking', () => {
+      it('should work with type guard in array methods', () => {
+        const values: unknown[] = [42, 'test', true, null, undefined, new Date()];
+        const comparableValues = values.filter(item => tree.isKey(item));
+        expect(comparableValues.length).toBe(5);
+      });
+    });
+  });
+
+  it('should isLeaf', () => {
+    tree.addMany([4, 2, 6, 1, 3, 5, 7, 4]);
+    const leftMost = tree.getLeftMost();
+    expect(tree.isLeaf(leftMost)).toBe(true);
+    expect(tree.isLeaf(null)).toBe(true);
+  });
+
+  it('should tree traverse', () => {
+    tree.addMany([4, 2, 6, null, 1, 3, null, 5, null, 7]);
+    expect(tree.dfs(node => node.key, 'PRE', undefined, 'ITERATIVE')).toEqual([4, 2, 1, 5, 6, 3, 7]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'PRE', undefined, 'ITERATIVE', false)).toEqual([
+      4, 2, 1, 5, 6, 3, 7
+    ]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'PRE', undefined, 'ITERATIVE', true)).toEqual([
+      4,
+      2,
+      null,
+      1,
+      5,
+      null,
+      6,
+      3,
+      7,
+      null
+    ]);
+
+    expect(tree.dfs(node => node.key, 'PRE', undefined, 'RECURSIVE')).toEqual([4, 2, 1, 5, 6, 3, 7]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'PRE', undefined, 'RECURSIVE', false)).toEqual([
+      4, 2, 1, 5, 6, 3, 7
+    ]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'PRE', undefined, 'RECURSIVE', true)).toEqual([
+      4,
+      2,
+      null,
+      1,
+      5,
+      null,
+      6,
+      3,
+      7,
+      null
+    ]);
+
+    expect(tree.dfs(node => node.key, 'IN', undefined, 'ITERATIVE')).toEqual([2, 5, 1, 4, 7, 3, 6]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'IN', undefined, 'ITERATIVE', false)).toEqual([
+      2, 5, 1, 4, 7, 3, 6
+    ]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'IN', undefined, 'ITERATIVE', true)).toEqual([
+      null,
+      2,
+      5,
+      1,
+      null,
+      4,
+      7,
+      3,
+      6,
+      null
+    ]);
+
+    expect(tree.dfs(node => node.key, 'IN', undefined, 'RECURSIVE')).toEqual([2, 5, 1, 4, 7, 3, 6]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'IN', undefined, 'RECURSIVE', false)).toEqual([
+      2, 5, 1, 4, 7, 3, 6
+    ]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'IN', undefined, 'RECURSIVE', true)).toEqual([
+      null,
+      2,
+      5,
+      1,
+      null,
+      4,
+      7,
+      3,
+      6,
+      null
+    ]);
+
+    expect(tree.dfs(node => node.key, 'POST', undefined, 'ITERATIVE')).toEqual([5, 1, 2, 7, 3, 6, 4]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'POST', undefined, 'ITERATIVE', false)).toEqual([
+      5, 1, 2, 7, 3, 6, 4
+    ]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'POST', undefined, 'ITERATIVE', true)).toEqual([
+      null,
+      5,
+      null,
+      1,
+      2,
+      7,
+      3,
+      null,
+      6,
+      4
+    ]);
+
+    expect(tree.dfs(node => node.key, 'POST', undefined, 'RECURSIVE')).toEqual([5, 1, 2, 7, 3, 6, 4]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'POST', undefined, 'RECURSIVE', false)).toEqual([
+      5, 1, 2, 7, 3, 6, 4
+    ]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'POST', undefined, 'RECURSIVE', true)).toEqual([
+      null,
+      5,
+      null,
+      1,
+      2,
+      7,
+      3,
+      null,
+      6,
+      4
+    ]);
+  });
+
   it('should sub tree traverse', () => {
     tree.addMany([4, 2, 6, null, 1, 3, null, 5, null, 7]);
     expect(tree.dfs(node => node.key, 'PRE', tree.getNode(6), 'ITERATIVE')).toEqual([6, 3, 7]);
-    expect(tree.dfs(node => node.key, 'PRE', tree.getNode(6), 'ITERATIVE', false)).toEqual([6, 3, 7]);
-    expect(tree.dfs(node => node.key, 'PRE', tree.getNode(6), 'RECURSIVE')).toEqual([6, 3, 7]);
-    expect(tree.dfs(node => (node ? node.key : null), 'PRE', tree.getNode(6), 'ITERATIVE', true)).toEqual([
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'PRE', tree.getNode(6), 'ITERATIVE', false)).toEqual([
+      6, 3, 7
+    ]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'PRE', tree.getNode(6), 'ITERATIVE', true)).toEqual([
       6,
       3,
       7,
       null
     ]);
-    expect(tree.dfs(node => (node ? node.key : node), 'PRE', tree.getNode(6), 'ITERATIVE', true)).toEqual([
+
+    expect(tree.dfs(node => node.key, 'PRE', tree.getNode(6), 'RECURSIVE')).toEqual([6, 3, 7]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'PRE', tree.getNode(6), 'RECURSIVE', false)).toEqual([
+      6, 3, 7
+    ]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'PRE', tree.getNode(6), 'RECURSIVE', true)).toEqual([
       6,
       3,
       7,
       null
     ]);
-    expect(tree.dfs(node => (node ? node.key : null), 'PRE', tree.getNode(6), 'RECURSIVE', true)).toEqual([
-      6,
+
+    expect(tree.dfs(node => node.key, 'IN', tree.getNode(6), 'ITERATIVE')).toEqual([7, 3, 6]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'IN', tree.getNode(6), 'ITERATIVE', false)).toEqual([
+      7, 3, 6
+    ]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'IN', tree.getNode(6), 'ITERATIVE', true)).toEqual([
+      7,
       3,
+      6,
+      null
+    ]);
+
+    expect(tree.dfs(node => node.key, 'IN', tree.getNode(6), 'RECURSIVE')).toEqual([7, 3, 6]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'IN', tree.getNode(6), 'RECURSIVE', false)).toEqual([
+      7, 3, 6
+    ]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'IN', tree.getNode(6), 'RECURSIVE', true)).toEqual([
       7,
+      3,
+      6,
       null
     ]);
+
+    expect(tree.dfs(node => node.key, 'POST', tree.getNode(6), 'ITERATIVE')).toEqual([7, 3, 6]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'POST', tree.getNode(6), 'ITERATIVE', false)).toEqual([
+      7, 3, 6
+    ]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'POST', tree.getNode(6), 'ITERATIVE', true)).toEqual([
+      7,
+      3,
+      null,
+      6
+    ]);
+
+    expect(tree.dfs(node => node.key, 'POST', tree.getNode(6), 'RECURSIVE')).toEqual([7, 3, 6]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'POST', tree.getNode(6), 'RECURSIVE', false)).toEqual([
+      7, 3, 6
+    ]);
+    expect(tree.dfs(node => (node !== null ? node.key : null), 'POST', tree.getNode(6), 'RECURSIVE', true)).toEqual([
+      7,
+      3,
+      null,
+      6
+    ]);
   });
 
   it('should clear the tree', () => {
@@ -350,6 +685,56 @@ describe('BinaryTree', () => {
       null
     ]);
   });
+
+  it('should keyValueOrEntryOrRawElementToNode', () => {
+    const tree = new BinaryTree<number>();
+    const node0 = tree.keyValueOrEntryOrRawElementToNode(0);
+    expect(node0).toEqual({
+      _left: undefined,
+      _right: undefined,
+      key: 0,
+      parent: undefined,
+      value: undefined
+    });
+
+    const nodeUndefined = tree.keyValueOrEntryOrRawElementToNode(undefined);
+    expect(nodeUndefined).toBe(undefined);
+
+    const nodeNull = tree.keyValueOrEntryOrRawElementToNode(null);
+    expect(nodeNull).toBe(null);
+
+    const nodeWithSeparateValue = tree.keyValueOrEntryOrRawElementToNode(7, 77);
+    expect(nodeWithSeparateValue?.value).toBe(77);
+
+    expect(tree.keyValueOrEntryOrRawElementToNode([undefined, 2])).toBe(undefined);
+
+    expect(tree.keyValueOrEntryOrRawElementToNode(Symbol('test') as unknown as number)).toBe(undefined);
+
+    const bTree = new BinaryTree<number, number, { obj: { id: number } }>([], {
+      toEntryFn: (ele: { obj: { id: number } }) => [Symbol('test') as unknown as number, ele.obj.id]
+    });
+    expect(bTree.keyValueOrEntryOrRawElementToNode({ obj: { id: 1 } })).toBe(undefined);
+  });
+});
+
+describe('BinaryTree ensureNode', () => {
+  it('should ensureNode with toEntryFn', () => {
+    const tree = new BinaryTree<
+      number,
+      string,
+      {
+        id: number;
+        name: string;
+      }
+    >([], { toEntryFn: rawElement => [rawElement.id, rawElement.name] });
+    tree.add({ id: 1, name: 'Pablo' });
+    const node = tree.getNode(1);
+    expect(tree.ensureNode({ id: 1, name: 'Pablo' })).toBe(node);
+    expect(tree.ensureNode([1, 'Pablo'])).toBe(node);
+    expect(tree.ensureNode([null, 'Pablo'])).toBe(null);
+    expect(tree.ensureNode([undefined, 'Pablo'])).toBe(undefined);
+    expect(tree.ensureNode(Symbol('test') as unknown as number)).toBe(undefined);
+  });
 });
 
 describe('BinaryTree Morris Traversal', () => {
@@ -404,25 +789,35 @@ describe('BinaryTree Morris Traversal', () => {
 });
 
 describe('BinaryTree toEntryFn', () => {
-  it('should toEntryFn 1', () => {
-    const tree = new BinaryTree<number, number, { obj: { id: number } }>([], {
+  it('should toEntryFn throw', () => {
+    expect(() => {
+      new BinaryTree<number, number, { obj: { id: number } }>([], {
+        toEntryFn: `ele => [ele.obj.id, ele.obj.id]` as unknown as (rawElement: {
+          obj: { id: number };
+        }) => BTNEntry<number, number>
+      });
+    }).toThrow('toEntryFn must be a function type');
+  });
+
+  it('should toEntryFn with add', () => {
+    const binTree = new BinaryTree<number, number, { obj: { id: number } }>([], {
       toEntryFn: ele => [ele.obj.id, ele.obj.id]
     });
-    tree.add({ obj: { id: 1 } });
-    tree.add({ obj: { id: 2 } });
-    tree.add({ obj: { id: 3 } });
-    tree.add({ obj: { id: 4 } });
-    tree.add({ obj: { id: 5 } });
+    binTree.add({ obj: { id: 1 } });
+    binTree.add({ obj: { id: 2 } });
+    binTree.add({ obj: { id: 3 } });
+    binTree.add({ obj: { id: 4 } });
+    binTree.add({ obj: { id: 5 } });
 
     const expected = [4, 2, 5, 1, 3];
 
-    expect(tree.morris(node => node.key, 'IN')).toEqual(expected);
-    expect(tree.dfs(node => node.key, 'IN')).toEqual(expected);
-    expect(tree.dfs(node => node.key, 'IN', tree.root, 'RECURSIVE')).toEqual(expected);
+    expect(binTree.morris(node => node.key, 'IN')).toEqual(expected);
+    expect(binTree.dfs(node => node.key, 'IN')).toEqual(expected);
+    expect(binTree.dfs(node => node.key, 'IN', binTree.root, 'RECURSIVE')).toEqual(expected);
   });
 
-  it('should toEntryFn 2', () => {
-    const tree = new BinaryTree<number, number, { obj: { id: number } }>(
+  it('should toEntryFn with initial', () => {
+    const binTree = new BinaryTree<number, number, { obj: { id: number } }>(
       [{ obj: { id: 1 } }, { obj: { id: 2 } }, { obj: { id: 3 } }, { obj: { id: 4 } }, { obj: { id: 5 } }],
       {
         toEntryFn: ele => [ele.obj.id, ele.obj.id]
@@ -431,139 +826,135 @@ describe('BinaryTree toEntryFn', () => {
 
     const expected = [4, 2, 5, 1, 3];
 
-    expect(tree.morris(node => node.key, 'IN')).toEqual(expected);
-    expect(tree.dfs(node => node.key, 'IN')).toEqual(expected);
-    expect(tree.dfs(node => node.key, 'IN', tree.root, 'RECURSIVE')).toEqual(expected);
+    expect(binTree.morris(node => node.key, 'IN')).toEqual(expected);
+    expect(binTree.dfs(node => node.key, 'IN')).toEqual(expected);
+    expect(binTree.dfs(node => node.key, 'IN', binTree.root, 'RECURSIVE')).toEqual(expected);
   });
 
-  it('should toEntryFn 3', () => {
-    const tree = new BinaryTree<{ obj: { id: number } }, number>([
-      { obj: { id: 1 } },
-      { obj: { id: 2 } },
-      { obj: { id: 3 } },
-      { obj: { id: 4 } },
-      { obj: { id: 5 } }
-    ]);
-
-    const expected = [
-      { obj: { id: 4 } },
-      { obj: { id: 2 } },
-      { obj: { id: 5 } },
-      { obj: { id: 1 } },
-      { obj: { id: 3 } }
+  it('should no toEntryFn', () => {
+    const data = [
+      { obj: { id: 4 }, valueOf: () => 4 },
+      { obj: { id: 2 }, valueOf: () => 2 },
+      { obj: { id: 5 }, valueOf: () => 5 },
+      { obj: { id: 1 }, valueOf: () => 1 },
+      { obj: { id: 3 }, valueOf: () => 3 }
     ];
+    const tree = new BinaryTree<{ obj: { id: number }; valueOf: () => number }, number>(data);
 
-    expect(tree.morris(node => node.key, 'IN')).toEqual(expected);
-    expect(tree.dfs(node => node.key, 'IN')).toEqual(expected);
-    expect(tree.dfs(node => node.key, 'IN', tree.root, 'RECURSIVE')).toEqual(expected);
+    expect(tree.morris(node => node.key, 'IN')).toEqual(data.sort((a, b) => a.obj.id - b.obj.id));
+    expect(tree.dfs(node => node.key, 'IN')).toEqual(data);
+    expect(tree.dfs(node => node.key, 'IN', tree.root, 'RECURSIVE')).toEqual(data);
   });
 });
 
 describe('BinaryTree traversals', () => {
-  const tree = new BinaryTree<number>();
+  it('traversals', () => {
+    const tree = new BinaryTree<number>();
+
+    const arr = [35, 20, 40, 15, 29, null, 50, null, 16, 28, 30, 45, 55];
+    tree.refill(arr);
+    expect(tree.bfs(node => node, tree.root, 'ITERATIVE', true).map(node => (node ? node.key : null))).toEqual([
+      35,
+      20,
+      40,
+      15,
+      29,
+      null,
+      50,
+      null,
+      16,
+      28,
+      30,
+      45,
+      55
+    ]);
+    expect(tree.bfs(node => node, tree.root, 'RECURSIVE', true).map(node => (node ? node.key : null))).toEqual([
+      35,
+      20,
+      40,
+      15,
+      29,
+      null,
+      50,
+      null,
+      16,
+      28,
+      30,
+      45,
+      55
+    ]);
+    expect(tree.bfs(node => node, tree.root, 'ITERATIVE').map(node => (node === null ? null : node.key))).toEqual([
+      35, 20, 40, 15, 29, 50, 16, 28, 30, 45, 55
+    ]);
+    expect(tree.bfs(node => node, tree.root, 'RECURSIVE').map(node => (node === null ? null : node.key))).toEqual([
+      35, 20, 40, 15, 29, 50, 16, 28, 30, 45, 55
+    ]);
+
+    expect(tree.dfs(node => node.key, 'PRE')).toEqual([35, 20, 15, 16, 29, 28, 30, 40, 50, 45, 55]);
+    expect(tree.dfs(node => node.key, 'PRE', tree.root, 'RECURSIVE')).toEqual([
+      35, 20, 15, 16, 29, 28, 30, 40, 50, 45, 55
+    ]);
+    expect(tree.dfs(node => node, 'PRE', tree.root, 'ITERATIVE', true).map(node => (node === null ? null : node.key))).toEqual([
+      35,
+      20,
+      15,
+      null,
+      16,
+      29,
+      28,
+      30,
+      40,
+      null,
+      50,
+      45,
+      55
+    ]);
+    expect(tree.dfs(node => node, 'PRE', tree.root, 'RECURSIVE', true).map(node => (node ? node.key : null))).toEqual([
+      35,
+      20,
+      15,
+      null,
+      16,
+      29,
+      28,
+      30,
+      40,
+      null,
+      50,
+      45,
+      55
+    ]);
+
+    expect(tree.dfs(node => node.key, 'IN')).toEqual([15, 16, 20, 28, 29, 30, 35, 40, 45, 50, 55]);
+    expect(tree.dfs(node => node.key, 'POST')).toEqual([16, 15, 28, 30, 29, 20, 45, 55, 50, 40, 35]);
+    expect(tree.dfs(node => node.key, 'POST', tree.root, 'RECURSIVE')).toEqual([
+      16, 15, 28, 30, 29, 20, 45, 55, 50, 40, 35
+    ]);
+    expect(tree.bfs(node => node.key, tree.root, 'RECURSIVE')).toEqual([35, 20, 40, 15, 29, 50, 16, 28, 30, 45, 55]);
+    expect(tree.bfs(node => node.key, tree.root, 'ITERATIVE')).toEqual([35, 20, 40, 15, 29, 50, 16, 28, 30, 45, 55]);
+
+    expect(tree.listLevels(node => node.key)).toEqual([[35], [20, 40], [15, 29, 50], [16, 28, 30, 45, 55]]);
+
+    expect(tree.listLevels(node => node.key, tree.root, 'RECURSIVE')).toEqual([
+      [35],
+      [20, 40],
+      [15, 29, 50],
+      [16, 28, 30, 45, 55]
+    ]);
+    expect(tree.listLevels(node => (node ? node.key : null), tree.root, 'ITERATIVE', true)).toEqual([
+      [35],
+      [20, 40],
+      [15, 29, null, 50],
+      [null, 16, 28, 30, 45, 55]
+    ]);
+    expect(tree.listLevels(node => (node ? node.key : null), tree.root, 'RECURSIVE', true)).toEqual([
+      [35],
+      [20, 40],
+      [15, 29, null, 50],
+      [null, 16, 28, 30, 45, 55]
+    ]);
+  })
 
-  const arr = [35, 20, 40, 15, 29, null, 50, null, 16, 28, 30, 45, 55];
-  tree.refill(arr);
-  expect(tree.bfs(node => node, tree.root, 'ITERATIVE', true).map(node => (node ? node.key : null))).toEqual([
-    35,
-    20,
-    40,
-    15,
-    29,
-    null,
-    50,
-    null,
-    16,
-    28,
-    30,
-    45,
-    55
-  ]);
-  expect(tree.bfs(node => node, tree.root, 'RECURSIVE', true).map(node => (node ? node.key : null))).toEqual([
-    35,
-    20,
-    40,
-    15,
-    29,
-    null,
-    50,
-    null,
-    16,
-    28,
-    30,
-    45,
-    55
-  ]);
-  expect(tree.bfs(node => node, tree.root, 'ITERATIVE').map(node => (node === null ? null : node.key))).toEqual([
-    35, 20, 40, 15, 29, 50, 16, 28, 30, 45, 55
-  ]);
-  expect(tree.bfs(node => node, tree.root, 'RECURSIVE').map(node => (node === null ? null : node.key))).toEqual([
-    35, 20, 40, 15, 29, 50, 16, 28, 30, 45, 55
-  ]);
-
-  expect(tree.dfs(node => node.key, 'PRE')).toEqual([35, 20, 15, 16, 29, 28, 30, 40, 50, 45, 55]);
-  expect(tree.dfs(node => node.key, 'PRE', tree.root, 'RECURSIVE')).toEqual([
-    35, 20, 15, 16, 29, 28, 30, 40, 50, 45, 55
-  ]);
-  expect(tree.dfs(node => node, 'PRE', tree.root, 'ITERATIVE', true).map(node => (node ? node.key : null))).toEqual([
-    35,
-    20,
-    15,
-    null,
-    16,
-    29,
-    28,
-    30,
-    40,
-    null,
-    50,
-    45,
-    55
-  ]);
-  expect(tree.dfs(node => node, 'PRE', tree.root, 'RECURSIVE', true).map(node => (node ? node.key : null))).toEqual([
-    35,
-    20,
-    15,
-    null,
-    16,
-    29,
-    28,
-    30,
-    40,
-    null,
-    50,
-    45,
-    55
-  ]);
-
-  expect(tree.dfs(node => node.key, 'IN')).toEqual([15, 16, 20, 28, 29, 30, 35, 40, 45, 50, 55]);
-  expect(tree.dfs(node => node.key, 'POST')).toEqual([16, 15, 28, 30, 29, 20, 45, 55, 50, 40, 35]);
-  expect(tree.dfs(node => node.key, 'POST', tree.root, 'RECURSIVE')).toEqual([
-    16, 15, 28, 30, 29, 20, 45, 55, 50, 40, 35
-  ]);
-  expect(tree.bfs(node => node.key, tree.root, 'RECURSIVE')).toEqual([35, 20, 40, 15, 29, 50, 16, 28, 30, 45, 55]);
-  expect(tree.bfs(node => node.key, tree.root, 'ITERATIVE')).toEqual([35, 20, 40, 15, 29, 50, 16, 28, 30, 45, 55]);
-
-  expect(tree.listLevels(node => node.key)).toEqual([[35], [20, 40], [15, 29, 50], [16, 28, 30, 45, 55]]);
-
-  expect(tree.listLevels(node => node.key, tree.root, 'RECURSIVE')).toEqual([
-    [35],
-    [20, 40],
-    [15, 29, 50],
-    [16, 28, 30, 45, 55]
-  ]);
-  expect(tree.listLevels(node => (node ? node.key : null), tree.root, 'ITERATIVE', true)).toEqual([
-    [35],
-    [20, 40],
-    [15, 29, null, 50],
-    [null, 16, 28, 30, 45, 55]
-  ]);
-  expect(tree.listLevels(node => (node ? node.key : null), tree.root, 'RECURSIVE', true)).toEqual([
-    [35],
-    [20, 40],
-    [15, 29, null, 50],
-    [null, 16, 28, 30, 45, 55]
-  ]);
 });
 
 describe('BinaryTree', () => {
@@ -706,19 +1097,33 @@ describe('BinaryTree', () => {
   });
 
   it('should get nodes by a custom callback', () => {
-    tree.add([5, 'A']);
-    tree.add([3, 'B']);
-    tree.add([7, 'C']);
+    tree.add([5, 'E']);
+    tree.add([4, 'D']);
+    tree.add([3, 'C']);
+    tree.add([7, 'G']);
+    tree.add([null, 'null']);
+    tree.add([1, 'A']);
+    tree.add([6, 'F']);
+    tree.add([null, 'null']);
+    tree.add([2, 'B']);
+    tree.add([null, 'null']);
 
     const nodes = tree.getNodes('B', node => node.value);
 
     expect(nodes.length).toBe(1);
-    expect(nodes[0].key).toBe(3);
+    expect(nodes[0].key).toBe(2);
 
     const nodesRec = tree.getNodes('B', node => node.value, false, tree.root, 'RECURSIVE');
 
     expect(nodesRec.length).toBe(1);
-    expect(nodesRec[0].key).toBe(3);
+    expect(nodesRec[0].key).toBe(2);
+
+    const nodesItr = tree.getNodes('B', node => node.value, false, tree.root, 'ITERATIVE');
+
+    expect(nodesItr.length).toBe(1);
+    expect(nodesItr[0].key).toBe(2);
+
+    expect(nodesItr).toEqual(nodesRec);
   });
 
   it('should perform Morris traversal', () => {
@@ -767,12 +1172,12 @@ describe('BinaryTree iterative methods test', () => {
     binaryTree.add([3, 'c']);
   });
 
-  test('The node obtained by get Node should match the node type', () => {
+  it('The node obtained by get Node should match the node type', () => {
     const node3 = binaryTree.getNode(3);
     expect(node3).toBeInstanceOf(BinaryTreeNode);
   });
 
-  test('forEach should iterate over all elements', () => {
+  it('forEach should iterate over all elements', () => {
     const mockCallback = jest.fn();
     binaryTree.forEach((value, key) => {
       mockCallback(value, key);
@@ -784,7 +1189,7 @@ describe('BinaryTree iterative methods test', () => {
     expect(mockCallback.mock.calls[2]).toEqual(['c', 3]);
   });
 
-  test('filter should return a new tree with filtered elements', () => {
+  it('filter should return a new tree with filtered elements', () => {
     const filteredTree = binaryTree.filter((value, key) => key > 1);
     expect(filteredTree.size).toBe(2);
     expect([...filteredTree]).toEqual([
@@ -793,7 +1198,7 @@ describe('BinaryTree iterative methods test', () => {
     ]);
   });
 
-  test('map should return a new tree with modified elements', () => {
+  it('map should return a new tree with modified elements', () => {
     const mappedTree = binaryTree.map((value, key) => (key * 2).toString());
     expect(mappedTree.size).toBe(3);
     expect([...mappedTree]).toEqual([
@@ -803,12 +1208,12 @@ describe('BinaryTree iterative methods test', () => {
     ]);
   });
 
-  test('reduce should accumulate values', () => {
+  it('reduce should accumulate values', () => {
     const sum = binaryTree.reduce((acc, currentValue, currentKey) => acc + currentKey, 0);
     expect(sum).toBe(6);
   });
 
-  test('[Symbol.iterator] should provide an iterator', () => {
+  it('[Symbol.iterator] should provide an iterator', () => {
     const entries = [];
     for (const entry of binaryTree) {
       entries.push(entry);
@@ -822,23 +1227,28 @@ describe('BinaryTree iterative methods test', () => {
     ]);
   });
 
-  test('should clone work well', () => {
+  it('should clone work well', () => {
     const cloned = binaryTree.clone();
     expect(cloned.root?.left?.key).toBe(2);
     expect(cloned.root?.right?.value).toBe('c');
   });
 
-  test('should keys', () => {
+  it('should keys', () => {
     const keys = binaryTree.keys();
     expect([...keys]).toEqual([2, 1, 3]);
   });
 
-  test('should values', () => {
+  it('should values', () => {
     const values = binaryTree.values();
     expect([...values]).toEqual(['b', 'a', 'c']);
   });
 
-  test('should iterative method return undefined when the node is null', () => {
+  it('should leaves', () => {
+    const leaves = binaryTree.leaves();
+    expect(leaves).toEqual([2, 3]);
+  });
+
+  it('should iterative method return undefined when the node is null', () => {
     const tree = new BinaryTree();
     tree.addMany([-10, -10, -10, 9, 9, 20, null, null, 15, 7, 8, null, 2, null, 6, null, null, 8, 8, 8]);
     const bfsResult = tree.bfs(undefined, undefined, undefined, true);