Upgrade ogr and feature id unit tests

Author: artemp

test/python_tests/feature_id_test.py

@@ -1,25 +1,11 @@
-#!/usr/bin/env python
-
-import os
-
-from nose.tools import eq_
-
 import mapnik
 
-from .utilities import execution_path, run_all
-
 try:
     import itertools.izip as zip
 except ImportError:
     pass
 
 
-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('.'))
-
-
 def compare_shape_between_mapnik_and_ogr(shapefile, query=None):
     plugins = mapnik.DatasourceCache.plugin_names()
     if 'shape' in plugins and 'ogr' in plugins:
@@ -34,47 +20,39 @@ def compare_shape_between_mapnik_and_ogr(shapefile, query=None):
         count = 0
         for feat1, feat2 in zip(fs1, fs2):
             count += 1
-            eq_(feat1.id(), feat2.id(),
-                '%s : ogr feature id %s "%s" does not equal shapefile feature id %s "%s"'
-                % (count, feat1.id(), str(feat1.attributes), feat2.id(), str(feat2.attributes)))
+            assert feat1.id() == feat2.id(), '%s : ogr feature id %s "%s" does not equal shapefile feature id %s "%s"' % (count, feat1.id(), str(feat1.attributes), feat2.id(), str(feat2.attributes))
     return True
 
 
 def test_shapefile_line_featureset_id():
-    compare_shape_between_mapnik_and_ogr('../data/shp/polylines.shp')
+    compare_shape_between_mapnik_and_ogr('./test/data/shp/polylines.shp')
 
 
 def test_shapefile_polygon_featureset_id():
-    compare_shape_between_mapnik_and_ogr('../data/shp/poly.shp')
+    compare_shape_between_mapnik_and_ogr('./test/data/shp/poly.shp')
 
 
 def test_shapefile_polygon_feature_query_id():
     bbox = (15523428.2632, 4110477.6323, -11218494.8310, 7495720.7404)
     query = mapnik.Query(mapnik.Box2d(*bbox))
     if 'ogr' in mapnik.DatasourceCache.plugin_names():
-        ds = mapnik.Ogr(file='../data/shp/world_merc.shp', layer_by_index=0)
+        ds = mapnik.Ogr(file='./test/data/shp/world_merc.shp', layer_by_index=0)
         for fld in ds.fields():
             query.add_property_name(fld)
         compare_shape_between_mapnik_and_ogr(
-            '../data/shp/world_merc.shp', query)
+            './test/data/shp/world_merc.shp', query)
 
 
 def test_feature_hit_count():
-    pass
-    #raise Todo("need to optimize multigeom bbox handling in shapeindex: https://github.com/mapnik/mapnik/issues/783")
     # results in different results between shp and ogr!
     #bbox = (-14284551.8434, 2074195.1992, -7474929.8687, 8140237.7628)
-    #bbox = (1113194.91,4512803.085,2226389.82,6739192.905)
-    #query = mapnik.Query(mapnik.Box2d(*bbox))
-    # if 'ogr' in mapnik.DatasourceCache.plugin_names():
-    #    ds1 = mapnik.Ogr(file='../data/shp/world_merc.shp',layer_by_index=0)
-    #    for fld in ds1.fields():
-    #        query.add_property_name(fld)
-    #    ds2 = mapnik.Shapefile(file='../data/shp/world_merc.shp')
-    #    count1 = len(ds1.features(query).features)
-    #    count2 = len(ds2.features(query).features)
-    #    eq_(count1,count2,"Feature count differs between OGR driver (%s features) and Shapefile Driver (%s features) when querying the same bbox" % (count1,count2))
-
-if __name__ == "__main__":
-    setup()
-    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
+    bbox = (1113194.91,4512803.085,2226389.82,6739192.905)
+    query = mapnik.Query(mapnik.Box2d(*bbox))
+    if 'ogr' in mapnik.DatasourceCache.plugin_names():
+        ds1 = mapnik.Ogr(file='./test/data/shp/world_merc.shp',layer_by_index=0)
+        for fld in ds1.fields():
+            query.add_property_name(fld)
+        ds2 = mapnik.Shapefile(file='./test/data/shp/world_merc.shp')
+        count1 = len(list(ds1.features(query)))
+        count2 = len(list(ds2.features(query)))
+        assert count1 < count2 # expected 17 and 20

test/python_tests/ogr_and_shape_geometries_test.py

@@ -1,24 +1,11 @@
-#!/usr/bin/env python
-
-import os
-
-from nose.tools import eq_
-
 import mapnik
 
-from .utilities import execution_path, run_all
-
 try:
     import itertools.izip as zip
 except ImportError:
     pass
 
 
-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('.'))
-
 # TODO - fix truncation in shapefile...
 polys = ["POLYGON ((30 10, 10 20, 20 40, 40 40, 30 10))",
          "POLYGON ((35 10, 10 20, 15 40, 45 45, 35 10),(20 30, 35 35, 30 20, 20 30))",
@@ -37,17 +24,12 @@ def ensure_geometries_are_interpreted_equivalently(filename):
         count = 0
         for feat1, feat2 in zip(fs1, fs2):
             count += 1
-            eq_(feat1.attributes, feat2.attributes)
-            # TODO - revisit this: https://github.com/mapnik/mapnik/issues/1093
-            # eq_(feat1.to_geojson(),feat2.to_geojson())
-            # eq_(feat1.geometries().to_wkt(),feat2.geometries().to_wkt())
-            # eq_(feat1.geometries().to_wkb(mapnik.wkbByteOrder.NDR),feat2.geometries().to_wkb(mapnik.wkbByteOrder.NDR))
-            # eq_(feat1.geometries().to_wkb(mapnik.wkbByteOrder.XDR),feat2.geometries().to_wkb(mapnik.wkbByteOrder.XDR))
+            assert feat1.attributes == feat2.attributes
+            assert feat1.to_geojson() == feat2.to_geojson()
+            assert feat1.geometry.to_wkt() == feat2.geometry.to_wkt()
+            assert feat1.geometry.to_wkb(mapnik.wkbByteOrder.NDR) == feat2.geometry.to_wkb(mapnik.wkbByteOrder.NDR)
+            assert feat1.geometry.to_wkb(mapnik.wkbByteOrder.XDR) == feat2.geometry.to_wkb(mapnik.wkbByteOrder.XDR)
 
     def test_simple_polys():
         ensure_geometries_are_interpreted_equivalently(
-            '../data/shp/wkt_poly.shp')
-
-if __name__ == "__main__":
-    setup()
-    exit(run_all(eval(x) for x in dir() if x.startswith("test_")))
+            './test/data/shp/wkt_poly.shp')