frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

fix persistable context handling of sort node & existing error in testcases

Browse Source
This commit is contained in:
Hiroyasu Nishiyama 2018-09-05 22:29:20 +09:00 committed by Nick O'Leary
parent a2d03c14ae
commit 6fa8b7f5f1
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
2 changed files with 80 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nodes/core/logic/18-sort.js
View File

@ -196,9 +196,10 @@ module.exports = function(RED) {
}).catch(err => { }).catch(err => {
node.error(err,msg); node.error(err,msg);
}); });
return;
} }
var parts = msg.parts; var parts = msg.parts;
if (!parts.hasOwnProperty("id") || !parts.hasOwnProperty("index")) { if (!parts || !parts.hasOwnProperty("id") || !parts.hasOwnProperty("index")) {
return; return;
} }
var gid = parts.id; var gid = parts.id;
@ -242,7 +243,8 @@ module.exports = function(RED) {
delete pending[key]; delete pending[key];
} }
} }
pending_count = 0; }) pending_count = 0;
});
} }
RED.nodes.registerType("sort", SortNode); RED.nodes.registerType("sort", SortNode);

95
test/nodes/core/logic/18-sort_spec.js
View File

@ -66,13 +66,25 @@ describe('SORT node', function() {
var n1 = helper.getNode("n1"); var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2"); var n2 = helper.getNode("n2");
n2.on("input", function(msg) { n2.on("input", function(msg) {
msg.should.have.property(target); try {
var data = msg[target]; msg.should.have.property(target);
data.length.should.equal(data_out.length); var data = msg[target];
for(var i = 0; i < data_out.length; i++) { data.length.should.equal(data_out.length);
data[i].should.equal(data_out[i]); for(var i = 0; i < data_out.length; i++) {
var data0 = data[i];
var data1 = data_out[i];
if (typeof data0 === "object") {
data0.should.deepEqual(data1);
}
else {
data0.should.equal(data1);
}
}
done();
}
catch(e) {
console.log(e);
} }
done();
}); });
var msg = {}; var msg = {};
msg[target] = data_in; msg[target] = data_in;
@ -93,6 +105,34 @@ describe('SORT node', function() {
} }
function check_sort1(flow, key, key_type, data_in, data_out, done) { function check_sort1(flow, key, key_type, data_in, data_out, done) {
function equals(v0, v1) {
var k0 = Object.keys(v0);
var k1 = Object.keys(v1);
if (k0.length === k1.length) {
for (var i = 0; i < k0.length; i++) {
var k = k0[i];
if (!v1.hasOwnProperty(k) ||
(v0[k] !== v1[k])) {
return false;
}
}
return true;
}
return false;
}
function indexOf(a, v) {
for(var i = 0; i < a.length; i++) {
var av = a[i];
if ((typeof v === 'object') && equals(v, av)) {
return i;
}
else if (v === av) {
return i;
}
}
return -1;
}
var sort = flow[0]; var sort = flow[0];
var prop = (key_type === "msg") ? key : "payload"; var prop = (key_type === "msg") ? key : "payload";
sort.targetType = "seq"; sort.targetType = "seq";
@ -107,7 +147,7 @@ describe('SORT node', function() {
msg.should.have.property("parts"); msg.should.have.property("parts");
msg.parts.should.have.property("count", data_out.length); msg.parts.should.have.property("count", data_out.length);
var data = msg[prop]; var data = msg[prop];
var index = data_out.indexOf(data); var index = indexOf(data_out, data);
msg.parts.should.have.property("index", index); msg.parts.should.have.property("index", index);
count++; count++;
if (count === data_out.length) { if (count === data_out.length) {
@ -136,7 +176,6 @@ describe('SORT node', function() {
check_sort1(flow, exp, "jsonata", data_in, data_out, done); check_sort1(flow, exp, "jsonata", data_in, data_out, done);
} }
(function() { (function() {
var flow = [{id:"n1", type:"sort", order:"ascending", as_num:false, wires:[["n2"]]}, var flow = [{id:"n1", type:"sort", order:"ascending", as_num:false, wires:[["n2"]]},
{id:"n2", type:"helper"}]; {id:"n2", type:"helper"}];
@ -239,6 +278,19 @@ describe('SORT node', function() {
}); });
})(); })();
(function() {
var flow = [{id:"n1", type:"sort", order:"ascending", as_num:true, wires:[["n2"]]},
{id:"n2", type:"helper"}];
var conv = function(x) {
return x.map(function(v) { return { val:v }; });
};
var data_in = conv([ "200", "4", "30", "1000" ]);
var data_out = conv([ "4", "30", "200", "1000" ]);
it('should sort payload of objects', function(done) {
check_sort0C(flow, "val", data_in, data_out, done);
});
})();
it('should sort payload by context (exp, not number, ascending)', function(done) { it('should sort payload by context (exp, not number, ascending)', function(done) {
var flow = [{id:"n1", type:"sort", target:"data", targetType:"msg", msgKey:"$flowContext($)", msgKeyType:"jsonata", order:"ascending", as_num:false, wires:[["n2"]],z:"flow"}, var flow = [{id:"n1", type:"sort", target:"data", targetType:"msg", msgKey:"$flowContext($)", msgKeyType:"jsonata", order:"ascending", as_num:false, wires:[["n2"]],z:"flow"},
{id:"n2", type:"helper",z:"flow"}, {id:"n2", type:"helper",z:"flow"},
@ -268,7 +320,7 @@ describe('SORT node', function() {
}); });
it('should sort message group by context (exp, not number, ascending)', function(done) { it('should sort message group by context (exp, not number, ascending)', function(done) {
var flow = [{id:"n1", type:"sort", target:"data", targetType:"msg", msgKey:"$globalContext(payload)", msgKeyType:"jsonata", order:"ascending", as_num:false, wires:[["n2"]],z:"flow"}, var flow = [{id:"n1", type:"sort", target:"data", targetType:"seq", seqKey:"$globalContext(payload)", seqKeyType:"jsonata", order:"ascending", as_num:false, wires:[["n2"]],z:"flow"},
{id:"n2", type:"helper",z:"flow"}, {id:"n2", type:"helper",z:"flow"},
{id:"flow", type:"tab"}]; {id:"flow", type:"tab"}];
var data_in = [ "first", "second", "third", "fourth" ]; var data_in = [ "first", "second", "third", "fourth" ];
@ -282,15 +334,20 @@ describe('SORT node', function() {
n1.context()["global"].set("third","3"); n1.context()["global"].set("third","3");
n1.context()["global"].set("fourth","2"); n1.context()["global"].set("fourth","2");
n2.on("input", function(msg) { n2.on("input", function(msg) {
msg.should.have.property("payload"); try {
msg.should.have.property("parts"); msg.should.have.property("payload");
msg.parts.should.have.property("count", data_out.length); msg.should.have.property("parts");
var data = msg["payload"]; msg.parts.should.have.property("count", data_out.length);
var index = data_out.indexOf(data); var data = msg["payload"];
msg.parts.should.have.property("index", index); var index = data_out.indexOf(data);
count++; msg.parts.should.have.property("index", index);
if (count === data_out.length) { count++;
done(); if (count === data_out.length) {
done();
}
}
catch(e) {
done(e);
} }
}); });
var len = data_in.length; var len = data_in.length;
@ -332,7 +389,7 @@ describe('SORT node', function() {
}); });
it('should sort message group by persistable context (exp, not number, descending)', function(done) { it('should sort message group by persistable context (exp, not number, descending)', function(done) {
var flow = [{id:"n1", type:"sort", target:"data", targetType:"msg", msgKey:"$flowContext(payload,\"memory\")", msgKeyType:"jsonata", order:"descending", as_num:false, wires:[["n2"]],z:"flow"}, var flow = [{id:"n1", type:"sort", target:"data", targetType:"seq", seqKey:"$flowContext(payload,\"memory\")", seqKeyType:"jsonata", order:"descending", as_num:false, wires:[["n2"]],z:"flow"},
{id:"n2", type:"helper",z:"flow"}, {id:"n2", type:"helper",z:"flow"},
{id:"flow", type:"tab"}]; {id:"flow", type:"tab"}];
var data_in = [ "first", "second", "third", "fourth" ]; var data_in = [ "first", "second", "third", "fourth" ];