Update tests (tape ^5.8.1) + expected images

Author: artemp

test/compositing.test.js

@@ -35,6 +35,7 @@ test('should stitch input images correctly', (assert) => {
 
   var output_image = new mapnik.Image(512, 512);
   output_image.premultiply();
+  assert.plan(20);
   input.forEach(function (item, index) {
     item[0].premultiply();
     output_image.composite(item[0], {dx: item[1], dy: item[2]}, function(err) {
@@ -59,7 +60,6 @@ test('should stitch input images correctly', (assert) => {
       });
     });
   });
-  assert.end();
 });
 
 test('should fail with bad parameters', (assert) => {

test/data/vector_tile/compositing/expected/0-0-0-mosaic.png

@@ -8,6 +8,7 @@ var path = require('path');
 // puts unnatural, odd, and intentionally racey load on opening geotiff
 
 test('should be able to open geotiff various ways without crashing', (assert) => {
+  assert.plan(5)
   mapnik.register_datasource(path.join(mapnik.settings.paths.input_plugins,'gdal.input'));
   var vtile = new mapnik.VectorTile(0, 0, 0);
   var map = new mapnik.Map(256, 256);
@@ -23,6 +24,5 @@ test('should be able to open geotiff various ways without crashing', (assert) =>
   map3.render(vtile,{},function(err,vtile) {
     if (err) throw err;
     assert.ok(vtile);
-    assert.end();
   });
 });

test/data/vector_tile/compositing/expected/2-1-1.png

@@ -152,10 +152,10 @@ test('should err with async non-existent file', (assert) => {
   });
 });
 
-test('should not error with async in non-strict mode on svg with validation and parse errors', (assert) => {
+test('should error with async in non-strict mode on svg with validation and parse errors', (assert) => {
   mapnik.Image.fromSVG('./test/data/vector_tile/errors.svg', {strict:false}, function(err, svg) {
-    assert.ok(!err);
-    assert.ok(svg);
+    assert.ok(err);
+    assert.equals(svg, undefined);
     assert.end();
   });
 });
@@ -311,12 +311,12 @@ test('svg scaling', (assert) =>  {
 
 test('svg viewBox', (assert) => {
   var svgdata = '<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"/>';
-  // "em" units are not supported, use viewBox to determine viewport
+  // by default 1em is equivalent to 16px
   var buffer = Buffer.from(svgdata);
   var img = mapnik.Image.fromSVGBytesSync(buffer, {scale: 1.0});
   assert.ok(img);
   assert.ok(img instanceof mapnik.Image);
-  assert.equal(img.width(), 24);
-  assert.equal(img.height(), 24);
+  assert.equal(img.width(), 16);
+  assert.equal(img.height(), 16);
   assert.end();
 });

test/data/vector_tile/compositing/expected/2-1-1b.png

@@ -43,6 +43,7 @@ test('should initialize image successfully with options', (assert) => {
 
 
 test('should throw with invalid encoding', (assert) => {
+  assert.plan(11);
   var im = new mapnik.Image(256, 256);
   assert.throws(function() { im.encodeSync('foo'); });
   assert.throws(function() { im.encodeSync(1); });
@@ -57,20 +58,18 @@ test('should throw with invalid encoding', (assert) => {
   im.encode('foo', {}, function(err, result) {
     assert.throws(function() { if (err) throw err; });
   });
-  assert.end();
 });
 
 
 test('should encode with a pallete', (assert) => {
   var im = new mapnik.Image(256, 256);
   var pal = new mapnik.Palette(Buffer.from('\xff\x09\x93\xFF\x01\x02\x03\x04','ascii'));
+  assert.plan(2);
   assert.ok(im.encodeSync('png', {palette:pal}));
-
   im.encode('png', {palette:pal}, function(err, result) {
     if (err) throw err;
     assert.ok(result);
   });
-  assert.end();
 });
 
 

test/data/vector_tile/compositing/expected/concat.png

@@ -81,11 +81,12 @@ test('should throw with invalid coords (4326 -> 3873)', (assert) => {
   var from = new mapnik.Projection('epsg:4326');
   var to = new mapnik.Projection('epsg:3873');
   var trans = new mapnik.ProjTransform(from,to);
-  var long_lat_coords = [-190, 95];
   assert.throws(function() { trans.forward(); });
   assert.throws(function() { trans.forward(null); });
   assert.throws(function() { trans.forward([1,2,3]); });
-  assert.throws(function() { trans.forward(long_lat_coords); });
+  var output = trans.forward([-190, 95])
+  assert.equal(output[0], Infinity)
+  assert.equal(output[1], Infinity);
   assert.end();
 });
 
@@ -97,7 +98,9 @@ test('should throw with invalid coords (3873 -> 4326) backward', (assert) => {
   assert.throws(function() { trans.backward(); });
   assert.throws(function() { trans.backward(null); });
   assert.throws(function() { trans.backward([1,2,3]); });
-  assert.throws(function() { trans.backward(long_lat_coords); });
+  var output = trans.backward(long_lat_coords);
+  assert.equal(output[0], Infinity);
+  assert.equal(output[1], Infinity);
   assert.end();
 });
 
@@ -121,20 +124,20 @@ test('should backward bbox properly (3857 -> 4326)', (assert) => {
   assert.end();
 });
 
-test('should throw with invalid bbox (4326 -> 3873)', (assert) => {
+test('should not throw with invalid bbox (4326 -> 3873)', (assert) => {
   var from = new mapnik.Projection('epsg:4326');
   var to = new mapnik.Projection('epsg:3873');
   var trans = new mapnik.ProjTransform(from,to);
   var long_lat_box = [-180,90,180,90];
-  assert.throws(function() { trans.forward(long_lat_box); });
+  assert.doesNotThrow(function() { trans.forward(long_lat_box); });
   assert.end();
 });
 
-test('should throw with invalid bbox (3873 -> 4326) backward', (assert) => {
+test('should not throw with invalid bbox (3873 -> 4326) backward', (assert) => {
   var from = new mapnik.Projection('epsg:3873');
   var to = new mapnik.Projection('epsg:4326');
   var trans = new mapnik.ProjTransform(from,to);
   var long_lat_box = [-180,90,180,90];
-  assert.throws(function() { trans.backward(long_lat_box); });
+  assert.doesNotThrow(function() { trans.backward(long_lat_box); });
   assert.end();
 });

test/data/vector_tile/compositing/expected/image_concat.png

@@ -464,7 +464,6 @@ test('should render by overzooming+jpeg+near', (assert) => {
     vtile.render(map,new mapnik.Image(256,256),{buffer_size:256,image_format:"jpeg",image_scaling:"near"},function(err,im) {
       if (err) throw err;
       var expected_file = data_base +'/expected/2-1-1.png';
-      //im.save(data_base +'/expected/2-1-1.png');
       assert.equal(0,compare_to_image(im,expected_file));
       assert.end();
     });
@@ -498,7 +497,6 @@ test('should render by overzooming+webp+biliear', (assert) => {
     vtile.render(map,new mapnik.Image(256,256),{buffer_size:256,image_format:"webp",image_scaling:"bilinear"},function(err,im) {
       if (err) throw err;
       var expected_file = data_base +'/expected/2-1-1b.png';
-      //im.save(data_base +'/expected/2-1-1b.png');
       assert.equal(0,compare_to_image(im,expected_file));
       assert.end();
     });
@@ -538,7 +536,6 @@ test('should render by overzooming+webp+biliear with threading mode auto', (asse
     vtile.render(map,new mapnik.Image(256,256),{buffer_size:256,image_format:"webp",image_scaling:"bilinear"},function(err,im) {
       if (err) throw err;
       var expected_file = data_base +'/expected/2-1-1b.png';
-      //im.save(data_base +'/expected/2-1-1b.png');
       assert.equal(0,compare_to_image(im,expected_file));
       assert.end();
     });
@@ -578,7 +575,6 @@ test('should render by overzooming+webp+biliear with threading mode async', (ass
     vtile.render(map,new mapnik.Image(256,256),{buffer_size:256,image_format:"webp",image_scaling:"bilinear"},function(err,im) {
       if (err) throw err;
       var expected_file = data_base +'/expected/2-1-1b.png';
-      //im.save(data_base +'/expected/2-1-1b.png');
       assert.equal(0,compare_to_image(im,expected_file));
       assert.end();
     });
@@ -615,7 +611,6 @@ test('should render by overzooming (drops point)', (assert) => {
   vtile.render(map,new mapnik.Image(256,256),{buffer_size:256},function(err,im) {
     if (err) throw err;
     var expected_file = data_base +'/expected/2-1-1-no-point.png';
-    //im.save(data_base +'/expected/2-1-1-no-point.png');
     assert.equal(0,compare_to_image(im,expected_file));
     assert.end();
   });
@@ -652,7 +647,6 @@ test('should render by underzooming or mosaicing', (assert) => {
   vtile.render(map,new mapnik.Image(256,256),{buffer_size:256},function(err,im) {
     if (err) throw err;
     var expected_file = data_base +'/expected/0-0-0-mosaic.png';
-    //im.save(data_base + '/expected/0-0-0-mosaic.png');
     assert.equal(0,compare_to_image(im,expected_file));
     assert.end();
   });