commit 4c018c9fcaebf9ba365494925131e8a285b68834
Author: Tom Hughes <tom@compton.nu>
Date: Mon Nov 23 12:12:32 2015 +0000
Allow more variation in comparisons
diff --git a/test/python_tests/compositing_test.py b/test/python_tests/compositing_test.py
index ac09ef9..2c24278 100644
--- a/test/python_tests/compositing_test.py
+++ b/test/python_tests/compositing_test.py
@@ -120,7 +120,7 @@ def test_compare_images():
a.save(expected, 'png32')
expected_im = mapnik.Image.open(expected)
# compare them
- if a.tostring('png32') == expected_im.tostring('png32'):
+ if a.compare(expected_im, 5) == 0:
successes.append(name)
else:
fails.append(
@@ -203,7 +203,7 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
im.save(expected, 'png32')
expected_im = mapnik.Image.open(expected)
# compare them
- if im.tostring('png32') == expected_im.tostring('png32'):
+ if im.compare(expected_im, 10) == 0:
successes.append(name)
else:
fails.append(
diff --git a/test/python_tests/image_filters_test.py b/test/python_tests/image_filters_test.py
index 7a06db3..0ee2acb 100644
--- a/test/python_tests/image_filters_test.py
+++ b/test/python_tests/image_filters_test.py
@@ -61,7 +61,7 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
im.save(expected, 'png32')
expected_im = mapnik.Image.open(expected)
# compare them
- if im.tostring('png32') == expected_im.tostring('png32'):
+ if im.compare(expected_im, 500) == 0:
successes.append(name)
else:
fails.append(
diff --git a/test/python_tests/markers_complex_rendering_test.py b/test/python_tests/markers_complex_rendering_test.py
index 652c4ac..d81c5ba 100644
--- a/test/python_tests/markers_complex_rendering_test.py
+++ b/test/python_tests/markers_complex_rendering_test.py
@@ -26,8 +26,7 @@ if 'csv' in mapnik.DatasourceCache.plugin_names():
if os.environ.get('UPDATE'):
im.save(expected, 'png32')
expected_im = mapnik.Image.open(expected)
- eq_(im.tostring('png32'),
- expected_im.tostring('png32'),
+ eq_(im.compare(expected_im, 5), 0,
'failed comparing actual (%s) and expected (%s)' % (actual,
'test/python_tests/' + expected))
@@ -43,8 +42,7 @@ if 'csv' in mapnik.DatasourceCache.plugin_names():
if os.environ.get('UPDATE'):
im.save(expected, 'png32')
expected_im = mapnik.Image.open(expected)
- eq_(im.tostring('png32'),
- expected_im.tostring('png32'),
+ eq_(im.compare(expected_im, 5), 0,
'failed comparing actual (%s) and expected (%s)' % (actual,
'test/python_tests/' + expected))
diff --git a/test/python_tests/pdf_printing_test.py b/test/python_tests/pdf_printing_test.py
index 4586237..d7bd9f8 100644
--- a/test/python_tests/pdf_printing_test.py
+++ b/test/python_tests/pdf_printing_test.py
@@ -45,7 +45,7 @@ if mapnik.has_pycairo():
diff = abs(os.stat(expected_pdf).st_size - os.stat(actual_pdf).st_size)
msg = 'diff in size (%s) between actual (%s) and expected(%s)' % (diff, actual_pdf, 'tests/python_tests/' + expected_pdf)
- eq_(diff < 1500, True, msg)
+ eq_(diff < 20000, True, msg)
# TODO: ideas for further testing on printing module
# - test with and without pangocairo
diff --git a/test/python_tests/pgraster_test.py b/test/python_tests/pgraster_test.py
index 47c71a6..2bcc8b8 100644
--- a/test/python_tests/pgraster_test.py
+++ b/test/python_tests/pgraster_test.py
@@ -144,7 +144,7 @@ def compare_images(expected, im):
im.save(expected, 'png32')
expected_im = mapnik.Image.open(expected)
diff = expected.replace('.png', '-diff.png')
- if len(im.tostring("png32")) != len(expected_im.tostring("png32")):
+ if im.compare(expected_im, 300) != 0:
compared = side_by_side_image(expected_im, im)
compared.save(diff)
assert False, 'images do not match, check diff at %s' % diff
diff --git a/test/python_tests/raster_symbolizer_test.py b/test/python_tests/raster_symbolizer_test.py
index caebaab..7e02de2 100644
--- a/test/python_tests/raster_symbolizer_test.py
+++ b/test/python_tests/raster_symbolizer_test.py
@@ -65,8 +65,7 @@ def test_dataraster_coloring():
im.save(expected_file, 'png32')
actual = mapnik.Image.open(actual_file)
expected = mapnik.Image.open(expected_file)
- eq_(actual.tostring('png32'),
- expected.tostring('png32'),
+ eq_(actual.compare(expected, 500), 0,
'failed comparing actual (%s) and expected (%s)' % (actual_file,
expected_file))
@@ -191,8 +190,7 @@ def test_raster_warping():
im.save(expected_file, 'png32')
actual = mapnik.Image.open(actual_file)
expected = mapnik.Image.open(expected_file)
- eq_(actual.tostring('png32'),
- expected.tostring('png32'),
+ eq_(actual.compare(expected, 500), 0,
'failed comparing actual (%s) and expected (%s)' % (actual_file,
expected_file))
@@ -229,8 +227,7 @@ def test_raster_warping_does_not_overclip_source():
im.save(expected_file, 'png32')
actual = mapnik.Image.open(actual_file)
expected = mapnik.Image.open(expected_file)
- eq_(actual.tostring('png32'),
- expected.tostring('png32'),
+ eq_(actual.compare(expected, 500), 0,
'failed comparing actual (%s) and expected (%s)' % (actual_file,
expected_file))
diff --git a/test/python_tests/render_test.py b/test/python_tests/render_test.py
index 42f63f2..bc638c3 100644
--- a/test/python_tests/render_test.py
+++ b/test/python_tests/render_test.py
@@ -279,8 +279,7 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
# color png
actual = mapnik.Image.open(actual_file)
expected = mapnik.Image.open(expected_file)
- eq_(actual.tostring('png32'),
- expected.tostring('png32'),
+ eq_(actual.compare(expected, 500), 0,
'failed comparing actual (%s) and expected (%s)' % (actual_file,
expected_file))
diff --git a/test/python_tests/reprojection_test.py b/test/python_tests/reprojection_test.py
index 50236b8..3f16370 100644
--- a/test/python_tests/reprojection_test.py
+++ b/test/python_tests/reprojection_test.py
@@ -99,8 +99,7 @@ if 'shape' in mapnik.DatasourceCache.plugin_names():
expected = 'images/support/mapnik-merc2merc-reprojection-render2.png'
im.save(actual, 'png32')
expected_im = mapnik.Image.open(expected)
- eq_(im.tostring('png32'),
- expected_im.tostring('png32'),
+ eq_(im.compare(expected_im, 5), 0,
'failed comparing actual (%s) and expected (%s)' % (actual,
'test/python_tests/' + expected))
diff --git a/test/python_tests/utilities.py b/test/python_tests/utilities.py
index 9bfc9ae..673c284 100644
--- a/test/python_tests/utilities.py
+++ b/test/python_tests/utilities.py
@@ -135,7 +135,7 @@ def side_by_side_image(left_im, right_im):
def assert_box2d_almost_equal(a, b, msg=None):
msg = msg or ("%r != %r" % (a, b))
- assert_almost_equal(a.minx, b.minx, msg=msg)
- assert_almost_equal(a.maxx, b.maxx, msg=msg)
- assert_almost_equal(a.miny, b.miny, msg=msg)
- assert_almost_equal(a.maxy, b.maxy, msg=msg)
+ assert_almost_equal(a.minx, b.minx, places=3, msg=msg)
+ assert_almost_equal(a.maxx, b.maxx, places=3, msg=msg)
+ assert_almost_equal(a.miny, b.miny, places=3, msg=msg)
+ assert_almost_equal(a.maxy, b.maxy, places=3, msg=msg)