From 9b56b6f4c37e9c237403e5bc8d32842cc82be977 Mon Sep 17 00:00:00 2001 From: dceejay Date: Tue, 31 Mar 2015 15:15:38 +0100 Subject: [PATCH] add some more tests (and fixes for resulting bugs :-) --- function/random/random.js | 8 +- parsers/geohash/70-geohash.js | 18 +- test/function/random/random_spec.js | 83 +++++++ test/parsers/geohash/70-geohash_spec.js | 318 ++++++++++++++++++++++++ 4 files changed, 418 insertions(+), 9 deletions(-) create mode 100644 test/function/random/random_spec.js create mode 100644 test/parsers/geohash/70-geohash_spec.js diff --git a/function/random/random.js b/function/random/random.js index ed732058..dda4d6ed 100644 --- a/function/random/random.js +++ b/function/random/random.js @@ -18,12 +18,12 @@ module.exports = function(RED) { "use strict"; function RandomNode(n) { RED.nodes.createNode(this,n); - this.low = Number(n.low); - this.high = Number(n.high); - this.inte = n.inte; + this.low = Number(n.low || 1); + this.high = Number(n.high || 10); + this.inte = n.inte || false; var node = this; this.on("input", function(msg) { - if (node.inte === "true") { + if (node.inte === true) { msg.payload = Math.round(Number(Math.random()) * (node.high - node.low + 1) + node.low - 0.5); } else { msg.payload = Number(Math.random()) * (node.high - node.low) + node.low; diff --git a/parsers/geohash/70-geohash.js b/parsers/geohash/70-geohash.js index 1aa1ba25..c81a50f5 100644 --- a/parsers/geohash/70-geohash.js +++ b/parsers/geohash/70-geohash.js @@ -38,12 +38,14 @@ module.exports = function(RED) { else { var lt = msg.location.lat; var ln = msg.location.lon; - var le = parseInt(msg.location.precision || msg.location.payload || 9); + var le = parseInt(msg.location.precision || 9); if (le < 1) { le = 1; } if (le > 9) { le = 9; } if (lt && ln) { msg.location.geohash = geohash.encode(lt, ln, le); node.send(msg); + } else { + node.warn("lat or lon missing from msg.location"); } } } @@ -64,10 +66,14 @@ module.exports = function(RED) { if (la < -90) { la = -90; } if (la > 90) { la = 90; } var lo = Number(bits[1]); - if (lo < -180) { lo = -180; } - if (lo > 180) { la = 180; } - msg.payload = geohash.encode(la, lo); - node.send(msg); + if (lo < -180) { lo = ((lo-180)%360)+180; } + if (lo > 180) { lo = ((lo+180)%360)-180; } + if (!isNaN(la) && !isNaN(lo)) { + msg.payload = geohash.encode(la, lo); + node.send(msg); + } else { + node.warn("Incorrect string format - should be lat,lon"); + } } else { node.warn("Unexpected string format - should be lat,lon"); } } @@ -82,6 +88,8 @@ module.exports = function(RED) { if (lat && lon) { msg.payload.geohash = geohash.encode(lat, lon, len); node.send(msg); + } else { + node.warn("lat or lon missing from msg.payload"); } } else { diff --git a/test/function/random/random_spec.js b/test/function/random/random_spec.js new file mode 100644 index 00000000..4e2fb4fd --- /dev/null +++ b/test/function/random/random_spec.js @@ -0,0 +1,83 @@ +/** + * Copyright 2015 IBM Corp. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + **/ + +var should = require("should"); +var helper = require('../../../test/helper.js'); +var testNode = require('../../../function/random/random.js'); + +describe('random node', function() { + "use strict"; + + beforeEach(function(done) { + helper.startServer(done); + }); + + afterEach(function(done) { + helper.unload().then(function() { + helper.stopServer(done); + }); + }); + + it("should be loaded with correct defaults", function(done) { + var flow = [{"id":"n1", "type":"random", "name":"random1", "wires":[[]]}]; + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + n1.should.have.property("low", 1); + n1.should.have.property("high", 10); + n1.should.have.property("inte", false); + done(); + }); + }); + + it('should output an integer between -3 and 3', function(done) { + var flow = [{"id":"n1", "type":"random", low:3, high:3, inte:true, wires:[["n2"]] }, + {id:"n2", type:"helper"} ]; + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + var c = 0; + n2.on("input", function(msg) { + if (c === 0) { + msg.should.have.a.property("payload"); + msg.payload.should.be.approximately(0,3); + msg.payload.toString().indexOf(".").should.equal(-1); + done(); + } + }); + n1.emit("input", {payload:"a"}); + }); + }); + + it('should output an float between 20 and 30', function(done) { + var flow = [{"id":"n1", "type":"random", low:20, high:30, inte:false, wires:[["n2"]] }, + {id:"n2", type:"helper"} ]; + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + var c = 0; + n2.on("input", function(msg) { + if (c === 0) { + msg.should.have.a.property("payload"); + msg.payload.should.be.approximately(25,5); + msg.payload.toString().indexOf(".").should.not.equal(-1); + done(); + } + }); + n1.emit("input", {payload:"a"}); + }); + }); + +}); diff --git a/test/parsers/geohash/70-geohash_spec.js b/test/parsers/geohash/70-geohash_spec.js new file mode 100644 index 00000000..026e93df --- /dev/null +++ b/test/parsers/geohash/70-geohash_spec.js @@ -0,0 +1,318 @@ +/** + * Copyright 2015 IBM Corp. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + **/ + +var should = require("should"); +var helper = require('../../../test/helper.js'); +var testNode = require('../../../parsers/geohash/70-geohash.js'); + +describe('geohash node', function() { + "use strict"; + + beforeEach(function(done) { + helper.startServer(done); + }); + + afterEach(function(done) { + helper.unload().then(function() { + helper.stopServer(done); + }); + }); + + it("should be loaded with correct defaults", function(done) { + var flow = [{"id":"n1", "type":"geohash", "name":"geohash1", "wires":[[]]}]; + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + n1.should.have.property("name", "geohash1"); + done(); + }); + }); + + it('should convert payload lat,lon to geohash', function(done) { + var flow = [{"id":"n1", "type":"geohash", func:"geohash", gap:0, wires:[["n2"]] }, + {id:"n2", type:"helper"} ]; + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + n2.on("input", function(msg) { + msg.should.have.a.property("payload", "gcnfju78x"); + done(); + }); + n1.emit("input", {payload:"51.0,-1.5"}); + }); + }); + + it('should convert payload lat,lon > 90/180 to geohash', function(done) { + var flow = [{"id":"n1", "type":"geohash", func:"geohash", gap:0, wires:[["n2"]] }, + {id:"n2", type:"helper"} ]; + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + n2.on("input", function(msg) { + msg.should.have.a.property("payload", "gzyzvzgxz"); + done(); + }); + n1.emit("input", {payload:"231.0,358.5"}); + }); + }); + + it('should convert payload lat,lon < -90/-180 to geohash', function(done) { + var flow = [{"id":"n1", "type":"geohash", func:"geohash", gap:0, wires:[["n2"]] }, + {id:"n2", type:"helper"} ]; + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + n2.on("input", function(msg) { + msg.should.have.a.property("payload", "5bnbjb58p"); + done(); + }); + n1.emit("input", {payload:"-100,-361.5"}); + }); + }); + + it('should convert payload object lat,lon to geohash', function(done) { + var flow = [{"id":"n1", "type":"geohash", func:"geohash", gap:0, wires:[["n2"]] }, + {id:"n2", type:"helper"} ]; + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + n2.on("input", function(msg) { + msg.should.have.a.property("payload"); + msg.payload.should.have.a.property("geohash", "t9cbbukqn"); + done(); + }); + n1.emit("input", {payload:{latitude:10,longitude:70}}); + }); + }); + + it('should convert payload geohash to lat.lon', function(done) { + var flow = [{"id":"n1", "type":"geohash", func:"geohash", gap:0, wires:[["n2"]] }, + {id:"n2", type:"helper"} ]; + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + n2.on("input", function(msg) { + msg.should.have.a.property("payload"); + msg.payload.should.have.a.property("lat", 51.00002); + msg.payload.should.have.a.property("lon", -1.5); + msg.payload.should.have.a.property("error"); + done(); + }); + n1.emit("input", {payload:"gcnfju78x"}); + }); + }); + + it('should convert location lat, lon to geohash', function(done) { + var flow = [{"id":"n1", "type":"geohash", func:"geohash", gap:0, wires:[["n2"]] }, + {id:"n2", type:"helper"} ]; + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + n2.on("input", function(msg) { + msg.should.have.a.property("location"); + msg.location.should.have.a.property("geohash", "kukqnpp5e"); + done(); + }); + n1.emit("input", {location:{lat:-20,lon:40}}); + }); + }); + + it('should convert location geohash to lat.lon', function(done) { + var flow = [{"id":"n1", "type":"geohash", func:"geohash", gap:0, wires:[["n2"]] }, + {id:"n2", type:"helper"} ]; + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + n2.on("input", function(msg) { + msg.should.have.a.property("location"); + msg.location.should.have.a.property("lat", -19.99999); + msg.location.should.have.a.property("lon", 40); + msg.location.should.have.a.property("error"); + done(); + }); + n1.emit("input", {location:{geohash:"kukqnpp5e"}}); + }); + }); + + it('should warn if given a duff string', function(done) { + var flow = [{"id":"n1", "type":"geohash", func:"gap", gap:10, wires:[["n2"]] }, + {id:"n2", type:"helper"} ]; + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + var c = 0; + n2.on("input", function(msg) { + c += 1; + }); + setTimeout( function() { + c.should.equal(0); + helper.log().called.should.be.true; + var logEvents = helper.log().args.filter(function (evt) { + return evt[0].type == "geohash"; + }); + logEvents.should.have.length(1); + var msg = logEvents[0][0]; + msg.should.have.property('level', helper.log().WARN); + msg.should.have.property('id', 'n1'); + msg.should.have.property('type', 'geohash'); + msg.should.have.property('msg', 'Unexpected string format - should either be lat,lon or geohash'); + done(); + },50); + n1.emit("input", {payload:"bananas is nice"}); + }); + }); + + it('should warn if given a non numeric pair of numbers', function(done) { + var flow = [{"id":"n1", "type":"geohash", func:"gap", gap:10, wires:[["n2"]] }, + {id:"n2", type:"helper"} ]; + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + var c = 0; + n2.on("input", function(msg) { + console.log(msg); + c += 1; + }); + setTimeout( function() { + c.should.equal(0); + helper.log().called.should.be.true; + var logEvents = helper.log().args.filter(function (evt) { + return evt[0].type == "geohash"; + }); + logEvents.should.have.length(1); + var msg = logEvents[0][0]; + msg.should.have.property('level', helper.log().WARN); + msg.should.have.property('id', 'n1'); + msg.should.have.property('type', 'geohash'); + msg.should.have.property('msg', 'Incorrect string format - should be lat,lon'); + done(); + },50); + n1.emit("input", {payload:"bananas,apples"}); + }); + }); + + it('should warn if given a string with wrong number of parts', function(done) { + var flow = [{"id":"n1", "type":"geohash", func:"gap", gap:10, wires:[["n2"]] }, + {id:"n2", type:"helper"} ]; + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + var c = 0; + n2.on("input", function(msg) { + c += 1; + }); + setTimeout( function() { + c.should.equal(0); + helper.log().called.should.be.true; + var logEvents = helper.log().args.filter(function (evt) { + return evt[0].type == "geohash"; + }); + logEvents.should.have.length(1); + var msg = logEvents[0][0]; + msg.should.have.property('level', helper.log().WARN); + msg.should.have.property('id', 'n1'); + msg.should.have.property('type', 'geohash'); + msg.should.have.property('msg', 'Unexpected string format - should be lat,lon'); + done(); + },50); + n1.emit("input", {payload:"bananas,apples,pears"}); + }); + }); + + it('should warn if not string or object', function(done) { + var flow = [{"id":"n1", "type":"geohash", func:"gap", gap:10, wires:[["n2"]] }, + {id:"n2", type:"helper"} ]; + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + var c = 0; + n2.on("input", function(msg) { + c += 1; + }); + setTimeout( function() { + c.should.equal(0); + helper.log().called.should.be.true; + var logEvents = helper.log().args.filter(function (evt) { + return evt[0].type == "geohash"; + }); + logEvents.should.have.length(1); + var msg = logEvents[0][0]; + msg.should.have.property('level', helper.log().WARN); + msg.should.have.property('id', 'n1'); + msg.should.have.property('type', 'geohash'); + msg.should.have.property('msg', 'This node only expects strings or objects.'); + done(); + },50); + n1.emit("input", {payload:42}); + }); + }); + + it('should warn if location object with only a lat (or lon)', function(done) { + var flow = [{"id":"n1", "type":"geohash", func:"gap", gap:10, wires:[["n2"]] }, + {id:"n2", type:"helper"} ]; + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + var c = 0; + n2.on("input", function(msg) { + c += 1; + }); + setTimeout( function() { + c.should.equal(0); + helper.log().called.should.be.true; + var logEvents = helper.log().args.filter(function (evt) { + return evt[0].type == "geohash"; + }); + logEvents.should.have.length(1); + var msg = logEvents[0][0]; + msg.should.have.property('level', helper.log().WARN); + msg.should.have.property('id', 'n1'); + msg.should.have.property('type', 'geohash'); + msg.should.have.property('msg', 'lat or lon missing from msg.location'); + done(); + },50); + n1.emit("input", {location:{lat:-20}}); + }); + }); + + it('should warn if payload object with only a lat (or lon)', function(done) { + var flow = [{"id":"n1", "type":"geohash", func:"gap", gap:10, wires:[["n2"]] }, + {id:"n2", type:"helper"} ]; + helper.load(testNode, flow, function() { + var n1 = helper.getNode("n1"); + var n2 = helper.getNode("n2"); + var c = 0; + n2.on("input", function(msg) { + c += 1; + }); + setTimeout( function() { + c.should.equal(0); + helper.log().called.should.be.true; + var logEvents = helper.log().args.filter(function (evt) { + return evt[0].type == "geohash"; + }); + logEvents.should.have.length(1); + var msg = logEvents[0][0]; + msg.should.have.property('level', helper.log().WARN); + msg.should.have.property('id', 'n1'); + msg.should.have.property('type', 'geohash'); + msg.should.have.property('msg', 'lat or lon missing from msg.payload'); + done(); + },50); + n1.emit("input", {payload:{lon:40}}); + }); + }); + +});