refactor: cleanup ReactTable.test.tsx

Author: Simon1375

benchexec/tablegenerator/react-table/src/tests/ReactTable.test.tsx

@@ -6,78 +6,48 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import React from "react";
-import Table from "../components/ReactTable.js";
+import Table from "../components/ReactTable";
 import { HashRouter as Router } from "react-router-dom";
 
 import { test_snapshot_of } from "./utils";
 
-// Add a serializer that removes title attributes (irrelevant in our table)
 type SnapshotSerializer = Parameters<typeof expect.addSnapshotSerializer>[0];
 
-const hasTitleProp = (
-  val: unknown,
-): val is { props: Record<string, unknown> } =>
-  typeof val === "object" &&
-  val !== null &&
-  "props" in val &&
-  typeof (val as { props?: unknown }).props === "object" &&
-  (val as { props?: Record<string, unknown> }).props !== null &&
-  Object.prototype.hasOwnProperty.call(
-    (val as { props: Record<string, unknown> }).props,
-    "title",
-  );
-
 // Add a serializer that removes title attributes (irrelevant in our table)
-const removeTitleSerializer: SnapshotSerializer = {
-  test: hasTitleProp,
-  print: (val, print) => {
+expect.addSnapshotSerializer({
+  print: (val, serialize) => {
     const v = val as { props?: { title?: unknown } };
-    if (v.props) {
-      delete v.props.title;
-    }
-    return print(val);
+    delete v.props?.title;
+    return serialize(val);
   },
-};
-
-expect.addSnapshotSerializer(removeTitleSerializer);
-
-type TableProps = React.ComponentProps<typeof Table>;
-
-type OverviewShape = {
-  tableHeader: TableProps["tableHeader"];
-  originalTable: TableProps["tableData"];
-  tools: TableProps["tools"];
-  toggleSelectColumns: TableProps["selectColumn"];
-  prepareTableValues: TableProps["prepareTableValues"];
-  setFilter: TableProps["setFilter"];
-  filterPlotData: TableProps["filterPlotData"];
-  filteredData: TableProps["filters"];
-  toggleLinkOverlay: TableProps["toggleLinkOverlay"];
-  changeTab: TableProps["changeTab"];
-  statusValues: TableProps["statusValues"];
-  categoryValues: TableProps["categoryValues"];
-  hiddenCols: TableProps["hiddenCols"];
-};
-
-test_snapshot_of("Render ReactTable", (overview: unknown) => {
-  const o = overview as unknown as OverviewShape;
-
+  test: (val) =>
+    !!val &&
+    typeof val === "object" &&
+    "props" in (val as object) &&
+    !!(val as { props?: unknown }).props &&
+    Object.prototype.hasOwnProperty.call(
+      (val as { props: Record<string, unknown> }).props,
+      "title",
+    ),
+} as SnapshotSerializer);
+
+test_snapshot_of("Render ReactTable", (overview) => {
   return (
     <Router>
       <Table
-        tableHeader={o.tableHeader}
-        tableData={o.originalTable}
-        tools={o.tools}
-        selectColumn={o.toggleSelectColumns}
-        prepareTableValues={o.prepareTableValues}
-        setFilter={o.setFilter}
-        filterPlotData={o.filterPlotData}
-        filters={o.filteredData}
-        toggleLinkOverlay={o.toggleLinkOverlay}
-        changeTab={o.changeTab}
-        statusValues={o.statusValues}
-        categoryValues={o.categoryValues}
-        hiddenCols={o.hiddenCols}
+        tableHeader={overview.tableHeader}
+        tableData={overview.originalTable}
+        tools={overview.tools}
+        selectColumn={overview.toggleSelectColumns}
+        prepareTableValues={overview.prepareTableValues}
+        setFilter={overview.setFilter}
+        filterPlotData={overview.filterPlotData}
+        filters={overview.filteredData}
+        toggleLinkOverlay={overview.toggleLinkOverlay}
+        changeTab={overview.changeTab}
+        statusValues={overview.statusValues}
+        categoryValues={overview.categoryValues}
+        hiddenCols={overview.hiddenCols}
       />
     </Router>
   );

benchexec/tablegenerator/react-table/src/tests/utils.tsx

@@ -16,12 +16,16 @@ import {
 import { getFilterableData } from "../utils/filters";
 import fs from "fs";
 
+import Table from "../components/ReactTable";
+
 const testDir = "../test_integration/expected/";
 
 /* ============================================================
  * Types
  * ============================================================ */
 
+type TableProps = React.ComponentProps<typeof Table>;
+
 type PreparedTableData = ReturnType<typeof prepareTableData>;
 type PreparedTools = PreparedTableData["tools"];
 type PreparedTableDataRows = PreparedTableData["tableData"];
@@ -46,6 +50,13 @@ type OverviewProps = {
   statusValues: unknown;
   categoryValues: unknown;
   filtered: unknown[];
+
+  toggleSelectColumns: TableProps["selectColumn"];
+  prepareTableValues: TableProps["prepareTableValues"];
+  setFilter: TableProps["setFilter"];
+  filterPlotData: TableProps["filterPlotData"];
+  toggleLinkOverlay: TableProps["toggleLinkOverlay"];
+  changeTab: TableProps["changeTab"];
 };
 
 type ComponentFuncResult = {