sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix PyQgsSymbolLayerV2 test

Browse Source
This commit is contained in:
Alexander Bruy 2013-07-18 14:49:10 +03:00
parent 090048fdf4
commit 8fc14f8ac0
2 changed files with 54 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
tests/src/python/test_qgssymbollayerv2.py
View File

@ -25,13 +25,8 @@ __revision__ = '$Format:%H$'
import os import os
from PyQt4.QtCore import (QString, import qgis
QChar, from PyQt4.QtCore import *
pyqtWrapperType,
QFile,
QIODevice,
QDir,
Qt)
from PyQt4.QtXml import QDomDocument from PyQt4.QtXml import QDomDocument
from qgis.core import (QgsCentroidFillSymbolLayerV2, from qgis.core import (QgsCentroidFillSymbolLayerV2,
@ -228,10 +223,8 @@ class TestQgsSymbolLayerV2(TestCase):
def testQgsSimpleFillSymbolLayerV2(self): def testQgsSimpleFillSymbolLayerV2(self):
'''Create a new style from a .sld file and match test. '''Create a new style from a .sld file and match test.
''' '''
mTestName = QString ('QgsSimpleFillSymbolLayerV2') mTestName = 'QgsSimpleFillSymbolLayerV2'
mFilePath = QDir.toNativeSeparators( mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
QString('%1/symbol_layer/%2.sld').arg(
unitTestDataPath(), mTestName))
mDoc = QDomDocument(mTestName) mDoc = QDomDocument(mTestName)
mFile = QFile(mFilePath) mFile = QFile(mFilePath)
@ -251,7 +244,7 @@ class TestQgsSymbolLayerV2(TestCase):
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
mExpectedValue = QString(u'#ffaa7f') mExpectedValue = u'#ffaa7f'
mValue = mSymbolLayer.borderColor().name() mValue = mSymbolLayer.borderColor().name()
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
@ -270,10 +263,8 @@ class TestQgsSymbolLayerV2(TestCase):
''' '''
Create a new style from a .sld file and match test Create a new style from a .sld file and match test
''' '''
mTestName = QString('QgsCentroidFillSymbolLayerV2') mTestName = 'QgsCentroidFillSymbolLayerV2'
mFilePath = QDir.toNativeSeparators( mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
QString('%1/symbol_layer/%2.sld').arg(
unitTestDataPath(), mTestName))
mDoc = QDomDocument(mTestName) mDoc = QDomDocument(mTestName)
mFile = QFile(mFilePath) mFile = QFile(mFilePath)
@ -288,17 +279,17 @@ class TestQgsSymbolLayerV2(TestCase):
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
mExpectedValue = QString(u'regular_star') mExpectedValue = u'regular_star'
mValue = mSymbolLayer.subSymbol().symbolLayer(0).name() mValue = mSymbolLayer.subSymbol().symbolLayer(0).name()
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
mExpectedValue = QString(u'#55aaff') mExpectedValue = u'#55aaff'
mValue = mSymbolLayer.subSymbol().symbolLayer(0).color().name() mValue = mSymbolLayer.subSymbol().symbolLayer(0).color().name()
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
mExpectedValue = QString(u'#00ff00') mExpectedValue = u'#00ff00'
mValue = mSymbolLayer.subSymbol().symbolLayer(0).borderColor().name() mValue = mSymbolLayer.subSymbol().symbolLayer(0).borderColor().name()
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
@ -307,10 +298,8 @@ class TestQgsSymbolLayerV2(TestCase):
''' '''
Create a new style from a .sld file and match test Create a new style from a .sld file and match test
''' '''
mTestName = QString ('QgsLinePatternFillSymbolLayer') mTestName = 'QgsLinePatternFillSymbolLayer'
mFilePath = QDir.toNativeSeparators( mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
QString ('%1/symbol_layer/%2.sld').arg(
unitTestDataPath(), mTestName))
mDoc = QDomDocument(mTestName) mDoc = QDomDocument(mTestName)
mFile = QFile(mFilePath) mFile = QFile(mFilePath)
@ -325,7 +314,7 @@ class TestQgsSymbolLayerV2(TestCase):
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
mExpectedValue = QString(u'#ff55ff') mExpectedValue = u'#ff55ff'
mValue = mSymbolLayer.color().name() mValue = mSymbolLayer.color().name()
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
@ -352,10 +341,8 @@ class TestQgsSymbolLayerV2(TestCase):
''' '''
# at the moment there is an empty createFromSld implementation # at the moment there is an empty createFromSld implementation
# that return nulls # that return nulls
mTestName = QString('QgsPointPatternFillSymbolLayer') mTestName = 'QgsPointPatternFillSymbolLayer'
mFilePath = QDir.toNativeSeparators( mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
QString ('%1/symbol_layer/%2.sld').arg(
unitTestDataPath(), mTestName))
mDoc = QDomDocument(mTestName) mDoc = QDomDocument(mTestName)
mFile = QFile(mFilePath) mFile = QFile(mFilePath)
@ -370,17 +357,17 @@ class TestQgsSymbolLayerV2(TestCase):
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
mExpectedValue = QString(u'triangle') mExpectedValue = u'triangle'
mValue = mSymbolLayer.subSymbol().symbolLayer(0).name() mValue = mSymbolLayer.subSymbol().symbolLayer(0).name()
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
mExpectedValue = QString(u'#ffaa00') mExpectedValue = u'#ffaa00'
mValue = mSymbolLayer.subSymbol().symbolLayer(0).color().name() mValue = mSymbolLayer.subSymbol().symbolLayer(0).color().name()
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
mExpectedValue = QString(u'#ff007f') mExpectedValue = u'#ff007f'
mValue = mSymbolLayer.subSymbol().symbolLayer(0).borderColor().name() mValue = mSymbolLayer.subSymbol().symbolLayer(0).borderColor().name()
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
@ -399,10 +386,8 @@ class TestQgsSymbolLayerV2(TestCase):
''' '''
Create a new style from a .sld file and match test Create a new style from a .sld file and match test
''' '''
mTestName = QString ('QgsSVGFillSymbolLayer') mTestName = 'QgsSVGFillSymbolLayer'
mFilePath = QDir.toNativeSeparators( mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
QString('%1/symbol_layer/%2.sld').arg(
unitTestDataPath(), mTestName))
mDoc = QDomDocument(mTestName) mDoc = QDomDocument(mTestName)
mFile = QFile(mFilePath) mFile = QFile(mFilePath)
@ -418,7 +403,7 @@ class TestQgsSymbolLayerV2(TestCase):
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
mExpectedValue = 'accommodation_camping.svg' mExpectedValue = 'accommodation_camping.svg'
mValue = os.path.basename (str (mSymbolLayer.svgFilePath())) mValue = os.path.basename(mSymbolLayer.svgFilePath())
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
@ -431,10 +416,8 @@ class TestQgsSymbolLayerV2(TestCase):
''' '''
Create a new style from a .sld file and match test Create a new style from a .sld file and match test
''' '''
mTestName = QString ('QgsMarkerLineSymbolLayerV2') mTestName = 'QgsMarkerLineSymbolLayerV2'
mFilePath = QDir.toNativeSeparators( mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
QString('%1/symbol_layer/%2.sld').arg(
unitTestDataPath(), mTestName))
mDoc = QDomDocument(mTestName) mDoc = QDomDocument(mTestName)
mFile = QFile(mFilePath) mFile = QFile(mFilePath)
@ -454,17 +437,17 @@ class TestQgsSymbolLayerV2(TestCase):
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
mExpectedValue = QString (u'circle') mExpectedValue = u'circle'
mValue = mSymbolLayer.subSymbol().symbolLayer(0).name() mValue = mSymbolLayer.subSymbol().symbolLayer(0).name()
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
mExpectedValue = QString(u'#000000') mExpectedValue = u'#000000'
mValue = mSymbolLayer.subSymbol().symbolLayer(0).borderColor().name() mValue = mSymbolLayer.subSymbol().symbolLayer(0).borderColor().name()
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
mExpectedValue = QString(u'#ff0000') mExpectedValue = u'#ff0000'
mValue = mSymbolLayer.subSymbol().symbolLayer(0).color().name() mValue = mSymbolLayer.subSymbol().symbolLayer(0).color().name()
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
@ -473,10 +456,8 @@ class TestQgsSymbolLayerV2(TestCase):
''' '''
Create a new style from a .sld file and match test Create a new style from a .sld file and match test
''' '''
mTestName = QString ('QgsSimpleLineSymbolLayerV2') mTestName = 'QgsSimpleLineSymbolLayerV2'
mFilePath = QDir.toNativeSeparators( mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
QString('%1/symbol_layer/%2.sld').arg(
unitTestDataPath(), mTestName))
mDoc = QDomDocument(mTestName) mDoc = QDomDocument(mTestName)
mFile = QFile(mFilePath) mFile = QFile(mFilePath)
@ -491,7 +472,7 @@ class TestQgsSymbolLayerV2(TestCase):
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
mExpectedValue = QString(u'#aa007f') mExpectedValue = u'#aa007f'
mValue = mSymbolLayer.color().name() mValue = mSymbolLayer.color().name()
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
@ -525,10 +506,8 @@ class TestQgsSymbolLayerV2(TestCase):
''' '''
Create a new style from a .sld file and match test Create a new style from a .sld file and match test
''' '''
mTestName = QString ('QgsEllipseSymbolLayerV2') mTestName = 'QgsEllipseSymbolLayerV2'
mFilePath = QDir.toNativeSeparators( mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
QString('%1/symbol_layer/%2.sld').arg(
unitTestDataPath(), mTestName))
mDoc = QDomDocument(mTestName) mDoc = QDomDocument(mTestName)
mFile = QFile(mFilePath) mFile = QFile(mFilePath)
@ -543,17 +522,17 @@ class TestQgsSymbolLayerV2(TestCase):
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
mExpectedValue = QString(u'circle') mExpectedValue = u'circle'
mValue = mSymbolLayer.symbolName() mValue = mSymbolLayer.symbolName()
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
mExpectedValue = QString(u'#ffff7f') mExpectedValue = u'#ffff7f'
mValue = mSymbolLayer.fillColor().name() mValue = mSymbolLayer.fillColor().name()
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
mExpectedValue = QString(u'#aaaaff') mExpectedValue = u'#aaaaff'
mValue = mSymbolLayer.outlineColor().name() mValue = mSymbolLayer.outlineColor().name()
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
@ -572,10 +551,8 @@ class TestQgsSymbolLayerV2(TestCase):
''' '''
Create a new style from a .sld file and match test Create a new style from a .sld file and match test
''' '''
mTestName = QString ('QgsFontMarkerSymbolLayerV2') mTestName = 'QgsFontMarkerSymbolLayerV2'
mFilePath = QDir.toNativeSeparators( mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
QString('%1/symbol_layer/%2.sld').arg(
unitTestDataPath(), mTestName))
mDoc = QDomDocument(mTestName) mDoc = QDomDocument(mTestName)
mFile = QFile(mFilePath) mFile = QFile(mFilePath)
@ -590,12 +567,12 @@ class TestQgsSymbolLayerV2(TestCase):
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
mExpectedValue = QString(u'Arial') mExpectedValue = u'Arial'
mValue = mSymbolLayer.fontFamily() mValue = mSymbolLayer.fontFamily()
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
mExpectedValue = QChar(0x4d) mExpectedValue = u"M"
mValue = mSymbolLayer.character() mValue = mSymbolLayer.character()
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
@ -614,8 +591,8 @@ class TestQgsSymbolLayerV2(TestCase):
''' '''
Create a new style from a .sld file and match test Create a new style from a .sld file and match test
''' '''
mTestName = QString ('QgsSvgMarkerSymbolLayerV2') mTestName = 'QgsSvgMarkerSymbolLayerV2'
mFilePath = QDir.toNativeSeparators (QString ('%1/symbol_layer/%2.sld').arg (unitTestDataPath(), mTestName)) mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
mDoc = QDomDocument(mTestName) mDoc = QDomDocument(mTestName)
mFile = QFile(mFilePath) mFile = QFile(mFilePath)
@ -629,8 +606,9 @@ class TestQgsSymbolLayerV2(TestCase):
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage
mExpectedValue = QString(u'skull.svg') mExpectedValue = u'skull.svg'
mValue = os.path.basename (str(mSymbolLayer.path())) mValue = os.path.basename(mSymbolLayer.path())
print "VALUE", mSymbolLayer.path()
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
assert mExpectedValue == mValue, mMessage assert mExpectedValue == mValue, mMessage

2
tests/testdata/symbol_layer/QgsSvgMarkerSymbolLayerV2.sld vendored
View File

@ -10,7 +10,7 @@
<se:PointSymbolizer> <se:PointSymbolizer>
<se:Graphic> <se:Graphic>
<se:ExternalGraphic> <se:ExternalGraphic>
<OnlineResource xlink:type="simple" xlink:href="file:gpsicons/skull.svg"/> <OnlineResource xlink:type="simple" xlink:href="file:///gpsicons/skull.svg"/>
<Format>image/svg+xml</Format> <Format>image/svg+xml</Format>
</se:ExternalGraphic> </se:ExternalGraphic>
<se:Size>12</se:Size> <se:Size>12</se:Size>