Skip to content

Commit 6f9b04e

Browse files
author
wonder
committed
Fixed renderer tests to actually show some output, they still fail due different units.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10027 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 6de7b0a commit 6f9b04e

17 files changed

+27
-55
lines changed

‎src/core/qgsvectorlayer.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -2324,6 +2324,7 @@ bool QgsVectorLayer::readSymbology( const QDomNode& node, QString& errorMessage
23242324

23252325
if ( !renderer )
23262326
{
2327+
errorMessage = tr("Unknown renderer");
23272328
return false;
23282329
}
23292330

‎tests/src/core/testqgsrenderers.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,10 @@ bool TestQgsRenderers::setQml( QString theType )
193193
}
194194
QString myFileName = mTestDataDir + "points_" + theType + "_symbol.qml";
195195
bool myStyleFlag = false;
196-
mpPointsLayer->loadNamedStyle( myFileName, myStyleFlag );
196+
QString error = mpPointsLayer->loadNamedStyle( myFileName, myStyleFlag );
197197
if ( !myStyleFlag )
198198
{
199+
qDebug(error.toLocal8Bit().data());
199200
return false;
200201
}
201202
else

‎tests/testdata/lines.qml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
2-
<qgis version="0.9.2-Ganymede" >
3-
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Line" type="vector" >
2+
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Line" type="vector" >
43
<id>lines20080110101725388</id>
54
<datasource>/Users/timlinux/dev/cpp/qgis_qml/tests/testdata/lines.shp</datasource>
65
<layername>lines</layername>
@@ -73,5 +72,4 @@
7372
<buffersize field="" units="pt" value="1" />
7473
<bufferenabled field="" on="" />
7574
</labelattributes>
76-
</maplayer>
7775
</qgis>

‎tests/testdata/lines_continuous_symbol.qml

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
2-
<qgis version="0.9.2-Ganymede" >
3-
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Line" type="vector" >
2+
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Line" type="vector" >
43
<id>lines20080110101725388</id>
54
<datasource>/Users/timlinux/dev/cpp/qgis_qml/tests/testdata/lines.shp</datasource>
65
<layername>lines</layername>
@@ -24,7 +23,7 @@
2423
<label>0</label>
2524
<attributeactions/>
2625
<continuoussymbol>
27-
<classificationfield>1</classificationfield>
26+
<classificationfield>Value</classificationfield>
2827
<polygonoutline>1</polygonoutline>
2928
<lowestsymbol>
3029
<symbol>
@@ -78,5 +77,4 @@
7877
<buffersize field="" units="pt" value="1" />
7978
<bufferenabled field="" on="" />
8079
</labelattributes>
81-
</maplayer>
8280
</qgis>

‎tests/testdata/lines_graduated_symbol.qml

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
2-
<qgis version="0.9.2-Ganymede" >
3-
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Line" type="vector" >
2+
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Line" type="vector" >
43
<id>lines20080110101725388</id>
54
<datasource>/Users/timlinux/dev/cpp/qgis_qml/tests/testdata/lines.shp</datasource>
65
<layername>lines</layername>
@@ -24,7 +23,7 @@
2423
<label>0</label>
2524
<attributeactions/>
2625
<graduatedsymbol>
27-
<classificationfield>1</classificationfield>
26+
<classificationfield>Value</classificationfield>
2827
<symbol>
2928
<lowervalue>0.999</lowervalue>
3029
<uppervalue>1.333</uppervalue>
@@ -88,5 +87,4 @@
8887
<buffersize field="" units="pt" value="1" />
8988
<bufferenabled field="" on="" />
9089
</labelattributes>
91-
</maplayer>
9290
</qgis>

‎tests/testdata/lines_single_symbol.qml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
2-
<qgis version="0.9.2-Ganymede" >
3-
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Line" type="vector" >
2+
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Line" type="vector" >
43
<id>lines20080110101725388</id>
54
<datasource>/Users/tim/dev/cpp/qgis/tests/testdata/lines.shp</datasource>
65
<layername>lines</layername>
@@ -56,5 +55,4 @@
5655
<buffersize field="" units="pt" value="1" />
5756
<bufferenabled field="" on="" />
5857
</labelattributes>
59-
</maplayer>
6058
</qgis>

‎tests/testdata/lines_uniquevalue_symbol.qml

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
2-
<qgis version="0.9.2-Ganymede" >
3-
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Line" type="vector" >
2+
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Line" type="vector" >
43
<id>lines20080110101725388</id>
54
<datasource>/Users/timlinux/dev/cpp/qgis_qml/tests/testdata/lines.shp</datasource>
65
<layername>lines</layername>
@@ -24,7 +23,7 @@
2423
<label>0</label>
2524
<attributeactions/>
2625
<uniquevalue>
27-
<classificationfield>0</classificationfield>
26+
<classificationfield>Name</classificationfield>
2827
<symbol>
2928
<lowervalue>Arterial</lowervalue>
3029
<uppervalue></uppervalue>
@@ -73,5 +72,4 @@
7372
<buffersize field="" units="pt" value="1" />
7473
<bufferenabled field="" on="" />
7574
</labelattributes>
76-
</maplayer>
7775
</qgis>

‎tests/testdata/points.qml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
2-
<qgis version="0.9.2-Ganymede" >
3-
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
2+
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
43
<id>points20080109122431720</id>
54
<datasource>/home/timlinux/dev/cpp/qgis/tests/testdata/points.shp</datasource>
65
<layername>Points</layername>
@@ -90,5 +89,4 @@
9089
<buffersize field="" units="pt" value="1" />
9190
<bufferenabled field="" on="" />
9291
</labelattributes>
93-
</maplayer>
9492
</qgis>

‎tests/testdata/points_continuous_symbol.qml

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
2-
<qgis version="0.9.2-Ganymede" >
3-
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
2+
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
43
<id>points20080103150949100</id>
54
<datasource>/Users/tim/dev/cpp/qgis/tests/testdata/points.shp</datasource>
65
<layername>points</layername>
@@ -24,7 +23,7 @@
2423
<label>0</label>
2524
<attributeactions/>
2625
<continuoussymbol>
27-
<classificationfield>2</classificationfield>
26+
<classificationfield>Importance</classificationfield>
2827
<polygonoutline>1</polygonoutline>
2928
<lowestsymbol>
3029
<symbol>
@@ -78,5 +77,4 @@
7877
<buffersize field="" units="pt" value="1" />
7978
<bufferenabled field="" on="" />
8079
</labelattributes>
81-
</maplayer>
8280
</qgis>

‎tests/testdata/points_graduated_symbol.qml

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
2-
<qgis version="0.9.2-Ganymede" >
3-
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
2+
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
43
<id>points20080103150949100</id>
54
<datasource>/Users/tim/dev/cpp/qgis/tests/testdata/points.shp</datasource>
65
<layername>points</layername>
@@ -25,7 +24,7 @@
2524
<label>0</label>
2625
<attributeactions/>
2726
<graduatedsymbol>
28-
<classificationfield>2</classificationfield>
27+
<classificationfield>Importance</classificationfield>
2928
<symbol>
3029
<lowervalue>0.999</lowervalue>
3130
<uppervalue>7.333</uppervalue>
@@ -89,5 +88,4 @@
8988
<buffersize field="" units="pt" value="1" />
9089
<bufferenabled field="" on="" />
9190
</labelattributes>
92-
</maplayer>
9391
</qgis>

‎tests/testdata/points_single_symbol.qml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
2-
<qgis version="0.9.2-Ganymede" >
3-
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
2+
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
43
<id>points20080103150949100</id>
54
<datasource>/Users/tim/dev/cpp/qgis/tests/testdata/points.shp</datasource>
65
<layername>points</layername>
@@ -58,5 +57,4 @@
5857
<buffersize field="" units="pt" value="1" />
5958
<bufferenabled field="" on="" />
6059
</labelattributes>
61-
</maplayer>
6260
</qgis>

‎tests/testdata/points_uniquevalue_symbol.qml

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
2-
<qgis version="0.9.2-Ganymede" >
3-
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
2+
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Point" type="vector" >
43
<id>points20080103150949100</id>
54
<datasource>/Users/tim/dev/cpp/qgis/tests/testdata/points.shp</datasource>
65
<layername>points</layername>
@@ -26,7 +25,7 @@
2625
<label>0</label>
2726
<attributeactions/>
2827
<uniquevalue>
29-
<classificationfield>0</classificationfield>
28+
<classificationfield>Class</classificationfield>
3029
<symbol>
3130
<lowervalue>B52</lowervalue>
3231
<uppervalue></uppervalue>
@@ -90,5 +89,4 @@
9089
<buffersize field="" units="pt" value="1" />
9190
<bufferenabled field="" on="" />
9291
</labelattributes>
93-
</maplayer>
9492
</qgis>

‎tests/testdata/polys.qml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
2-
<qgis version="0.9.2-Ganymede" >
3-
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
2+
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
43
<id>polys20080110101725465</id>
54
<datasource>/Users/timlinux/dev/cpp/qgis_qml/tests/testdata/polys.shp</datasource>
65
<layername>polys</layername>
@@ -73,5 +72,4 @@
7372
<buffersize field="" units="pt" value="1" />
7473
<bufferenabled field="" on="" />
7574
</labelattributes>
76-
</maplayer>
7775
</qgis>

‎tests/testdata/polys_continuous_symbol.qml

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
2-
<qgis version="0.9.2-Ganymede" >
3-
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
2+
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
43
<id>polys20080110101725465</id>
54
<datasource>/Users/timlinux/dev/cpp/qgis_qml/tests/testdata/polys.shp</datasource>
65
<layername>polys</layername>
@@ -24,7 +23,7 @@
2423
<label>0</label>
2524
<attributeactions/>
2625
<continuoussymbol>
27-
<classificationfield>1</classificationfield>
26+
<classificationfield>Value</classificationfield>
2827
<polygonoutline>1</polygonoutline>
2928
<lowestsymbol>
3029
<symbol>
@@ -78,5 +77,4 @@
7877
<buffersize field="" units="pt" value="1" />
7978
<bufferenabled field="" on="" />
8079
</labelattributes>
81-
</maplayer>
8280
</qgis>

‎tests/testdata/polys_graduated_symbol.qml

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
2-
<qgis version="0.9.2-Ganymede" >
3-
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
2+
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
43
<id>polys20080110101725465</id>
54
<datasource>/Users/timlinux/dev/cpp/qgis_qml/tests/testdata/polys.shp</datasource>
65
<layername>polys</layername>
@@ -24,7 +23,7 @@
2423
<label>0</label>
2524
<attributeactions/>
2625
<graduatedsymbol>
27-
<classificationfield>1</classificationfield>
26+
<classificationfield>Value</classificationfield>
2827
<symbol>
2928
<lowervalue>6.999</lowervalue>
3029
<uppervalue>11.333</uppervalue>
@@ -88,5 +87,4 @@
8887
<buffersize field="" units="pt" value="1" />
8988
<bufferenabled field="" on="" />
9089
</labelattributes>
91-
</maplayer>
9290
</qgis>

‎tests/testdata/polys_single_symbol.qml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
2-
<qgis version="0.9.2-Ganymede" >
3-
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
2+
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
43
<id>polys20080110101725465</id>
54
<datasource>/Users/tim/dev/cpp/qgis/tests/testdata/polys.shp</datasource>
65
<layername>polys</layername>
@@ -56,5 +55,4 @@
5655
<buffersize field="" units="pt" value="1" />
5756
<bufferenabled field="" on="" />
5857
</labelattributes>
59-
</maplayer>
6058
</qgis>

‎tests/testdata/polys_uniquevalue_symbol.qml

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
2-
<qgis version="0.9.2-Ganymede" >
3-
<maplayer minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
2+
<qgis version="0.9.2-Ganymede" minimumScale="1" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0" geometry="Polygon" type="vector" >
43
<id>polys20080110101725465</id>
54
<datasource>/Users/timlinux/dev/cpp/qgis_qml/tests/testdata/polys.shp</datasource>
65
<layername>polys</layername>
@@ -24,7 +23,7 @@
2423
<label>0</label>
2524
<attributeactions/>
2625
<continuoussymbol>
27-
<classificationfield>1</classificationfield>
26+
<classificationfield>Value</classificationfield>
2827
<polygonoutline>1</polygonoutline>
2928
<lowestsymbol>
3029
<symbol>
@@ -78,5 +77,4 @@
7877
<buffersize field="" units="pt" value="1" />
7978
<bufferenabled field="" on="" />
8079
</labelattributes>
81-
</maplayer>
8280
</qgis>

0 commit comments

Comments
 (0)