tests-related improvements

Author: istefanis

test/custom/simplificationAlgorithms.customTest.js

@@ -7,6 +7,7 @@
  */
 
 import { Block } from "../../model/elements/block.js";
+import { getTopBlock, setTopBlock } from "../../model/topBlockService.js";
 import {
   animationSpeedCoeff,
   setAnimationSpeedCoeff,
@@ -18,14 +19,16 @@ import {
 import { logMessages } from "../../util/loggingService.js";
 import { simplificationAlgorithmsTests } from "../definitions/simplificationAlgorithmsTests.js";
 
-let testsBlock = new Block();
-
 const runSimplificationAlgorithmsCustomTest = async (t) => {
-  testsBlock.clearState();
-  testsBlock = t.circuit(testsBlock);
+  if (getTopBlock()) {
+    getTopBlock().clearState();
+  } else {
+    setTopBlock(new Block());
+  }
+  setTopBlock(t.circuit(getTopBlock()));
 
   //computation of simplified block value
-  const actualValue = await testsBlock.getSimplifiedValue();
+  const actualValue = await getTopBlock().getSimplifiedValue();
   const expectedValue = t.assertion;
   const testCondition = areEqualArraysRoundDecimal(
     actualValue,
@@ -44,7 +47,7 @@ const runSimplificationAlgorithmsCustomTest = async (t) => {
     "tests-css"
   );
 
-  testsBlock.clearState();
+  getTopBlock().clearState();
   return;
 };
 

test/definitions/viewServicesTests.js

@@ -9,6 +9,7 @@
 import { Block } from "../../model/elements/block.js";
 import { getTopBlock, setTopBlock } from "../../model/topBlockService.js";
 import { roundDecimal, sleep } from "../../util/commons.js";
+import { setLogMode } from "../../util/loggingService.js";
 import { getTotalLengthOfAllLines } from "../../view/services/core/lineRenderingService.js";
 import { optimizeTopology } from "../../view/services/feature/optimizeTopologyService.js";
 import { circuit1 } from "./circuits.js";
@@ -17,7 +18,14 @@ export const viewServicesTests = {
   test1: {
     description: "test1: zoomingService",
     steps: async function () {
-      setTopBlock(circuit1(new Block()));
+      setLogMode("null");
+
+      if (getTopBlock()) {
+        getTopBlock().clearState();
+      } else {
+        setTopBlock(new Block());
+      }
+      setTopBlock(circuit1(getTopBlock()));
 
       const zoomInButton = document.getElementById("zoom-in-button");
       const zoomOutButton = document.getElementById("zoom-out-button");
@@ -61,7 +69,12 @@ export const viewServicesTests = {
   test2: {
     description: "test2: optimizeTopologyService",
     steps: async function () {
-      setTopBlock(circuit1(new Block()));
+      if (getTopBlock()) {
+        getTopBlock().clearState();
+      } else {
+        setTopBlock(new Block());
+      }
+      setTopBlock(circuit1(getTopBlock()));
 
       const initialTotalLengthOfAllLines = getTotalLengthOfAllLines();
       await optimizeTopology({

test/jest/simplificationAlgorithms.test.js

@@ -12,21 +12,24 @@
 // Import this first to initialize required components
 import * as computerAlgebraService from "../../math/computerAlgebra/computerAlgebraService.js";
 import { Block } from "../../model/elements/block.js";
+import { getTopBlock, setTopBlock } from "../../model/topBlockService.js";
 import {
   areEqualArraysRoundDecimal,
   roundDecimalDigitsTests,
 } from "../../util/commons.js";
 import { getLogMode, setLogMode } from "../../util/loggingService.js";
 import { simplificationAlgorithmsTests } from "../definitions/simplificationAlgorithmsTests.js";
 
-let testsBlock = new Block();
-
 const runSimplificationAlgorithmsJestTest = async (t) => {
-  testsBlock.clearState();
-  testsBlock = t.circuit(testsBlock);
+  if (getTopBlock()) {
+    getTopBlock().clearState();
+  } else {
+    setTopBlock(new Block());
+  }
+  setTopBlock(t.circuit(getTopBlock()));
 
   //computation of simplified block value
-  const actualValue = await testsBlock.getSimplifiedValue();
+  const actualValue = await getTopBlock().getSimplifiedValue();
   const expectedValue = t.assertion;
   const testCondition = areEqualArraysRoundDecimal(
     actualValue,
@@ -38,7 +41,7 @@ const runSimplificationAlgorithmsJestTest = async (t) => {
     expect(testCondition).toBeTruthy();
   });
 
-  testsBlock.clearState();
+  getTopBlock().clearState();
   return;
 };
 

view/plots/bodePlot.js

@@ -107,7 +107,7 @@ export default class BodePlot {
       this.#bandwidthThreshold = "";
     }
 
-    if (!plotContainerDomElement) {
+    if (!plotContainerDomElement || !functionPlot) {
       // return Bode curve points & characteristics numbers without displaying the plot (ex. for testing)
       return {
         magnitudeCurvePoints: this.#magnitudeCurvePoints,

view/plots/nyquistPlot.js

@@ -69,7 +69,7 @@ export default class NyquistPlot {
       this.#denominatorTermsArray
     );
 
-    if (!plotContainerDomElement) {
+    if (!plotContainerDomElement || !functionPlot) {
       // return Nyquist curve points & stability without displaying the plot (ex. for testing)
       return {
         curvePoints: this.#curvePoints,

view/plots/timeDomainPlot.js

@@ -47,19 +47,6 @@ export default class TimeDomainPlot {
     zeros,
     poles
   ) {
-    this.#plotContainerDomElement = plotContainerDomElement;
-    //create the two plot DOM elements inside the container
-    const markup = `
-      <div class="time-domain-subplot" id="time-response-plot"></div>
-      <div class="time-domain-subplot" id="trajectory-plot"></div>
-    `;
-    plotContainerDomElement.insertAdjacentHTML("afterbegin", markup);
-
-    this.#timeResponsePlotDomElement = plotContainerDomElement.querySelector(
-      "#time-response-plot"
-    );
-    this.#trajectoryPlotDomElement =
-      plotContainerDomElement.querySelector("#trajectory-plot");
     this.#numeratorTermsArray = numeratorTermsArray;
     this.#denominatorTermsArray = denominatorTermsArray;
     this.#zeros = zeros;
@@ -72,9 +59,31 @@ export default class TimeDomainPlot {
       );
     }
 
-    this.createTimeDomainPlot();
+    if (!plotContainerDomElement || !functionPlot) {
+      // return time domain curve points without displaying the plots (ex. for testing)
+      return {
+        timeResponseCurvePoints: this.#timeResponseCurvePoints,
+        trajectoryCurvePoints: this.#trajectoryCurvePoints,
+      };
+    } else {
+      this.#plotContainerDomElement = plotContainerDomElement;
+      //create the two plot DOM elements inside the container
+      const markup = `
+      <div class="time-domain-subplot" id="time-response-plot"></div>
+      <div class="time-domain-subplot" id="trajectory-plot"></div>
+    `;
+      plotContainerDomElement.insertAdjacentHTML("afterbegin", markup);
+
+      this.#timeResponsePlotDomElement = plotContainerDomElement.querySelector(
+        "#time-response-plot"
+      );
+      this.#trajectoryPlotDomElement =
+        plotContainerDomElement.querySelector("#trajectory-plot");
+
+      this.createTimeDomainPlot();
 
-    return this.#timeDomainObserver;
+      return this.#timeDomainObserver;
+    }
   }
 
   /**