[auth] Skip unit tests if qca-ossl plugin is missing

dakcarto · dakcarto · commit dd9b37b4c9fd · 2015-09-26T02:01:15.000-06:00
diff --git a/tests/src/core/testqgsauthconfig.cpp b/tests/src/core/testqgsauthconfig.cpp
@@ -19,6 +19,7 @@
 #include <QStringList>
 
 #include "qgsapplication.h"
+#include "qgsauthcrypto.h"
 #include "qgsauthconfig.h"
 
 /** \ingroup UnitTests
@@ -50,6 +51,8 @@ void TestQgsAuthConfig::initTestCase()
 {
   QgsApplication::init();
   QgsApplication::initQgis();
+  if ( QgsAuthCrypto::isDisabled() )
+    QSKIP( "QCA's qca-ossl plugin is missing, skipping test case", SkipAll );
 }
 
 void TestQgsAuthConfig::cleanupTestCase()
diff --git a/tests/src/core/testqgsauthcrypto.cpp b/tests/src/core/testqgsauthcrypto.cpp
@@ -82,7 +82,8 @@ void TestQgsAuthCrypto::initTestCase()
 {
   QgsApplication::init();
   QgsApplication::initQgis();
-  QVERIFY2( !QgsAuthCrypto::isDisabled(), "QCA's qca-ossl plugin is missing, skipping test" );
+  if ( QgsAuthCrypto::isDisabled() )
+    QSKIP( "QCA's qca-ossl plugin is missing, skipping test case", SkipAll );
 }
 
 void TestQgsAuthCrypto::cleanupTestCase()

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`#include <QStringList>`
`20`	`20`
`21`	`21`	`#include "qgsapplication.h"`
	`22`	`+#include "qgsauthcrypto.h"`
`22`	`23`	`#include "qgsauthconfig.h"`
`23`	`24`
`24`	`25`	`/** \ingroup UnitTests`
`@@ -50,6 +51,8 @@ void TestQgsAuthConfig::initTestCase()`
`50`	`51`	`{`
`51`	`52`	`QgsApplication::init();`
`52`	`53`	`QgsApplication::initQgis();`
	`54`	`+ if ( QgsAuthCrypto::isDisabled() )`
	`55`	`+ QSKIP( "QCA's qca-ossl plugin is missing, skipping test case", SkipAll );`
`53`	`56`	`}`
`54`	`57`
`55`	`58`	`void TestQgsAuthConfig::cleanupTestCase()`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,8 @@ void TestQgsAuthCrypto::initTestCase()`
`82`	`82`	`{`
`83`	`83`	`QgsApplication::init();`
`84`	`84`	`QgsApplication::initQgis();`
`85`		`- QVERIFY2( !QgsAuthCrypto::isDisabled(), "QCA's qca-ossl plugin is missing, skipping test" );`
	`85`	`+ if ( QgsAuthCrypto::isDisabled() )`
	`86`	`+ QSKIP( "QCA's qca-ossl plugin is missing, skipping test case", SkipAll );`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`void TestQgsAuthCrypto::cleanupTestCase()`