diff --git a/jest.config.js b/jest.config.js index a2d2ede..9569eff 100644 --- a/jest.config.js +++ b/jest.config.js @@ -5,6 +5,7 @@ module.exports = { '/nodes/generalFunctions/src/coolprop-node/test/**/*.test.js', '/nodes/generalFunctions/test/**/*.test.js', '/nodes/dashboardAPI/test/**/*.test.js', + '/nodes/diffuser/test/specificClass.test.js', '/nodes/monster/test/**/*.test.js', '/nodes/pumpingStation/test/**/*.test.js', '/nodes/reactor/test/**/*.test.js', diff --git a/nodes/diffuser b/nodes/diffuser index ce48389..0570df2 160000 --- a/nodes/diffuser +++ b/nodes/diffuser @@ -1 +1 @@ -Subproject commit ce4838979192ca93f8532241d07cd7cb63bd94fd +Subproject commit 0570df208c5110dc283da8ae25152d7f255aaf65 diff --git a/package.json b/package.json index 55764a0..c6c3bc1 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "node-red": { "nodes": { "dashboardapi": "nodes/dashboardAPI/dashboardapi.js", + "diffuser": "nodes/diffuser/diffuser.js", "machineGroupControl": "nodes/machineGroupControl/mgc.js", "measurement": "nodes/measurement/measurement.js", "monster": "nodes/monster/monster.js", diff --git a/test/e2e/flows.json b/test/e2e/flows.json index 93034e4..a99a20a 100644 --- a/test/e2e/flows.json +++ b/test/e2e/flows.json @@ -366,5 +366,75 @@ "x": 920, "y": 500, "wires": [] + }, + { + "id": "inject-diffuser-flow", + "type": "inject", + "z": "e2e-flow-tab", + "name": "Diffuser airflow", + "props": [ + { "p": "payload" }, + { "p": "topic", "vt": "str" } + ], + "repeat": "", + "crontab": "", + "once": true, + "onceDelay": "9", + "topic": "air_flow", + "payload": "24", + "payloadType": "num", + "x": 150, + "y": 620, + "wires": [["diffuser-e2e"]] + }, + { + "id": "diffuser-e2e", + "type": "diffuser", + "z": "e2e-flow-tab", + "name": "E2E-Diffuser", + "number": 1, + "i_elements": 4, + "i_diff_density": 2.4, + "i_m_water": 4.5, + "alfaf": 0.7, + "enableLog": false, + "logLevel": "error", + "x": 390, + "y": 620, + "wires": [["debug-diffuser-process"], ["debug-diffuser-dbase"], []] + }, + { + "id": "debug-diffuser-process", + "type": "debug", + "z": "e2e-flow-tab", + "name": "Diffuser Process Output", + "active": true, + "tosidebar": true, + "console": true, + "tostatus": true, + "complete": "true", + "targetType": "full", + "statusVal": "", + "statusType": "auto", + "x": 670, + "y": 600, + "wires": [] + }, + { + "id": "debug-diffuser-dbase", + "type": "debug", + "z": "e2e-flow-tab", + "name": "Diffuser Database Output", + "active": true, + "tosidebar": true, + "console": true, + "tostatus": true, + "complete": "true", + "targetType": "full", + "statusVal": "", + "statusType": "auto", + "x": 680, + "y": 640, + "wires": [] } ] diff --git a/test/e2e/run-e2e.sh b/test/e2e/run-e2e.sh index 71de2bb..c15d8a5 100755 --- a/test/e2e/run-e2e.sh +++ b/test/e2e/run-e2e.sh @@ -20,6 +20,7 @@ LOG_WAIT=20 # EVOLV node types that must appear in the palette (from package.json node-red.nodes) EXPECTED_NODES=( "dashboardapi" + "diffuser" "machineGroupControl" "measurement" "monster" @@ -193,6 +194,8 @@ wait_for_log_pattern "Database Output" "EVOLV measurement node produced database wait_for_log_pattern "Process Output" "EVOLV measurement node produced process output" true || true wait_for_log_pattern "Monster Process Output" "EVOLV monster node produced process output" true || true wait_for_log_pattern "Monster Database Output" "EVOLV monster node produced database output" true || true +wait_for_log_pattern "Diffuser Process Output" "EVOLV diffuser node produced process output" true || true +wait_for_log_pattern "Diffuser Database Output" "EVOLV diffuser node produced database output" true || true wait_for_log_pattern "DashboardAPI Output" "EVOLV dashboardapi node produced create output" true || true # --- Step 6: Summary ---