cartodb/carto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

serialize json representation rather than mapnik xml for easier comparision

Browse Source
This commit is contained in:
Dane Springmeyer 2012-12-21 16:12:02 -08:00
parent 539d293388
commit c707188ed5
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/rendering.test.js
View File

@ -27,9 +27,10 @@ helper.files('rendering', 'mml', function(file) {
} else {
var result = helper.resultFile(file);
renderResult = output;
helper.compareToXMLFile(result, output, function(err) {
helper.compareToXMLFile(result, output, function(err,expected_json,actual_json) {
completed = true;
var actual = file + '.actual.xml';
var actual = file.replace(path.extname(file),'') + '-actual.json';
var expected = file.replace(path.extname(file),'') + '-expected.json';
if (err) {
// disabled since it can break on large diffs
/*
@ -40,12 +41,14 @@ helper.files('rendering', 'mml', function(file) {
helper.showDifferences(err);
throw '';
*/
fs.writeFileSync(actual,output);
fs.writeFileSync(actual,JSON.stringify(actual_json,null,4));
fs.writeFileSync(expected,JSON.stringify(expected_json,null,4));
throw new Error('failed: ' + actual + ' not equal to expected: ' + result);
} else {
// cleanup any actual renders that no longer fail
try {
fs.unlinkSync(actual);
fs.unlinkSync(expected);
} catch (err) {}
}
done();

2
test/support/helper.js
View File

@ -120,7 +120,7 @@ exports.compareToXMLFile = function(filename, second, callback, processors) {
assert.deepEqual(secondXML, firstXML);
callback(null);
} catch (err) {
callback(err);
callback(err,secondXML, firstXML);
}
});
});