Update tests [WIP] [skip ci]

Author: artemp

test/python_tests/agg_rasterizer_integer_overflow_test.py

@@ -27,7 +27,7 @@ def test_that_coordinates_do_not_overflow_and_polygon_is_rendered_memory():
     r = mapnik.Rule()
     sym = mapnik.PolygonSymbolizer()
     sym.fill = expected_color
-    r.symbols.append(sym)
+    r.symbolizers.append(sym)
     s.rules.append(r)
     lyr = mapnik.Layer('Layer', projection)
     lyr.datasource = ds
@@ -58,7 +58,7 @@ def test_that_coordinates_do_not_overflow_and_polygon_is_rendered_csv():
     r = mapnik.Rule()
     sym = mapnik.PolygonSymbolizer()
     sym.fill = expected_color
-    r.symbols.append(sym)
+    r.symbolizers.append(sym)
     s.rules.append(r)
     lyr = mapnik.Layer('Layer', projection)
     lyr.datasource = ds

test/python_tests/buffer_clear_test.py

@@ -4,14 +4,14 @@
 def test_clearing_image_data():
     im = mapnik.Image(256, 256)
     # make sure it equals itself
-    bytes = im.tostring()
-    assert im.tostring() == bytes
+    bytes = im.to_string()
+    assert im.to_string() == bytes
     # set background, then clear
     im.fill(mapnik.Color('green'))
-    assert not im.tostring() == bytes
+    assert not im.to_string() == bytes
     # clear image, should now equal original
     im.clear()
-    assert im.tostring() == bytes
+    assert im.to_string() == bytes
 
 def make_map():
     ds = mapnik.MemoryDatasource()

test/python_tests/compositing_test.py

@@ -88,10 +88,10 @@ def validate_pixels_are_premultiplied(image):
 def test_compare_images(setup):
     b = mapnik.Image.open('images/support/b.png')
     b.premultiply()
-    num_ops = len(mapnik.CompositeOp.names)
+    num_ops = len(mapnik.CompositeOp.__members__)
     successes = []
     fails = []
-    for name in mapnik.CompositeOp.names:
+    for name in mapnik.CompositeOp.__members__.keys():
         a = mapnik.Image.open('images/support/a.png')
         a.premultiply()
         a.composite(b, getattr(mapnik.CompositeOp, name))
@@ -112,7 +112,7 @@ def test_compare_images(setup):
             a.save(expected, 'png32')
         expected_im = mapnik.Image.open(expected)
         # compare them
-        if a.tostring('png32') == expected_im.tostring('png32'):
+        if a.to_string('png32') == expected_im.to_string('png32'):
             successes.append(name)
         else:
             fails.append(
@@ -130,7 +130,7 @@ def test_compare_images(setup):
     # TODO - write test to ensure the image is 99% the same.
     #expected_b = mapnik.Image.open('./images/support/b.png')
     # b.save('/tmp/mapnik-comp-op-test-original-mask.png')
-    #assert b.tostring('png32') == expected_b.tostring('png32'), '/tmp/mapnik-comp-op-test-original-mask.png is no longer equivalent to original mask: ./images/support/b.png'
+    #assert b.to_string('png32') == expected_b.to_string('png32'), '/tmp/mapnik-comp-op-test-original-mask.png is no longer equivalent to original mask: ./images/support/b.png'
 
 
 def test_pre_multiply_status():
@@ -179,7 +179,8 @@ def test_style_level_comp_op():
         m.zoom_all()
         successes = []
         fails = []
-        for name in mapnik.CompositeOp.names:
+
+        for name in mapnik.CompositeOp.__members__.keys():
             # find_style returns a copy of the style object
             style_markers = m.find_style("markers")
             style_markers.comp_op = getattr(mapnik.CompositeOp, name)
@@ -195,7 +196,7 @@ def test_style_level_comp_op():
                 im.save(expected, 'png32')
             expected_im = mapnik.Image.open(expected)
             # compare them
-            if im.tostring('png32') == expected_im.tostring('png32'):
+            if im.to_string('png32') == expected_im.to_string('png32'):
                 successes.append(name)
             else:
                 fails.append(
@@ -220,7 +221,7 @@ def test_style_level_opacity():
         expected = 'images/support/mapnik-style-level-opacity.png'
         im.save(actual, 'png32')
         expected_im = mapnik.Image.open(expected)
-        assert im.tostring('png32') == expected_im.tostring('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual,
+        assert im.to_string('png32') == expected_im.to_string('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual,
                                                                                                                           'tests/python_tests/' + expected)
 
 

test/python_tests/image_filters_test.py

@@ -54,7 +54,7 @@ def test_style_level_image_filter(setup):
                 im.save(expected, 'png32')
             expected_im = mapnik.Image.open(expected)
             # compare them
-            if im.tostring('png32') == expected_im.tostring('png32'):
+            if im.to_string('png32') == expected_im.to_string('png32'):
                 successes.append(name)
             else:
                 fails.append(

test/python_tests/introspection_test.py

@@ -20,17 +20,17 @@ def test_introspect_symbolizers(setup):
 
     assert p.allow_overlap ==  True
     assert p.opacity ==  0.5
-    assert p.filename ==  '../data/images/dummy.png'
+    assert p.file ==  '../data/images/dummy.png'
 
     # make sure the defaults
     # are what we think they are
     assert p.allow_overlap ==  True
     assert p.opacity ==  0.5
-    assert p.filename ==  '../data/images/dummy.png'
+    assert p.file ==  '../data/images/dummy.png'
 
     # contruct objects to hold it
     r = mapnik.Rule()
-    r.symbols.append(p)
+    r.symbolizers.append(p)
     s = mapnik.Style()
     s.rules.append(r)
     m = mapnik.Map(0, 0)
@@ -44,7 +44,7 @@ def test_introspect_symbolizers(setup):
     rules = s2.rules
     assert len(rules) ==  1
     r2 = rules[0]
-    syms = r2.symbols
+    syms = r2.symbolizers
     assert len(syms) ==  1
 
     # TODO here, we can do...
@@ -54,4 +54,4 @@ def test_introspect_symbolizers(setup):
 
     assert p2.allow_overlap ==  True
     assert p2.opacity ==  0.5
-    assert p2.filename ==  '../data/images/dummy.png'
+    assert p2.file ==  '../data/images/dummy.png'

test/python_tests/layer_buffer_size_test.py

@@ -29,4 +29,4 @@ def test_layer_buffer_size_1(setup):
         expected = 'images/support/mapnik-layer-buffer-size.png'
         im.save(actual, "png32")
         expected_im = mapnik.Image.open(expected)
-        assert im.tostring('png32') == expected_im.tostring('png32'),'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/' + expected)
+        assert im.to_string('png32') == expected_im.to_string('png32'),'failed comparing actual (%s) and expected (%s)' % (actual,'tests/python_tests/' + expected)

test/python_tests/markers_complex_rendering_test.py

@@ -23,7 +23,7 @@ def test_marker_ellipse_render1(setup):
         if os.environ.get('UPDATE'):
             im.save(expected, 'png32')
         expected_im = mapnik.Image.open(expected)
-        assert im.tostring('png32') == expected_im.tostring('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual, expected)
+        assert im.to_string('png32') == expected_im.to_string('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual, expected)
 
     def test_marker_ellipse_render2():
         m = mapnik.Map(256, 256)
@@ -37,4 +37,4 @@ def test_marker_ellipse_render2():
         if os.environ.get('UPDATE'):
             im.save(expected, 'png32')
         expected_im = mapnik.Image.open(expected)
-        assert im.tostring('png32') == expected_im.tostring('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual, expected)
+        assert im.to_string('png32') == expected_im.to_string('png32'), 'failed comparing actual (%s) and expected (%s)' % (actual, expected)