@gregoriusrippenstein/erlang-red-unittest 0.12.3 → 0.15.0

package/nodes/ut-assert-success.html

@@ -1,14 +1,6 @@
 <script type="text/javascript">
   (function(){
-  
-
-  function frontendSupportFunction() {
-  }
-
-  var functTwo = (arg) => {
-
-  };
-  
+    
   RED.nodes.registerType('ut-assert-success',{
     color: '#addb7b',
     icon: "font-awesome/fa-smile-o",
@@ -17,6 +9,9 @@
       name: {
         value:"",
       },
+      msglimit: {
+        value:"=="
+      },
       count: {
         value: 1,
         required: true,
@@ -36,8 +31,8 @@
 
       if ( this.count == "") { this.count = 1 }
 
-      if ( this.count > 1  ) {
-        label = `${label}: ${this.count}`
+      if ( this.count > 0  ) {
+        label = `${label}: ${this.msglimit || '=='} ${this.count}`
       }
       return label;
     },
@@ -55,6 +50,21 @@
 
     oneditprepare: function() {
       if (!this.count || this.count == "")  { this.count = 1 }
+      
+      $(".limit-msgcnt-button-group").removeClass("selected")
+      $('#node-input-msglimit').val(this.msglimit || "==")
+
+      $(".limit-msgcnt-button-group").map((i, d) => {
+        if ($(d).data("value") == $('#node-input-msglimit').val()) {
+          $(d).addClass("selected")
+        }
+      })
+
+      $(".limit-msgcnt-button-group").on("click", function () {
+        $(".limit-msgcnt-button-group").removeClass("selected");
+        $(this).addClass("selected");
+        $('#node-input-msglimit').val($(this).data("value"))
+      })
     },
 
     oneditcancel: function() {
@@ -78,9 +88,20 @@
     <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
     <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
   </div>
-
+  
   <div class="form-row">
     <label for="node-input-count" data-i18n="ut-assert-success.label.count"></label>
+
+
+    <span class="button-group">
+      <button type="button" data-value="<=" class="red-ui-button toggle limit-msgcnt-button-group selected"><span data-i18n="ut-assert-success.label.limit.upperlimit"></span></button>
+      <button type="button" data-value="=="class="red-ui-button toggle limit-msgcnt-button-group"><span data-i18n="ut-assert-success.label.limit.exactly"></span></button>
+      <button type="button" data-value=">=" class="red-ui-button toggle limit-msgcnt-button-group"><span data-i18n="ut-assert-success.label.limit.lowerlimit"></span></button>
+    </span>
+
+    <input type="text" id="node-input-msglimit" class='hide'></input>
     <input type="number" id="node-input-count" data-i18n="[placeholder]ut-assert-success.placeholder.count" style="width: 100px;"></input>
+
+    <span data-i18n="ut-assert-success.label.messages"></span>
   </div>
 </script>

package/nodes/ut-assert-success.js

@@ -1,43 +1,74 @@
-module.exports = function(RED) {
+module.exports = function (RED) {
   function CoreutassertsuccessFunctionality(config) {
-    RED.nodes.createNode(this,config);
+    RED.nodes.createNode(this, config);
 
     var node = this;
     var cfg = config;
 
-    node.on('close', function() {
+    let hasFailed = () => {
+      if (!cfg.msglimit) { cfg.msglimit = "==" }
+      let msgcnt = (node.context().get("msgcnt") || 0)
+
+      if (cfg.count == 0) { return msgcnt < 1 } // zero count means 1 and above, so a msgcnt of zero is only failure
+      else if (cfg.msglimit == "==") { return msgcnt != cfg.count }
+      else if (cfg.msglimit == ">=") { return msgcnt < cfg.count }
+      else if (cfg.msglimit == "<=") { return msgcnt > cfg.count }
+      
+      return false
+    }
+
+    node.on('close', function (removed, done) {
+      if (removed) {
+        if ( hasFailed() ) {
+          RED.comms.publish("unittesting:testresults", {
+            flowid: node.z,
+            status: "failed"
+          })
+          node.status({ fill: "red", shape: "ring", text: RED._("ut-assert-success.label.failed") + `: ${cfg.count} ${cfg.msglimit} ${node.context().get("msgcnt") || 0}` });
+          // use node.log(..) here because node.error(..) sends a message to the debug
+          // panel but that errors out because the frontend can't find the workspace:
+          //    Uncaught TypeError: can't access property "label", RED.nodes.workspace(...) is undefined
+          // that has follow-on effects.
+          // see https://nodered.org/docs/creating-nodes/node-js#logging-events for more details
+          node.log(`FAILED [${node.z}] assert success node failed: ${cfg.count} ${cfg.msglimit} ${node.context().get("msgcnt") || 0}`)
+        }
+      } else {
+        node.status({});
+      }
+
       node.context().set("msgcnt", 0)
-      node.status({});
+      done();
     });
 
     /* msg handler, in this case pass the message on unchanged */
-    node.on("input", function(msg, send, done) {
-        let msgcnt = (node.context().get("msgcnt") || 0) + 1;
-        node.context().set("msgcnt", msgcnt)
-
-        // How to send a status update
-        if ( (cfg.count || 1) == msgcnt) {
-          node.status({ fill: "green", shape: "ring", text: RED._("ut-assert-success.label.succeed") });
-        } else {
-          node.status({ fill: "red", shape: "ring", text: RED._("ut-assert-success.label.failed") + `: ${cfg.count} != ${msgcnt}`});
-        }
-        
-        // Send a message and how to handle errors.
+    node.on("input", function (msg, send, done) {
+      let msgcnt = (node.context().get("msgcnt") || 0) + 1;
+      node.context().set("msgcnt", msgcnt)
+
+      // How to send a status update
+      if (!hasFailed()) {
+        node.status({ fill: "green", shape: "ring", text: RED._("ut-assert-success.label.succeed") });
+        setTimeout(() => { node.status({}); }, 1000)
+      } else {
+        // node.status({ fill: "red", shape: "ring", text: RED._("ut-assert-success.label.failed") + `: ${cfg.count} != ${msgcnt}` });
+      }
+
+      // Send a message and how to handle errors.
+      try {
         try {
-          try {
-            send(msg);
-            done();
-          } catch ( err ) {
-            // use node.error if the node might send subsequent messages
-            node.error("error occurred", { ...msg, error: err })
-            done();
-          }
+          send(msg);
+          done();
         } catch (err) {
-          // use done if the node won't send anymore messages for the
-          // message it received.
-          msg.error = err
-          done(err.message, msg)
+          // use node.error if the node might send subsequent messages
+          node.error("error occurred", { ...msg, error: err })
+          done();
         }
+      } catch (err) {
+        // use done if the node won't send anymore messages for the
+        // message it received.
+        msg.error = err
+        done(err.message, msg)
+      }
     });
   }
 

package/nodes/ut-assert-values.js

@@ -5,6 +5,14 @@ module.exports = function(RED) {
     var node = this;
     var cfg = config;
  
+
+    //
+    // 
+    // Helper Code
+    //
+    //
+
+
     /*
     * Note to self: getMessageProperty(..) and getObjectProperty(...) only differ in that
     * getMessageProperty will remove any 'msg.' prefix from the property name. This is not
@@ -17,7 +25,6 @@ module.exports = function(RED) {
     *  getObjectProperty will return undefined if a property isn't set.
     */
 
-
     var sendToDebug = (nde,rule,msgc,lvl) => {
      try {
       let msg = {
@@ -33,7 +40,15 @@ module.exports = function(RED) {
 
       msg = RED.util.encodeObject(msg);
       if (!cfg.ignore_failure_if_succeed) {
-        RED.comms.publish("debug", msg);
+        // don't post debug, causes error in the editor because the flow does not 
+        // exist in the workspace of the editor - flow is loaded in the backend only.
+        if (!msg._unittest_triggered) {
+          RED.comms.publish("debug", msg);
+        } else {
+          // send details to the console.
+          node.log(`ASSERT FAILURE [${node.z}] assert values failed`)
+          console.log(msg)
+        }
       }
      } catch (ex) {
       console.error(ex)
@@ -45,23 +60,61 @@ module.exports = function(RED) {
       node.status({ fill: "red", shape: "dot", 
                       text: RED._("ut-assert-values.label.unsupported", { property: JSON.stringify(rule) }) });
       sendToDebug(node, rule, msg, 30)
-      
+
+      RED.comms.publish("unittesting:testresults", {
+        flowid: node.z,
+        status: "pending"
+      })
+
       return ["unsupported", rule]
     }
 
     var escapeSpecials = (str) => {
-      return str ? str.replace(/\n/g, "\\n").replace(/\r/g, "\\r").replaceAll(/\t/g, "\\t") : str
+      return (str && str.replace && (typeof str.replace == "function")) ? str.replace(/\n/g, "\\n").replace(/\r/g, "\\r").replaceAll(/\t/g, "\\t") : str
     }
 
-    node.on('close', function() {
-      node.context().set("succeed", false)
-      node.status({});
+    //
+    //
+    // Event Hander code
+    //
+    //
+
+    /* initialise and close handler - if removed is false, then this is an initailise */
+    node.on('close', function(removed, done) {
+      if (removed) {
+        if ((!node.context().get("succeed") && !cfg.ignore_failure_if_succeed) || !node.context().get("received_message")) {
+          RED.comms.publish("unittesting:testresults", {
+            flowid: node.z,
+            status: "failed"
+          })
+
+          node.status({ fill: "red", shape: "dot", text: "assert failed" })
+          
+          // use node.log(..) here because node.error(..) sends a message to the debug
+          // panel but that errors out because the frontend can't find the workspace:
+          //    Uncaught TypeError: can't access property "label", RED.nodes.workspace(...) is undefined
+          // that has follow-on effects.
+          // see https://nodered.org/docs/creating-nodes/node-js#logging-events for more details
+          if (!node.context().get("received_message")) {
+            node.log(`FAILED [${node.z}] Assert Values node not reached`)
+          } else {
+            node.log(`FAILED [${node.z}] Assert values node failed`)
+          }
+        } 
+      } else {
+        node.status({});
+        node.context().set("succeed", false)
+        node.context().set("received_message", false)
+      }
+
+      done()
     });
 
     /* msg handler, in this case pass the message on unchanged */
     node.on("input", function(msg, send, done) {
         var failures = [];
         var unsupported = [];
+        node.context().set("received_message", true)
 
         try {
           cfg.rules.forEach(rule => {     
@@ -75,8 +128,14 @@ module.exports = function(RED) {
                   failures.push(sendToDebug(node, rule, msg, 20))
                 }
               } else if ( rule.tot == "num") {
-                if ( rule.to != RED.util.getObjectProperty(msg,rule.p) ) {
-                  failures.push(sendToDebug(node, rule, msg, 20))                
+                if (rule.to == "NaN") {
+                  if ( !isNaN(RED.util.getObjectProperty(msg, rule.p)) ) {
+                    failures.push(sendToDebug(node, rule, msg, 20))
+                  }
+                } else {
+                  if ( rule.to != RED.util.getObjectProperty(msg,rule.p) ) {
+                    failures.push(sendToDebug(node, rule, msg, 20))                
+                  }
                 }
               } else if (rule.tot == "bin") {
                 let expBuffer = Buffer.from(JSON.parse(rule.to));
@@ -90,17 +149,44 @@ module.exports = function(RED) {
                 } else if (rule.to == "false" && !!RED.util.getObjectProperty(msg, rule.p) ) {
                   failures.push(sendToDebug(node, rule, msg, 20))
                 }
+              } else if (rule.tot == "jsonata") {
+                try {
+                  let jsonExpr = RED.util.prepareJSONataExpression(rule.to, node);
+                  
+                  RED.util.evaluateJSONataExpression(jsonExpr, msg, (err, value) => {
+                    if (err) {
+                      rule._err = err
+                      failures.push(sendToDebug(node, rule, msg, 20))
+                    } else {
+                      if (value != escapeSpecials(RED.util.getObjectProperty(msg, rule.p))) {
+                        rule._vt = escapeSpecials(RED.util.getObjectProperty(msg, rule.p))
+                        failures.push(sendToDebug(node, rule, msg, 20))
+                      }
+                    }
+                  });
+                } catch (e) {
+                  rule._err = e
+                  failures.push(sendToDebug(node, rule, msg, 20))
+                }                
+
               } else if (rule.tot == "json") {
                 let expObj = JSON.parse(rule.to)
                 let oldObj = RED.util.getObjectProperty(msg, rule.p)
 
-                if ( Array.isArray(expObj)) {
-                  if (JSON.stringify(oldObj) != JSON.stringify(expObj)) {
+                // special case: null or undefined
+                if (!expObj) {
+                  if (oldObj != null && oldObj != undefined) {
                     failures.push(sendToDebug(node, rule, msg, 20))
                   }
                 } else {
-                  if ( JSON.stringify(oldObj, Object.keys(oldObj).sort()) != JSON.stringify(expObj, Object.keys(expObj).sort()) ) {
-                    failures.push(sendToDebug(node, rule, msg, 20))                
+                  if ( Array.isArray(expObj)) {
+                    if (JSON.stringify(oldObj) != JSON.stringify(expObj)) {
+                      failures.push(sendToDebug(node, rule, msg, 20))
+                    }
+                  } else {
+                    if ( JSON.stringify(oldObj, Object.keys(oldObj).sort()) != JSON.stringify(expObj, Object.keys(expObj).sort()) ) {
+                      failures.push(sendToDebug(node, rule, msg, 20))                
+                    }
                   }
                 }
               } else if (rule.tot == "msg") {
@@ -137,16 +223,37 @@ module.exports = function(RED) {
                 unsupported.push(postUnsupported(rule,msg))
               }
             /*
-            * Rule is not equal
+            * Rule is not equal - both value are msg properties
             */
             } else if (rule.t == "noteql" && rule.pt == "msg" && rule.tot == "msg") {
-              /* comparing two values on the message object */
               let expObj = RED.util.getObjectProperty(msg, rule.to)
               let oldObj = RED.util.getObjectProperty(msg, rule.p)
               if (expObj == oldObj) {
                 failures.push(sendToDebug(node, rule, msg, 20))
               }
             /*
+            * Rule is not equal - comparing message property to string value
+            */
+            } else if (rule.t == "noteql" && rule.pt == "msg" && rule.tot == "str") {
+              let expValue = rule.to
+              let msgValue = RED.util.getObjectProperty(msg, rule.p)
+              if (expValue == escapeSpecials(msgValue)) {
+                rule._vt = escapeSpecials(msgValue)
+                failures.push(sendToDebug(node, rule, msg, 20))
+              }
+
+            /*
+            * Rule is not equal - comparing message property to number value
+            */
+            } else if (rule.t == "noteql" && rule.pt == "msg" && rule.tot == "num") {
+              let expValue = rule.to
+              let msgValue = RED.util.getObjectProperty(msg, rule.p)
+              if (expValue == msgValue) {
+                rule._vt = msgValue
+                failures.push(sendToDebug(node, rule, msg, 20))
+              }
+
+            /*
             * Other rule types are not supported
             */
             } else {
@@ -156,11 +263,12 @@ module.exports = function(RED) {
 
           if (node.context().get("succeed") && cfg.ignore_failure_if_succeed) {
             node.status({ fill: "green", shape: "ring", text: "assert succeed" })
+            setTimeout(() => { node.status({}); }, 1000)
           } else {
             if (failures.length > 0 ) {
               node.status({fill: "red", shape: "dot", text: "assert failed"})
               msg.assert_succeed = false
-              msg.assert_failures = failures.concat(unsupported)            
+              msg.assert_failures = failures.concat(unsupported)
             } else {
               if ( unsupported.length > 0) {
                 node.status({ fill: "yellow", shape: "ring", text: "unsupported errors - check debug" })
@@ -169,6 +277,8 @@ module.exports = function(RED) {
               } else {
                 node.context().set("succeed",true)
                 node.status({ fill: "green", shape: "ring", text: "assert succeed" })
+                setTimeout(() => { node.status({}); }, 1000)
+                
                 msg.assert_succeed = true
                 delete msg.assert_failures
               }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gregoriusrippenstein/erlang-red-unittest",
-  "version": "0.12.3",
+  "version": "0.15.0",
   "dependencies": {
   },