update tests

This commit is contained in:
Dane Springmeyer 2014-04-01 17:34:24 -07:00
parent 5fd04e72ef
commit 818e87dce4
3 changed files with 9 additions and 9 deletions

View file

@ -13,7 +13,7 @@ before_install:
- sudo apt-get install -qq make libboost-dev libboost-filesystem-dev libboost-program-options-dev libboost-python-dev libboost-regex-dev libboost-system-dev libboost-thread-dev python-nose libicu-dev libpng-dev libjpeg-dev libtiff-dev libwebp-dev libz-dev libfreetype6-dev libxml2-dev libproj-dev libcairo-dev python-cairo-dev libsqlite3-dev postgresql-server-dev* - sudo apt-get install -qq make libboost-dev libboost-filesystem-dev libboost-program-options-dev libboost-python-dev libboost-regex-dev libboost-system-dev libboost-thread-dev python-nose libicu-dev libpng-dev libjpeg-dev libtiff-dev libwebp-dev libz-dev libfreetype6-dev libxml2-dev libproj-dev libcairo-dev python-cairo-dev libsqlite3-dev postgresql-server-dev*
script: script:
- ./configure CXX=${CXX} CC=${CC} DEBUG=True DEMO=False BINDINGS='python' CPP_TESTS=True CAIRO=True FAST=True && JOBS=2 make - ./configure CXX=${CXX} CC=${CC} DEBUG=False DEMO=False BINDINGS='python' CPP_TESTS=True CAIRO=True FAST=True && JOBS=2 make
- make test-local - make test-local
notifications: notifications:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 47 KiB

View file

@ -44,9 +44,9 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
mapnik.render(m,im) mapnik.render(m,im)
actual = '/tmp/mapnik-wgs842merc-reprojection-render.png' actual = '/tmp/mapnik-wgs842merc-reprojection-render.png'
expected = 'images/support/mapnik-wgs842merc-reprojection-render.png' expected = 'images/support/mapnik-wgs842merc-reprojection-render.png'
im.save(actual) im.save(actual,'png32')
expected_im = mapnik.Image.open(expected) expected_im = mapnik.Image.open(expected)
eq_(im.tostring(),expected_im.tostring(), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) eq_(im.tostring('png32'),expected_im.tostring('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected))
def test_visual_zoom_all_rendering2(): def test_visual_zoom_all_rendering2():
m = mapnik.Map(512,512) m = mapnik.Map(512,512)
@ -56,9 +56,9 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
mapnik.render(m,im) mapnik.render(m,im)
actual = '/tmp/mapnik-merc2wgs84-reprojection-render.png' actual = '/tmp/mapnik-merc2wgs84-reprojection-render.png'
expected = 'images/support/mapnik-merc2wgs84-reprojection-render.png' expected = 'images/support/mapnik-merc2wgs84-reprojection-render.png'
im.save(actual) im.save(actual,'png32')
expected_im = mapnik.Image.open(expected) expected_im = mapnik.Image.open(expected)
eq_(im.tostring(),expected_im.tostring(), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) eq_(im.tostring('png32'),expected_im.tostring('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected))
# maximum-extent read from map.xml # maximum-extent read from map.xml
def test_visual_zoom_all_rendering3(): def test_visual_zoom_all_rendering3():
@ -69,9 +69,9 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
mapnik.render(m,im) mapnik.render(m,im)
actual = '/tmp/mapnik-merc2merc-reprojection-render1.png' actual = '/tmp/mapnik-merc2merc-reprojection-render1.png'
expected = 'images/support/mapnik-merc2merc-reprojection-render1.png' expected = 'images/support/mapnik-merc2merc-reprojection-render1.png'
im.save(actual) im.save(actual,'png32')
expected_im = mapnik.Image.open(expected) expected_im = mapnik.Image.open(expected)
eq_(im.tostring(),expected_im.tostring(), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) eq_(im.tostring('png32'),expected_im.tostring('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected))
# no maximum-extent # no maximum-extent
def test_visual_zoom_all_rendering4(): def test_visual_zoom_all_rendering4():
@ -83,9 +83,9 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
mapnik.render(m,im) mapnik.render(m,im)
actual = '/tmp/mapnik-merc2merc-reprojection-render2.png' actual = '/tmp/mapnik-merc2merc-reprojection-render2.png'
expected = 'images/support/mapnik-merc2merc-reprojection-render2.png' expected = 'images/support/mapnik-merc2merc-reprojection-render2.png'
im.save(actual) im.save(actual,'png32')
expected_im = mapnik.Image.open(expected) expected_im = mapnik.Image.open(expected)
eq_(im.tostring(),expected_im.tostring(), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected)) eq_(im.tostring('png32'),expected_im.tostring('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/'+ expected))
if __name__ == "__main__": if __name__ == "__main__":
setup() setup()