Skip to content

Commit 8fc14f8

Browse files
alexbruyalexbruy
committed
fix PyQgsSymbolLayerV2 test
1 parent 090048f commit 8fc14f8

2 files changed

Lines changed: 54 additions & 76 deletions

File tree

‎tests/src/python/test_qgssymbollayerv2.py‎

Lines changed: 53 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,8 @@
2525

2626
import os
2727

28-
from PyQt4.QtCore import (QString,
29-
QChar,
30-
pyqtWrapperType,
31-
QFile,
32-
QIODevice,
33-
QDir,
34-
Qt)
28+
import qgis
29+
from PyQt4.QtCore import *
3530
from PyQt4.QtXml import QDomDocument
3631

3732
from qgis.core import (QgsCentroidFillSymbolLayerV2,
@@ -228,13 +223,11 @@ def testBinding(self):
228223
def testQgsSimpleFillSymbolLayerV2(self):
229224
'''Create a new style from a .sld file and match test.
230225
'''
231-
mTestName = QString ('QgsSimpleFillSymbolLayerV2')
232-
mFilePath = QDir.toNativeSeparators(
233-
QString('%1/symbol_layer/%2.sld').arg(
234-
unitTestDataPath(), mTestName))
226+
mTestName = 'QgsSimpleFillSymbolLayerV2'
227+
mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
235228

236229
mDoc = QDomDocument(mTestName)
237-
mFile = QFile (mFilePath)
230+
mFile = QFile(mFilePath)
238231
mFile.open(QIODevice.ReadOnly)
239232
mDoc.setContent(mFile,True)
240233
mFile.close()
@@ -251,7 +244,7 @@ def testQgsSimpleFillSymbolLayerV2(self):
251244
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
252245
assert mExpectedValue == mValue, mMessage
253246

254-
mExpectedValue = QString(u'#ffaa7f')
247+
mExpectedValue = u'#ffaa7f'
255248
mValue = mSymbolLayer.borderColor().name()
256249
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
257250
assert mExpectedValue == mValue, mMessage
@@ -270,13 +263,11 @@ def testQgsCentroidFillSymbolLayerV2(self):
270263
'''
271264
Create a new style from a .sld file and match test
272265
'''
273-
mTestName = QString('QgsCentroidFillSymbolLayerV2')
274-
mFilePath = QDir.toNativeSeparators(
275-
QString('%1/symbol_layer/%2.sld').arg(
276-
unitTestDataPath(), mTestName))
266+
mTestName = 'QgsCentroidFillSymbolLayerV2'
267+
mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
277268

278269
mDoc = QDomDocument(mTestName)
279-
mFile = QFile (mFilePath)
270+
mFile = QFile(mFilePath)
280271
mFile.open(QIODevice.ReadOnly)
281272
mDoc.setContent(mFile,True)
282273
mFile.close()
@@ -288,17 +279,17 @@ def testQgsCentroidFillSymbolLayerV2(self):
288279
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
289280
assert mExpectedValue == mValue, mMessage
290281

291-
mExpectedValue = QString(u'regular_star')
282+
mExpectedValue = u'regular_star'
292283
mValue = mSymbolLayer.subSymbol().symbolLayer(0).name()
293284
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
294285
assert mExpectedValue == mValue, mMessage
295286

296-
mExpectedValue = QString(u'#55aaff')
287+
mExpectedValue = u'#55aaff'
297288
mValue = mSymbolLayer.subSymbol().symbolLayer(0).color().name()
298289
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
299290
assert mExpectedValue == mValue, mMessage
300291

301-
mExpectedValue = QString(u'#00ff00')
292+
mExpectedValue = u'#00ff00'
302293
mValue = mSymbolLayer.subSymbol().symbolLayer(0).borderColor().name()
303294
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
304295
assert mExpectedValue == mValue, mMessage
@@ -307,13 +298,11 @@ def testQgsLinePatternFillSymbolLayer(self):
307298
'''
308299
Create a new style from a .sld file and match test
309300
'''
310-
mTestName = QString ('QgsLinePatternFillSymbolLayer')
311-
mFilePath = QDir.toNativeSeparators(
312-
QString ('%1/symbol_layer/%2.sld').arg(
313-
unitTestDataPath(), mTestName))
301+
mTestName = 'QgsLinePatternFillSymbolLayer'
302+
mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
314303

315304
mDoc = QDomDocument(mTestName)
316-
mFile = QFile (mFilePath)
305+
mFile = QFile(mFilePath)
317306
mFile.open(QIODevice.ReadOnly)
318307
mDoc.setContent(mFile,True)
319308
mFile.close()
@@ -325,7 +314,7 @@ def testQgsLinePatternFillSymbolLayer(self):
325314
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
326315
assert mExpectedValue == mValue, mMessage
327316

328-
mExpectedValue = QString(u'#ff55ff')
317+
mExpectedValue = u'#ff55ff'
329318
mValue = mSymbolLayer.color().name()
330319
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
331320
assert mExpectedValue == mValue, mMessage
@@ -352,13 +341,11 @@ def testQgsPointPatternFillSymbolLayer(self):
352341
'''
353342
# at the moment there is an empty createFromSld implementation
354343
# that return nulls
355-
mTestName = QString('QgsPointPatternFillSymbolLayer')
356-
mFilePath = QDir.toNativeSeparators(
357-
QString ('%1/symbol_layer/%2.sld').arg(
358-
unitTestDataPath(), mTestName))
344+
mTestName = 'QgsPointPatternFillSymbolLayer'
345+
mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
359346

360347
mDoc = QDomDocument(mTestName)
361-
mFile = QFile (mFilePath)
348+
mFile = QFile(mFilePath)
362349
mFile.open(QIODevice.ReadOnly)
363350
mDoc.setContent(mFile,True)
364351
mFile.close()
@@ -370,17 +357,17 @@ def testQgsPointPatternFillSymbolLayer(self):
370357
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
371358
assert mExpectedValue == mValue, mMessage
372359

373-
mExpectedValue = QString(u'triangle')
360+
mExpectedValue = u'triangle'
374361
mValue = mSymbolLayer.subSymbol().symbolLayer(0).name()
375362
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
376363
assert mExpectedValue == mValue, mMessage
377364

378-
mExpectedValue = QString(u'#ffaa00')
365+
mExpectedValue = u'#ffaa00'
379366
mValue = mSymbolLayer.subSymbol().symbolLayer(0).color().name()
380367
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
381368
assert mExpectedValue == mValue, mMessage
382369

383-
mExpectedValue = QString(u'#ff007f')
370+
mExpectedValue = u'#ff007f'
384371
mValue = mSymbolLayer.subSymbol().symbolLayer(0).borderColor().name()
385372
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
386373
assert mExpectedValue == mValue, mMessage
@@ -399,13 +386,11 @@ def testQgsSVGFillSymbolLayer(self):
399386
'''
400387
Create a new style from a .sld file and match test
401388
'''
402-
mTestName = QString ('QgsSVGFillSymbolLayer')
403-
mFilePath = QDir.toNativeSeparators(
404-
QString('%1/symbol_layer/%2.sld').arg(
405-
unitTestDataPath(), mTestName))
389+
mTestName = 'QgsSVGFillSymbolLayer'
390+
mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
406391

407392
mDoc = QDomDocument(mTestName)
408-
mFile = QFile (mFilePath)
393+
mFile = QFile(mFilePath)
409394
mFile.open(QIODevice.ReadOnly)
410395
mDoc.setContent(mFile,True)
411396
mFile.close()
@@ -418,7 +403,7 @@ def testQgsSVGFillSymbolLayer(self):
418403
assert mExpectedValue == mValue, mMessage
419404

420405
mExpectedValue = 'accommodation_camping.svg'
421-
mValue = os.path.basename (str (mSymbolLayer.svgFilePath()))
406+
mValue = os.path.basename(mSymbolLayer.svgFilePath())
422407
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
423408
assert mExpectedValue == mValue, mMessage
424409

@@ -431,13 +416,11 @@ def testQgsMarkerLineSymbolLayerV2(self):
431416
'''
432417
Create a new style from a .sld file and match test
433418
'''
434-
mTestName = QString ('QgsMarkerLineSymbolLayerV2')
435-
mFilePath = QDir.toNativeSeparators(
436-
QString('%1/symbol_layer/%2.sld').arg(
437-
unitTestDataPath(), mTestName))
419+
mTestName = 'QgsMarkerLineSymbolLayerV2'
420+
mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
438421

439422
mDoc = QDomDocument(mTestName)
440-
mFile = QFile (mFilePath)
423+
mFile = QFile(mFilePath)
441424
mFile.open(QIODevice.ReadOnly)
442425
mDoc.setContent(mFile,True)
443426
mFile.close()
@@ -454,17 +437,17 @@ def testQgsMarkerLineSymbolLayerV2(self):
454437
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
455438
assert mExpectedValue == mValue, mMessage
456439

457-
mExpectedValue = QString (u'circle')
440+
mExpectedValue = u'circle'
458441
mValue = mSymbolLayer.subSymbol().symbolLayer(0).name()
459442
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
460443
assert mExpectedValue == mValue, mMessage
461444

462-
mExpectedValue = QString(u'#000000')
445+
mExpectedValue = u'#000000'
463446
mValue = mSymbolLayer.subSymbol().symbolLayer(0).borderColor().name()
464447
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
465448
assert mExpectedValue == mValue, mMessage
466449

467-
mExpectedValue = QString(u'#ff0000')
450+
mExpectedValue = u'#ff0000'
468451
mValue = mSymbolLayer.subSymbol().symbolLayer(0).color().name()
469452
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
470453
assert mExpectedValue == mValue, mMessage
@@ -473,13 +456,11 @@ def testQgsSimpleLineSymbolLayerV2(self):
473456
'''
474457
Create a new style from a .sld file and match test
475458
'''
476-
mTestName = QString ('QgsSimpleLineSymbolLayerV2')
477-
mFilePath = QDir.toNativeSeparators(
478-
QString('%1/symbol_layer/%2.sld').arg(
479-
unitTestDataPath(), mTestName))
459+
mTestName = 'QgsSimpleLineSymbolLayerV2'
460+
mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
480461

481462
mDoc = QDomDocument(mTestName)
482-
mFile = QFile (mFilePath)
463+
mFile = QFile(mFilePath)
483464
mFile.open(QIODevice.ReadOnly)
484465
mDoc.setContent(mFile,True)
485466
mFile.close()
@@ -491,7 +472,7 @@ def testQgsSimpleLineSymbolLayerV2(self):
491472
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
492473
assert mExpectedValue == mValue, mMessage
493474

494-
mExpectedValue = QString(u'#aa007f')
475+
mExpectedValue = u'#aa007f'
495476
mValue = mSymbolLayer.color().name()
496477
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
497478
assert mExpectedValue == mValue, mMessage
@@ -525,13 +506,11 @@ def testQgsEllipseSymbolLayerV2(self):
525506
'''
526507
Create a new style from a .sld file and match test
527508
'''
528-
mTestName = QString ('QgsEllipseSymbolLayerV2')
529-
mFilePath = QDir.toNativeSeparators(
530-
QString('%1/symbol_layer/%2.sld').arg(
531-
unitTestDataPath(), mTestName))
509+
mTestName = 'QgsEllipseSymbolLayerV2'
510+
mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
532511

533512
mDoc = QDomDocument(mTestName)
534-
mFile = QFile (mFilePath)
513+
mFile = QFile(mFilePath)
535514
mFile.open(QIODevice.ReadOnly)
536515
mDoc.setContent(mFile,True)
537516
mFile.close()
@@ -543,17 +522,17 @@ def testQgsEllipseSymbolLayerV2(self):
543522
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
544523
assert mExpectedValue == mValue, mMessage
545524

546-
mExpectedValue = QString(u'circle')
525+
mExpectedValue = u'circle'
547526
mValue = mSymbolLayer.symbolName()
548527
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
549528
assert mExpectedValue == mValue, mMessage
550529

551-
mExpectedValue = QString(u'#ffff7f')
530+
mExpectedValue = u'#ffff7f'
552531
mValue = mSymbolLayer.fillColor().name()
553532
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
554533
assert mExpectedValue == mValue, mMessage
555534

556-
mExpectedValue = QString(u'#aaaaff')
535+
mExpectedValue = u'#aaaaff'
557536
mValue = mSymbolLayer.outlineColor().name()
558537
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
559538
assert mExpectedValue == mValue, mMessage
@@ -572,13 +551,11 @@ def testQgsFontMarkerSymbolLayerV2(self):
572551
'''
573552
Create a new style from a .sld file and match test
574553
'''
575-
mTestName = QString ('QgsFontMarkerSymbolLayerV2')
576-
mFilePath = QDir.toNativeSeparators(
577-
QString('%1/symbol_layer/%2.sld').arg(
578-
unitTestDataPath(), mTestName))
554+
mTestName = 'QgsFontMarkerSymbolLayerV2'
555+
mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
579556

580557
mDoc = QDomDocument(mTestName)
581-
mFile = QFile (mFilePath)
558+
mFile = QFile(mFilePath)
582559
mFile.open(QIODevice.ReadOnly)
583560
mDoc.setContent(mFile,True)
584561
mFile.close()
@@ -590,12 +567,12 @@ def testQgsFontMarkerSymbolLayerV2(self):
590567
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
591568
assert mExpectedValue == mValue, mMessage
592569

593-
mExpectedValue = QString(u'Arial')
570+
mExpectedValue = u'Arial'
594571
mValue = mSymbolLayer.fontFamily()
595572
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
596573
assert mExpectedValue == mValue, mMessage
597574

598-
mExpectedValue = QChar(0x4d)
575+
mExpectedValue = u"M"
599576
mValue = mSymbolLayer.character()
600577
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
601578
assert mExpectedValue == mValue, mMessage
@@ -614,11 +591,11 @@ def testQgsSvgMarkerSymbolLayerV2(self):
614591
'''
615592
Create a new style from a .sld file and match test
616593
'''
617-
mTestName = QString ('QgsSvgMarkerSymbolLayerV2')
618-
mFilePath = QDir.toNativeSeparators (QString ('%1/symbol_layer/%2.sld').arg (unitTestDataPath(), mTestName))
594+
mTestName = 'QgsSvgMarkerSymbolLayerV2'
595+
mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName))
619596

620597
mDoc = QDomDocument(mTestName)
621-
mFile = QFile (mFilePath)
598+
mFile = QFile(mFilePath)
622599
mFile.open(QIODevice.ReadOnly)
623600
mDoc.setContent(mFile,True)
624601
mFile.close()
@@ -629,8 +606,9 @@ def testQgsSvgMarkerSymbolLayerV2(self):
629606
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
630607
assert mExpectedValue == mValue, mMessage
631608

632-
mExpectedValue = QString(u'skull.svg')
633-
mValue = os.path.basename (str(mSymbolLayer.path()))
609+
mExpectedValue = u'skull.svg'
610+
mValue = os.path.basename(mSymbolLayer.path())
611+
print "VALUE", mSymbolLayer.path()
634612
mMessage = 'Expected "%s" got "%s"' % (mExpectedValue,mValue)
635613
assert mExpectedValue == mValue, mMessage
636614

‎tests/testdata/symbol_layer/QgsSvgMarkerSymbolLayerV2.sld‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<se:PointSymbolizer>
1111
<se:Graphic>
1212
<se:ExternalGraphic>
13-
<OnlineResource xlink:type="simple" xlink:href="file:gpsicons/skull.svg"/>
13+
<OnlineResource xlink:type="simple" xlink:href="file:///gpsicons/skull.svg"/>
1414
<Format>image/svg+xml</Format>
1515
</se:ExternalGraphic>
1616
<se:Size>12</se:Size>

0 commit comments

Comments
 (0)