diff --git a/tests/python_tests/images/support/tif_colortable.png b/tests/python_tests/images/support/tif_colortable.png deleted file mode 100644 index aa055bb45..000000000 Binary files a/tests/python_tests/images/support/tif_colortable.png and /dev/null differ diff --git a/tests/python_tests/images/support/vrt_colortable.png b/tests/python_tests/images/support/vrt_colortable.png deleted file mode 100644 index f885c68f8..000000000 Binary files a/tests/python_tests/images/support/vrt_colortable.png and /dev/null differ diff --git a/tests/python_tests/raster_colormapped_test.py b/tests/python_tests/raster_colormapped_test.py deleted file mode 100644 index de56346e0..000000000 --- a/tests/python_tests/raster_colormapped_test.py +++ /dev/null @@ -1,40 +0,0 @@ -#coding=utf8 -import os -import mapnik -from utilities import execution_path, run_all -from nose.tools import * - -def setup(): - # All of the paths used are relative, if we run the tests - # from another directory we need to chdir() - os.chdir(execution_path('.')) - -if 'gdal' in mapnik.DatasourceCache.plugin_names(): - - def test_vrt_rendering(): - m = mapnik.Map(512,512) - mapnik.load_map(m,'../data/good_maps/vrt_colortable.xml') - m.zoom_all() - im = mapnik.Image(512,512) - mapnik.render(m,im) - actual = '/tmp/vrt_colortable.png' - expected = 'images/support/vrt_colortable.png' - im.save(actual) - expected_im = mapnik.Image.open(expected) - eq_(im.tostring(),expected_im.tostring(), 'failed comparing actual (%s) and expected(%s)' % (actual,'tests/python_tests/'+ expected)) - - def test_tif_rendering_nodata(): - m = mapnik.Map(512,512) - mapnik.load_map(m,'../data/good_maps/tiff_colortable.xml') - m.zoom_all() - im = mapnik.Image(512,512) - mapnik.render(m,im) - actual = '/tmp/tif_colortable.png' - expected = 'images/support/tif_colortable.png' - im.save(actual) - expected_im = mapnik.Image.open(expected) - eq_(im.tostring(),expected_im.tostring(), 'failed comparing actual (%s) and expected(%s)' % (actual,'tests/python_tests/'+ expected)) - -if __name__ == "__main__": - setup() - run_all(eval(x) for x in dir() if x.startswith("test_")) diff --git a/tests/visual_tests/grids/vrt_colortable-256-256-1.0-grid-reference.json b/tests/visual_tests/grids/vrt_colortable-256-256-1.0-grid-reference.json new file mode 100644 index 000000000..e023c5e7e --- /dev/null +++ b/tests/visual_tests/grids/vrt_colortable-256-256-1.0-grid-reference.json @@ -0,0 +1,72 @@ +{ + "keys": [ + "" + ], + "data": {}, + "grid": [ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " " + ] +} \ No newline at end of file diff --git a/tests/visual_tests/images/vrt_colortable-256-256-1.0-agg-reference.png b/tests/visual_tests/images/vrt_colortable-256-256-1.0-agg-reference.png new file mode 100644 index 000000000..3fa463b51 Binary files /dev/null and b/tests/visual_tests/images/vrt_colortable-256-256-1.0-agg-reference.png differ diff --git a/tests/visual_tests/images/vrt_colortable-256-256-2.0-agg-reference.png b/tests/visual_tests/images/vrt_colortable-256-256-2.0-agg-reference.png new file mode 100644 index 000000000..3fa463b51 Binary files /dev/null and b/tests/visual_tests/images/vrt_colortable-256-256-2.0-agg-reference.png differ diff --git a/tests/data/good_maps/vrt_colortable.xml b/tests/visual_tests/styles/vrt_colortable.xml similarity index 85% rename from tests/data/good_maps/vrt_colortable.xml rename to tests/visual_tests/styles/vrt_colortable.xml index d20367c72..f51088343 100644 --- a/tests/data/good_maps/vrt_colortable.xml +++ b/tests/visual_tests/styles/vrt_colortable.xml @@ -8,7 +8,7 @@ 2011_5km_vrt_nodata_style - ../raster/dataraster.vrt + ../../data/raster/dataraster.vrt gdal diff --git a/tests/visual_tests/test.py b/tests/visual_tests/test.py index 47ff731b1..846cb3888 100755 --- a/tests/visual_tests/test.py +++ b/tests/visual_tests/test.py @@ -176,6 +176,7 @@ files = { 'dst-over-compositing':{'sizes':[(512,512)]}, 'tiff_colortable':{'sizes':[(256,256)]}, 'tiff_colortable_custom_nodata':{'sizes':[(256,256)]}, + 'vrt_colortable':{'sizes':[(256,256)]}, } class Reporting: