Skip to content

Commit e93f776

Browse files
elpasoelpaso
committedJan 9, 2018
[test] Do not check the unique_ptr but get
Because std::unique_ptr is not implicitly convertible to bool (why it works locally remains a mistery to me)
·
ltr-3_40final-3_0_0
1 parent a5fc570 commit e93f776

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed
 

‎tests/src/core/testqgscompositionconverter.cpp

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ void TestQgsCompositionConverter::importComposerTemplateLabel()
145145
QgsProject project;
146146
std::unique_ptr< QgsLayout > layout( QgsCompositionConverter::createLayoutFromCompositionXml( docElem, &project ) );
147147

148-
QVERIFY( layout );
148+
QVERIFY( layout.get() );
149149
QCOMPARE( layout->pageCollection()->pageCount(), 1 );
150150

151151
QList<QgsLayoutItemLabel *> items;
@@ -173,11 +173,10 @@ void TestQgsCompositionConverter::importComposerTemplateLabel()
173173
void TestQgsCompositionConverter::importComposerTemplateShape()
174174
{
175175
QDomElement docElem( loadComposition( "2x_template_shape.qpt" ) );
176-
QgsReadWriteContext context;
177176
QgsProject project;
178177
std::unique_ptr< QgsLayout > layout( QgsCompositionConverter::createLayoutFromCompositionXml( docElem, &project ) );
179178

180-
QVERIFY( layout );
179+
QVERIFY( layout.get() );
181180
QCOMPARE( layout->pageCollection()->pageCount(), 1 );
182181

183182
QList<QgsLayoutItemShape *> items;
@@ -209,7 +208,7 @@ void TestQgsCompositionConverter::importComposerTemplatePicture()
209208
QVERIFY( !docElem.isNull() );
210209
QgsProject project;
211210
std::unique_ptr< QgsLayout > layout( QgsCompositionConverter::createLayoutFromCompositionXml( docElem, &project ) );
212-
QVERIFY( layout );
211+
QVERIFY( layout.get() );
213212
QCOMPARE( layout->pageCollection()->pageCount(), 1 );
214213

215214
QList<QgsLayoutItemPicture *> items;
@@ -238,7 +237,7 @@ void TestQgsCompositionConverter::importComposerTemplatePolygon()
238237
QVERIFY( !docElem.isNull() );
239238
QgsProject project;
240239
std::unique_ptr< QgsLayout > layout( QgsCompositionConverter::createLayoutFromCompositionXml( docElem, &project ) );
241-
QVERIFY( layout );
240+
QVERIFY( layout.get() );
242241
QCOMPARE( layout->pageCollection()->pageCount(), 1 );
243242

244243
QList<QgsLayoutItemPolygon *> items;
@@ -261,7 +260,7 @@ void TestQgsCompositionConverter::importComposerTemplatePolyline()
261260
QVERIFY( !docElem.isNull() );
262261
QgsProject project;
263262
std::unique_ptr< QgsLayout > layout( QgsCompositionConverter::createLayoutFromCompositionXml( docElem, &project ) );
264-
QVERIFY( layout );
263+
QVERIFY( layout.get() );
265264
QCOMPARE( layout->pageCollection()->pageCount(), 1 );
266265

267266
QList<QgsLayoutItemPolyline *> items;
@@ -288,7 +287,7 @@ void TestQgsCompositionConverter::importComposerTemplateArrow()
288287
QVERIFY( !docElem.isNull() );
289288
QgsProject project;
290289
std::unique_ptr< QgsLayout > layout( QgsCompositionConverter::createLayoutFromCompositionXml( docElem, &project ) );
291-
QVERIFY( layout );
290+
QVERIFY( layout.get() );
292291
QCOMPARE( layout->pageCollection()->pageCount(), 1 );
293292

294293
QList<QgsLayoutItemPolyline *> items;
@@ -314,7 +313,7 @@ void TestQgsCompositionConverter::importComposerTemplateMap()
314313
QVERIFY( !docElem.isNull() );
315314
QgsProject project;
316315
std::unique_ptr< QgsLayout > layout( QgsCompositionConverter::createLayoutFromCompositionXml( docElem, &project ) );
317-
QVERIFY( layout );
316+
QVERIFY( layout.get() );
318317
QCOMPARE( layout->pageCollection()->pageCount(), 1 );
319318

320319
QList<QgsLayoutItemMap *> items;
@@ -336,7 +335,7 @@ void TestQgsCompositionConverter::importComposerTemplateLegend()
336335
QVERIFY( !docElem.isNull() );
337336
QgsProject project;
338337
std::unique_ptr< QgsLayout > layout( QgsCompositionConverter::createLayoutFromCompositionXml( docElem, &project ) );
339-
QVERIFY( layout );
338+
QVERIFY( layout.get() );
340339
QCOMPARE( layout->pageCollection()->pageCount(), 1 );
341340

342341
QList<QgsLayoutItemLegend *> items;
@@ -358,7 +357,7 @@ void TestQgsCompositionConverter::importComposerTemplateScaleBar()
358357
QVERIFY( !docElem.isNull() );
359358
QgsProject project;
360359
std::unique_ptr< QgsLayout > layout( QgsCompositionConverter::createLayoutFromCompositionXml( docElem, &project ) );
361-
QVERIFY( layout );
360+
QVERIFY( layout.get() );
362361
QCOMPARE( layout->pageCollection()->pageCount(), 1 );
363362

364363
QList<QgsLayoutItemScaleBar *> items;
@@ -380,7 +379,7 @@ void TestQgsCompositionConverter::importComposerTemplate()
380379
QgsProject project;
381380
std::unique_ptr< QgsLayout > layout( QgsCompositionConverter::createLayoutFromCompositionXml( docElem, &project ) );
382381

383-
QVERIFY( layout );
382+
QVERIFY( layout.get() );
384383
QCOMPARE( layout->pageCollection()->pageCount(), 2 );
385384

386385
checkRenderedImage( layout.get(), QTest::currentTestFunction(), 0 );

0 commit comments

Comments
 (0)
Please sign in to comment.