From 1be431d93e8a98b9105bdc4af46ff825e3ccb9f6 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Fri, 5 Feb 2021 10:45:45 +1000
Subject: [PATCH] v.rast.stats refuses to create shapefiles in newer grass
 versions, so use a different format

---
 .../expected/grass7/v_rast_stats2.gml         |  52 +++++++++
 .../expected/grass7/v_rast_stats2.xsd         | 108 ++++++++++++++++++
 .../grass7_algorithms_vector_tests.yaml       |   2 +-
 3 files changed, 161 insertions(+), 1 deletion(-)
 create mode 100644 python/plugins/processing/tests/testdata/expected/grass7/v_rast_stats2.gml
 create mode 100644 python/plugins/processing/tests/testdata/expected/grass7/v_rast_stats2.xsd

diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_rast_stats2.gml b/python/plugins/processing/tests/testdata/expected/grass7/v_rast_stats2.gml
new file mode 100644
index 000000000000..51e838478ad3
--- /dev/null
+++ b/python/plugins/processing/tests/testdata/expected/grass7/v_rast_stats2.gml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ogr:FeatureCollection
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://ogr.maptools.org/ v_rast_stats2.xsd"
+     xmlns:ogr="http://ogr.maptools.org/"
+     xmlns:gml="http://www.opengis.net/gml">
+  <gml:boundedBy>
+    <gml:Box>
+      <gml:coord><gml:X>18.67319311115957</gml:X><gml:Y>45.77795780842602</gml:Y></gml:coord>
+      <gml:coord><gml:X>18.70090093189771</gml:X><gml:Y>45.80786158698488</gml:Y></gml:coord>
+    </gml:Box>
+  </gml:boundedBy>
+                                                                                                
+  <gml:featureMember>
+    <ogr:vector_601c94af8e0a86 fid="polygon_mask.0">
+      <ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>18.6744202640594,45.7984964727494 18.6731931111596,45.7899709894453 18.6759703519329,45.7902293374243 18.6838499652896,45.7903585114137 18.694442232425,45.7962359279339 18.6948297543933,45.8001757346123 18.6896627948151,45.8045676502538 18.6832040953424,45.8078615869849 18.6744202640594,45.7984964727494</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
+      <ogr:cat>1</ogr:cat>
+      <ogr:s_number>24890</ogr:s_number>
+      <ogr:s_minimum>85</ogr:s_minimum>
+      <ogr:s_maximum>230</ogr:s_maximum>
+      <ogr:s_range>145</ogr:s_range>
+      <ogr:s_average>140.558313692981</ogr:s_average>
+      <ogr:s_stddev>39.3360767510494</ogr:s_stddev>
+      <ogr:s_variance>1547.32693416445</ogr:s_variance>
+      <ogr:s_coeff_var>27.9855923975941</ogr:s_coeff_var>
+      <ogr:s_sum>3498496.4278183</ogr:s_sum>
+      <ogr:s_first_quartile>98.7667</ogr:s_first_quartile>
+      <ogr:s_median>141.309</ogr:s_median>
+      <ogr:s_third_quartile>175.558</ogr:s_third_quartile>
+      <ogr:s_percentile_90>193.708</ogr:s_percentile_90>
+    </ogr:vector_601c94af8e0a86>
+  </gml:featureMember>
+  <gml:featureMember>
+    <ogr:vector_601c94af8e0a86 fid="polygon_mask.1">
+      <ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>18.6906961867308,45.7866124657195 18.6800393326007,45.7833185289884 18.6804914415638,45.7798954182678 18.6884356419153,45.777957808426 18.6997383659926,45.7811225711677 18.7009009318977,45.7856436607986 18.694442232425,45.7911335553504 18.6906961867308,45.7866124657195</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
+      <ogr:cat>2</ogr:cat>
+      <ogr:s_number>14940</ogr:s_number>
+      <ogr:s_minimum>121.586990356445</ogr:s_minimum>
+      <ogr:s_maximum>209.600006103516</ogr:s_maximum>
+      <ogr:s_range>88.0130157470703</ogr:s_range>
+      <ogr:s_average>171.984373565531</ogr:s_average>
+      <ogr:s_stddev>21.9023964009941</ogr:s_stddev>
+      <ogr:s_variance>479.714968106278</ogr:s_variance>
+      <ogr:s_coeff_var>12.7351083978851</ogr:s_coeff_var>
+      <ogr:s_sum>2569446.54106903</ogr:s_sum>
+      <ogr:s_first_quartile>153.417</ogr:s_first_quartile>
+      <ogr:s_median>179.076</ogr:s_median>
+      <ogr:s_third_quartile>190.563</ogr:s_third_quartile>
+      <ogr:s_percentile_90>196.643</ogr:s_percentile_90>
+    </ogr:vector_601c94af8e0a86>
+  </gml:featureMember>
+</ogr:FeatureCollection>
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/v_rast_stats2.xsd b/python/plugins/processing/tests/testdata/expected/grass7/v_rast_stats2.xsd
new file mode 100644
index 000000000000..07372801e0ed
--- /dev/null
+++ b/python/plugins/processing/tests/testdata/expected/grass7/v_rast_stats2.xsd
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://ogr.maptools.org/" xmlns:ogr="http://ogr.maptools.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" elementFormDefault="qualified" version="1.0">
+<xs:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/2.1.2/feature.xsd"/>
+<xs:element name="FeatureCollection" type="ogr:FeatureCollectionType" substitutionGroup="gml:_FeatureCollection"/>
+<xs:complexType name="FeatureCollectionType">
+  <xs:complexContent>
+    <xs:extension base="gml:AbstractFeatureCollectionType">
+      <xs:attribute name="lockId" type="xs:string" use="optional"/>
+      <xs:attribute name="scope" type="xs:string" use="optional"/>
+    </xs:extension>
+  </xs:complexContent>
+</xs:complexType>
+<xs:element name="vector_601c94af8e0a86" type="ogr:vector_601c94af8e0a86_Type" substitutionGroup="gml:_Feature"/>
+<xs:complexType name="vector_601c94af8e0a86_Type">
+  <xs:complexContent>
+    <xs:extension base="gml:AbstractFeatureType">
+      <xs:sequence>
+        <xs:element name="geometryProperty" type="gml:PolygonPropertyType" nillable="true" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="cat" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:integer">
+              <xs:totalDigits value="16"/>
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="s_number" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:decimal">
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="s_minimum" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:decimal">
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="s_maximum" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:decimal">
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="s_range" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:decimal">
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="s_average" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:decimal">
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="s_stddev" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:decimal">
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="s_variance" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:decimal">
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="s_coeff_var" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:decimal">
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="s_sum" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:decimal">
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="s_first_quartile" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:decimal">
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="s_median" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:decimal">
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="s_third_quartile" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:decimal">
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+        <xs:element name="s_percentile_90" nillable="true" minOccurs="0" maxOccurs="1">
+          <xs:simpleType>
+            <xs:restriction base="xs:decimal">
+            </xs:restriction>
+          </xs:simpleType>
+        </xs:element>
+      </xs:sequence>
+    </xs:extension>
+  </xs:complexContent>
+</xs:complexType>
+</xs:schema>
diff --git a/python/plugins/processing/tests/testdata/grass7_algorithms_vector_tests.yaml b/python/plugins/processing/tests/testdata/grass7_algorithms_vector_tests.yaml
index bb85f4b4c392..a01807b72a82 100644
--- a/python/plugins/processing/tests/testdata/grass7_algorithms_vector_tests.yaml
+++ b/python/plugins/processing/tests/testdata/grass7_algorithms_vector_tests.yaml
@@ -67,7 +67,7 @@ tests:
         type: raster
     results:
       output:
-        name: expected/grass7/v_rast_stats.shp
+        name: expected/grass7/v_rast_stats2.gml
         type: vector
 
   - algorithm: grass7:v.voronoi