mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-14 00:07:35 -04:00
fix PyQgsSymbolLayerV2 test
This commit is contained in:
Alexander Bruy
parent
090048fdf4
commit
8fc14f8ac0
@ -25,13 +25,8 @@ __revision__ = '$Format:%H$'
|
||||
|
||||
import os
|
||||
|
||||
from PyQt4.QtCore import (QString,
|
||||
QChar,
|
||||
pyqtWrapperType,
|
||||
QFile,
|
||||
QIODevice,
|
||||
QDir,
|
||||
Qt)
|
||||
import qgis
|
||||
from PyQt4.QtCore import *
|
||||
from PyQt4.QtXml import QDomDocument
|
||||
|
||||
from qgis.core import (QgsCentroidFillSymbolLayerV2,
|
||||
@ -228,13 +223,11 @@ class TestQgsSymbolLayerV2(TestCase):
|
||||
def testQgsSimpleFillSymbolLayerV2(self):
|
||||
'''Create a new style from a .sld file and match test.
|
||||
'''
|
||||
mTestName = QString ('QgsSimpleFillSymbolLayerV2')
|
||||
mFilePath = QDir.toNativeSeparators(
|
||||
QString('%1/symbol_layer/%2.sld').arg(
|
||||
unitTestDataPath(), mTestName))
|
||||
mTestName = 'QgsSimpleFillSymbolLayerV2'
|
||||
mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
|
||||
|
||||
mDoc = QDomDocument(mTestName)
|
||||
mFile = QFile (mFilePath)
|
||||
mFile = QFile(mFilePath)
|
||||
mFile.open(QIODevice.ReadOnly)
|
||||
mDoc.setContent(mFile,True)
|
||||
mFile.close()
|
||||
@ -251,7 +244,7 @@ class TestQgsSymbolLayerV2(TestCase):
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
mExpectedValue = QString(u'#ffaa7f')
|
||||
mExpectedValue = u'#ffaa7f'
|
||||
mValue = mSymbolLayer.borderColor().name()
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
@ -270,13 +263,11 @@ class TestQgsSymbolLayerV2(TestCase):
|
||||
'''
|
||||
Create a new style from a .sld file and match test
|
||||
'''
|
||||
mTestName = QString('QgsCentroidFillSymbolLayerV2')
|
||||
mFilePath = QDir.toNativeSeparators(
|
||||
QString('%1/symbol_layer/%2.sld').arg(
|
||||
unitTestDataPath(), mTestName))
|
||||
mTestName = 'QgsCentroidFillSymbolLayerV2'
|
||||
mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
|
||||
|
||||
mDoc = QDomDocument(mTestName)
|
||||
mFile = QFile (mFilePath)
|
||||
mFile = QFile(mFilePath)
|
||||
mFile.open(QIODevice.ReadOnly)
|
||||
mDoc.setContent(mFile,True)
|
||||
mFile.close()
|
||||
@ -288,17 +279,17 @@ class TestQgsSymbolLayerV2(TestCase):
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
mExpectedValue = QString(u'regular_star')
|
||||
mExpectedValue = u'regular_star'
|
||||
mValue = mSymbolLayer.subSymbol().symbolLayer(0).name()
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
mExpectedValue = QString(u'#55aaff')
|
||||
mExpectedValue = u'#55aaff'
|
||||
mValue = mSymbolLayer.subSymbol().symbolLayer(0).color().name()
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
mExpectedValue = QString(u'#00ff00')
|
||||
mExpectedValue = u'#00ff00'
|
||||
mValue = mSymbolLayer.subSymbol().symbolLayer(0).borderColor().name()
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
@ -307,13 +298,11 @@ class TestQgsSymbolLayerV2(TestCase):
|
||||
'''
|
||||
Create a new style from a .sld file and match test
|
||||
'''
|
||||
mTestName = QString ('QgsLinePatternFillSymbolLayer')
|
||||
mFilePath = QDir.toNativeSeparators(
|
||||
QString ('%1/symbol_layer/%2.sld').arg(
|
||||
unitTestDataPath(), mTestName))
|
||||
mTestName = 'QgsLinePatternFillSymbolLayer'
|
||||
mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
|
||||
|
||||
mDoc = QDomDocument(mTestName)
|
||||
mFile = QFile (mFilePath)
|
||||
mFile = QFile(mFilePath)
|
||||
mFile.open(QIODevice.ReadOnly)
|
||||
mDoc.setContent(mFile,True)
|
||||
mFile.close()
|
||||
@ -325,7 +314,7 @@ class TestQgsSymbolLayerV2(TestCase):
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
mExpectedValue = QString(u'#ff55ff')
|
||||
mExpectedValue = u'#ff55ff'
|
||||
mValue = mSymbolLayer.color().name()
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
@ -352,13 +341,11 @@ class TestQgsSymbolLayerV2(TestCase):
|
||||
'''
|
||||
# at the moment there is an empty createFromSld implementation
|
||||
# that return nulls
|
||||
mTestName = QString('QgsPointPatternFillSymbolLayer')
|
||||
mFilePath = QDir.toNativeSeparators(
|
||||
QString ('%1/symbol_layer/%2.sld').arg(
|
||||
unitTestDataPath(), mTestName))
|
||||
mTestName = 'QgsPointPatternFillSymbolLayer'
|
||||
mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
|
||||
|
||||
mDoc = QDomDocument(mTestName)
|
||||
mFile = QFile (mFilePath)
|
||||
mFile = QFile(mFilePath)
|
||||
mFile.open(QIODevice.ReadOnly)
|
||||
mDoc.setContent(mFile,True)
|
||||
mFile.close()
|
||||
@ -370,17 +357,17 @@ class TestQgsSymbolLayerV2(TestCase):
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
mExpectedValue = QString(u'triangle')
|
||||
mExpectedValue = u'triangle'
|
||||
mValue = mSymbolLayer.subSymbol().symbolLayer(0).name()
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
mExpectedValue = QString(u'#ffaa00')
|
||||
mExpectedValue = u'#ffaa00'
|
||||
mValue = mSymbolLayer.subSymbol().symbolLayer(0).color().name()
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
mExpectedValue = QString(u'#ff007f')
|
||||
mExpectedValue = u'#ff007f'
|
||||
mValue = mSymbolLayer.subSymbol().symbolLayer(0).borderColor().name()
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
@ -399,13 +386,11 @@ class TestQgsSymbolLayerV2(TestCase):
|
||||
'''
|
||||
Create a new style from a .sld file and match test
|
||||
'''
|
||||
mTestName = QString ('QgsSVGFillSymbolLayer')
|
||||
mFilePath = QDir.toNativeSeparators(
|
||||
QString('%1/symbol_layer/%2.sld').arg(
|
||||
unitTestDataPath(), mTestName))
|
||||
mTestName = 'QgsSVGFillSymbolLayer'
|
||||
mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
|
||||
|
||||
mDoc = QDomDocument(mTestName)
|
||||
mFile = QFile (mFilePath)
|
||||
mFile = QFile(mFilePath)
|
||||
mFile.open(QIODevice.ReadOnly)
|
||||
mDoc.setContent(mFile,True)
|
||||
mFile.close()
|
||||
@ -418,7 +403,7 @@ class TestQgsSymbolLayerV2(TestCase):
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
mExpectedValue = 'accommodation_camping.svg'
|
||||
mValue = os.path.basename (str (mSymbolLayer.svgFilePath()))
|
||||
mValue = os.path.basename(mSymbolLayer.svgFilePath())
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
@ -431,13 +416,11 @@ class TestQgsSymbolLayerV2(TestCase):
|
||||
'''
|
||||
Create a new style from a .sld file and match test
|
||||
'''
|
||||
mTestName = QString ('QgsMarkerLineSymbolLayerV2')
|
||||
mFilePath = QDir.toNativeSeparators(
|
||||
QString('%1/symbol_layer/%2.sld').arg(
|
||||
unitTestDataPath(), mTestName))
|
||||
mTestName = 'QgsMarkerLineSymbolLayerV2'
|
||||
mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
|
||||
|
||||
mDoc = QDomDocument(mTestName)
|
||||
mFile = QFile (mFilePath)
|
||||
mFile = QFile(mFilePath)
|
||||
mFile.open(QIODevice.ReadOnly)
|
||||
mDoc.setContent(mFile,True)
|
||||
mFile.close()
|
||||
@ -454,17 +437,17 @@ class TestQgsSymbolLayerV2(TestCase):
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
mExpectedValue = QString (u'circle')
|
||||
mExpectedValue = u'circle'
|
||||
mValue = mSymbolLayer.subSymbol().symbolLayer(0).name()
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
mExpectedValue = QString(u'#000000')
|
||||
mExpectedValue = u'#000000'
|
||||
mValue = mSymbolLayer.subSymbol().symbolLayer(0).borderColor().name()
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
mExpectedValue = QString(u'#ff0000')
|
||||
mExpectedValue = u'#ff0000'
|
||||
mValue = mSymbolLayer.subSymbol().symbolLayer(0).color().name()
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
@ -473,13 +456,11 @@ class TestQgsSymbolLayerV2(TestCase):
|
||||
'''
|
||||
Create a new style from a .sld file and match test
|
||||
'''
|
||||
mTestName = QString ('QgsSimpleLineSymbolLayerV2')
|
||||
mFilePath = QDir.toNativeSeparators(
|
||||
QString('%1/symbol_layer/%2.sld').arg(
|
||||
unitTestDataPath(), mTestName))
|
||||
mTestName = 'QgsSimpleLineSymbolLayerV2'
|
||||
mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
|
||||
|
||||
mDoc = QDomDocument(mTestName)
|
||||
mFile = QFile (mFilePath)
|
||||
mFile = QFile(mFilePath)
|
||||
mFile.open(QIODevice.ReadOnly)
|
||||
mDoc.setContent(mFile,True)
|
||||
mFile.close()
|
||||
@ -491,7 +472,7 @@ class TestQgsSymbolLayerV2(TestCase):
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
mExpectedValue = QString(u'#aa007f')
|
||||
mExpectedValue = u'#aa007f'
|
||||
mValue = mSymbolLayer.color().name()
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
@ -525,13 +506,11 @@ class TestQgsSymbolLayerV2(TestCase):
|
||||
'''
|
||||
Create a new style from a .sld file and match test
|
||||
'''
|
||||
mTestName = QString ('QgsEllipseSymbolLayerV2')
|
||||
mFilePath = QDir.toNativeSeparators(
|
||||
QString('%1/symbol_layer/%2.sld').arg(
|
||||
unitTestDataPath(), mTestName))
|
||||
mTestName = 'QgsEllipseSymbolLayerV2'
|
||||
mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
|
||||
|
||||
mDoc = QDomDocument(mTestName)
|
||||
mFile = QFile (mFilePath)
|
||||
mFile = QFile(mFilePath)
|
||||
mFile.open(QIODevice.ReadOnly)
|
||||
mDoc.setContent(mFile,True)
|
||||
mFile.close()
|
||||
@ -543,17 +522,17 @@ class TestQgsSymbolLayerV2(TestCase):
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
mExpectedValue = QString(u'circle')
|
||||
mExpectedValue = u'circle'
|
||||
mValue = mSymbolLayer.symbolName()
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
mExpectedValue = QString(u'#ffff7f')
|
||||
mExpectedValue = u'#ffff7f'
|
||||
mValue = mSymbolLayer.fillColor().name()
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
mExpectedValue = QString(u'#aaaaff')
|
||||
mExpectedValue = u'#aaaaff'
|
||||
mValue = mSymbolLayer.outlineColor().name()
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
@ -572,13 +551,11 @@ class TestQgsSymbolLayerV2(TestCase):
|
||||
'''
|
||||
Create a new style from a .sld file and match test
|
||||
'''
|
||||
mTestName = QString ('QgsFontMarkerSymbolLayerV2')
|
||||
mFilePath = QDir.toNativeSeparators(
|
||||
QString('%1/symbol_layer/%2.sld').arg(
|
||||
unitTestDataPath(), mTestName))
|
||||
mTestName = 'QgsFontMarkerSymbolLayerV2'
|
||||
mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
|
||||
|
||||
mDoc = QDomDocument(mTestName)
|
||||
mFile = QFile (mFilePath)
|
||||
mFile = QFile(mFilePath)
|
||||
mFile.open(QIODevice.ReadOnly)
|
||||
mDoc.setContent(mFile,True)
|
||||
mFile.close()
|
||||
@ -590,12 +567,12 @@ class TestQgsSymbolLayerV2(TestCase):
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
mExpectedValue = QString(u'Arial')
|
||||
mExpectedValue = u'Arial'
|
||||
mValue = mSymbolLayer.fontFamily()
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
mExpectedValue = QChar(0x4d)
|
||||
mExpectedValue = u"M"
|
||||
mValue = mSymbolLayer.character()
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
@ -614,11 +591,11 @@ class TestQgsSymbolLayerV2(TestCase):
|
||||
'''
|
||||
Create a new style from a .sld file and match test
|
||||
'''
|
||||
mTestName = QString ('QgsSvgMarkerSymbolLayerV2')
|
||||
mFilePath = QDir.toNativeSeparators (QString ('%1/symbol_layer/%2.sld').arg (unitTestDataPath(), mTestName))
|
||||
mTestName = 'QgsSvgMarkerSymbolLayerV2'
|
||||
mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
|
||||
|
||||
mDoc = QDomDocument(mTestName)
|
||||
mFile = QFile (mFilePath)
|
||||
mFile = QFile(mFilePath)
|
||||
mFile.open(QIODevice.ReadOnly)
|
||||
mDoc.setContent(mFile,True)
|
||||
mFile.close()
|
||||
@ -629,8 +606,9 @@ class TestQgsSymbolLayerV2(TestCase):
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
mExpectedValue = QString(u'skull.svg')
|
||||
mValue = os.path.basename (str(mSymbolLayer.path()))
|
||||
mExpectedValue = u'skull.svg'
|
||||
mValue = os.path.basename(mSymbolLayer.path())
|
||||
print "VALUE", mSymbolLayer.path()
|
||||
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
|
||||
assert mExpectedValue == mValue, mMessage
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
<se:PointSymbolizer>
|
||||
<se:Graphic>
|
||||
<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>
|
||||
</se:ExternalGraphic>
|
||||
<se:Size>12</se:Size>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user