Updates for test data:

- fix issues with qmls so tests run properly - updated expected images to be 400x400 rather than 800x800 - added new expected image results for new tests which will be committed shortly git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8014 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 21, 2008 · 49e899075c9a92dd3d0bffcaa67844d590733bf6 · 49e8990
1 parent 7f5ad44
commit 49e899075c9a92dd3d0bffcaa67844d590733bf6
diff --git a/tests/testdata/expected_continuous.png b/tests/testdata/expected_continuous.png
diff --git a/tests/testdata/expected_graduated.png b/tests/testdata/expected_graduated.png
diff --git a/tests/testdata/expected_maprender.png b/tests/testdata/expected_maprender.png
diff --git a/tests/testdata/expected_raster.png b/tests/testdata/expected_raster.png
diff --git a/tests/testdata/expected_raster_pseudo.png b/tests/testdata/expected_raster_pseudo.png
diff --git a/tests/testdata/expected_single.png b/tests/testdata/expected_single.png
diff --git a/tests/testdata/expected_uniquevalue.png b/tests/testdata/expected_uniquevalue.png
diff --git a/tests/testdata/lines_single_symbol.qml b/tests/testdata/lines_single_symbol.qml
@@ -2,7 +2,7 @@
 <qgis version="0.9.2-Ganymede" >
   <maplayer minScale="1" maxScale="1e+08" scaleBasedVisibilityFlag="0" geometry="Line" type="vector" >
     <id>lines20080110101725388</id>
-    <datasource>/Users/timlinux/dev/cpp/qgis_qml/tests/testdata/lines.shp</datasource>
+    <datasource>/Users/tim/dev/cpp/qgis/tests/testdata/lines.shp</datasource>
     <layername>lines</layername>
     <srs>
       <spatialrefsys>
@@ -13,7 +13,7 @@
         <description>Unknown datum based upon the GEM 10C ellipsoid</description>
         <projectionacronym>longlat</projectionacronym>
         <ellipsoidacronym>WGS84</ellipsoidacronym>
-        <geographicflag>true</geographicflag>
+        <geographicflag>false</geographicflag>
       </spatialrefsys>
     </srs>
     <transparencyLevelInt>255</transparencyLevelInt>
@@ -31,7 +31,7 @@
         <pointsize>11</pointsize>
         <rotationclassificationfield>-1</rotationclassificationfield>
         <scaleclassificationfield>-1</scaleclassificationfield>
-        <outlinecolor red="98" blue="109" green="111" />
+        <outlinecolor red="159" blue="98" green="113" />
         <outlinestyle>DashLine</outlinestyle>
         <outlinewidth>2</outlinewidth>
         <fillcolor red="0" blue="0" green="0" />

diff --git a/tests/testdata/maprender_testdata.qml b/tests/testdata/maprender_testdata.qml
@@ -0,0 +1,82 @@
+<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
+<qgis version="0.9.2-Ganymede" >
+  <maplayer minScale="1" maxScale="1e+08" scaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
+    <id>maprender_testdata20080120093911087</id>
+    <datasource>/tmp/maprender_testdata.shp</datasource>
+    <layername>maprender_testdata</layername>
+    <srs>
+      <spatialrefsys>
+        <proj4>+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs</proj4>
+        <srsid>2585</srsid>
+        <srid>4326</srid>
+        <epsg>4326</epsg>
+        <description>WGS 84</description>
+        <projectionacronym>longlat</projectionacronym>
+        <ellipsoidacronym>WGS84</ellipsoidacronym>
+        <geographicflag>true</geographicflag>
+      </spatialrefsys>
+    </srs>
+    <transparencyLevelInt>255</transparencyLevelInt>
+    <provider>ogr</provider>
+    <encoding>System</encoding>
+    <classificationattribute>Value</classificationattribute>
+    <displayfield>Value</displayfield>
+    <label>0</label>
+    <attributeactions/>
+    <continuoussymbol>
+      <classificationfield>0</classificationfield>
+      <polygonoutline>1</polygonoutline>
+      <lowestsymbol>
+        <symbol>
+          <lowervalue>-180.000000</lowervalue>
+          <uppervalue></uppervalue>
+          <label></label>
+          <pointsymbol>hard:circle</pointsymbol>
+          <pointsize>10</pointsize>
+          <rotationclassificationfield>-1</rotationclassificationfield>
+          <scaleclassificationfield>-1</scaleclassificationfield>
+          <outlinecolor red="0" blue="0" green="0" />
+          <outlinestyle>SolidLine</outlinestyle>
+          <outlinewidth>0</outlinewidth>
+          <fillcolor red="221" blue="77" green="218" />
+          <fillpattern>SolidPattern</fillpattern>
+          <texturepath></texturepath>
+        </symbol>
+      </lowestsymbol>
+      <highestsymbol>
+        <symbol>
+          <lowervalue>180.000000</lowervalue>
+          <uppervalue></uppervalue>
+          <label></label>
+          <pointsymbol>hard:circle</pointsymbol>
+          <pointsize>10</pointsize>
+          <rotationclassificationfield>-1</rotationclassificationfield>
+          <scaleclassificationfield>-1</scaleclassificationfield>
+          <outlinecolor red="0" blue="0" green="0" />
+          <outlinestyle>SolidLine</outlinestyle>
+          <outlinewidth>0</outlinewidth>
+          <fillcolor red="187" blue="20" green="27" />
+          <fillpattern>SolidPattern</fillpattern>
+          <texturepath></texturepath>
+        </symbol>
+      </highestsymbol>
+    </continuoussymbol>
+    <labelattributes>
+      <label field="" text="Rótulo" />
+      <family field="" name="Lucida Grande" />
+      <size field="" units="pt" value="12" />
+      <bold field="" on="0" />
+      <italic field="" on="0" />
+      <underline field="" on="0" />
+      <color field="" red="0" blue="0" green="0" />
+      <x field="" />
+      <y field="" />
+      <offset x="0" y="0" yfield="-1" xfield="-1" units="pt" />
+      <angle field="" value="0" />
+      <alignment field="-1" value="center" />
+      <buffercolor field="" red="255" blue="255" green="255" />
+      <buffersize field="" units="pt" value="1" />
+      <bufferenabled field="" on="" />
+    </labelattributes>
+  </maplayer>
+</qgis>
diff --git a/tests/testdata/points_continuous_symbol.qml b/tests/testdata/points_continuous_symbol.qml
@@ -2,7 +2,7 @@
 <qgis version="0.9.2-Ganymede" >
   <maplayer minScale="1" maxScale="1e+08" scaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
     <id>points20080103150949100</id>
-    <datasource>/Users/timlinux/dev/cpp/qgis_qml/tests/testdata/points.shp</datasource>
+    <datasource>/Users/tim/dev/cpp/qgis/tests/testdata/points.shp</datasource>
     <layername>points</layername>
     <srs>
       <spatialrefsys>
@@ -19,38 +19,42 @@
     <transparencyLevelInt>255</transparencyLevelInt>
     <provider>ogr</provider>
     <encoding>System</encoding>
-    <classificationattribute>Value</classificationattribute>
-    <displayfield>Name</displayfield>
+    <classificationattribute>Importance</classificationattribute>
+    <displayfield>Class</displayfield>
     <label>0</label>
     <attributeactions/>
     <continuoussymbol>
-      <classificationfield>1</classificationfield>
+      <classificationfield>2</classificationfield>
       <polygonoutline>1</polygonoutline>
       <lowestsymbol>
         <symbol>
-          <lowervalue>12.000000</lowervalue>
+          <lowervalue>1.000000</lowervalue>
           <uppervalue></uppervalue>
           <label></label>
           <pointsymbol>hard:circle</pointsymbol>
-          <pointsize>6</pointsize>
-          <outlinecolor red="255" blue="204" green="216" />
+          <pointsize>10</pointsize>
+          <rotationclassificationfield>-1</rotationclassificationfield>
+          <scaleclassificationfield>-1</scaleclassificationfield>
+          <outlinecolor red="216" blue="30" green="210" />
           <outlinestyle>SolidLine</outlinestyle>
-          <outlinewidth>2</outlinewidth>
+          <outlinewidth>1</outlinewidth>
           <fillcolor red="0" blue="0" green="0" />
           <fillpattern>NoBrush</fillpattern>
           <texturepath></texturepath>
         </symbol>
       </lowestsymbol>
       <highestsymbol>
         <symbol>
-          <lowervalue>233.000000</lowervalue>
+          <lowervalue>20.000000</lowervalue>
           <uppervalue></uppervalue>
           <label></label>
           <pointsymbol>hard:circle</pointsymbol>
-          <pointsize>6</pointsize>
-          <outlinecolor red="196" blue="0" green="56" />
+          <pointsize>10</pointsize>
+          <rotationclassificationfield>-1</rotationclassificationfield>
+          <scaleclassificationfield>-1</scaleclassificationfield>
+          <outlinecolor red="46" blue="206" green="43" />
           <outlinestyle>SolidLine</outlinestyle>
-          <outlinewidth>2</outlinewidth>
+          <outlinewidth>1</outlinewidth>
           <fillcolor red="0" blue="0" green="0" />
           <fillpattern>NoBrush</fillpattern>
           <texturepath></texturepath>

diff --git a/tests/testdata/points_graduated_symbol.qml b/tests/testdata/points_graduated_symbol.qml
@@ -2,7 +2,7 @@
 <qgis version="0.9.2-Ganymede" >
   <maplayer minScale="1" maxScale="1e+08" scaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
     <id>points20080103150949100</id>
-    <datasource>/Users/timlinux/dev/cpp/qgis_qml/tests/testdata/points.shp</datasource>
+    <datasource>/Users/tim/dev/cpp/qgis/tests/testdata/points.shp</datasource>
     <layername>points</layername>
     <srs>
       <spatialrefsys>
@@ -13,80 +13,61 @@
         <description>Unknown datum based upon the GEM 10C ellipsoid</description>
         <projectionacronym>longlat</projectionacronym>
         <ellipsoidacronym>WGS84</ellipsoidacronym>
-        <geographicflag>false</geographicflag>
+        <geographicflag>true</geographicflag>
       </spatialrefsys>
     </srs>
     <transparencyLevelInt>255</transparencyLevelInt>
     <provider>ogr</provider>
     <encoding>System</encoding>
-    <classificationattribute>Value</classificationattribute>
-    <displayfield>Name</displayfield>
+    <classificationattribute>Heading</classificationattribute>
+    <classificationattribute>Importance</classificationattribute>
+    <displayfield>Class</displayfield>
     <label>0</label>
     <attributeactions/>
     <graduatedsymbol>
-      <classificationfield>1</classificationfield>
+      <classificationfield>2</classificationfield>
       <symbol>
-        <lowervalue>11.999</lowervalue>
-        <uppervalue>56.200</uppervalue>
+        <lowervalue>0.999</lowervalue>
+        <uppervalue>7.333</uppervalue>
         <label></label>
         <pointsymbol>hard:circle</pointsymbol>
-        <pointsize>20</pointsize>
+        <pointsize>10</pointsize>
+        <rotationclassificationfield>1</rotationclassificationfield>
+        <scaleclassificationfield>2</scaleclassificationfield>
         <outlinecolor red="0" blue="0" green="0" />
         <outlinestyle>SolidLine</outlinestyle>
         <outlinewidth>1</outlinewidth>
-        <fillcolor red="255" blue="202" green="223" />
+        <fillcolor red="0" blue="0" green="255" />
         <fillpattern>SolidPattern</fillpattern>
         <texturepath></texturepath>
       </symbol>
       <symbol>
-        <lowervalue>56.200</lowervalue>
-        <uppervalue>100.400</uppervalue>
+        <lowervalue>7.333</lowervalue>
+        <uppervalue>13.667</uppervalue>
         <label></label>
-        <pointsymbol>hard:circle</pointsymbol>
-        <pointsize>20</pointsize>
-        <outlinecolor red="0" blue="0" green="0" />
-        <outlinestyle>SolidLine</outlinestyle>
-        <outlinewidth>1</outlinewidth>
-        <fillcolor red="255" blue="80" green="133" />
-        <fillpattern>SolidPattern</fillpattern>
-        <texturepath></texturepath>
-      </symbol>
-      <symbol>
-        <lowervalue>100.400</lowervalue>
-        <uppervalue>144.600</uppervalue>
-        <label></label>
-        <pointsymbol>hard:circle</pointsymbol>
-        <pointsize>20</pointsize>
+        <pointsymbol>hard:rectangle</pointsymbol>
+        <pointsize>18</pointsize>
+        <rotationclassificationfield>1</rotationclassificationfield>
+        <scaleclassificationfield>2</scaleclassificationfield>
         <outlinecolor red="0" blue="0" green="0" />
         <outlinestyle>SolidLine</outlinestyle>
         <outlinewidth>1</outlinewidth>
-        <fillcolor red="255" blue="4" green="81" />
+        <fillcolor red="169" blue="108" green="102" />
         <fillpattern>SolidPattern</fillpattern>
         <texturepath></texturepath>
       </symbol>
       <symbol>
-        <lowervalue>144.600</lowervalue>
-        <uppervalue>188.800</uppervalue>
+        <lowervalue>13.667</lowervalue>
+        <uppervalue>20.001</uppervalue>
         <label></label>
-        <pointsymbol>hard:circle</pointsymbol>
-        <pointsize>20</pointsize>
-        <outlinecolor red="0" blue="0" green="0" />
-        <outlinestyle>SolidLine</outlinestyle>
-        <outlinewidth>1</outlinewidth>
-        <fillcolor red="204" blue="0" green="59" />
-        <fillpattern>SolidPattern</fillpattern>
-        <texturepath></texturepath>
-      </symbol>
-      <symbol>
-        <lowervalue>188.800</lowervalue>
-        <uppervalue>233.001</uppervalue>
-        <label></label>
-        <pointsymbol>hard:circle</pointsymbol>
-        <pointsize>20</pointsize>
+        <pointsymbol>hard:star</pointsymbol>
+        <pointsize>22</pointsize>
+        <rotationclassificationfield>1</rotationclassificationfield>
+        <scaleclassificationfield>2</scaleclassificationfield>
         <outlinecolor red="0" blue="0" green="0" />
         <outlinestyle>SolidLine</outlinestyle>
         <outlinewidth>1</outlinewidth>
-        <fillcolor red="133" blue="0" green="38" />
+        <fillcolor red="0" blue="171" green="84" />
         <fillpattern>SolidPattern</fillpattern>
         <texturepath></texturepath>
       </symbol>

diff --git a/tests/testdata/points_single_symbol.qml b/tests/testdata/points_single_symbol.qml
@@ -1,8 +1,8 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
 <qgis version="0.9.2-Ganymede" >
-  <maplayer minScale="0" maxScale="1e+08" scaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
+  <maplayer minScale="1" maxScale="1e+08" scaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
     <id>points20080103150949100</id>
-    <datasource>/Users/timlinux/dev/cpp/qgis_qml/tests/testdata/points.shp</datasource>
+    <datasource>/Users/tim/dev/cpp/qgis/tests/testdata/points.shp</datasource>
     <layername>points</layername>
     <srs>
       <spatialrefsys>
@@ -13,28 +13,30 @@
         <description>Unknown datum based upon the GEM 10C ellipsoid</description>
         <projectionacronym>longlat</projectionacronym>
         <ellipsoidacronym>WGS84</ellipsoidacronym>
-        <geographicflag>false</geographicflag>
+        <geographicflag>true</geographicflag>
       </spatialrefsys>
     </srs>
     <transparencyLevelInt>255</transparencyLevelInt>
     <provider>ogr</provider>
     <encoding>System</encoding>
-    <displayfield>Name</displayfield>
+    <classificationattribute>Heading</classificationattribute>
+    <classificationattribute>Importance</classificationattribute>
+    <displayfield>Class</displayfield>
     <label>0</label>
     <attributeactions/>
     <singlesymbol>
-      <angleclassificationfield>-1</angleclassificationfield>
-      <scaleclassificationfield>-1</scaleclassificationfield>
       <symbol>
         <lowervalue></lowervalue>
         <uppervalue></uppervalue>
         <label></label>
-        <pointsymbol>hard:circle</pointsymbol>
-        <pointsize>6</pointsize>
-        <outlinecolor red="0" blue="0" green="0" />
+        <pointsymbol>hard:triangle</pointsymbol>
+        <pointsize>14</pointsize>
+        <rotationclassificationfield>1</rotationclassificationfield>
+        <scaleclassificationfield>2</scaleclassificationfield>
+        <outlinecolor red="140" blue="60" green="82" />
         <outlinestyle>SolidLine</outlinestyle>
         <outlinewidth>1</outlinewidth>
-        <fillcolor red="1" blue="193" green="34" />
+        <fillcolor red="193" blue="122" green="145" />
         <fillpattern>SolidPattern</fillpattern>
         <texturepath></texturepath>
       </symbol>