From 19a62867dda0885453c639e0efefd450721cfa72 Mon Sep 17 00:00:00 2001 From: slomo Date: Fri, 28 Jan 2011 19:59:57 +0100 Subject: parsing first try --- src/nodejs/tests/urlToResObj.js | 63 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 src/nodejs/tests/urlToResObj.js (limited to 'src/nodejs/tests') diff --git a/src/nodejs/tests/urlToResObj.js b/src/nodejs/tests/urlToResObj.js new file mode 100644 index 0000000..b45edfd --- /dev/null +++ b/src/nodejs/tests/urlToResObj.js @@ -0,0 +1,63 @@ +var assert = require('assert'); +var test = require('../parse.js'); + + +//TODO function does not exist yet +var toTest = test.urlToXpathObj; + + +// test all simple objects { node, way, relation } + +var simpleNodeString = "/node"; +var expected = { object: "node" }; +assert.deepEqual(toTest(simpleNodeString), expected); + +var simpleNodeStringTrail = "/node/"; +var expected = { object: "node" }; +assert.deepEqual(toTest(simpleNodeStringTrail), expected); + +var simpleWayString = "/way"; +var expected = { object: "way" }; +assert.deepEqual(toTest(simpleWayString), expected); + +var simpleWayStringTrail = "/way/"; +var expected = { object: "way" }; +assert.deepEqual(toTest(simpleWayStringTrail), expected); + +var simpleRelationString = "/relation"; +var expected = { object: "relation" }; +assert.deepEqual(toTest(simpleRelationString), expected); + +var simpleRelationStringTrail = "/relation/"; +var expected = { object: "relation" }; +assert.deepEqual(toTest(simpleRelationStringTrail), expected); + +// TODO invalid object eg not (node, way, relation) + +var nodeWithBbox = "/node[bbox=0,51.5,0.25,51.75]"; +var expected = { object: "node", bbox: {left:0, bottom:51.5, right:0.25, top:51.75} }; +assert.deepEqual(toTest(nodeWithBbox), expected); + +var nodeWithSimpleTag = "/node[key=value]"; +var expected = { object: "node", tag: { key:["key"], value:["value"]}}; +assert.deepEqual(toTest(nodeWithSimpleTag), expected); + +var nodeWithTwoValues = "/node[tag=foo|bar]"; +var expected = { object: "node", tag: { key:["key"], value:["foo", "bar"]}}; +assert.deepEqual(toTest(nodeWithTwoValues), expected); + +var nodeWithTwoKeys = "/node[foo,bar=value]"; +var expected = { object: "node", tag: { key:["foo", "bar"], value:["value"]}}; +assert.deepEqual(toTest(nodeWithTwoKeys), expected); + +var tagCrossProduct = "/node[key1,key2=value1,value2]"; +var expected = { object: "node", tag: {key:["key1", "key2"], value:["value1", "value2"]}}; +assert.deepEqual(toTest(tagCrossProduct), expected); + +var nodeBboxTag = "/node[bbox=0,0,0,0][key=value]"; +var nodeTagBbox = "/node[bbox=0,0,0,0][key=value]"; +var expected = { object: "node", bbox: {left:0,bottom:0,right:0,top:0}, tag: {key:["key"], value:["value"]}}; +assert.deepEqual(toTest(nodeBboxTag), expected); +assert.deepEqual(toTest(nodeTagBbox), expected); + + -- cgit v1.2.3 From dd8415cc058f943d17712a2a5230d78578cb8485 Mon Sep 17 00:00:00 2001 From: slomo Date: Fri, 28 Jan 2011 22:10:43 +0100 Subject: fixed parsing --- src/nodejs/tests/pathparsing.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/nodejs/tests') diff --git a/src/nodejs/tests/pathparsing.js b/src/nodejs/tests/pathparsing.js index e1a20f5..ebd5baf 100644 --- a/src/nodejs/tests/pathparsing.js +++ b/src/nodejs/tests/pathparsing.js @@ -54,7 +54,7 @@ module.exports = test.ok(true); var simpleRelationStringTrail = "/relation/"; var expected = { object: "relation" }; - assert.deepEqual(toTest(simpleRelationStringTrail), expectedi); + assert.deepEqual(toTest(simpleRelationStringTrail), expected); test.finish(); } @@ -78,20 +78,20 @@ module.exports = , 'tag with two values': function(test) { test.ok(true); var nodeWithTwoValues = "/node[tag=foo|bar]"; - var expected = { object: "node", tag: { key:["key"], value:["foo", "bar"]}}; + var expected = { object: "node", tag: { key:["tag"], value:["foo", "bar"]}}; assert.deepEqual(toTest(nodeWithTwoValues), expected); test.finish(); } , 'tag with two keys': function(test) { test.ok(true); - var nodeWithTwoKeys = "/node[foo,bar=value]"; + var nodeWithTwoKeys = "/node[foo|bar=value]"; var expected = { object: "node", tag: { key:["foo", "bar"], value:["value"]}}; assert.deepEqual(toTest(nodeWithTwoKeys), expected); test.finish(); } , 'tags with cross product': function(test) { test.ok(true); - var tagCrossProduct = "/node[key1,key2=value1,value2]"; + var tagCrossProduct = "/node[key1|key2=value1|value2]"; var expected = { object: "node", tag: {key:["key1", "key2"], value:["value1", "value2"]}}; assert.deepEqual(toTest(tagCrossProduct), expected); test.finish(); -- cgit v1.2.3