From 1931395fdbe5a0ea81283a5cf425bcf399b067b6 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 29 Sep 2021 13:49:55 +0100
Subject: [PATCH] Add basic link-call/return tests

---
 .../@node-red/nodes/core/common/60-link.js    |  6 +-
 .../nodes/locales/en-US/messages.json         |  6 +-
 test/nodes/core/common/60-link_spec.js        | 65 +++++++++++++++++++
 3 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/common/60-link.js b/packages/node_modules/@node-red/nodes/core/common/60-link.js
index 939191fbf..d5eda733f 100644
--- a/packages/node_modules/@node-red/nodes/core/common/60-link.js
+++ b/packages/node_modules/@node-red/nodes/core/common/60-link.js
@@ -56,10 +56,10 @@ module.exports = function(RED) {
                     if (returnNode && returnNode.returnLinkMessage) {
                         returnNode.returnLinkMessage(messageEvent.id, msg);
                     } else {
-                        node.warn("Return target not a link-call node")
+                        node.warn(RED._("link.error.missingReturn"))
                     }
                 } else {
-                    node.warn("No call return target")
+                    node.warn(RED._("link.error.missingReturn"))
                 }
                 done();
             } else if (mode === "link") {
@@ -101,7 +101,7 @@ module.exports = function(RED) {
                 messageEvent.send(msg);
                 messageEvent.done();
             } else {
-                node.warn("Unrecognised message returned")
+                node.send(msg);
             }
         }
     }
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index d9d94ef59..cbb344ed3 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -164,8 +164,10 @@
         "linkOutReturn": "link return",
         "outMode": "Mode",
         "sendToAll": "Send to all connected link nodes",
-        "returnToCaller": "Return to calling link node"
-
+        "returnToCaller": "Return to calling link node",
+        "error": {
+            "missingReturn": "Missing return node information"
+        }
     },
     "tls": {
         "tls": "TLS configuration",
diff --git a/test/nodes/core/common/60-link_spec.js b/test/nodes/core/common/60-link_spec.js
index 50072d761..5314eed15 100644
--- a/test/nodes/core/common/60-link_spec.js
+++ b/test/nodes/core/common/60-link_spec.js
@@ -119,4 +119,69 @@ describe('link Node', function() {
         });
     });
 
+    describe("link-call node", function() {
+        it('should call link-in node and get response', function(done) {
+            var flow = [{id:"link-in-1", type:"link in", wires: [[ "func"]]},
+                        {id:"func", type:"helper", wires: [["link-out-1"]]},
+                        {id:"link-out-1", type:"link out", mode: "return"},
+                        {id:"link-call", type:"link call", links:["link-in-1"], wires:[["n4"]]},
+                        {id:"n4", type:"helper"} ];
+            helper.load(linkNode, flow, function() {
+                var func = helper.getNode("func");
+                func.on("input", function(msg, send, done) {
+                    msg.payload = "123";
+                    send(msg);
+                    done();
+                })
+                var n1 = helper.getNode("link-call");
+                var n4 = helper.getNode("n4");
+                n4.on("input", function(msg) {
+                    try {
+                        msg.should.have.property('payload', '123');
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                });
+                n1.receive({payload:"hello"});
+            });
+        })
+    });
+
+    it('should allow nested link-call flows', function(done) {
+        var flow = [/** Multiply by 2 link flow **/
+                    {id:"li1", type:"link in", wires: [[ "m2"]]},
+                    {id:"m2", type:"helper", wires: [["lo1"]]},
+                    {id:"lo1", type:"link out", mode: "return"},
+                    /** Multiply by 3 link flow **/
+                    {id:"li2", type:"link in", wires: [[ "m3"]]},
+                    {id:"m3", type:"helper", wires: [["lo2"]]},
+                    {id:"lo2", type:"link out", mode: "return"},
+                    /** Multiply by 6 link flow **/
+                    {id:"li3", type:"link in", wires: [[ "link-call-1"]]},
+                    {id:"link-call-1", type:"link call", links:["m2"], wires:[["link-call-2"]]},
+                    {id:"link-call-2", type:"link call", links:["m3"], wires:[["lo3"]]},
+                    {id:"lo3", type:"link out", mode: "return"},
+                    /** Test Flow Entry **/
+                    {id:"link-call", type:"link call", links:["li3"], wires:[["n4"]]},
+                    {id:"n4", type:"helper"} ];
+        helper.load(linkNode, flow, function() {
+            var m2 = helper.getNode("m2");
+            m2.on("input", function(msg, send, done) { msg.payload *= 2 ; send(msg); done(); })
+            var m3 = helper.getNode("m3");
+            m3.on("input", function(msg, send, done) { msg.payload *= 3 ; send(msg); done(); })
+
+            var n1 = helper.getNode("link-call");
+            var n4 = helper.getNode("n4");
+            n4.on("input", function(msg) {
+                try {
+                    msg.should.have.property('payload', 24);
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            });
+            n1.receive({payload:4});
+        });
+    })
 });