From 0943cd5d51f3f7a0117464c80b272bcfffd85c12 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Tue, 26 Sep 2017 15:25:33 +1000
Subject: [PATCH] Resurrect commented out zonal stats test

---
 .../tests/testdata/custom/zonal_stats.cpg     |   1 +
 .../tests/testdata/custom/zonal_stats.dbf     | Bin 0 -> 575 bytes
 .../tests/testdata/custom/zonal_stats.prj     |   1 +
 .../tests/testdata/custom/zonal_stats.qpj     |   1 +
 .../tests/testdata/custom/zonal_stats.shp     | Bin 0 -> 484 bytes
 .../tests/testdata/custom/zonal_stats.shx     | Bin 0 -> 116 bytes
 .../tests/testdata/expected/zonal_stats.cpg   |   1 +
 .../tests/testdata/expected/zonal_stats.dbf   | Bin 0 -> 815 bytes
 .../tests/testdata/expected/zonal_stats.prj   |   1 +
 .../tests/testdata/expected/zonal_stats.qpj   |   1 +
 .../tests/testdata/expected/zonal_stats.shp   | Bin 0 -> 484 bytes
 .../tests/testdata/expected/zonal_stats.shx   | Bin 0 -> 116 bytes
 .../tests/testdata/qgis_algorithm_tests.yaml  |  40 +++++++++++-------
 13 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 python/plugins/processing/tests/testdata/custom/zonal_stats.cpg
 create mode 100644 python/plugins/processing/tests/testdata/custom/zonal_stats.dbf
 create mode 100644 python/plugins/processing/tests/testdata/custom/zonal_stats.prj
 create mode 100644 python/plugins/processing/tests/testdata/custom/zonal_stats.qpj
 create mode 100644 python/plugins/processing/tests/testdata/custom/zonal_stats.shp
 create mode 100644 python/plugins/processing/tests/testdata/custom/zonal_stats.shx
 create mode 100644 python/plugins/processing/tests/testdata/expected/zonal_stats.cpg
 create mode 100644 python/plugins/processing/tests/testdata/expected/zonal_stats.dbf
 create mode 100644 python/plugins/processing/tests/testdata/expected/zonal_stats.prj
 create mode 100644 python/plugins/processing/tests/testdata/expected/zonal_stats.qpj
 create mode 100644 python/plugins/processing/tests/testdata/expected/zonal_stats.shp
 create mode 100644 python/plugins/processing/tests/testdata/expected/zonal_stats.shx

diff --git a/python/plugins/processing/tests/testdata/custom/zonal_stats.cpg b/python/plugins/processing/tests/testdata/custom/zonal_stats.cpg
new file mode 100644
index 00000000000..3ad133c048f
--- /dev/null
+++ b/python/plugins/processing/tests/testdata/custom/zonal_stats.cpg
@@ -0,0 +1 @@
+UTF-8
\ No newline at end of file
diff --git a/python/plugins/processing/tests/testdata/custom/zonal_stats.dbf b/python/plugins/processing/tests/testdata/custom/zonal_stats.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..c9e814684dd7e5e0d606a8a7183a07b58067b00f
GIT binary patch
literal 575
zcmZQB<&<J#U|?`$_zxs8L0V=COwbv`_y^-bX<mhb{G7`4{Ji+w#Nuo{1BH<WP`qzA
H(tHm9+rdkM

literal 0
HcmV?d00001

diff --git a/python/plugins/processing/tests/testdata/custom/zonal_stats.prj b/python/plugins/processing/tests/testdata/custom/zonal_stats.prj
new file mode 100644
index 00000000000..a30c00a55de
--- /dev/null
+++ 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]]
\ No newline at end of file
diff --git a/python/plugins/processing/tests/testdata/custom/zonal_stats.qpj b/python/plugins/processing/tests/testdata/custom/zonal_stats.qpj
new file mode 100644
index 00000000000..5fbc831e743
--- /dev/null
+++ 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
new file mode 100644
index 0000000000000000000000000000000000000000..1566b4c1d91cc732dff6f85d14db2fc033caa6dd
GIT binary patch
literal 484
zcmZQzQ0HR64nDnLW?*0i$}JDFNeWwI<Zv`sLVn6)H;0KfA$ED2jU0A8)n>|g?&g49
zJBlbHke7gLR=(A@BeGB39E>yW$2{1GFbkxR6RK6{Y2mqLKzljOpDCI?b90dVySD7v
zI)vJ-|JUs8-C*Qkxp0BdAD}$UEc4kDHFALbua=?Tj{(irGZ5x~4YW(sYsx8s^+pc8
zfxFAKfP9vDvr>508adqbRIyP5@?rjjxeeWZptG2OI0EF4hUTMu;y|~chsmjW*SpR@
zvq1jf0Adhetd=dm2y~}N(fsY}pCH@?Qws}Ej~$zS^aJJZY~0GL1PtGat9UN|28OqH
nZh4?BP(RGB!ky37n*i;OdH8Y8WuQFFEt7ObPB;VgquU1nU{R;~

literal 0
HcmV?d00001

diff --git a/python/plugins/processing/tests/testdata/custom/zonal_stats.shx b/python/plugins/processing/tests/testdata/custom/zonal_stats.shx
new file mode 100644
index 0000000000000000000000000000000000000000..63aed4072ca1df9b23b4a2288e263897656dfeee
GIT binary patch
literal 116
zcmZQzQ0HR64y;}<Gcd3M<(3E8B!#UpayXhRAwT7@o5Mt#5WBq1Mh?54YBOa#cXPn5
Q9Yxd#$V&j?X+RtS0L;!0-~a#s

literal 0
HcmV?d00001

diff --git a/python/plugins/processing/tests/testdata/expected/zonal_stats.cpg b/python/plugins/processing/tests/testdata/expected/zonal_stats.cpg
new file mode 100644
index 00000000000..3ad133c048f
--- /dev/null
+++ b/python/plugins/processing/tests/testdata/expected/zonal_stats.cpg
@@ -0,0 +1 @@
+UTF-8
\ No newline at end of file
diff --git a/python/plugins/processing/tests/testdata/expected/zonal_stats.dbf b/python/plugins/processing/tests/testdata/expected/zonal_stats.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..bb54848e5aed09a807df133a096b7a07cd428b8d
GIT binary patch
literal 815
zcmd^*I}XA?3`7G|6o?j4?Fm-vwY}@DDd@OD6!8;+BuF6z$Kj%ge2a+OAX9k89#?Ns
zF1Pb2iaybPR@t8}w^M)H)#2N3oyW(#%wElMsOM(g6`jRJnRao!PtQr#K8*G&^~@jd
zYo5hvQrxvs(~~6$Mw_7&vOy1`Jy8IFfI{A}Yw!RW?VW%P>>QI}i$jbsJ&Fn_R9J=-
djj|OX0oI6u;uzTxF}8fbgBBx}nFYvJk$;C@ZY2N!

literal 0
HcmV?d00001

diff --git a/python/plugins/processing/tests/testdata/expected/zonal_stats.prj b/python/plugins/processing/tests/testdata/expected/zonal_stats.prj
new file mode 100644
index 00000000000..a30c00a55de
--- /dev/null
+++ 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]]
\ No newline at end of file
diff --git a/python/plugins/processing/tests/testdata/expected/zonal_stats.qpj b/python/plugins/processing/tests/testdata/expected/zonal_stats.qpj
new file mode 100644
index 00000000000..5fbc831e743
--- /dev/null
+++ 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
new file mode 100644
index 0000000000000000000000000000000000000000..1566b4c1d91cc732dff6f85d14db2fc033caa6dd
GIT binary patch
literal 484
zcmZQzQ0HR64nDnLW?*0i$}JDFNeWwI<Zv`sLVn6)H;0KfA$ED2jU0A8)n>|g?&g49
zJBlbHke7gLR=(A@BeGB39E>yW$2{1GFbkxR6RK6{Y2mqLKzljOpDCI?b90dVySD7v
zI)vJ-|JUs8-C*Qkxp0BdAD}$UEc4kDHFALbua=?Tj{(irGZ5x~4YW(sYsx8s^+pc8
zfxFAKfP9vDvr>508adqbRIyP5@?rjjxeeWZptG2OI0EF4hUTMu;y|~chsmjW*SpR@
zvq1jf0Adhetd=dm2y~}N(fsY}pCH@?Qws}Ej~$zS^aJJZY~0GL1PtGat9UN|28OqH
nZh4?BP(RGB!ky37n*i;OdH8Y8WuQFFEt7ObPB;VgquU1nU{R;~

literal 0
HcmV?d00001

diff --git a/python/plugins/processing/tests/testdata/expected/zonal_stats.shx b/python/plugins/processing/tests/testdata/expected/zonal_stats.shx
new file mode 100644
index 0000000000000000000000000000000000000000..63aed4072ca1df9b23b4a2288e263897656dfeee
GIT binary patch
literal 116
zcmZQzQ0HR64y;}<Gcd3M<(3E8B!#UpayXhRAwT7@o5Mt#5WBq1Mh?54YBOa#cXPn5
Q9Yxd#$V&j?X+RtS0L;!0-~a#s

literal 0
HcmV?d00001

diff --git a/python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml b/python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml
index 42515210393..a72ca7dbd99 100755
--- 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