Skip to content

Commit 5fe886b

Browse files
committed
[tests] Linting: Remove trailing whitespaces
1 parent a44537b commit 5fe886b

File tree

2 files changed

+84
-84
lines changed

2 files changed

+84
-84
lines changed

tests/test_attributeKeyValues.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def test_initialization(self):
6161

6262
# Check attribute pairs empty
6363
assert nodeA.keyableBool.isDefault
64-
assert nodeA.keyableInt.isDefault
64+
assert nodeA.keyableInt.isDefault
6565
assert nodeA.keyableFloat.isDefault
6666

6767
# Check attribute description value
@@ -182,7 +182,7 @@ def test_multipleKeys(self):
182182
assert nodeA.keyableFloat.keyValues.hasKey("2") == True
183183

184184
# Check attributes values at key "0", should be default value
185-
assert nodeA.keyableBool.keyValues.getValueAtKeyOrDefault("0") == False
185+
assert nodeA.keyableBool.keyValues.getValueAtKeyOrDefault("0") == False
186186
assert nodeA.keyableInt.keyValues.getValueAtKeyOrDefault("0") == 1
187187
assert nodeA.keyableFloat.keyValues.getValueAtKeyOrDefault("0") == 1.1
188188

tests/test_attributeShape.py

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,10 @@ def test_staticShapeGeometry(self):
158158
graph = Graph("")
159159
node = graph.addNewNode(NodeWithShapeAttributes.__name__)
160160

161-
observationPoint = {"x" : 1, "y" : 1}
162-
observationLine = {"a" : {"x" : 1, "y" : 1}, "b" : {"x" : 2, "y" : 2}}
163-
observationRectangle = {"center" : {"x" : 10, "y" : 10}, "size" : {"width" : 20, "height" : 20}}
164-
observationCircle = {"center" : {"x" : 10, "y" : 10}, "radius" : 20}
161+
observationPoint = {"x": 1, "y": 1}
162+
observationLine = {"a": {"x": 1, "y": 1}, "b": {"x": 2, "y": 2}}
163+
observationRectangle = {"center": {"x": 10, "y": 10}, "size": {"width": 20, "height": 20}}
164+
observationCircle = {"center": {"x": 10, "y": 10}, "radius": 20}
165165

166166
# Check static shape has observation, should be true (default)
167167
assert node.point.geometry.hasObservation("0")
@@ -195,15 +195,15 @@ def test_staticShapeGeometry(self):
195195
assert node.circle.geometry.getObservation("0") == observationCircle
196196

197197
# Update static shape observation
198-
node.point.geometry.setObservation("0", {"x" : 2})
199-
node.line.geometry.setObservation("0", {"a" : {"x" : 2, "y": 2}})
200-
node.rectangle.geometry.setObservation("0", {"center" : {"x" : 20, "y" : 20}})
201-
node.circle.geometry.setObservation("0", {"radius" : 40})
198+
node.point.geometry.setObservation("0", {"x": 2})
199+
node.line.geometry.setObservation("0", {"a": {"x": 2, "y": 2}})
200+
node.rectangle.geometry.setObservation("0", {"center": {"x": 20, "y": 20}})
201+
node.circle.geometry.setObservation("0", {"radius": 40})
202202

203203
# Check static shape get observation, should be updated observation
204204
assert node.point.geometry.getObservation("0").get("x") == 2
205-
assert node.line.geometry.getObservation("0").get("a") == {"x" : 2, "y": 2}
206-
assert node.rectangle.geometry.getObservation("0").get("center") == {"x" : 20, "y" : 20}
205+
assert node.line.geometry.getObservation("0").get("a") == {"x": 2, "y": 2}
206+
assert node.rectangle.geometry.getObservation("0").get("center") == {"x": 20, "y": 20}
207207
assert node.circle.geometry.getObservation("0").get("radius") == 40
208208

209209
# Reset static shape geometry
@@ -223,10 +223,10 @@ def test_keyableShapeGeometry(self):
223223
graph = Graph("")
224224
node = graph.addNewNode(NodeWithShapeAttributes.__name__)
225225

226-
observationPoint = {"x" : 1, "y" : 1}
227-
observationLine = {"a" : {"x" : 1, "y" : 1}, "b" : {"x" : 2, "y" : 2}}
228-
observationRectangle = {"center" : {"x" : 10, "y" : 10}, "size" : {"width" : 20, "height" : 20}}
229-
observationCircle = {"center" : {"x" : 10, "y" : 10}, "radius" : 20}
226+
observationPoint = {"x": 1, "y": 1}
227+
observationLine = {"a": {"x": 1, "y": 1}, "b": {"x": 2, "y": 2}}
228+
observationRectangle = {"center": {"x": 10, "y": 10}, "size": {"width": 20, "height": 20}}
229+
observationCircle = {"center": {"x": 10, "y": 10}, "radius": 20}
230230

231231
# Check keyable shape has observation at key "0", should be false
232232
assert not node.keyablePoint.geometry.hasObservation("0")
@@ -281,15 +281,15 @@ def test_keyableShapeGeometry(self):
281281
assert node.keyableCircle.geometry.getObservation("0") == observationCircle
282282

283283
# Update keyable shape observation at key "1"
284-
node.keyablePoint.geometry.setObservation("1", {"x" : 2})
285-
node.keyableLine.geometry.setObservation("1", {"a" : {"x" : 2, "y": 2}})
286-
node.keyableRectangle.geometry.setObservation("1", {"center" : {"x" : 20, "y" : 20}})
287-
node.keyableCircle.geometry.setObservation("1", {"radius" : 40})
284+
node.keyablePoint.geometry.setObservation("1", {"x": 2})
285+
node.keyableLine.geometry.setObservation("1", {"a": {"x": 2, "y": 2}})
286+
node.keyableRectangle.geometry.setObservation("1", {"center": {"x": 20, "y": 20}})
287+
node.keyableCircle.geometry.setObservation("1", {"radius": 40})
288288

289289
# Check keyable shape get observation at key "1", should be updated observation
290290
assert node.keyablePoint.geometry.getObservation("1").get("x") == 2
291-
assert node.keyableLine.geometry.getObservation("1").get("a") == {"x" : 2, "y": 2}
292-
assert node.keyableRectangle.geometry.getObservation("1").get("center") == {"x" : 20, "y" : 20}
291+
assert node.keyableLine.geometry.getObservation("1").get("a") == {"x": 2, "y": 2}
292+
assert node.keyableRectangle.geometry.getObservation("1").get("center") == {"x": 20, "y": 20}
293293
assert node.keyableCircle.geometry.getObservation("1").get("radius") == 40
294294

295295
# Remove keyable shape observation at key "0"
@@ -326,8 +326,8 @@ def test_shapeList(self):
326326
graph = Graph("")
327327
node = graph.addNewNode(NodeWithShapeAttributes.__name__)
328328

329-
pointValue = {"userName" : "testPoint", "userColor" : "#fff", "geometry" : {"x" : 1, "y" : 1}}
330-
keyablePointValue = {"userName" : "testKeyablePoint", "userColor" : "#fff", "geometry" : {}}
329+
pointValue = {"userName": "testPoint", "userColor": "#fff", "geometry": {"x": 1, "y": 1}}
330+
keyablePointValue = {"userName": "testKeyablePoint", "userColor": "#fff", "geometry": {}}
331331

332332
# Check visibility
333333
assert node.pointList.isVisible
@@ -368,7 +368,7 @@ def test_shapeList(self):
368368
# Reset shape lists
369369
node.pointList.resetToDefaultValue()
370370
node.keyablePointList.resetToDefaultValue()
371-
371+
372372
# Check number of shapes, should be 0 (no shape)
373373
assert len(node.pointList) == 0
374374
assert len(node.keyablePointList) == 0
@@ -379,8 +379,8 @@ def test_linkAttribute(self):
379379
nodeA = graph.addNewNode(NodeWithShapeAttributes.__name__)
380380
nodeB = graph.addNewNode(NodeWithShapeAttributes.__name__)
381381

382-
pointGeometryValue = {"x" : 1, "y" : 1}
383-
pointValue = {"userName" : "testPoint", "userColor" : "#fff", "geometry" : pointGeometryValue}
382+
pointGeometryValue = {"x": 1, "y": 1}
383+
pointValue = {"userName": "testPoint", "userColor": "#fff", "geometry": pointGeometryValue}
384384

385385
# Add link:
386386
# nodeB.pointList is a link for nodeA.pointList
@@ -411,8 +411,8 @@ def test_linkAttribute(self):
411411
assert nodeB.pointList.at(2).geometry.getValueAsDict() == pointGeometryValue
412412

413413
# Update nodeA.point and nodeA.pointList[1] geometry
414-
nodeA.point.geometry.setObservation("0", {"x" : 2})
415-
nodeA.pointList.at(1).geometry.setObservation("0", {"x" : 2})
414+
nodeA.point.geometry.setObservation("0", {"x": 2})
415+
nodeA.pointList.at(1).geometry.setObservation("0", {"x": 2})
416416

417417
# Check nodeB second shape geometry
418418
assert nodeB.point.geometry.getObservation("0").get("x") == 2
@@ -427,14 +427,14 @@ def test_exportDict(self):
427427
graph = Graph("")
428428
node = graph.addNewNode(NodeWithShapeAttributes.__name__)
429429

430-
observationPoint = {"x" : 1, "y" : 1}
431-
observationLine = {"a" : {"x" : 1, "y" : 1}, "b" : {"x" : 2, "y" : 2}}
432-
observationRectangle = {"center" : {"x" : 10, "y" : 10}, "size" : {"width" : 20, "height" : 20}}
433-
observationCircle = {"center" : {"x" : 10, "y" : 10}, "radius" : 20}
430+
observationPoint = {"x": 1, "y": 1}
431+
observationLine = {"a": {"x": 1, "y": 1}, "b": {"x": 2, "y": 2}}
432+
observationRectangle = {"center": {"x": 10, "y": 10}, "size": {"width": 20, "height": 20}}
433+
observationCircle = {"center": {"x": 10, "y": 10}, "radius": 20}
434434

435-
pointValue = {"userName" : "testPoint", "userColor" : "#fff", "geometry" : observationPoint}
436-
keyablePointGeometryValue = {"x" : {"0" : observationPoint.get("x")}, "y" : {"0" : observationPoint.get("y")}}
437-
keyablePointValue = {"userName" : "testKeyablePoint", "userColor" : "#fff", "geometry" : keyablePointGeometryValue}
435+
pointValue = {"userName": "testPoint", "userColor": "#fff", "geometry": observationPoint}
436+
keyablePointGeometryValue = {"x": {"0": observationPoint.get("x")}, "y": {"0": observationPoint.get("y")}}
437+
keyablePointValue = {"userName": "testKeyablePoint", "userColor": "#fff", "geometry": keyablePointGeometryValue}
438438

439439
# Check uninitialized shape attribute
440440
# Shape list attribute should be empty list
@@ -443,49 +443,49 @@ def test_exportDict(self):
443443
assert node.pointList.getShapesAsDict() == []
444444
assert node.keyablePointList.getShapesAsDict() == []
445445
# Static shape attribute should be default
446-
assert node.point.geometry.getValueAsDict() == {"x" : -1, "y" : -1}
447-
assert node.line.geometry.getValueAsDict() == {"a" : {"x" : -1, "y" : -1}, "b" : {"x" : -1, "y" : -1}}
448-
assert node.rectangle.geometry.getValueAsDict() == {"center" : {"x" : -1, "y" : -1}, "size" : {"width" : -1, "height" : -1}}
449-
assert node.circle.geometry.getValueAsDict() == {"center" : {"x" : -1, "y" : -1}, "radius" : -1}
450-
assert node.point.getShapeAsDict() == {"name" : node.point.rootName,
451-
"type" : node.point.type,
452-
"properties" : {"color" : node.point.userColor, "x" : -1, "y" : -1}}
453-
assert node.line.getShapeAsDict() == {"name" : node.line.rootName,
454-
"type" : node.line.type,
455-
"properties" : {"color" : node.line.userColor, "a" : {"x" : -1, "y" : -1}, "b" : {"x" : -1, "y" : -1}}}
456-
assert node.rectangle.getShapeAsDict() == {"name" : node.rectangle.rootName,
457-
"type" : node.rectangle.type,
458-
"properties" : {"color" : node.rectangle.userColor, "center" : {"x" : -1, "y" : -1}, "size" : {"width" : -1, "height" : -1}}}
459-
assert node.circle.getShapeAsDict() == {"name" : node.circle.rootName,
460-
"type" : node.circle.type,
461-
"properties" : {"color" : node.circle.userColor, "center" : {"x" : -1, "y" : -1}, "radius" : -1}}
446+
assert node.point.geometry.getValueAsDict() == {"x": -1, "y": -1}
447+
assert node.line.geometry.getValueAsDict() == {"a": {"x": -1, "y": -1}, "b": {"x": -1, "y": -1}}
448+
assert node.rectangle.geometry.getValueAsDict() == {"center": {"x": -1, "y": -1}, "size": {"width": -1, "height": -1}}
449+
assert node.circle.geometry.getValueAsDict() == {"center": {"x": -1, "y": -1}, "radius": -1}
450+
assert node.point.getShapeAsDict() == {"name": node.point.rootName,
451+
"type": node.point.type,
452+
"properties": {"color": node.point.userColor, "x": -1, "y": -1}}
453+
assert node.line.getShapeAsDict() == {"name": node.line.rootName,
454+
"type": node.line.type,
455+
"properties": {"color": node.line.userColor, "a": {"x": -1, "y": -1}, "b": {"x": -1, "y": -1}}}
456+
assert node.rectangle.getShapeAsDict() == {"name": node.rectangle.rootName,
457+
"type": node.rectangle.type,
458+
"properties": {"color": node.rectangle.userColor, "center": {"x": -1, "y": -1}, "size": {"width": -1, "height": -1}}}
459+
assert node.circle.getShapeAsDict() == {"name": node.circle.rootName,
460+
"type": node.circle.type,
461+
"properties": {"color": node.circle.userColor, "center": {"x": -1, "y": -1}, "radius": -1}}
462462
# Keyable shape attribute should be empty dict
463463
assert node.keyablePoint.geometry.getValueAsDict() == {}
464464
assert node.keyableLine.geometry.getValueAsDict() == {}
465465
assert node.keyableRectangle.geometry.getValueAsDict() == {}
466466
assert node.keyableCircle.geometry.getValueAsDict() == {}
467-
assert node.keyablePoint.getShapeAsDict() == {"name" : node.keyablePoint.rootName,
468-
"type" : node.keyablePoint.type,
469-
"properties" : {"color" : node.keyablePoint.userColor},
470-
"observations" : {}}
471-
assert node.keyableLine.getShapeAsDict() == {"name" : node.keyableLine.rootName,
472-
"type" : node.keyableLine.type,
473-
"properties" : {"color" : node.keyableLine.userColor},
474-
"observations" : {}}
475-
assert node.keyableRectangle.getShapeAsDict() == {"name" : node.keyableRectangle.rootName,
476-
"type" : node.keyableRectangle.type,
477-
"properties" : {"color" : node.keyableRectangle.userColor},
478-
"observations" : {}}
479-
assert node.keyableCircle.getShapeAsDict() == {"name" : node.keyableCircle.rootName,
480-
"type" : node.keyableCircle.type,
481-
"properties" : {"color" : node.keyableCircle.userColor},
482-
"observations" : {}}
467+
assert node.keyablePoint.getShapeAsDict() == {"name": node.keyablePoint.rootName,
468+
"type": node.keyablePoint.type,
469+
"properties": {"color": node.keyablePoint.userColor},
470+
"observations": {}}
471+
assert node.keyableLine.getShapeAsDict() == {"name": node.keyableLine.rootName,
472+
"type": node.keyableLine.type,
473+
"properties": {"color": node.keyableLine.userColor},
474+
"observations": {}}
475+
assert node.keyableRectangle.getShapeAsDict() == {"name": node.keyableRectangle.rootName,
476+
"type": node.keyableRectangle.type,
477+
"properties": {"color": node.keyableRectangle.userColor},
478+
"observations": {}}
479+
assert node.keyableCircle.getShapeAsDict() == {"name": node.keyableCircle.rootName,
480+
"type": node.keyableCircle.type,
481+
"properties": {"color": node.keyableCircle.userColor},
482+
"observations": {}}
483483

484484
# Add one shape with an observation
485485
node.pointList.append(pointValue)
486486
node.keyablePointList.append(keyablePointValue)
487487

488-
# Add one observation
488+
# Add one observation
489489
node.point.geometry.setObservation("0", observationPoint)
490490
node.keyablePoint.geometry.setObservation("0", observationPoint)
491491
node.line.geometry.setObservation("0", observationLine)
@@ -498,24 +498,24 @@ def test_exportDict(self):
498498
# Check shape attribute
499499
# Shape list attribute should be empty dict
500500
assert node.pointList.getGeometriesAsDict() == [observationPoint]
501-
assert node.keyablePointList.getGeometriesAsDict() == [{"0" : observationPoint}]
502-
assert node.pointList.getShapesAsDict()[0].get("properties") == {"color" : pointValue.get("userColor")} | observationPoint
503-
assert node.keyablePointList.getShapesAsDict()[0].get("observations") == {"0" : observationPoint}
501+
assert node.keyablePointList.getGeometriesAsDict() == [{"0": observationPoint}]
502+
assert node.pointList.getShapesAsDict()[0].get("properties") == {"color": pointValue.get("userColor")} | observationPoint
503+
assert node.keyablePointList.getShapesAsDict()[0].get("observations") == {"0": observationPoint}
504504
# Not keyable shape attribute should be default
505505
assert node.point.geometry.getValueAsDict() == observationPoint
506506
assert node.line.geometry.getValueAsDict() == observationLine
507507
assert node.rectangle.geometry.getValueAsDict() == observationRectangle
508508
assert node.circle.geometry.getValueAsDict() == observationCircle
509-
assert node.point.getShapeAsDict().get("properties") == {"color" : node.point.userColor} | observationPoint
510-
assert node.line.getShapeAsDict().get("properties") == {"color" : node.line.userColor} | observationLine
511-
assert node.rectangle.getShapeAsDict().get("properties") == {"color" : node.rectangle.userColor} | observationRectangle
512-
assert node.circle.getShapeAsDict().get("properties") == {"color" : node.circle.userColor} | observationCircle
509+
assert node.point.getShapeAsDict().get("properties") == {"color": node.point.userColor} | observationPoint
510+
assert node.line.getShapeAsDict().get("properties") == {"color": node.line.userColor} | observationLine
511+
assert node.rectangle.getShapeAsDict().get("properties") == {"color": node.rectangle.userColor} | observationRectangle
512+
assert node.circle.getShapeAsDict().get("properties") == {"color": node.circle.userColor} | observationCircle
513513
# Keyable shape attribute should be empty dict
514-
assert node.keyablePoint.geometry.getValueAsDict() == {"0" : observationPoint}
515-
assert node.keyableLine.geometry.getValueAsDict() == {"0" : observationLine}
516-
assert node.keyableRectangle.geometry.getValueAsDict() == {"0" : observationRectangle}
517-
assert node.keyableCircle.geometry.getValueAsDict() == {"0" : observationCircle}
518-
assert node.keyablePoint.getShapeAsDict().get("observations") == {"0" : observationPoint}
519-
assert node.keyableLine.getShapeAsDict().get("observations") == {"0" : observationLine}
520-
assert node.keyableRectangle.getShapeAsDict().get("observations") == {"0" : observationRectangle}
521-
assert node.keyableCircle.getShapeAsDict().get("observations") == {"0" : observationCircle}
514+
assert node.keyablePoint.geometry.getValueAsDict() == {"0": observationPoint}
515+
assert node.keyableLine.geometry.getValueAsDict() == {"0": observationLine}
516+
assert node.keyableRectangle.geometry.getValueAsDict() == {"0": observationRectangle}
517+
assert node.keyableCircle.geometry.getValueAsDict() == {"0": observationCircle}
518+
assert node.keyablePoint.getShapeAsDict().get("observations") == {"0": observationPoint}
519+
assert node.keyableLine.getShapeAsDict().get("observations") == {"0": observationLine}
520+
assert node.keyableRectangle.getShapeAsDict().get("observations") == {"0": observationRectangle}
521+
assert node.keyableCircle.getShapeAsDict().get("observations") == {"0": observationCircle}

0 commit comments

Comments
 (0)