Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-01-17 20:51:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix layoutTree tests

Browse Source
This commit is contained in:
Evan Simkowitz 2024-08-26 16:35:35 -07:00
parent 7d98aeb2c9
commit 56757e4bb0
No known key found for this signature in database
2 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
frontend/layout/tests/layoutState.test.ts → frontend/layout/tests/layoutTree.test.ts
View File

@ -3,50 +3,50 @@
import { assert, test } from "vitest"; import { assert, test } from "vitest";
import { newLayoutNode } from "../lib/layoutNode.js"; import { newLayoutNode } from "../lib/layoutNode.js";
import { layoutStateReducer, newLayoutTreeState } from "../lib/layoutTree.js"; import { computeMoveNode, moveNode } from "../lib/layoutTree.js";
import { LayoutTreeActionType, LayoutTreeComputeMoveNodeAction, LayoutTreeMoveNodeAction } from "../lib/types.js"; import {
import { DropDirection } from "../lib/utils.js"; DropDirection,
import { TestData } from "./model.js"; LayoutTreeActionType,
LayoutTreeComputeMoveNodeAction,
LayoutTreeMoveNodeAction,
} from "../lib/types.js";
import { newLayoutTreeState } from "./model.js";
test("layoutTreeStateReducer - compute move", () => { test("layoutTreeStateReducer - compute move", () => {
let treeState = newLayoutTreeState<TestData>(newLayoutNode(undefined, undefined, undefined, { name: "root" })); let treeState = newLayoutTreeState(newLayoutNode(undefined, undefined, undefined, { blockId: "root" }));
assert(treeState.rootNode.data!.name === "root", "root should have no children and should have data"); assert(treeState.rootNode.data!.blockId === "root", "root should have no children and should have data");
let node1 = newLayoutNode(undefined, undefined, undefined, { name: "node1" }); let node1 = newLayoutNode(undefined, undefined, undefined, { blockId: "node1" });
treeState = layoutStateReducer(treeState, { let pendingAction = computeMoveNode(treeState, {
type: LayoutTreeActionType.ComputeMove, type: LayoutTreeActionType.ComputeMove,
node: treeState.rootNode, node: treeState.rootNode,
nodeToMove: node1, nodeToMove: node1,
direction: DropDirection.Bottom, direction: DropDirection.Bottom,
} as LayoutTreeComputeMoveNodeAction<TestData>); });
const insertOperation = treeState.pendingAction as LayoutTreeMoveNodeAction<TestData>; const insertOperation = pendingAction as LayoutTreeMoveNodeAction;
assert(insertOperation.node === node1, "insert operation node should equal node1"); assert(insertOperation.node === node1, "insert operation node should equal node1");
assert(!insertOperation.parentId, "insert operation parent should not be defined"); assert(!insertOperation.parentId, "insert operation parent should not be defined");
assert(insertOperation.index === 1, "insert operation index should equal 1"); assert(insertOperation.index === 1, "insert operation index should equal 1");
assert(insertOperation.insertAtRoot, "insert operation insertAtRoot should be true"); assert(insertOperation.insertAtRoot, "insert operation insertAtRoot should be true");
treeState = layoutStateReducer(treeState, { moveNode(treeState, insertOperation);
type: LayoutTreeActionType.CommitPendingAction,
});
assert( assert(
treeState.rootNode.data === undefined && treeState.rootNode.children!.length === 2, treeState.rootNode.data === undefined && treeState.rootNode.children!.length === 2,
"root node should now have no data and should have two children" "root node should now have no data and should have two children"
); );
assert(treeState.rootNode.children![1].data!.name === "node1", "root's second child should be node1"); assert(treeState.rootNode.children![1].data!.blockId === "node1", "root's second child should be node1");
let node2 = newLayoutNode(undefined, undefined, undefined, { name: "node2" }); let node2 = newLayoutNode(undefined, undefined, undefined, { blockId: "node2" });
treeState = layoutStateReducer(treeState, { pendingAction = computeMoveNode(treeState, {
type: LayoutTreeActionType.ComputeMove, type: LayoutTreeActionType.ComputeMove,
node: node1, node: node1,
nodeToMove: node2, nodeToMove: node2,
direction: DropDirection.Bottom, direction: DropDirection.Bottom,
} as LayoutTreeComputeMoveNodeAction<TestData>); });
const insertOperation2 = treeState.pendingAction as LayoutTreeMoveNodeAction<TestData>; const insertOperation2 = pendingAction as LayoutTreeMoveNodeAction;
assert(insertOperation2.node === node2, "insert operation node should equal node2"); assert(insertOperation2.node === node2, "insert operation node should equal node2");
assert(insertOperation2.parentId === node1.id, "insert operation parent id should be node1 id"); assert(insertOperation2.parentId === node1.id, "insert operation parent id should be node1 id");
assert(insertOperation2.index === 1, "insert operation index should equal 1"); assert(insertOperation2.index === 1, "insert operation index should equal 1");
assert(!insertOperation2.insertAtRoot, "insert operation insertAtRoot should be false"); assert(!insertOperation2.insertAtRoot, "insert operation insertAtRoot should be false");
treeState = layoutStateReducer(treeState, { moveNode(treeState, insertOperation2);
type: LayoutTreeActionType.CommitPendingAction,
});
assert( assert(
treeState.rootNode.data === undefined && treeState.rootNode.children!.length === 2, treeState.rootNode.data === undefined && treeState.rootNode.children!.length === 2,
"root node should still have three children" "root node should still have three children"
@ -55,24 +55,22 @@ test("layoutTreeStateReducer - compute move", () => {
}); });
test("computeMove - noop action", () => { test("computeMove - noop action", () => {
let nodeToMove = newLayoutNode<TestData>(undefined, undefined, undefined, { name: "nodeToMove" }); let nodeToMove = newLayoutNode(undefined, undefined, undefined, { blockId: "nodeToMove" });
let treeState = newLayoutTreeState<TestData>( let treeState = newLayoutTreeState(
newLayoutNode(undefined, undefined, [ newLayoutNode(undefined, undefined, [
nodeToMove, nodeToMove,
newLayoutNode<TestData>(undefined, undefined, undefined, { name: "otherNode" }), newLayoutNode(undefined, undefined, undefined, { blockId: "otherNode" }),
]) ])
); );
let moveAction: LayoutTreeComputeMoveNodeAction<TestData> = { let moveAction: LayoutTreeComputeMoveNodeAction = {
type: LayoutTreeActionType.ComputeMove, type: LayoutTreeActionType.ComputeMove,
node: treeState.rootNode, node: treeState.rootNode,
nodeToMove, nodeToMove,
direction: DropDirection.Left, direction: DropDirection.Left,
}; };
treeState = layoutStateReducer(treeState, moveAction); let pendingAction = computeMoveNode(treeState, moveAction);
assert(
treeState.pendingAction === undefined, assert(pendingAction === undefined, "inserting a node to the left of itself should not produce a pendingAction");
"inserting a node to the left of itself should not produce a pendingAction"
);
moveAction = { moveAction = {
type: LayoutTreeActionType.ComputeMove, type: LayoutTreeActionType.ComputeMove,
@ -81,9 +79,6 @@ test("computeMove - noop action", () => {
direction: DropDirection.Right, direction: DropDirection.Right,
}; };
treeState = layoutStateReducer(treeState, moveAction); pendingAction = computeMoveNode(treeState, moveAction);
assert( assert(pendingAction === undefined, "inserting a node to the right of itself should not produce a pendingAction");
treeState.pendingAction === undefined,
"inserting a node to the right of itself should not produce a pendingAction"
);
}); });

11
frontend/layout/tests/model.ts
View File

@ -1,6 +1,11 @@
// Copyright 2024, Command Line Inc. // Copyright 2024, Command Line Inc.
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
export type TestData = { import { LayoutNode, LayoutTreeState } from "../lib/types";
name: string;
}; export function newLayoutTreeState(rootNode: LayoutNode): LayoutTreeState {
return {
rootNode,
generation: 0,
};
}