Unit tests - markers + image-filters [WIP]

Author: artemp

test/python_tests/image_filters_test.py

@@ -1,38 +1,23 @@
-#!/usr/bin/env python
-
-import os
-import re
-
-from nose.tools import eq_
-
+import re, os
 import mapnik
-
-from .utilities import execution_path, run_all, side_by_side_image
-
-
-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('.'))
-
+from .utilities import side_by_side_image
 
 def replace_style(m, name, style):
     m.remove_style(name)
     m.append_style(name, style)
 
-
 def test_append():
     s = mapnik.Style()
-    eq_(s.image_filters, '')
+    assert s.image_filters ==  ''
     s.image_filters = 'gray'
-    eq_(s.image_filters, 'gray')
+    assert s.image_filters ==  'gray'
     s.image_filters = 'sharpen'
-    eq_(s.image_filters, 'sharpen')
+    assert s.image_filters ==  'sharpen'
 
 if 'shape' in mapnik.DatasourceCache.plugin_names():
     def test_style_level_image_filter():
         m = mapnik.Map(256, 256)
-        mapnik.load_map(m, '../data/good_maps/style_level_image_filter.xml')
+        mapnik.load_map(m, './test/data/good_maps/style_level_image_filter.xml')
         m.zoom_all()
         successes = []
         fails = []
@@ -54,7 +39,7 @@ def test_style_level_image_filter():
             im = mapnik.Image(m.width, m.height)
             mapnik.render(m, im)
             actual = '/tmp/mapnik-style-image-filter-' + filename + '.png'
-            expected = 'images/style-image-filter/' + filename + '.png'
+            expected = './test/python_tests/images/style-image-filter/' + filename + '.png'
             im.save(actual, "png32")
             if not os.path.exists(expected) or os.environ.get('UPDATE'):
                 print('generating expected test image: %s' % expected)
@@ -66,15 +51,11 @@ def test_style_level_image_filter():
             else:
                 fails.append(
                     'failed comparing actual (%s) and expected(%s)' %
-                    (actual, 'tests/python_tests/' + expected))
+                    (actual, expected))
                 fail_im = side_by_side_image(expected_im, im)
                 fail_im.save(
                     '/tmp/mapnik-style-image-filter-' +
                     filename +
                     '.fail.png',
                     'png32')
-        eq_(len(fails), 0, '\n' + '\n'.join(fails))
-
-if __name__ == "__main__":
-    setup()
-    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
+        assert len(fails) ==  0, '\n' + '\n'.join(fails)