improve png comparison tests

tests/python_tests/image_encoding_speed_test.py

@@ -42,8 +42,10 @@ combinations = ['png',
                 'png:z=1:s=filtered',
                 'png:z=1:s=huff',
                 'png:z=1:s=rle',
-                'png:m=h;g=2.0',
+                'png:m=h:g=2.0',
-                'png:m=h;g=1.0',
+                'png:m=h:g=1.0',
+                'png:e=miniz',
+                'png8:e=miniz'
                ]
 
 tiles = [

tests/python_tests/png_encoding_test.py

@@ -32,6 +32,8 @@ if mapnik.has_png():
     'png8:m=h:c=1:t=0',
     'png8:m=h:t=1',
     'png8:m=h:t=2',
+    'png:e=miniz',
+    'png8:e=miniz'
     ]
 
     # Todo - use itertools.product
@@ -44,6 +46,7 @@ if mapnik.has_png():
     generate = False
 
     def test_expected_encodings():
+        # blank image
         im = mapnik.Image(256,256)
         for opt in opts:
             expected = gen_filepath('solid',opt)
@@ -53,10 +56,12 @@ if mapnik.has_png():
               im.save(expected,opt)
             else:
               im.save(actual,opt)
-            eq_(mapnik.Image.open(actual).tostring(),
+              eq_(mapnik.Image.open(actual).tostring(),
                 mapnik.Image.open(expected).tostring(),
                 '%s (actual) not == to %s (expected)' % (actual,expected))
 
+        # solid image
+        im.background = mapnik.Color('green');
         for opt in opts:
             expected = gen_filepath('blank',opt)
             actual = os.path.join(tmp_dir,os.path.basename(expected))
@@ -65,7 +70,21 @@ if mapnik.has_png():
               im.save(expected,opt)
             else:
               im.save(actual,opt)
-            eq_(mapnik.Image.open(actual).tostring(),
+              eq_(mapnik.Image.open(actual).tostring(),
+                mapnik.Image.open(expected).tostring(),
+                '%s (actual) not == to %s (expected)' % (actual,expected))
+
+        # aerial
+        im = mapnik.Image.open('./images/support/transparency/aerial_rgba.png')
+        for opt in opts:
+            expected = gen_filepath('aerial_rgba',opt)
+            actual = os.path.join(tmp_dir,os.path.basename(expected))
+            if generate or not os.path.exists(expected):
+              print 'generating expected image %s' % expected
+              im.save(expected,opt)
+            else:
+              im.save(actual,opt)
+              eq_(mapnik.Image.open(actual).tostring(),
                 mapnik.Image.open(expected).tostring(),
                 '%s (actual) not == to %s (expected)' % (actual,expected))