diff --git a/test/spec/ol/format/gmlformat.test.js b/test/spec/ol/format/gmlformat.test.js index 4a86a4f324..09aa00cb01 100644 --- a/test/spec/ol/format/gmlformat.test.js +++ b/test/spec/ol/format/gmlformat.test.js @@ -977,7 +977,6 @@ describe('ol.format.GML3', function() { }); it('writes back features as GML', function() { - this.timeout(4000); var serialized = gmlFormat.writeFeaturesNode(features); expect(serialized).to.xmleql(ol.xml.parse(text)); }); diff --git a/test/test-extensions.js b/test/test-extensions.js index badd5dfbe2..31587eb1d0 100644 --- a/test/test-extensions.js +++ b/test/test-extensions.js @@ -97,7 +97,7 @@ return node.childNodes; } else { var nodes = []; - for (var i = 0, ii=node.childNodes.length; i < ii; i++ ) { + for (var i = 0, ii = node.childNodes.length; i < ii; i++) { var child = node.childNodes[i]; if (child.nodeType == 1) { // element node, add it @@ -116,36 +116,25 @@ function assertElementNodesEqual(node1, node2, options, errors) { var testPrefix = (options && options.prefix === true); - try { - expect(node1.nodeType).to.equal(node2.nodeType); - } catch(e) { + if (node1.nodeType !== node2.nodeType) { errors.push('nodeType test failed for: ' + node1.nodeName + ' | ' + - node2.nodeName + ' | ' + e.message); + node2.nodeName); } if (testPrefix) { - try { - expect(node1.nodeName).to.equal(node2.nodeName); - } catch(e) { - errors.push('nodeName test failed for: ' + node1.nodeName + ' | ' + - node2.nodeName + ' | ' + e.message); - } - } else { - try { - expect(node1.nodeName.split(':').pop()).to.equal( - node2.nodeName.split(':').pop()); - } catch(e) { - errors.push('nodeName test failed for: ' + node1.nodeName + ' | ' + - node2.nodeName + ' | ' + e.message); - } + if (node1.nodeName !== node2.nodeName) { + errors.push('nodeName test failed for: ' + node1.nodeName + ' | ' + + node2.nodeName); + } + } else if (node1.nodeName.split(':').pop() !== + node2.nodeName.split(':').pop()) { + errors.push('nodeName test failed for: ' + node1.nodeName + ' | ' + + node2.nodeName); } // for text nodes compare value if (node1.nodeType === 3) { - try { - // TODO should we make this optional? - expect(node1.nodeValue.replace(/\s/g, '')).to.equal( - node2.nodeValue.replace(/\s/g, '')); - } catch(e) { - errors.push('nodeValue test failed | ' + e.message); + if (node1.nodeValue.replace(/\s/g, '') !== + node2.nodeValue.replace(/\s/g, '')) { + errors.push('nodeValue test failed'); } } // for element type nodes compare namespace, attributes, and children @@ -153,20 +142,14 @@ // test namespace alias and uri if (node1.prefix || node2.prefix) { if (testPrefix) { - try { - expect(node1.prefix).to.equal(node2.prefix); - } catch(e) { - errors.push('Prefix test failed for: ' + node1.nodeName + ' | ' + - e.message); + if (node1.prefix !== node2.prefix) { + errors.push('Prefix test failed for: ' + node1.nodeName); } } } if (node1.namespaceURI || node2.namespaceURI) { - try { - expect(node1.namespaceURI).to.equal(node2.namespaceURI); - } catch(e) { - errors.push('namespaceURI test failed for: ' + node1.nodeName + - ' | ' + e.message); + if (node1.namespaceURI !== node2.namespaceURI) { + errors.push('namespaceURI test failed for: ' + node1.nodeName); } } // compare attributes - disregard xmlns given namespace handling above @@ -177,7 +160,7 @@ var ga, ea, gn, en; var i, ii; if (node1.attributes) { - for (i=0, ii=node1.attributes.length; i