Skip to content

Commit ff1988f

Browse files
3nids3nids
committedJun 19, 2018
Python __repr__ test output
·
ltr-3_40final-3_2_0
1 parent 763dfd2 commit ff1988f

31 files changed

+52
-51
lines changed
 

‎python/core/auto_generated/geometry/qgscircle.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ Returns true if the circle contains the ``point``.
255255

256256
SIP_PYOBJECT __repr__();
257257
%MethodCode
258-
QString str = QString( "<QgsCircle %1>" ).arg( sipCpp->toString() );
258+
QString str = QStringLiteral( "<QgsCircle: %1>" ).arg( sipCpp->toString() );
259259
sipRes = PyUnicode_FromString( str.toUtf8().data() );
260260
%End
261261
};

‎python/core/auto_generated/geometry/qgscircularstring.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ Sets the circular string's points
164164

165165
SIP_PYOBJECT __repr__();
166166
%MethodCode
167-
QString str = QString( "<QgsCircularString %1>" ).arg( sipCpp->asWkt() );
167+
QString str = QStringLiteral( "<QgsCircularString: %1>" ).arg( sipCpp->asWkt() );
168168
sipRes = PyUnicode_FromString( str.toUtf8().data() );
169169
%End
170170

‎python/core/auto_generated/geometry/qgscompoundcurve.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ Appends first point if not already closed.
168168

169169
SIP_PYOBJECT __repr__();
170170
%MethodCode
171-
QString str = QString( "<QgsCompoundCurve %1>" ).arg( sipCpp->asWkt() );
171+
QString str = QStringLiteral( "<QgsCompoundCurve: %1>" ).arg( sipCpp->asWkt() );
172172
sipRes = PyUnicode_FromString( str.toUtf8().data() );
173173
%End
174174

‎python/core/auto_generated/geometry/qgscurvepolygon.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ Returns approximate rotation angle for a vertex. Usually average angle between a
218218

219219
SIP_PYOBJECT __repr__();
220220
%MethodCode
221-
QString str = QString( "<QgsCurvePolygon %1>" ).arg( sipCpp->asWkt() );
221+
QString str = QStringLiteral( "<QgsCurvePolygon: %1>" ).arg( sipCpp->asWkt() );
222222
sipRes = PyUnicode_FromString( str.toUtf8().data() );
223223
%End
224224

‎python/core/auto_generated/geometry/qgsellipse.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ Members will be truncated to the specified precision.
250250

251251
SIP_PYOBJECT __repr__();
252252
%MethodCode
253-
QString str = QString( "<QgsEllipse %1>" ).arg( sipCpp->toString() );
253+
QString str = QStringLiteral( "<QgsEllipse: %1>" ).arg( sipCpp->toString() );
254254
sipRes = PyUnicode_FromString( str.toUtf8().data() );
255255
%End
256256

‎python/core/auto_generated/geometry/qgsgeometry.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1292,7 +1292,7 @@ Exports the geometry to WKT
12921292

12931293
SIP_PYOBJECT __repr__();
12941294
%MethodCode
1295-
QString str = QString( "<QgsGeometry %1>" ).arg( sipCpp->asWkt() );
1295+
QString str = QStringLiteral( "<QgsGeometry: %1>" ).arg( sipCpp->asWkt() );
12961296
sipRes = PyUnicode_FromString( str.toUtf8().data() );
12971297
%End
12981298

‎python/core/auto_generated/geometry/qgslinestring.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ of the curve.
319319

320320
SIP_PYOBJECT __repr__();
321321
%MethodCode
322-
QString str = QString( "<QgsLineString %1>" ).arg( sipCpp->asWkt() );
322+
QString str = QStringLiteral( "<QgsLineString: %1>" ).arg( sipCpp->asWkt() );
323323
sipRes = PyUnicode_FromString( str.toUtf8().data() );
324324
%End
325325

‎python/core/auto_generated/geometry/qgsmulticurve.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Returns a copy of the multi curve, where each component curve has had its line d
5858

5959
SIP_PYOBJECT __repr__();
6060
%MethodCode
61-
QString str = QString( "<QgsMulitCurve %1>" ).arg( sipCpp->asWkt() );
61+
QString str = QStringLiteral( "<QgsMulitCurve: %1>" ).arg( sipCpp->asWkt() );
6262
sipRes = PyUnicode_FromString( str.toUtf8().data() );
6363
%End
6464

‎python/core/auto_generated/geometry/qgsmultilinestring.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Returns the geometry converted to the more generic curve type :py:class:`QgsMult
5555

5656
SIP_PYOBJECT __repr__();
5757
%MethodCode
58-
QString str = QString( "<QgsMultiLineString %1>" ).arg( sipCpp->asWkt() );
58+
QString str = QStringLiteral( "<QgsMultiLineString: %1>" ).arg( sipCpp->asWkt() );
5959
sipRes = PyUnicode_FromString( str.toUtf8().data() );
6060
%End
6161

‎python/core/auto_generated/geometry/qgsmultipoint.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Multi point geometry collection.
5757

5858
SIP_PYOBJECT __repr__();
5959
%MethodCode
60-
QString str = QString( "<QgsMultiPoint %1>" ).arg( sipCpp->asWkt() );
60+
QString str = QStringLiteral( "<QgsMultiPoint: %1>" ).arg( sipCpp->asWkt() );
6161
sipRes = PyUnicode_FromString( str.toUtf8().data() );
6262
%End
6363

‎python/core/auto_generated/geometry/qgsmultipolygon.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Returns the geometry converted to the more generic curve type :py:class:`QgsMult
5656

5757
SIP_PYOBJECT __repr__();
5858
%MethodCode
59-
QString str = QString( "<QgsMultiPolygon %1>" ).arg( sipCpp->asWkt() );
59+
QString str = QStringLiteral( "<QgsMultiPolygon: %1>" ).arg( sipCpp->asWkt() );
6060
sipRes = PyUnicode_FromString( str.toUtf8().data() );
6161
%End
6262

‎python/core/auto_generated/geometry/qgspoint.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ Angle undefined. Always returns 0.0
428428

429429
SIP_PYOBJECT __repr__();
430430
%MethodCode
431-
QString str = QString( "<QgsPoint %1>" ).arg( sipCpp->asWkt() );
431+
QString str = QStringLiteral( "<QgsPoint: %1>" ).arg( sipCpp->asWkt() );
432432
sipRes = PyUnicode_FromString( str.toUtf8().data() );
433433
%End
434434

‎python/core/auto_generated/geometry/qgspolygon.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ negative if the point lies outside the polygon.
6767

6868
SIP_PYOBJECT __repr__();
6969
%MethodCode
70-
QString str = QString( "<QgsPolygon %1>" ).arg( sipCpp->asWkt() );
70+
QString str = QStringLiteral( "<QgsPolygon: %1>" ).arg( sipCpp->asWkt() );
7171
sipRes = PyUnicode_FromString( str.toUtf8().data() );
7272
%End
7373

‎python/core/auto_generated/geometry/qgsrectangle.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ Converts the rectangle to a 3D box, with the specified
324324

325325
SIP_PYOBJECT __repr__();
326326
%MethodCode
327-
QString str = QString( "<QgsRectangle %1>" ).arg( sipCpp->asWktCoordinates() );
327+
QString str = QStringLiteral( "<QgsRectangle: %1>" ).arg( sipCpp->asWktCoordinates() );
328328
sipRes = PyUnicode_FromString( str.toUtf8().data() );
329329
%End
330330

‎python/core/auto_generated/qgspointxy.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ Multiply x and y by the given value
230230

231231
SIP_PYOBJECT __repr__();
232232
%MethodCode
233-
QString str = QString( "<QgsPointXY %1>" ).arg( sipCpp->asWkt() );
233+
QString str = QStringLiteral( "<QgsPointXY: %1>" ).arg( sipCpp->asWkt() );
234234
sipRes = PyUnicode_FromString( str.toUtf8().data() );
235235
%End
236236

‎src/core/geometry/qgscircle.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ class CORE_EXPORT QgsCircle : public QgsEllipse
250250
#ifdef SIP_RUN
251251
SIP_PYOBJECT __repr__();
252252
% MethodCode
253-
QString str = QString( "<QgsCircle %1>" ).arg( sipCpp->toString() );
253+
QString str = QStringLiteral( "<QgsCircle: %1>" ).arg( sipCpp->toString() );
254254
sipRes = PyUnicode_FromString( str.toUtf8().data() );
255255
% End
256256
#endif

‎src/core/geometry/qgscircularstring.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class CORE_EXPORT QgsCircularString: public QgsCurve
149149
#ifdef SIP_RUN
150150
SIP_PYOBJECT __repr__();
151151
% MethodCode
152-
QString str = QString( "<QgsCircularString %1>" ).arg( sipCpp->asWkt() );
152+
QString str = QStringLiteral( "<QgsCircularString: %1>" ).arg( sipCpp->asWkt() );
153153
sipRes = PyUnicode_FromString( str.toUtf8().data() );
154154
% End
155155
#endif

‎src/core/geometry/qgscompoundcurve.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class CORE_EXPORT QgsCompoundCurve: public QgsCurve
149149
#ifdef SIP_RUN
150150
SIP_PYOBJECT __repr__();
151151
% MethodCode
152-
QString str = QString( "<QgsCompoundCurve %1>" ).arg( sipCpp->asWkt() );
152+
QString str = QStringLiteral( "<QgsCompoundCurve: %1>" ).arg( sipCpp->asWkt() );
153153
sipRes = PyUnicode_FromString( str.toUtf8().data() );
154154
% End
155155
#endif

‎src/core/geometry/qgscurvepolygon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ class CORE_EXPORT QgsCurvePolygon: public QgsSurface
207207
#ifdef SIP_RUN
208208
SIP_PYOBJECT __repr__();
209209
% MethodCode
210-
QString str = QString( "<QgsCurvePolygon %1>" ).arg( sipCpp->asWkt() );
210+
QString str = QStringLiteral( "<QgsCurvePolygon: %1>" ).arg( sipCpp->asWkt() );
211211
sipRes = PyUnicode_FromString( str.toUtf8().data() );
212212
% End
213213
#endif

‎src/core/geometry/qgsellipse.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ class CORE_EXPORT QgsEllipse
243243
#ifdef SIP_RUN
244244
SIP_PYOBJECT __repr__();
245245
% MethodCode
246-
QString str = QString( "<QgsEllipse %1>" ).arg( sipCpp->toString() );
246+
QString str = QStringLiteral( "<QgsEllipse: %1>" ).arg( sipCpp->toString() );
247247
sipRes = PyUnicode_FromString( str.toUtf8().data() );
248248
% End
249249
#endif

‎src/core/geometry/qgsgeometry.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1251,7 +1251,7 @@ class CORE_EXPORT QgsGeometry
12511251
#ifdef SIP_RUN
12521252
SIP_PYOBJECT __repr__();
12531253
% MethodCode
1254-
QString str = QString( "<QgsGeometry %1>" ).arg( sipCpp->asWkt() );
1254+
QString str = QStringLiteral( "<QgsGeometry: %1>" ).arg( sipCpp->asWkt() );
12551255
sipRes = PyUnicode_FromString( str.toUtf8().data() );
12561256
% End
12571257
#endif

‎src/core/geometry/qgslinestring.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ class CORE_EXPORT QgsLineString: public QgsCurve
349349
#ifdef SIP_RUN
350350
SIP_PYOBJECT __repr__();
351351
% MethodCode
352-
QString str = QString( "<QgsLineString %1>" ).arg( sipCpp->asWkt() );
352+
QString str = QStringLiteral( "<QgsLineString: %1>" ).arg( sipCpp->asWkt() );
353353
sipRes = PyUnicode_FromString( str.toUtf8().data() );
354354
% End
355355
#endif

‎src/core/geometry/qgsmulticurve.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class CORE_EXPORT QgsMultiCurve: public QgsGeometryCollection
7676
#ifdef SIP_RUN
7777
SIP_PYOBJECT __repr__();
7878
% MethodCode
79-
QString str = QString( "<QgsMulitCurve %1>" ).arg( sipCpp->asWkt() );
79+
QString str = QStringLiteral( "<QgsMulitCurve: %1>" ).arg( sipCpp->asWkt() );
8080
sipRes = PyUnicode_FromString( str.toUtf8().data() );
8181
% End
8282
#endif

‎src/core/geometry/qgsmultilinestring.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class CORE_EXPORT QgsMultiLineString: public QgsMultiCurve
6868
#ifdef SIP_RUN
6969
SIP_PYOBJECT __repr__();
7070
% MethodCode
71-
QString str = QString( "<QgsMultiLineString %1>" ).arg( sipCpp->asWkt() );
71+
QString str = QStringLiteral( "<QgsMultiLineString: %1>" ).arg( sipCpp->asWkt() );
7272
sipRes = PyUnicode_FromString( str.toUtf8().data() );
7373
% End
7474
#endif

‎src/core/geometry/qgsmultipoint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class CORE_EXPORT QgsMultiPoint: public QgsGeometryCollection
6969
#ifdef SIP_RUN
7070
SIP_PYOBJECT __repr__();
7171
% MethodCode
72-
QString str = QString( "<QgsMultiPoint %1>" ).arg( sipCpp->asWkt() );
72+
QString str = QStringLiteral( "<QgsMultiPoint: %1>" ).arg( sipCpp->asWkt() );
7373
sipRes = PyUnicode_FromString( str.toUtf8().data() );
7474
% End
7575
#endif

‎src/core/geometry/qgsmultipolygon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class CORE_EXPORT QgsMultiPolygon: public QgsMultiSurface
6868
#ifdef SIP_RUN
6969
SIP_PYOBJECT __repr__();
7070
% MethodCode
71-
QString str = QString( "<QgsMultiPolygon %1>" ).arg( sipCpp->asWkt() );
71+
QString str = QStringLiteral( "<QgsMultiPolygon: %1>" ).arg( sipCpp->asWkt() );
7272
sipRes = PyUnicode_FromString( str.toUtf8().data() );
7373
% End
7474
#endif

‎src/core/geometry/qgspoint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ class CORE_EXPORT QgsPoint: public QgsAbstractGeometry
498498
#ifdef SIP_RUN
499499
SIP_PYOBJECT __repr__();
500500
% MethodCode
501-
QString str = QString( "<QgsPoint %1>" ).arg( sipCpp->asWkt() );
501+
QString str = QStringLiteral( "<QgsPoint: %1>" ).arg( sipCpp->asWkt() );
502502
sipRes = PyUnicode_FromString( str.toUtf8().data() );
503503
% End
504504
#endif

‎src/core/geometry/qgspolygon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class CORE_EXPORT QgsPolygon: public QgsCurvePolygon
8787
#ifdef SIP_RUN
8888
SIP_PYOBJECT __repr__();
8989
% MethodCode
90-
QString str = QString( "<QgsPolygon %1>" ).arg( sipCpp->asWkt() );
90+
QString str = QStringLiteral( "<QgsPolygon: %1>" ).arg( sipCpp->asWkt() );
9191
sipRes = PyUnicode_FromString( str.toUtf8().data() );
9292
% End
9393
#endif

‎src/core/geometry/qgsrectangle.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ class CORE_EXPORT QgsRectangle
544544
#ifdef SIP_RUN
545545
SIP_PYOBJECT __repr__();
546546
% MethodCode
547-
QString str = QString( "<QgsRectangle %1>" ).arg( sipCpp->asWktCoordinates() );
547+
QString str = QStringLiteral( "<QgsRectangle: %1>" ).arg( sipCpp->asWktCoordinates() );
548548
sipRes = PyUnicode_FromString( str.toUtf8().data() );
549549
% End
550550
#endif

‎src/core/qgspointxy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ class CORE_EXPORT QgsPointXY
297297
#ifdef SIP_RUN
298298
SIP_PYOBJECT __repr__();
299299
% MethodCode
300-
QString str = QString( "<QgsPointXY %1>" ).arg( sipCpp->asWkt() );
300+
QString str = QStringLiteral( "<QgsPointXY: %1>" ).arg( sipCpp->asWkt() );
301301
sipRes = PyUnicode_FromString( str.toUtf8().data() );
302302
% End
303303

‎tests/src/python/test_python_repr.py

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,63 +13,64 @@
1313
__revision__ = '$Format:%H$'
1414

1515
import qgis # NOQA
16-
import os
1716

1817
from qgis.testing import unittest, start_app
19-
from qgis.core import QgsGeometry, QgsPoint, QgsPointXY, QgsCircle, QgsCircularString, QgsCompoundCurve, QgsCurve,\
20-
QgsCurvePolygon, QgsEllipse, QgsLineString, QgsMultiCurve, QgsMultiLineString, QgsMultiPoint, QgsMultiPolygon,\
21-
QgsPolygon, QgsRectangle
22-
23-
import sip
18+
from qgis.core import QgsGeometry, QgsPoint, QgsPointXY, QgsCircle, QgsCircularString, QgsCompoundCurve,\
19+
QgsCurvePolygon, QgsEllipse, QgsLineString, QgsMultiCurve, QgsRectangle
2420

2521
start_app()
2622

2723

28-
class TestCoreAdditions(unittest.TestCase):
24+
class TestPython__repr__(unittest.TestCase):
25+
26+
def TestQgsGeometryRepr(self):
27+
p = QgsPointXY(123.456, 987.654)
28+
g = QgsGeometry.fromPointXY(p)
29+
self.assertTrue(g.__repr__().startswith('<QgsGeometry: Point (123.456)'))
2930

3031
def TestQgsPointRepr(self):
3132
p = QgsPoint(123.456, 987.654, 100)
32-
print(p)
33+
self.assertTrue(p.__repr__().startswith('<QgsPoint: PointZ (123.456)'))
3334

3435
def TestQgsPointXYRepr(self):
3536
p = QgsPointXY(123.456, 987.654)
36-
print(p)
37+
self.assertTrue(p.__repr__().startswith('<QgsPointXY: POINT(123.456'))
3738

3839
def TestQgsCircleRepr(self):
3940
c = QgsCircle(QgsPoint(1, 1), 2.0)
40-
print(c)
41+
self.assertEqual(c.__repr__(), '<QgsCircle: Circle (Center: Point (1 1), Radius: 2, Azimuth: 0)>')
4142

4243
def TestQgsCircularstringRepr(self):
4344
cs = QgsCircularString(QgsPoint(1, 2), QgsPoint(2, 3), QgsPoint(3, 4))
44-
print(cs)
45+
self.assertEqual(cs.__repr__(), '<QgsCompoundCurve: CompoundCurve (CircularString (1 2, 2 3, 3 4))>')
4546

4647
def TestQgsCompoundcurveRepr(self):
4748
cs = QgsCircularString(QgsPoint(1, 2), QgsPoint(2, 3), QgsPoint(3, 4))
4849
cc = QgsCompoundCurve()
4950
cc.addCurve(cs)
50-
print(cc)
51+
self.assertEqual(cc.__repr__(), '<QgsCompoundCurve: CompoundCurve (CircularString (1 2, 2 3, 3 4))>')
5152

5253
def TestQgsCurvepolygonRepr(self):
5354
cp = QgsCurvePolygon()
5455
cs = QgsCircularString(QgsPoint(1, 10), QgsPoint(2, 11), QgsPoint(1, 10))
5556
cp.setExteriorRing(cs)
56-
print(cp)
57+
self.assertEqual(cp.__repr__(), '<QgsCurvePolygon: CurvePolygon (CircularString (1 10, 2 11, 1 10))>')
5758

5859
def TestQgsEllipseRepr(self):
5960
e = QgsEllipse(QgsPoint(1, 2), 2.0, 3.0)
60-
print(e)
61+
self.assertEqual(e.__repr__(), '<QgsEllipse: Ellipse (Center: Point (1 2), Semi-Major Axis: 3, Semi-Minor Axis: 2, Azimuth: 180)>')
6162

6263
def TestQgsLineStringRepr(self):
6364
ls = QgsLineString([QgsPoint(10, 2), QgsPoint(10, 1), QgsPoint(5, 1)])
64-
print(ls)
65+
self.assertEqual(ls.__repr__(), '<QgsLineString: LineString (10 2, 10 1, 5 1)>')
6566

6667
def TestQgsMulticurveRepr(self):
6768
mc = QgsMultiCurve()
6869
cs = QgsCircularString(QgsPoint(1, 10), QgsPoint(2, 11), QgsPoint(3, 12))
6970
mc.addGeometry(cs)
7071
cs2 = QgsCircularString(QgsPoint(4, 20), QgsPoint(5, 22), QgsPoint(6, 24))
7172
mc.addGeometry(cs2)
72-
print(mc)
73+
self.assertEqual(mc.__repr__(), '<QgsMulitCurve: MultiCurve (CircularString (1 10, 2 11, 3 12),CircularString (4 20, 5 22, 6 24))>')
7374

7475
def TestQgsMultilineStringRepr(self):
7576
ml = QgsGeometry.fromMultiPolylineXY(
@@ -78,12 +79,12 @@ def TestQgsMultilineStringRepr(self):
7879
[QgsPointXY(3, 0), QgsPointXY(3, 1), QgsPointXY(5, 1), QgsPointXY(5, 0), QgsPointXY(6, 0), ]
7980
]
8081
)
81-
print(ml)
82+
self.assertEqual(ml.constGet().__repr__(), '<QgsMultiLineString: MultiLineString ((0 0, 1 0, 1 1, 2 1, 2 0),(3 0, 3 1, 5 1, 5 0, 6 0))>')
8283

8384
def TestQgsMultiPointRepr(self):
8485
wkt = "MultiPoint ((10 30),(40 20),(30 10),(20 10))"
8586
mp = QgsGeometry.fromWkt(wkt)
86-
print(mp)
87+
self.assertEqual(mp.constGet().__repr__(), '<QgsMultiPoint: MultiPoint ((10 30),(40 20),(30 10),(20 10))>')
8788

8889
def TestQgsMultipolygonRepr(self):
8990
mp = QgsGeometry.fromMultiPolygonXY([
@@ -96,7 +97,7 @@ def TestQgsMultipolygonRepr(self):
9697
QgsPointXY(3, 1),
9798
QgsPointXY(2, 2)]]
9899
])
99-
print(mp)
100+
self.assertEqual(mp.constGet().__repr__(), '<QgsMultiPolygon: MultiPolygon (((1 1, 2 2, 1 2, 1 1)),((2 2, 3 3, 3 1, 2 2)))>')
100101

101102
def TestQgsPolygonRepr(self):
102103
p = QgsGeometry.fromPolygonXY(
@@ -105,11 +106,11 @@ def TestQgsPolygonRepr(self):
105106
QgsPointXY(2, 2),
106107
QgsPointXY(0, 2),
107108
QgsPointXY(0, 0)]])
108-
print(p)
109+
self.assertEqual(p.constGet().__repr__(), '<QgsPolygon: Polygon ((0 0, 2 0, 2 2, 0 2, 0 0))>')
109110

110111
def TestQgsRectangleRepr(self):
111112
r = QgsRectangle(1, 2, 3, 4)
112-
print(r)
113+
self.assertEqual(r.constGet().__repr__(), '<QgsRectangle: 1 2, 3 4>')
113114

114115

115116
if __name__ == "__main__":

0 commit comments

Comments
 (0)
Please sign in to comment.