Resurrect commented out zonal stats test

qgis · Sep 26, 2017 · 0943cd5 · 0943cd5
1 parent fddb6a5
commit 0943cd5
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 16 deletions.
diff --git a/python/plugins/processing/tests/testdata/custom/zonal_stats.cpg b/python/plugins/processing/tests/testdata/custom/zonal_stats.cpg
@@ -0,0 +1 @@
+UTF-8
diff --git a/python/plugins/processing/tests/testdata/custom/zonal_stats.dbf b/python/plugins/processing/tests/testdata/custom/zonal_stats.dbf
diff --git a/python/plugins/processing/tests/testdata/custom/zonal_stats.prj b/python/plugins/processing/tests/testdata/custom/zonal_stats.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
diff --git a/python/plugins/processing/tests/testdata/custom/zonal_stats.qpj b/python/plugins/processing/tests/testdata/custom/zonal_stats.qpj
@@ -0,0 +1 @@
+GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]
diff --git a/python/plugins/processing/tests/testdata/custom/zonal_stats.shp b/python/plugins/processing/tests/testdata/custom/zonal_stats.shp
diff --git a/python/plugins/processing/tests/testdata/custom/zonal_stats.shx b/python/plugins/processing/tests/testdata/custom/zonal_stats.shx
diff --git a/python/plugins/processing/tests/testdata/expected/zonal_stats.cpg b/python/plugins/processing/tests/testdata/expected/zonal_stats.cpg
@@ -0,0 +1 @@
+UTF-8
diff --git a/python/plugins/processing/tests/testdata/expected/zonal_stats.dbf b/python/plugins/processing/tests/testdata/expected/zonal_stats.dbf
diff --git a/python/plugins/processing/tests/testdata/expected/zonal_stats.prj b/python/plugins/processing/tests/testdata/expected/zonal_stats.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
diff --git a/python/plugins/processing/tests/testdata/expected/zonal_stats.qpj b/python/plugins/processing/tests/testdata/expected/zonal_stats.qpj
@@ -0,0 +1 @@
+GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]
diff --git a/python/plugins/processing/tests/testdata/expected/zonal_stats.shp b/python/plugins/processing/tests/testdata/expected/zonal_stats.shp
diff --git a/python/plugins/processing/tests/testdata/expected/zonal_stats.shx b/python/plugins/processing/tests/testdata/expected/zonal_stats.shx
diff --git a/python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml b/python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml
@@ -2771,22 +2771,30 @@ tests:
           fields:
             fid: skip
 
-#  - algorithm: qgis:zonalstatistics
-#    name: simple zonal statistics
-#    params:
-#      COLUMN_PREFIX: _
-#      GLOBAL_EXTENT: false
-#      INPUT_RASTER:
-#        name: dem.tif
-#        type: raster
-#      INPUT_VECTOR:
-#        name: custom/polygon_mask.gml
-#        type: vector
-#      RASTER_BAND: 1
-#    results:
-#      OUTPUT_LAYER:
-#        name: expected/zonal_statistics.gml
-#        type: vector
+  - algorithm: qgis:zonalstatistics
+    name: simple zonal statistics
+    params:
+      COLUMN_PREFIX: _
+      INPUT_RASTER:
+        name: dem.tif
+        type: raster
+      INPUT_VECTOR:
+        name: custom/zonal_stats.shp
+        type: vector
+        in_place: true
+      RASTER_BAND: 1
+      STATS:
+      - 0
+      - 1
+      - 2
+    results:
+      INPUT_VECTOR:
+        name: expected/zonal_stats.shp
+        type: vector
+        in_place_result: true
+        compare:
+          geometry:
+            precision: 5
 
   - algorithm: native:fixgeometries
     name: Fix geometries