Skip to content

Commit d69f932

Browse files
committed
Reformat code
1 parent 71cdb8c commit d69f932

File tree

1 file changed

+34
-23
lines changed

1 file changed

+34
-23
lines changed

tests/src/python/test_qgsvectorlayer.py

+34-23
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
from qgis.testing import start_app, unittest
6464
from featuresourcetestbase import FeatureSourceTestCase
6565
from utilities import unitTestDataPath
66+
6667
start_app()
6768

6869

@@ -353,6 +354,7 @@ def checkBefore():
353354

354355
checkAfter()
355356
self.assertEqual(layer.dataProvider().featureCount(), 2)
357+
356358
# DELETE FEATURE
357359

358360
def test_DeleteFeature(self):
@@ -738,12 +740,12 @@ def testUpdateFeature(self):
738740

739741
# change geometry and attributes
740742
f = features[0]
741-
f.setAttributes(['new',321])
743+
f.setAttributes(['new', 321])
742744
f.setGeometry(QgsGeometry.fromPointXY(QgsPointXY(-200, -200)))
743745
self.assertTrue(layer.updateFeature(f))
744746

745747
new_feature = next(layer.getFeatures(QgsFeatureRequest(f.id())))
746-
self.assertEqual(new_feature.attributes(), ['new',321])
748+
self.assertEqual(new_feature.attributes(), ['new', 321])
747749
self.assertEqual(new_feature.geometry().asPoint(), QgsPointXY(-200, -200))
748750

749751
# add feature with no geometry
@@ -774,7 +776,8 @@ def testUpdateFeature(self):
774776
def test_AddAttribute(self):
775777
layer = createLayerWithOnePoint()
776778
fld1 = QgsField("fld1", QVariant.Int, "integer")
777-
#fld2 = QgsField("fld2", QVariant.Int, "integer")
779+
780+
# fld2 = QgsField("fld2", QVariant.Int, "integer")
778781

779782
def checkBefore():
780783
# check fields
@@ -1197,7 +1200,7 @@ def checkFieldNames(names):
11971200
checkFieldNames(['fldtxt', 'fldint'])
11981201
self.assertTrue(layer.renameAttribute(1, 'fldint2'))
11991202
checkFieldNames(['fldtxt', 'fldint2'])
1200-
#add an attribute
1203+
# add an attribute
12011204
self.assertTrue(layer.addAttribute(QgsField("flddouble", QVariant.Double, "double")))
12021205
checkFieldNames(['fldtxt', 'fldint2', 'flddouble'])
12031206
# rename it
@@ -1260,15 +1263,15 @@ def checkFieldNames(names):
12601263
self.assertTrue(layer.renameAttribute(2, 'flddouble2'))
12611264
checkFieldNames(['fldtxt2', 'fldint', 'flddouble2'])
12621265

1263-
#delete an attribute
1266+
# delete an attribute
12641267
self.assertTrue(layer.deleteAttribute(0))
12651268
checkFieldNames(['fldint', 'flddouble2'])
12661269
# rename remaining
12671270
self.assertTrue(layer.renameAttribute(0, 'fldint2'))
12681271
checkFieldNames(['fldint2', 'flddouble2'])
12691272
self.assertTrue(layer.renameAttribute(1, 'flddouble3'))
12701273
checkFieldNames(['fldint2', 'flddouble3'])
1271-
#delete an attribute
1274+
# delete an attribute
12721275
self.assertTrue(layer.deleteAttribute(0))
12731276
checkFieldNames(['flddouble3'])
12741277
self.assertTrue(layer.renameAttribute(0, 'flddouble4'))
@@ -1289,16 +1292,16 @@ def checkFieldNames(names):
12891292
layer.undoStack().undo()
12901293
checkFieldNames(['fldtxt', 'fldint', 'flddouble'])
12911294

1292-
#layer.undoStack().redo()
1293-
#checkFieldNames(['fldtxt2', 'fldint'])
1294-
#layer.undoStack().redo()
1295-
#checkFieldNames(['fldint'])
1295+
# layer.undoStack().redo()
1296+
# checkFieldNames(['fldtxt2', 'fldint'])
1297+
# layer.undoStack().redo()
1298+
# checkFieldNames(['fldint'])
12961299

12971300
def test_RenameExpressionField(self):
12981301
layer = createLayerWithOnePoint()
12991302
exp_field_idx = layer.addExpressionField('1+1', QgsField('math_is_hard', QVariant.Int))
13001303

1301-
#rename and check
1304+
# rename and check
13021305
self.assertTrue(layer.renameAttribute(exp_field_idx, 'renamed'))
13031306
self.assertEqual(layer.fields()[exp_field_idx].name(), 'renamed')
13041307
f = next(layer.getFeatures())
@@ -1559,7 +1562,8 @@ def testUniqueStringsMatching(self):
15591562
f1_id = next(layer.getFeatures()).id()
15601563
self.assertTrue(layer.changeAttributeValue(f1_id, 0, 'coconut'))
15611564
# note - this isn't 100% accurate, since orange no longer exists - but it avoids looping through all features
1562-
self.assertEqual(set(layer.uniqueStringsMatching(0, 'n')), set(['orange', 'BanaNa', 'waterMelon', 'pineapple', 'coconut']))
1565+
self.assertEqual(set(layer.uniqueStringsMatching(0, 'n')),
1566+
set(['orange', 'BanaNa', 'waterMelon', 'pineapple', 'coconut']))
15631567

15641568
def testMinValue(self):
15651569
""" test retrieving minimum values """
@@ -1638,7 +1642,7 @@ def test_InvalidOperations(self):
16381642
self.assertFalse(layer.deleteFeature(-333))
16391643
# we do not check for existence of the feature id if it's
16401644
# not newly added feature
1641-
#self.assertFalse(layer.deleteFeature(333))
1645+
# self.assertFalse(layer.deleteFeature(333))
16421646

16431647
# CHANGE GEOMETRY
16441648

@@ -1712,7 +1716,7 @@ def test_ExpressionField(self):
17121716
self.assertEqual(fet['test2'], NULL)
17131717

17141718
def test_ExpressionFieldEllipsoidLengthCalculation(self):
1715-
#create a temporary layer
1719+
# create a temporary layer
17161720
temp_layer = QgsVectorLayer("LineString?crs=epsg:3111&field=pk:int", "vl", "memory")
17171721
self.assertTrue(temp_layer.isValid())
17181722
f1 = QgsFeature(temp_layer.dataProvider().fields(), 1)
@@ -1740,12 +1744,14 @@ def test_ExpressionFieldEllipsoidLengthCalculation(self):
17401744
self.assertAlmostEqual(f['length'], expected, 3)
17411745

17421746
def test_ExpressionFieldEllipsoidAreaCalculation(self):
1743-
#create a temporary layer
1747+
# create a temporary layer
17441748
temp_layer = QgsVectorLayer("Polygon?crs=epsg:3111&field=pk:int", "vl", "memory")
17451749
self.assertTrue(temp_layer.isValid())
17461750
f1 = QgsFeature(temp_layer.dataProvider().fields(), 1)
17471751
f1.setAttribute("pk", 1)
1748-
f1.setGeometry(QgsGeometry.fromPolygonXY([[QgsPointXY(2484588, 2425722), QgsPointXY(2482767, 2398853), QgsPointXY(2520109, 2397715), QgsPointXY(2520792, 2425494), QgsPointXY(2484588, 2425722)]]))
1752+
f1.setGeometry(QgsGeometry.fromPolygonXY([[QgsPointXY(2484588, 2425722), QgsPointXY(2482767, 2398853),
1753+
QgsPointXY(2520109, 2397715), QgsPointXY(2520792, 2425494),
1754+
QgsPointXY(2484588, 2425722)]]))
17491755
temp_layer.dataProvider().addFeatures([f1])
17501756

17511757
# set project CRS and ellipsoid
@@ -1774,11 +1780,11 @@ def test_ExpressionFilter(self):
17741780

17751781
features = layer.getFeatures(QgsFeatureRequest().setFilterExpression('"test" = 6'))
17761782

1777-
assert(len(list(features)) == 0)
1783+
assert (len(list(features)) == 0)
17781784

17791785
features = layer.getFeatures(QgsFeatureRequest().setFilterExpression('"test" = 5'))
17801786

1781-
assert(len(list(features)) == 1)
1787+
assert (len(list(features)) == 1)
17821788

17831789
def testSelectByIds(self):
17841790
""" Test selecting by ID"""
@@ -2198,14 +2204,16 @@ def testGetSetConstraints(self):
21982204
layer.setFieldConstraint(1, QgsFieldConstraints.ConstraintNotNull)
21992205
layer.setFieldConstraint(1, QgsFieldConstraints.ConstraintUnique)
22002206
self.assertEqual(layer.fieldConstraints(0), QgsFieldConstraints.ConstraintNotNull)
2201-
self.assertEqual(layer.fieldConstraints(1), QgsFieldConstraints.ConstraintNotNull | QgsFieldConstraints.ConstraintUnique)
2207+
self.assertEqual(layer.fieldConstraints(1),
2208+
QgsFieldConstraints.ConstraintNotNull | QgsFieldConstraints.ConstraintUnique)
22022209
self.assertFalse(layer.fieldConstraints(2))
22032210
self.assertEqual(layer.fields().at(0).constraints().constraints(), QgsFieldConstraints.ConstraintNotNull)
22042211
self.assertEqual(layer.fields().at(0).constraints().constraintOrigin(QgsFieldConstraints.ConstraintNotNull),
22052212
QgsFieldConstraints.ConstraintOriginLayer)
22062213
self.assertEqual(layer.fields().at(0).constraints().constraintStrength(QgsFieldConstraints.ConstraintNotNull),
22072214
QgsFieldConstraints.ConstraintStrengthHard)
2208-
self.assertEqual(layer.fields().at(1).constraints().constraints(), QgsFieldConstraints.ConstraintNotNull | QgsFieldConstraints.ConstraintUnique)
2215+
self.assertEqual(layer.fields().at(1).constraints().constraints(),
2216+
QgsFieldConstraints.ConstraintNotNull | QgsFieldConstraints.ConstraintUnique)
22092217
self.assertEqual(layer.fields().at(1).constraints().constraintOrigin(QgsFieldConstraints.ConstraintNotNull),
22102218
QgsFieldConstraints.ConstraintOriginLayer)
22112219
self.assertEqual(layer.fields().at(1).constraints().constraintOrigin(QgsFieldConstraints.ConstraintUnique),
@@ -2257,13 +2265,15 @@ def testSaveRestoreConstraints(self):
22572265
layer3 = createLayerWithOnePoint()
22582266
self.assertTrue(layer3.readXml(elem, QgsReadWriteContext()))
22592267
self.assertEqual(layer3.fieldConstraints(0), QgsFieldConstraints.ConstraintNotNull)
2260-
self.assertEqual(layer3.fieldConstraints(1), QgsFieldConstraints.ConstraintNotNull | QgsFieldConstraints.ConstraintUnique)
2268+
self.assertEqual(layer3.fieldConstraints(1),
2269+
QgsFieldConstraints.ConstraintNotNull | QgsFieldConstraints.ConstraintUnique)
22612270
self.assertEqual(layer3.fields().at(0).constraints().constraints(), QgsFieldConstraints.ConstraintNotNull)
22622271
self.assertEqual(layer3.fields().at(0).constraints().constraintOrigin(QgsFieldConstraints.ConstraintNotNull),
22632272
QgsFieldConstraints.ConstraintOriginLayer)
22642273
self.assertEqual(layer.fields().at(0).constraints().constraintStrength(QgsFieldConstraints.ConstraintNotNull),
22652274
QgsFieldConstraints.ConstraintStrengthHard)
2266-
self.assertEqual(layer3.fields().at(1).constraints().constraints(), QgsFieldConstraints.ConstraintNotNull | QgsFieldConstraints.ConstraintUnique)
2275+
self.assertEqual(layer3.fields().at(1).constraints().constraints(),
2276+
QgsFieldConstraints.ConstraintNotNull | QgsFieldConstraints.ConstraintUnique)
22672277
self.assertEqual(layer3.fields().at(1).constraints().constraintOrigin(QgsFieldConstraints.ConstraintNotNull),
22682278
QgsFieldConstraints.ConstraintOriginLayer)
22692279
self.assertEqual(layer3.fields().at(1).constraints().constraintOrigin(QgsFieldConstraints.ConstraintUnique),
@@ -2605,7 +2615,8 @@ def testFeatureRequestWithReprojectionAndVirtualFields(self):
26052615
self.assertAlmostEqual(virtual_values[4], -65.32, 2)
26062616

26072617
# repeat, with reprojection on request
2608-
request = QgsFeatureRequest().setDestinationCrs(QgsCoordinateReferenceSystem('epsg:3785'), QgsProject.instance().transformContext())
2618+
request = QgsFeatureRequest().setDestinationCrs(QgsCoordinateReferenceSystem('epsg:3785'),
2619+
QgsProject.instance().transformContext())
26092620
features = [f for f in layer.getFeatures(request)]
26102621
# virtual field value should not change, even though geometry has
26112622
self.assertAlmostEqual(features[0]['virtual'], -71.123, 2)

0 commit comments

Comments
 (0)