fix some tests

Author: rerpha

app/components/GroupUtils.test.ts

@@ -1,31 +1,25 @@
 import { checkIfAllBlocksInGroupAreHidden } from "./GroupUtils";
 
-import { IfcBlock, IfcGroup } from "@/app/types";
+import { tBlockMapping } from "@/app/types";
 
 test("group with all hidden blocks returns true", () => {
-  const aHiddenBlock: IfcBlock = { pvaddress: "", visible: false };
-  let group: IfcGroup = { name: "testing", blocks: [aHiddenBlock] };
-  const result = checkIfAllBlocksInGroupAreHidden(group);
+  let blocks: tBlockMapping = new Map();
+  blocks.set("testing", { pvaddress: "", visible: false });
+  const result = checkIfAllBlocksInGroupAreHidden(blocks);
   expect(result).toBe(true);
 });
 
-test("group with all visible blocks returns true", () => {
-  let group: IfcGroup = {
-    name: "testing",
-    blocks: [{ pvaddress: "", visible: true }],
-  };
-  const result = checkIfAllBlocksInGroupAreHidden(group);
+test("group with all visible blocks returns false", () => {
+  let blocks: tBlockMapping = new Map();
+  blocks.set("testing", { pvaddress: "testing", visible: true });
+  const result = checkIfAllBlocksInGroupAreHidden(blocks);
   expect(result).toBe(false);
 });
 
-test("group with mixed visible blocks returns true", () => {
-  let group: IfcGroup = {
-    name: "testing",
-    blocks: [
-      { pvaddress: "", visible: false },
-      { pvaddress: "", visible: true },
-    ],
-  };
-  const result = checkIfAllBlocksInGroupAreHidden(group);
+test("group with mixed visible blocks returns false", () => {
+  let blocks: tBlockMapping = new Map();
+  blocks.set("block1", { pvaddress: "block1", visible: false });
+  blocks.set("block2", { pvaddress: "block2", visible: true });
+  const result = checkIfAllBlocksInGroupAreHidden(blocks);
   expect(result).toBe(false);
 });

app/components/GroupUtils.ts

@@ -3,7 +3,5 @@ import { tBlockMapping } from "@/app/types";
 export function checkIfAllBlocksInGroupAreHidden(
   blocks: tBlockMapping,
 ): boolean {
-  return Array.from(blocks.values())
-    .map((block) => block.visible)
-    .every((v) => v === false);
+  return Array.from(blocks.values()).every((block) => block.visible === false);
 }

app/components/TopBar.test.ts

@@ -1,50 +1,52 @@
-import TopBar, {
-  configName,
-  getRunstate,
-  runStateStr,
-} from "@/app/components/TopBar";
-import { IfcPV } from "@/app/types";
+import TopBar, { getRunstate, runStateStr } from "@/app/components/TopBar";
+import { tBlockMapping } from "@/app/types";
 import { render } from "@testing-library/react";
 import { Instrument } from "@/app/components/Instrument";
-import { findPVByHumanReadableName } from "@/app/components/PVutils";
 
 test("GetRunstate returns the runstate when it exists and is of string type", () => {
+  const prefix = "TESTING:";
+
   const expected = "SETUP";
-  const PVToTest: IfcPV = {
-    pvaddress: "",
+  let blocks: tBlockMapping = new Map();
+  blocks.set(prefix + "DAE:RUNSTATE_STR", {
+    pvaddress: prefix + "DAE:RUNSTATE_STR",
     value: expected,
     human_readable_name: runStateStr,
-  };
-  const PVArr = [PVToTest];
-  expect(getRunstate(PVArr)).toBe(expected);
+  });
+  expect(getRunstate(prefix, blocks)).toBe(expected);
 });
 
 test("GetRunstate returns unknown when no runstate PV in array", () => {
-  const PVArr: Array<IfcPV> = [];
-  expect(getRunstate(PVArr)).toBe("UNREACHABLE");
+  expect(getRunstate("", new Map())).toBe("UNREACHABLE");
 });
 
 it("renders topbar unchanged", () => {
-  let instrument = new Instrument("TESTING");
+  const prefix = "TESTING:";
+
+  let instrument = new Instrument(prefix);
   const instName = "Instrument";
   const { container } = render(
     TopBar({
       dashboard: instrument.dashboard,
       instName: instName,
       runInfoPVs: instrument.runInfoPVs,
+      prefix: prefix,
     }),
   );
   expect(container).toMatchSnapshot();
 });
 
 it("draws instName expectedly", () => {
-  let instrument = new Instrument("TESTING");
+  const prefix = "TESTING:";
+
+  let instrument = new Instrument(prefix);
   const instName = "Instrument";
   const { container } = render(
     TopBar({
       dashboard: instrument.dashboard,
       instName: instName,
       runInfoPVs: instrument.runInfoPVs,
+      prefix: prefix,
     }),
   );
   expect(container.querySelector("#instNameLabel")!.innerHTML).toContain(
@@ -53,18 +55,19 @@ it("draws instName expectedly", () => {
 });
 
 it("draws configName expectedly", () => {
-  let instrument = new Instrument("TESTING");
-  let configNamePV = findPVByHumanReadableName(
-    instrument.runInfoPVs,
-    configName,
-  )!;
+  const prefix = "TESTING:";
+  let instrument = new Instrument(prefix);
+  let configNamePV = instrument.runInfoPVs.get(
+    prefix + "CS:BLOCKSERVER:CURR_CONFIG_NAME",
+  );
   const expectedConfigName = "Aconfig";
-  configNamePV.value = expectedConfigName;
+  configNamePV!.value = expectedConfigName;
   const { container } = render(
     TopBar({
       dashboard: instrument.dashboard,
       instName: "Instrument",
       runInfoPVs: instrument.runInfoPVs,
+      prefix: prefix,
     }),
   );
   expect(container.querySelector("#configNameSpan")!.innerHTML).toBe(

app/components/__snapshots__/Block.test.tsx.snap

@@ -32,7 +32,7 @@ exports[`renders topbar unchanged 1`] = `
             mm
           </span>
           <svg
-            class="min-w-2 min-h-2 max-w-2 max-h-2 transition-all text-transparent"
+            class="min-w-2 min-h-2 max-w-2 max-h-2 transition-opacity text-green-500 opacity-100"
             fill="currentColor"
             id="undefined_CIRCLE"
             viewBox="0 0 24 24"