Fix unit test data

qgis · Sep 15, 2017 · 4fd2a1a05c09b2070988457696cdc8fb0325d22e · 4fd2a1a
1 parent 4eeac1c
commit 4fd2a1a05c09b2070988457696cdc8fb0325d22e
diff --git a/python/plugins/processing/tests/testdata/expected/extract_by_extent.gfs b/python/plugins/processing/tests/testdata/expected/extract_by_extent.gfs
@@ -6,9 +6,9 @@
     <GeometryType>3</GeometryType>
     <SRSName>EPSG:4326</SRSName>
     <DatasetSpecificInfo>
-      <FeatureCount>3</FeatureCount>
+      <FeatureCount>2</FeatureCount>
       <ExtentXMin>-1.00000</ExtentXMin>
-      <ExtentXMax>10.00000</ExtentXMax>
+      <ExtentXMax>6.00000</ExtentXMax>
       <ExtentYMin>-3.00000</ExtentYMin>
       <ExtentYMax>3.00000</ExtentYMax>
     </DatasetSpecificInfo>
@@ -26,8 +26,7 @@
     <PropertyDefn>
       <Name>floatval</Name>
       <ElementPath>floatval</ElementPath>
-      <Type>String</Type>
-      <Width>18</Width>
+      <Type>Real</Type>
     </PropertyDefn>
   </GMLFeatureClass>
 </GMLFeatureClassList>
diff --git a/python/plugins/processing/tests/testdata/expected/extract_by_extent.gml b/python/plugins/processing/tests/testdata/expected/extract_by_extent.gml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ogr:FeatureCollection
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation=""
-     xmlns:ogr="http://ogr.maptools.org/"
-     xmlns:gml="http://www.opengis.net/gml">
-  <gml:boundedBy>
-    <gml:Box>
-      <gml:coord><gml:X>-1</gml:X><gml:Y>-3</gml:Y></gml:coord>
-      <gml:coord><gml:X>6</gml:X><gml:Y>3</gml:Y></gml:coord>
-    </gml:Box>
-  </gml:boundedBy>
-
-  <gml:featureMember>
-    <ogr:extract_by_extent fid="polys.0">
-      <ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>-1,-1 -1,3 3,3 3,2 2,2 2,-1 -1,-1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
-      <ogr:name>aaaaa</ogr:name>
-      <ogr:intval>33</ogr:intval>
-      <ogr:floatval>44.123456</ogr:floatval>
-    </ogr:extract_by_extent>
-  </gml:featureMember>
-  <gml:featureMember>
-    <ogr:extract_by_extent fid="polys.5">
-      <ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>3,2 6,1 6,-3 2,-1 2,2 3,2</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
-      <ogr:name>elim</ogr:name>
-      <ogr:intval>2</ogr:intval>
-      <ogr:floatval>3.33</ogr:floatval>
-    </ogr:extract_by_extent>
-  </gml:featureMember>
-</ogr:FeatureCollection>
+<?xml version="1.0" encoding="utf-8" ?>
+<ogr:FeatureCollection
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation=""
+     xmlns:ogr="http://ogr.maptools.org/"
+     xmlns:gml="http://www.opengis.net/gml">
+  <gml:boundedBy>
+    <gml:Box>
+      <gml:coord><gml:X>-1</gml:X><gml:Y>-3</gml:Y></gml:coord>
+      <gml:coord><gml:X>6</gml:X><gml:Y>3</gml:Y></gml:coord>
+    </gml:Box>
+  </gml:boundedBy>
+                                                                                                                                                              
+  <gml:featureMember>
+    <ogr:extract_by_extent fid="polys.0">
+      <ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>-1,-1 -1,3 3,3 3,2 2,2 2,-1 -1,-1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
+      <ogr:name>aaaaa</ogr:name>
+      <ogr:intval>33</ogr:intval>
+      <ogr:floatval>44.123456</ogr:floatval>
+    </ogr:extract_by_extent>
+  </gml:featureMember>
+  <gml:featureMember>
+    <ogr:extract_by_extent fid="polys.5">
+      <ogr:geometryProperty><gml:Polygon srsName="EPSG:4326"><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>3,2 6,1 6,-3 2,-1 2,2 3,2</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></ogr:geometryProperty>
+      <ogr:name>elim</ogr:name>
+      <ogr:intval>2</ogr:intval>
+      <ogr:floatval>3.33</ogr:floatval>
+    </ogr:extract_by_extent>
+  </gml:featureMember>
+</ogr:FeatureCollection>
diff --git a/python/plugins/processing/tests/testdata/expected/extract_by_extent_clip.gfs b/python/plugins/processing/tests/testdata/expected/extract_by_extent_clip.gfs
diff --git a/python/plugins/processing/tests/testdata/expected/extract_by_extent_clip.gml b/python/plugins/processing/tests/testdata/expected/extract_by_extent_clip.gml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ogr:FeatureCollection
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation=""
-     xmlns:ogr="http://ogr.maptools.org/"
-     xmlns:gml="http://www.opengis.net/gml">
-  <gml:boundedBy>
-    <gml:Box>
-      <gml:coord><gml:X>-1</gml:X><gml:Y>-2.3875</gml:Y></gml:coord>
-      <gml:coord><gml:X>4.775</gml:X><gml:Y>3</gml:Y></gml:coord>
-    </gml:Box>
-  </gml:boundedBy>
-
-  <gml:featureMember>
-    <ogr:extract_by_extent_clip fid="polys.0">
-      <ogr:geometryProperty><gml:MultiPolygon srsName="EPSG:4326"><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>-1,-1 -1,3 3,3 3,2 2,2 2,-1 -1,-1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>
-      <ogr:name>aaaaa</ogr:name>
-      <ogr:intval>33</ogr:intval>
-      <ogr:floatval>44.123456</ogr:floatval>
-    </ogr:extract_by_extent_clip>
-  </gml:featureMember>
-  <gml:featureMember>
-    <ogr:extract_by_extent_clip fid="polys.5">
-      <ogr:geometryProperty><gml:MultiPolygon srsName="EPSG:4326"><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>3,2 4.775,1.40833333333333 4.775,-2.3875 2,-1 2,2 3,2</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>
-      <ogr:name>elim</ogr:name>
-      <ogr:intval>2</ogr:intval>
-      <ogr:floatval>3.33</ogr:floatval>
-    </ogr:extract_by_extent_clip>
-  </gml:featureMember>
-</ogr:FeatureCollection>
+<?xml version="1.0" encoding="utf-8" ?>
+<ogr:FeatureCollection
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation=""
+     xmlns:ogr="http://ogr.maptools.org/"
+     xmlns:gml="http://www.opengis.net/gml">
+  <gml:boundedBy>
+    <gml:Box>
+      <gml:coord><gml:X>-1</gml:X><gml:Y>-2.3875</gml:Y></gml:coord>
+      <gml:coord><gml:X>4.775</gml:X><gml:Y>3</gml:Y></gml:coord>
+    </gml:Box>
+  </gml:boundedBy>
+                                                                                                                                                     
+  <gml:featureMember>
+    <ogr:extract_by_extent_clip fid="polys.0">
+      <ogr:geometryProperty><gml:MultiPolygon srsName="EPSG:4326"><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>-1,-1 -1,3 3,3 3,2 2,2 2,-1 -1,-1</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>
+      <ogr:name>aaaaa</ogr:name>
+      <ogr:intval>33</ogr:intval>
+      <ogr:floatval>44.123456</ogr:floatval>
+    </ogr:extract_by_extent_clip>
+  </gml:featureMember>
+  <gml:featureMember>
+    <ogr:extract_by_extent_clip fid="polys.5">
+      <ogr:geometryProperty><gml:MultiPolygon srsName="EPSG:4326"><gml:polygonMember><gml:Polygon><gml:outerBoundaryIs><gml:LinearRing><gml:coordinates>3,2 4.775,1.40833333333333 4.775,-2.3875 2,-1 2,2 3,2</gml:coordinates></gml:LinearRing></gml:outerBoundaryIs></gml:Polygon></gml:polygonMember></gml:MultiPolygon></ogr:geometryProperty>
+      <ogr:name>elim</ogr:name>
+      <ogr:intval>2</ogr:intval>
+      <ogr:floatval>3.33</ogr:floatval>
+    </ogr:extract_by_extent_clip>
+  </gml:featureMember>
+</ogr:FeatureCollection>