whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved failure messages from tst_qlibrary 

Use QVERIFY2 to include errorString() in the failure message.

Change-Id: Iecb4e7694c3d71bfb786908a6a6c26b187d60c8f
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
bb10
Rohan McGovern 2011-11-24 15:01:49 +10:00 committed by Qt by Nokia
parent e15548d3e4
commit ab79c7c092
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
View File

@ -193,13 +193,12 @@ void tst_QLibrary::version()
#if !defined(Q_OS_AIX) && !defined(Q_OS_WIN)
QString currDir = QDir::currentPath();
QLibrary library( currDir + QLatin1Char('/') + lib, loadversion );
bool ok = library.load();
QVERIFY(ok);
QVERIFY2(library.load(), qPrintable(library.errorString()));
VersionFunction fnVersion = (VersionFunction)library.resolve("mylibversion");
QVERIFY(fnVersion);
QCOMPARE(fnVersion(), resultversion);
QVERIFY(library.unload());
QVERIFY2(library.unload(), qPrintable(library.errorString()));
#else
Q_UNUSED(lib);
Q_UNUSED(loadversion);
@ -241,8 +240,8 @@ void tst_QLibrary::load()
QLibrary library( lib );
bool ok = library.load();
if ( result ) {
QVERIFY( ok );
QVERIFY(library.unload());
QVERIFY2( ok, qPrintable(library.errorString()) );
QVERIFY2( library.unload(), qPrintable(library.errorString()) );
} else {
QVERIFY( !ok );
}
@ -272,7 +271,7 @@ void tst_QLibrary::unload()
library.load();
bool ok = library.unload();
if ( result ) {
QVERIFY( ok );
QVERIFY2( ok, qPrintable(library.errorString()) );
} else {
QVERIFY( !ok );
}