20
20
// qgis includes...
21
21
#include " qgsapplication.h"
22
22
#include " qgsproject.h"
23
- #include " qgsrenderchecker.h"
24
23
#include " qgstiles.h"
25
24
#include " qgsvectortilebasicrenderer.h"
26
25
#include " qgsvectortilelayer.h"
@@ -47,15 +46,13 @@ class TestQgsVectorTileLayer : public QgsTest
47
46
Q_OBJECT
48
47
49
48
public:
50
- TestQgsVectorTileLayer () : QgsTest( QStringLiteral( " Vector Tile Layer Tests" ) ) {}
49
+ TestQgsVectorTileLayer () : QgsTest( QStringLiteral( " Vector Tile Layer Tests" ), QStringLiteral( " vector_tile " ) ) {}
51
50
52
51
private:
53
52
QString mDataDir ;
54
53
QgsVectorTileLayer *mLayer = nullptr ;
55
54
QgsMapSettings *mMapSettings = nullptr ;
56
55
57
- bool imageCheck ( const QString &testType, QgsVectorTileLayer *layer, QgsRectangle extent );
58
-
59
56
private slots:
60
57
void initTestCase ();// will be called before the first testfunction is executed.
61
58
void cleanupTestCase ();// will be called after the last testfunction was executed.
@@ -103,6 +100,7 @@ void TestQgsVectorTileLayer::initTestCase()
103
100
104
101
mMapSettings = new QgsMapSettings ();
105
102
mMapSettings ->setLayers ( QList<QgsMapLayer *>() << mLayer );
103
+ mMapSettings ->setOutputDpi ( 96 );
106
104
107
105
// let's have some standard style config for the layer
108
106
QColor polygonFillColor = Qt::blue;
@@ -142,25 +140,12 @@ void TestQgsVectorTileLayer::test_basic()
142
140
QCOMPARE ( mLayer ->properties (), Qgis::MapLayerProperties ( Qgis::MapLayerProperty::IsBasemapLayer ) );
143
141
}
144
142
145
-
146
- bool TestQgsVectorTileLayer::imageCheck ( const QString &testType, QgsVectorTileLayer *layer, QgsRectangle extent )
147
- {
148
- mMapSettings ->setExtent ( extent );
149
- mMapSettings ->setDestinationCrs ( layer->crs () );
150
- mMapSettings ->setOutputDpi ( 96 );
151
- QgsRenderChecker myChecker;
152
- myChecker.setControlPathPrefix ( QStringLiteral ( " vector_tile" ) );
153
- myChecker.setControlName ( " expected_" + testType );
154
- myChecker.setMapSettings ( *mMapSettings );
155
- myChecker.setColorTolerance ( 15 );
156
- const bool myResultFlag = myChecker.runTest ( testType, 0 );
157
- mReport += myChecker.report ();
158
- return myResultFlag;
159
- }
160
-
161
143
void TestQgsVectorTileLayer::test_render ()
162
144
{
163
- QVERIFY ( imageCheck ( " render_test_basic" , mLayer , mLayer ->extent () ) );
145
+ mMapSettings ->setExtent ( mLayer ->extent () );
146
+ mMapSettings ->setDestinationCrs ( mLayer ->crs () );
147
+ QVERIFY ( renderMapSettingsCheck ( QStringLiteral ( " render_test_basic" ),
148
+ QStringLiteral ( " render_test_basic" ), *mMapSettings , 0 , 15 ) );
164
149
}
165
150
166
151
void TestQgsVectorTileLayer::test_render_withClip ()
@@ -171,7 +156,11 @@ void TestQgsVectorTileLayer::test_render_withClip()
171
156
region2.setFeatureClip ( QgsMapClippingRegion::FeatureClippingType::ClipToIntersection );
172
157
mMapSettings ->addClippingRegion ( region );
173
158
mMapSettings ->addClippingRegion ( region2 );
174
- const bool res = imageCheck ( " render_painterclip" , mLayer , mLayer ->extent () );
159
+
160
+ mMapSettings ->setExtent ( mLayer ->extent () );
161
+ mMapSettings ->setDestinationCrs ( mLayer ->crs () );
162
+ const bool res = renderMapSettingsCheck ( QStringLiteral ( " render_painterclip" ),
163
+ QStringLiteral ( " render_painterclip" ), *mMapSettings , 0 , 15 );
175
164
mMapSettings ->setClippingRegions ( QList< QgsMapClippingRegion >() );
176
165
QVERIFY ( res );
177
166
}
@@ -213,11 +202,16 @@ void TestQgsVectorTileLayer::test_labeling()
213
202
Qt::transparent, 0 ,
214
203
Qt::transparent, Qt::transparent, 0 ) );
215
204
mLayer ->setRenderer ( rend ); // takes ownership
216
- bool res1 = imageCheck ( " render_test_labeling" , mLayer , mLayer ->extent () );
205
+
206
+ mMapSettings ->setExtent ( mLayer ->extent () );
207
+ mMapSettings ->setDestinationCrs ( mLayer ->crs () );
208
+ const bool res1 = renderMapSettingsCheck ( QStringLiteral ( " render_test_labeling" ),
209
+ QStringLiteral ( " render_test_labeling" ), *mMapSettings , 0 , 15 );
217
210
218
211
// disable label rendering
219
212
mLayer ->setLabelsEnabled ( false );
220
- bool res2 = imageCheck ( " render_test_labeling_disabled" , mLayer , mLayer ->extent () );
213
+ const bool res2 = renderMapSettingsCheck ( QStringLiteral ( " render_test_labeling_disabled" ),
214
+ QStringLiteral ( " render_test_labeling_disabled" ), *mMapSettings , 0 , 15 );
221
215
222
216
mLayer ->setRenderer ( oldRenderer );
223
217
@@ -556,7 +550,10 @@ void TestQgsVectorTileLayer::test_polygonWithLineStyle()
556
550
rend->setStyles ( QList<QgsVectorTileBasicRendererStyle>() << bgst << st );
557
551
layer->setRenderer ( rend ); // takes ownership
558
552
559
- QVERIFY ( imageCheck ( " render_test_polygon_with_line_style" , layer.get (), layer->extent () ) );
553
+ mMapSettings ->setExtent ( layer->extent () );
554
+ mMapSettings ->setDestinationCrs ( layer->crs () );
555
+ QVERIFY ( renderMapSettingsCheck ( QStringLiteral ( " render_test_polygon_with_line_style" ),
556
+ QStringLiteral ( " render_test_polygon_with_line_style" ), *mMapSettings , 0 , 15 ) );
560
557
}
561
558
562
559
void TestQgsVectorTileLayer::test_polygonWithMarker ()
@@ -592,7 +589,10 @@ void TestQgsVectorTileLayer::test_polygonWithMarker()
592
589
rend->setStyles ( QList<QgsVectorTileBasicRendererStyle>() << bgst << st );
593
590
layer->setRenderer ( rend ); // takes ownership
594
591
595
- QVERIFY ( imageCheck ( " render_test_polygon_with_marker" , layer.get (), layer->extent () ) );
592
+ mMapSettings ->setExtent ( layer->extent () );
593
+ mMapSettings ->setDestinationCrs ( layer->crs () );
594
+ QVERIFY ( renderMapSettingsCheck ( QStringLiteral ( " render_test_polygon_with_marker" ),
595
+ QStringLiteral ( " render_test_polygon_with_marker" ), *mMapSettings , 0 , 15 ) );
596
596
}
597
597
598
598
void TestQgsVectorTileLayer::test_styleMinZoomBeyondTileMaxZoom ()
@@ -631,7 +631,10 @@ void TestQgsVectorTileLayer::test_styleMinZoomBeyondTileMaxZoom()
631
631
rend->setStyles ( QList<QgsVectorTileBasicRendererStyle>() << bgst << st );
632
632
layer->setRenderer ( rend ); // takes ownership
633
633
634
- QVERIFY ( imageCheck ( " render_test_style_min_zoom" , layer.get (), QgsRectangle ( -1180017 , 4261973 , 155871 , 5474783 ) ) );
634
+ mMapSettings ->setExtent ( QgsRectangle ( -1180017 , 4261973 , 155871 , 5474783 ) );
635
+ mMapSettings ->setDestinationCrs ( layer->crs () );
636
+ QVERIFY ( renderMapSettingsCheck ( QStringLiteral ( " render_test_style_min_zoom" ),
637
+ QStringLiteral ( " render_test_style_min_zoom" ), *mMapSettings , 0 , 15 ) );
635
638
}
636
639
637
640
0 commit comments