Skip to content

Commit 04068c9

Browse files
timlinuxtimlinux
committedJul 26, 2013
Python formatting cleanups for zonal stats and raster layer tests
1 parent 282ef29 commit 04068c9

File tree

2 files changed

+55
-52
lines changed

2 files changed

+55
-52
lines changed
 

‎tests/src/python/test_qgsrasterlayer.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
from utilities import (unitTestDataPath,
3636
getQgisTestApp,
3737
TestCase,
38-
unittest
39-
#expectedFailure
40-
)
38+
unittest)
39+
#expectedFailure)
4140
# Convenience instances in case you may need them
4241
# not used in this test
4342
QGISAPP, CANVAS, IFACE, PARENT = getQgisTestApp()
4443

44+
4545
class TestQgsRasterLayer(TestCase):
4646

4747
def testIdentify(self):
@@ -178,14 +178,14 @@ def testShaderCrash(self):
178178
myColorRampShader = QgsColorRampShader()
179179
myColorRampShader.setColorRampType(QgsColorRampShader.INTERPOLATED)
180180
myItems = []
181-
myItem = QgsColorRampShader.ColorRampItem(10,
182-
QtGui.QColor('#ffff00'), 'foo')
181+
myItem = QgsColorRampShader.ColorRampItem(
182+
10, QtGui.QColor('#ffff00'), 'foo')
183183
myItems.append(myItem)
184-
myItem = QgsColorRampShader.ColorRampItem(100,
185-
QtGui.QColor('#ff00ff'), 'bar')
184+
myItem = QgsColorRampShader.ColorRampItem(
185+
100, QtGui.QColor('#ff00ff'), 'bar')
186186
myItems.append(myItem)
187-
myItem = QgsColorRampShader.ColorRampItem(1000,
188-
QtGui.QColor('#00ff00'), 'kazam')
187+
myItem = QgsColorRampShader.ColorRampItem(
188+
1000, QtGui.QColor('#00ff00'), 'kazam')
189189
myItems.append(myItem)
190190
myColorRampShader.setColorRampItemList(myItems)
191191
myRasterShader.setRasterShaderFunction(myColorRampShader)

‎tests/src/python/test_qgszonalstatistics.py

Lines changed: 46 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -18,58 +18,61 @@
1818
from PyQt4.QtCore import *
1919
from qgis.core import *
2020
from qgis.analysis import *
21-
from utilities import (unitTestDataPath,
22-
getQgisTestApp,
23-
TestCase,
24-
unittest,
25-
)
21+
from utilities import (
22+
unitTestDataPath,
23+
getQgisTestApp,
24+
TestCase,
25+
unittest)
2626

2727
QGISAPP, CANVAS, IFACE, PARENT = getQgisTestApp()
2828

29+
2930
class TestQgsZonalStatistics(TestCase):
31+
"""Tests for zonal stats class."""
3032

31-
def testStatistics(self):
32-
sep = os.sep
33-
TEST_DATA_DIR = unitTestDataPath() + sep + "zonalstatistics" + sep
34-
myTempPath = QDir.tempPath() + sep
35-
testDir = QDir(TEST_DATA_DIR)
36-
for f in testDir.entryList(QDir.Files):
37-
QFile.remove(myTempPath + f)
38-
QFile.copy(TEST_DATA_DIR + f, myTempPath + f)
33+
def testStatistics(self):
34+
"""Test zonal stats"""
35+
sep = os.sep
36+
TEST_DATA_DIR = unitTestDataPath() + sep + "zonalstatistics" + sep
37+
myTempPath = QDir.tempPath() + sep
38+
testDir = QDir(TEST_DATA_DIR)
39+
for f in testDir.entryList(QDir.Files):
40+
QFile.remove(myTempPath + f)
41+
QFile.copy(TEST_DATA_DIR + f, myTempPath + f)
3942

40-
myVector = QgsVectorLayer(myTempPath + "polys.shp", "poly", "ogr")
41-
myRasterPath = myTempPath + "edge_problem.asc"
42-
zs = QgsZonalStatistics( myVector, myRasterPath, "", 1 )
43-
zs.calculateStatistics(None)
43+
myVector = QgsVectorLayer(myTempPath + "polys.shp", "poly", "ogr")
44+
myRasterPath = myTempPath + "edge_problem.asc"
45+
zs = QgsZonalStatistics(myVector, myRasterPath, "", 1)
46+
zs.calculateStatistics(None)
4447

45-
feat = QgsFeature()
46-
# validate statistics for each feature
47-
request = QgsFeatureRequest().setFilterFid(0)
48-
feat = myVector.getFeatures(request).next()
49-
myMessage = ('Expected: %f\nGot: %f\n' % (12.0, feat[1]))
50-
assert feat[1] == 12.0, myMessage
51-
myMessage = ('Expected: %f\nGot: %f\n' % (8.0, feat[2]))
52-
assert feat[2] == 8.0, myMessage
53-
myMessage = ('Expected: %f\nGot: %f\n' % (0.666666666666667, feat[3]))
54-
assert abs(feat[3] - 0.666666666666667 ) < 0.00001, myMessage
48+
feat = QgsFeature()
49+
# validate statistics for each feature
50+
request = QgsFeatureRequest().setFilterFid(0)
51+
feat = myVector.getFeatures(request).next()
52+
myMessage = ('Expected: %f\nGot: %f\n' % (12.0, feat[1]))
53+
assert feat[1] == 12.0, myMessage
54+
myMessage = ('Expected: %f\nGot: %f\n' % (8.0, feat[2]))
55+
assert feat[2] == 8.0, myMessage
56+
myMessage = ('Expected: %f\nGot: %f\n' % (0.666666666666667, feat[3]))
57+
assert abs(feat[3] - 0.666666666666667) < 0.00001, myMessage
5558

56-
request.setFilterFid(1)
57-
feat = myVector.getFeatures(request).next()
58-
myMessage = ('Expected: %f\nGot: %f\n' % (9.0, feat[1]))
59-
assert feat[1] == 9.0, myMessage
60-
myMessage = ('Expected: %f\nGot: %f\n' % (5.0, feat[2]))
61-
assert feat[2] == 5.0, myMessage
62-
myMessage = ('Expected: %f\nGot: %f\n' % (0.555555555555556, feat[3]))
63-
assert abs( feat[3] - 0.555555555555556) < 0.00001, myMessage
59+
request.setFilterFid(1)
60+
feat = myVector.getFeatures(request).next()
61+
myMessage = ('Expected: %f\nGot: %f\n' % (9.0, feat[1]))
62+
assert feat[1] == 9.0, myMessage
63+
myMessage = ('Expected: %f\nGot: %f\n' % (5.0, feat[2]))
64+
assert feat[2] == 5.0, myMessage
65+
myMessage = ('Expected: %f\nGot: %f\n' % (0.555555555555556, feat[3]))
66+
assert abs(feat[3] - 0.555555555555556) < 0.00001, myMessage
6467

65-
request.setFilterFid(2)
66-
feat = myVector.getFeatures(request).next()
67-
myMessage = ('Expected: %f\nGot: %f\n' % (6.0, feat[1]))
68-
assert feat[1] == 6.0, myMessage
69-
myMessage = ('Expected: %f\nGot: %f\n' % (5.0, feat[2]))
70-
assert feat[2] == 5.0, myMessage
71-
myMessage = ('Expected: %f\nGot: %f\n' % (0.833333333333333, feat[3]))
72-
assert abs( feat[3] - 0.833333333333333 ) < 0.00001, myMessage
68+
request.setFilterFid(2)
69+
feat = myVector.getFeatures(request).next()
70+
myMessage = ('Expected: %f\nGot: %f\n' % (6.0, feat[1]))
71+
assert feat[1] == 6.0, myMessage
72+
myMessage = ('Expected: %f\nGot: %f\n' % (5.0, feat[2]))
73+
assert feat[2] == 5.0, myMessage
74+
myMessage = ('Expected: %f\nGot: %f\n' % (0.833333333333333, feat[3]))
75+
assert abs(feat[3] - 0.833333333333333) < 0.00001, myMessage
7376

7477
if __name__ == '__main__':
7578
unittest.main()

0 commit comments

Comments
 (0)