Fix tests

nand2tetris · Aug 5, 2024 · 057697c · 057697c
1 parent 647ac42
commit 057697c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/components/src/stores/chip.store.test.ts b/components/src/stores/chip.store.test.ts
@@ -54,7 +54,7 @@ describe("ChipStore", () => {
  });
 
  await store.actions.initialize();
- await store.actions.loadChip("projects/01/Not/Not.hdl");
+ await store.actions.loadChip("projects/01/Not.hdl");
 
  expect(store.state.controls.project).toBe("01");
  expect(store.state.controls.chipName).toBe("Not");
@@ -68,12 +68,12 @@ describe("ChipStore", () => {
  describe("behavior", () => {
  const state = cleanState(async () => {
  const store = testChipStore({
- "projects/01/Not/Not.hdl": not.hdl,
- "projects/01/Not/Not.tst": not.tst,
- "projects/01/Not/Not.cmp": not.cmp,
+ "projects/01/Not.hdl": not.hdl,
+ "projects/01/Not.tst": not.tst,
+ "projects/01/Not.cmp": not.cmp,
  });
  await store.actions.initialize();
- await store.actions.loadChip("projects/01/Not/Not.hdl");
+ await store.actions.loadChip("projects/01/Not.hdl");
  return { store };
  }, beforeEach);
 
@@ -106,7 +106,7 @@ describe("ChipStore", () => {
  "projects/01/Not.cmp": not.cmp,
  });
  await store.actions.initialize();
- await store.actions.loadChip("projects/01/Not/Not.hdl");
+ await store.actions.loadChip("projects/01/Not.hdl");
  return { store };
  }, beforeEach);
 
@@ -124,7 +124,7 @@ describe("ChipStore", () => {
  expect(bits(state.store.state.sim.inPins)).toEqual([[0]]);
  expect(bits(state.store.state.sim.outPins)).toEqual([[1]]);
 
- await state.store.actions.stepTest(); // Output List
+ await state.store.actions.stepTest(); // Load, Compare To and Output List
 
  await state.store.actions.stepTest(); // Set in 0
  expect(bits(state.store.state.sim.inPins)).toEqual([[0]]);
@@ -143,7 +143,7 @@ describe("ChipStore", () => {
  expect(state.store.state.files.tst).toBe(not.tst);
  expect(state.store.state.controls.span).toEqual({
  start: 167,
- end: 186,
+ end: 220,
  line: 6,
  });
  });
@@ -158,9 +158,9 @@ describe("ChipStore", () => {
  await state.store.actions.stepTest();
 
  expect(state.store.state.controls.span).toEqual({
- start: 235,
- end: 236,
- line: 14,
+ start: 269,
+ end: 270,
+ line: 16,
  });
  });
  });

diff --git a/simulator/src/test/chiptst.test.ts b/simulator/src/test/chiptst.test.ts
@@ -181,7 +181,12 @@ describe("Chip Test", () => {
  },
  };
 
- const maybeTest = ChipTest.from({ lines: [repeat] });
+ const maybeTest = ChipTest.from(
+ {
+ lines: [repeat],
+ },
+ { requireLoad: false },
+ );
  expect(maybeTest).toBeOk();
  const test = unwrap(maybeTest);
  test.outputList([{ id: "time", style: "S", len: 4, lpad: 0, rpad: 0 }]);

diff --git a/simulator/src/test/chiptst.ts b/simulator/src/test/chiptst.ts
@@ -24,11 +24,12 @@ export class ChipTest extends Test<ChipTestInstruction> {
  setStatus?: Action<string>;
  loadAction?: (path: string) => Promise<Chip>;
  compareTo?: Action<string>;
+ requireLoad?: boolean;
  } = {},
  ): Result<ChipTest, Error> {
  const test = new ChipTest(options);
 
- return fill(test, tst);
+ return fill(test, tst, options.requireLoad);
  }
 
  constructor({
@@ -53,7 +54,6 @@ export class ChipTest extends Test<ChipTestInstruction> {
 
  override async load(filename?: string): Promise<void> {
  if (!this.dir) return;
- console.log("Loading chip", this.dir, filename);
  const chip = await this.doLoad?.(
  filename ? `${this.dir}/${filename}` : this.dir,
  );