ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4896 from ahocevar/xml-ignore-order

Browse Source 
Ignore XML sequence when comparing GML
This commit is contained in:
Andreas Hocevar
2016-02-24 08:59:30 +01:00
parent 9f21f1dac4 cdf9eda132
commit 4e11a86b4e
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/ol/format/gmlformat.test.js
+1 -1
View File
@@ -1034,7 +1034,7 @@ describe('ol.format.GML3', function() {
it('writes back features as GML', function() { it('writes back features as GML', function() {
var serialized = gmlFormat.writeFeaturesNode(features); var serialized = gmlFormat.writeFeaturesNode(features);
expect(serialized).to.xmleql(ol.xml.parse(text)); expect(serialized).to.xmleql(ol.xml.parse(text), {ignoreElementOrder: true});
}); });
}); });
test/test-extensions.js
+7 -1
View File
@@ -125,6 +125,11 @@
} }
} }
} }
if (options && options.ignoreElementOrder) {
nodes.sort(function(a, b) {
return a.nodeName > b.nodeName ? 1 : a.nodeName < b.nodeName ? -1 : 0;
});
}
return nodes; return nodes;
} }
} }
@@ -275,7 +280,8 @@
/** /**
* Checks if the XML document sort of equals another XML document. * Checks if the XML document sort of equals another XML document.
* @param {Object} obj The other object. * @param {Object} obj The other object.
* @param {Object} options The options. * @param {{includeWhiteSpace: (boolean|undefined),
* ignoreElementOrder: (boolean|undefined)}=} options The options.
* @return {expect.Assertion} The assertion. * @return {expect.Assertion} The assertion.
*/ */
expect.Assertion.prototype.xmleql = function(obj, options) { expect.Assertion.prototype.xmleql = function(obj, options) {