Replace Q_ASSERT with QVERIFY in tests

m-kuhn · m-kuhn · commit e552b9b2ded8 · 2017-12-27T18:28:49.000+01:00
Q_ASSERT's are only evaluated in debug mode. However, tests should trigger in debug or release mode.
diff --git a/tests/src/app/testqgsattributetable.cpp b/tests/src/app/testqgsattributetable.cpp
@@ -252,7 +252,7 @@ void TestQgsAttributeTable::testRegression15974()
   QgsFeature f1( shpLayer->dataProvider()->fields(), 1 );
   QgsGeometry geom;
   geom = QgsGeometry().fromWkt( QStringLiteral( "polygon((0 0, 0 1, 1 1, 1 0, 0 0))" ) );
-  Q_ASSERT( geom.isGeosValid() );
+  QVERIFY( geom.isGeosValid() );
   f1.setGeometry( geom );
   QgsFeature f2( shpLayer->dataProvider()->fields(), 2 );
   f2.setGeometry( geom );
diff --git a/tests/src/core/testmaprendererjob.cpp b/tests/src/core/testmaprendererjob.cpp
@@ -50,7 +50,7 @@ class TestQgsMapRendererJob : public QObject
 static QString _loadLayer( QString path )
 {
   QgsMapLayer *layer = new QgsVectorLayer( path, "testlayer", "ogr" );
-  Q_ASSERT( layer->isValid() );
+  QVERIFY( layer->isValid() );
   QgsProject::instance()->addMapLayer( layer );
   return layer->id();
 }
diff --git a/tests/src/core/testqgsdxfexport.cpp b/tests/src/core/testqgsdxfexport.cpp
@@ -73,15 +73,15 @@ void TestQgsDxfExport::init()
 {
   QString filename = QStringLiteral( TEST_DATA_DIR ) + "/points.shp";
   mPointLayer = new QgsVectorLayer( filename, QStringLiteral( "points" ), QStringLiteral( "ogr" ) );
-  Q_ASSERT( mPointLayer->isValid() );
+  QVERIFY( mPointLayer->isValid() );
   QgsProject::instance()->addMapLayer( mPointLayer );
   filename = QStringLiteral( TEST_DATA_DIR ) + "/lines.shp";
   mLineLayer = new QgsVectorLayer( filename, QStringLiteral( "lines" ), QStringLiteral( "ogr" ) );
-  Q_ASSERT( mLineLayer->isValid() );
+  QVERIFY( mLineLayer->isValid() );
   QgsProject::instance()->addMapLayer( mLineLayer );
   filename = QStringLiteral( TEST_DATA_DIR ) + "/polys.shp";
   mPolygonLayer = new QgsVectorLayer( filename, QStringLiteral( "polygons" ), QStringLiteral( "ogr" ) );
-  Q_ASSERT( mPolygonLayer->isValid() );
+  QVERIFY( mPolygonLayer->isValid() );
   QgsProject::instance()->addMapLayer( mPolygonLayer );
 }
 
diff --git a/tests/src/core/testqgsexpressioncontext.cpp b/tests/src/core/testqgsexpressioncontext.cpp
@@ -533,13 +533,13 @@ void TestQgsExpressionContext::takeScopes()
   auto scopes = context.takeScopes();
 
   QCOMPARE( scopes.length(), 2 );
-  Q_ASSERT( scopes.at( 0 )->hasVariable( "test_global" ) );
-  Q_ASSERT( scopes.at( 1 )->hasVariable( "test_project" ) );
+  QVERIFY( scopes.at( 0 )->hasVariable( "test_global" ) );
+  QVERIFY( scopes.at( 1 )->hasVariable( "test_project" ) );
 
   qDeleteAll( scopes );
 
-  Q_ASSERT( !context.variable( "test_global" ).isValid() );
-  Q_ASSERT( !context.variable( "test_project" ).isValid() );
+  QVERIFY( !context.variable( "test_global" ).isValid() );
+  QVERIFY( !context.variable( "test_project" ).isValid() );
 }
 
 void TestQgsExpressionContext::globalScope()
diff --git a/tests/src/core/testqgslabelingengine.cpp b/tests/src/core/testqgslabelingengine.cpp
@@ -86,7 +86,7 @@ void TestQgsLabelingEngine::init()
 {
   QString filename = QStringLiteral( TEST_DATA_DIR ) + "/points.shp";
   vl = new QgsVectorLayer( filename, QStringLiteral( "points" ), QStringLiteral( "ogr" ) );
-  Q_ASSERT( vl->isValid() );
+  QVERIFY( vl->isValid() );
   QgsProject::instance()->addMapLayer( vl );
 }
 
@@ -179,7 +179,7 @@ void TestQgsLabelingEngine::testDiagrams()
 
   bool res;
   vl->loadNamedStyle( QStringLiteral( TEST_DATA_DIR ) + "/points_diagrams.qml", res );
-  Q_ASSERT( res );
+  QVERIFY( res );
 
   QgsLabelingEngine engine;
   engine.setMapSettings( mapSettings );
@@ -353,7 +353,7 @@ void TestQgsLabelingEngine::zOrder()
   //add a second layer
   QString filename = QStringLiteral( TEST_DATA_DIR ) + "/points.shp";
   QgsVectorLayer *vl2 = new QgsVectorLayer( filename, QStringLiteral( "points" ), QStringLiteral( "ogr" ) );
-  Q_ASSERT( vl2->isValid() );
+  QVERIFY( vl2->isValid() );
   QgsProject::instance()->addMapLayer( vl2 );
 
   QgsPalLayerSettings pls2( pls1 );
diff --git a/tests/src/core/testqgstaskmanager.cpp b/tests/src/core/testqgstaskmanager.cpp
@@ -83,7 +83,7 @@ class TestTerminationTask : public TestTask
     ~TestTerminationTask() override
     {
       //make sure task has been terminated by manager prior to deletion
-      Q_ASSERT( status() == QgsTask::Terminated );
+      QVERIFY( status() == QgsTask::Terminated );
     }
 
   protected:
@@ -167,7 +167,7 @@ class FinishTask : public QgsTask
 
     void finished( bool result ) override
     {
-      Q_ASSERT( QApplication::instance()->thread() == QThread::currentThread() );
+      QVERIFY( QApplication::instance()->thread() == QThread::currentThread() );
       *resultObtained = result;
     }
 };
diff --git a/tests/src/core/testqgstracer.cpp b/tests/src/core/testqgstracer.cpp
@@ -338,7 +338,7 @@ void TestQgsTracer::testCurved()
 
   QgsPolylineXY points1 = tracer.findShortestPath( QgsPointXY( 0, 0 ), QgsPointXY( 10, 10 ) );
 
-  QVERIFY( points1.count() != 0 );
+  QVERIFY( !points1.isEmpty() );
 
   QgsGeometry tmpG1 = QgsGeometry::fromPolylineXY( points1 );
   double l = tmpG1.length();
diff --git a/tests/src/gui/testqgsattributeform.cpp b/tests/src/gui/testqgsattributeform.cpp
@@ -188,10 +188,10 @@ void TestQgsAttributeForm::testFieldMultiConstraints()
   ww3 = qobject_cast<QgsEditorWidgetWrapper *>( form.mWidgets[3] );
 
   // no constraint so we expect an empty label
-  Q_ASSERT( constraintsLabel( &form, ww0 )->text().isEmpty() );
-  Q_ASSERT( constraintsLabel( &form, ww1 )->text().isEmpty() );
-  Q_ASSERT( constraintsLabel( &form, ww2 )->text().isEmpty() );
-  Q_ASSERT( constraintsLabel( &form, ww3 )->text().isEmpty() );
+  QVERIFY( constraintsLabel( &form, ww0 )->text().isEmpty() );
+  QVERIFY( constraintsLabel( &form, ww1 )->text().isEmpty() );
+  QVERIFY( constraintsLabel( &form, ww2 )->text().isEmpty() );
+  QVERIFY( constraintsLabel( &form, ww3 )->text().isEmpty() );
 
   // update constraint
   layer->setConstraintExpression( 0, QStringLiteral( "col0 < (col1 * col2)" ) );
diff --git a/tests/src/gui/testqgsfeaturelistcombobox.cpp b/tests/src/gui/testqgsfeaturelistcombobox.cpp
@@ -99,7 +99,7 @@ void TestQgsFeatureListComboBox::testSetGetLayer()
 {
   std::unique_ptr<QgsFeatureListComboBox> cb( new QgsFeatureListComboBox() );
 
-  Q_ASSERT( cb->sourceLayer() == nullptr );
+  QVERIFY( cb->sourceLayer() == nullptr );
   cb->setSourceLayer( mLayer.get() );
   QCOMPARE( cb->sourceLayer(), mLayer.get() );
 }
@@ -109,25 +109,25 @@ void TestQgsFeatureListComboBox::testSetGetForeignKey()
   QgsFeatureListComboBox *cb = new QgsFeatureListComboBox();
   // std::unique_ptr<QgsFeatureListComboBox> cb( new QgsFeatureListComboBox() );
 
-  Q_ASSERT( cb->identifierValue().isNull() );
+  QVERIFY( cb->identifierValue().isNull() );
 
   cb->setSourceLayer( mLayer.get() );
   cb->setDisplayExpression( "\"material\"" );
   cb->lineEdit()->setText( "ro" );
   emit cb->lineEdit()->textChanged( "ro" );
-  Q_ASSERT( cb->identifierValue().isNull() );
+  QVERIFY( cb->identifierValue().isNull() );
 
   waitForLoaded( cb );
 
-  Q_ASSERT( cb->identifierValue().isNull() );
+  QVERIFY( cb->identifierValue().isNull() );
 
   cb->setIdentifierValue( 20 );
   QCOMPARE( cb->identifierValue(), QVariant( 20 ) );
 }
 
 void TestQgsFeatureListComboBox::testAllowNull()
 {
-  Q_ASSERT( false );
+  QVERIFY( false );
   // Note to self: implement this!
 }
 
diff --git a/tests/src/gui/testqgsfiledownloader.cpp b/tests/src/gui/testqgsfiledownloader.cpp
@@ -133,7 +133,7 @@ void TestQgsFileDownloader::init()
   mCompleted = false;
   mExited = false;
   mTempFile = new QTemporaryFile();
-  Q_ASSERT( mTempFile->open() );
+  QVERIFY( mTempFile->open() );
   mTempFile->close();
 }
 
diff --git a/tests/src/gui/testrenderergui.cpp b/tests/src/gui/testrenderergui.cpp
@@ -55,8 +55,8 @@ void TestRendererGUI::loadLayers()
 void TestRendererGUI::setRenderer()
 {
   QgsMapLayer *layer = mMapCanvas->layer( 0 );
-  Q_ASSERT( layer );
-  Q_ASSERT( layer->type() == QgsMapLayer::VectorLayer );
+  QVERIFY( layer );
+  QVERIFY( layer->type() == QgsMapLayer::VectorLayer );
   QgsVectorLayer *vlayer = static_cast<QgsVectorLayer *>( layer );
 
   QgsRendererPropertiesDialog dlg( vlayer, QgsStyle::defaultStyle() );
diff --git a/tests/src/providers/grass/testqgsgrassprovider.cpp b/tests/src/providers/grass/testqgsgrassprovider.cpp
@@ -1209,7 +1209,7 @@ void TestQgsGrassProvider::edit()
         grassLayer->startEditing();
         grassProvider->startEditing( grassLayer );
 
-        Q_ASSERT( expectedLayer );
+        QVERIFY( expectedLayer );
         expectedLayer->startEditing();
       }
 
@@ -1577,7 +1577,7 @@ bool TestQgsGrassProvider::compare( QMap<QString, QgsVectorLayer *> layers, bool
   Q_FOREACH ( const QString &grassUri, layers.keys() )
   {
     QgsVectorLayer *layer = layers.value( grassUri );
-    Q_ASSERT( layer );
+    QVERIFY( layer );
     if ( !compare( grassUri, layer, ok ) )
     {
       reportRow( "comparison failed: " + grassUri );

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class TestQgsMapRendererJob : public QObject`
`50`	`50`	`static QString _loadLayer( QString path )`
`51`	`51`	`{`
`52`	`52`	`QgsMapLayer *layer = new QgsVectorLayer( path, "testlayer", "ogr" );`
`53`		`- Q_ASSERT( layer->isValid() );`
	`53`	`+ QVERIFY( layer->isValid() );`
`54`	`54`	`QgsProject::instance()->addMapLayer( layer );`
`55`	`55`	`return layer->id();`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ class TestTerminationTask : public TestTask`
`83`	`83`	`~TestTerminationTask() override`
`84`	`84`	`{`
`85`	`85`	`//make sure task has been terminated by manager prior to deletion`
`86`		`- Q_ASSERT( status() == QgsTask::Terminated );`
	`86`	`+ QVERIFY( status() == QgsTask::Terminated );`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`protected:`
`@@ -167,7 +167,7 @@ class FinishTask : public QgsTask`
`167`	`167`
`168`	`168`	`void finished( bool result ) override`
`169`	`169`	`{`
`170`		`- Q_ASSERT( QApplication::instance()->thread() == QThread::currentThread() );`
	`170`	`+ QVERIFY( QApplication::instance()->thread() == QThread::currentThread() );`
`171`	`171`	`*resultObtained = result;`
`172`	`172`	`}`
`173`	`173`	`};`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ void TestQgsFileDownloader::init()`
`133`	`133`	`mCompleted = false;`
`134`	`134`	`mExited = false;`
`135`	`135`	`mTempFile = new QTemporaryFile();`
`136`		`- Q_ASSERT( mTempFile->open() );`
	`136`	`+ QVERIFY( mTempFile->open() );`
`137`	`137`	`mTempFile->close();`
`138`	`138`	`}`
`139`	`139`
Original file line number	Diff line number	Diff line change
`@@ -1209,7 +1209,7 @@ void TestQgsGrassProvider::edit()`
`1209`	`1209`	`grassLayer->startEditing();`
`1210`	`1210`	`grassProvider->startEditing( grassLayer );`
`1211`	`1211`
`1212`		`- Q_ASSERT( expectedLayer );`
	`1212`	`+ QVERIFY( expectedLayer );`
`1213`	`1213`	`expectedLayer->startEditing();`
`1214`	`1214`	`}`
`1215`	`1215`
`@@ -1577,7 +1577,7 @@ bool TestQgsGrassProvider::compare( QMap<QString, QgsVectorLayer *> layers, bool`
`1577`	`1577`	`Q_FOREACH ( const QString &grassUri, layers.keys() )`
`1578`	`1578`	`{`
`1579`	`1579`	`QgsVectorLayer *layer = layers.value( grassUri );`
`1580`		`- Q_ASSERT( layer );`
	`1580`	`+ QVERIFY( layer );`
`1581`	`1581`	`if ( !compare( grassUri, layer, ok ) )`
`1582`	`1582`	`{`
`1583`	`1583`	`reportRow( "comparison failed: " + grassUri );`