AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

List possible matches when specifying invalid test function.

Browse Source 
List functions matching the command line parameter instead
of dumping all functions.

Change-Id: Ic504587b1036f09702f47579f90406333c4efbeb
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
This commit is contained in:
Friedemann Kleint 2012-10-29 12:18:11 +01:00 committed by The Qt Project
parent 8fedf68369
commit e880ff9cae
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/testlib/qtestcase.cpp
View File

@ -1203,12 +1203,15 @@ Q_TESTLIB_EXPORT bool printAvailableFunctions = false;
Q_TESTLIB_EXPORT QStringList testFunctions;
Q_TESTLIB_EXPORT QStringList testTags;
static void qPrintTestSlots(FILE *stream)
static void qPrintTestSlots(FILE *stream, const char *filter = 0)
{
for (int i = 0; i < QTest::currentTestObject->metaObject()->methodCount(); ++i) {
QMetaMethod sl = QTest::currentTestObject->metaObject()->method(i);
if (isValidSlot(sl))
fprintf(stream, "%s\n", sl.methodSignature().constData());
if (isValidSlot(sl)) {
const QByteArray signature = sl.methodSignature();
if (!filter || QString::fromLatin1(signature).contains(QLatin1String(filter), Qt::CaseInsensitive))
fprintf(stream, "%s\n", signature.constData());
}
}
}
@ -1570,9 +1573,10 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml)
qsnprintf(buf + off, qMin(512 - off, 3), "()"); // append "()"
int idx = QTest::currentTestObject->metaObject()->indexOfMethod(buf);
if (idx < 0 || !isValidSlot(QTest::currentTestObject->metaObject()->method(idx))) {
fprintf(stderr, "Unknown testfunction: '%s'\n", buf);
fprintf(stderr, "Available testfunctions:\n");
qPrintTestSlots(stderr);
fprintf(stderr, "Unknown test function: '%s'. Possible matches:\n", buf);
buf[off] = 0;
qPrintTestSlots(stderr, buf);
fprintf(stderr, "\n%s -functions\nlists all available test functions.\n", argv[0]);
exit(1);
}
testFuncs[testFuncCount].set(idx, data);