diff options
author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-12-09 10:34:28 +1000 |
---|---|---|
committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-12-09 10:34:52 +1000 |
commit | 2b3d1477069b73f592f206b2ee8f2293c317f87e (patch) | |
tree | 7f97227d1fdab6c51da215d0e40f46e796348d4a | |
parent | e57f248f34e4742fa73a123c7ed8366f74a08f50 (diff) |
QDeclarative -> QuickTest for the test classes
-rw-r--r-- | src/imports/testlib/main.cpp | 6 | ||||
-rw-r--r-- | src/quicktestlib/quicktest.cpp (renamed from src/quicktestlib/qdeclarativetest.cpp) | 14 | ||||
-rw-r--r-- | src/quicktestlib/quicktest.h (renamed from src/quicktestlib/qdeclarativetest.h) | 4 | ||||
-rw-r--r-- | src/quicktestlib/quicktestlib.pro | 8 | ||||
-rw-r--r-- | src/quicktestlib/quicktestresult.cpp (renamed from src/quicktestlib/qdeclarativetestresult.cpp) | 104 | ||||
-rw-r--r-- | src/quicktestlib/quicktestresult_p.h (renamed from src/quicktestlib/qdeclarativetestresult_p.h) | 18 | ||||
-rw-r--r-- | tests/qmlauto/tst_qmlauto.cpp | 2 | ||||
-rw-r--r-- | tests/qmlexample/tst_qmlexample.cpp | 2 |
8 files changed, 79 insertions, 79 deletions
diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp index d04bccf..c91decd 100644 --- a/src/imports/testlib/main.cpp +++ b/src/imports/testlib/main.cpp @@ -45,11 +45,11 @@ #include <QtScript/qscriptcontext.h> #include <QtScript/qscriptcontextinfo.h> #include <QtScript/qscriptengine.h> -#include "qdeclarativetestresult_p.h" +#include "quicktestresult_p.h" QT_BEGIN_NAMESPACE -QML_DECLARE_TYPE(QDeclarativeTestResult) +QML_DECLARE_TYPE(QuickTestResult) // Copied from qdeclarativedebughelper_p.h in Qt, to avoid a dependency // on a private header from Qt. @@ -104,7 +104,7 @@ public: virtual void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuickTest")); - qmlRegisterType<QDeclarativeTestResult>(uri,1,0,"TestResult"); + qmlRegisterType<QuickTestResult>(uri,1,0,"TestResult"); } void initializeEngine(QDeclarativeEngine *engine, const char *) { diff --git a/src/quicktestlib/qdeclarativetest.cpp b/src/quicktestlib/quicktest.cpp index ed0f12e..f1afc0a 100644 --- a/src/quicktestlib/qdeclarativetest.cpp +++ b/src/quicktestlib/quicktest.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qdeclarativetest.h" -#include "qdeclarativetestresult_p.h" +#include "quicktest.h" +#include "quicktestresult_p.h" #include "qtestsystem.h" #include <QApplication> #include <QtDeclarative/qdeclarative.h> @@ -127,8 +127,8 @@ int qtest_quick_main(int argc, char **argv, const char *name, qtest_create_viewp } // Parse the command-line arguments. - QDeclarativeTestResult::parseArgs(argc, argv); - QDeclarativeTestResult::setProgramName(name); + QuickTestResult::parseArgs(argc, argv); + QuickTestResult::setProgramName(name); // Scan through all of the "tst_*.qml" files and run each of them // in turn with a QDeclarativeView. @@ -178,10 +178,10 @@ int qtest_quick_main(int argc, char **argv, const char *name, qtest_create_viewp } // Flush the current logging stream. - QDeclarativeTestResult::setProgramName(0); + QuickTestResult::setProgramName(0); // Return the number of failures as the exit code. - int code = QDeclarativeTestResult::exitCode(); + int code = QuickTestResult::exitCode(); if (!code && compileFail) ++code; return code; @@ -189,4 +189,4 @@ int qtest_quick_main(int argc, char **argv, const char *name, qtest_create_viewp QT_END_NAMESPACE -#include "qdeclarativetest.moc" +#include "quicktest.moc" diff --git a/src/quicktestlib/qdeclarativetest.h b/src/quicktestlib/quicktest.h index f89868d..4cf64be 100644 --- a/src/quicktestlib/qdeclarativetest.h +++ b/src/quicktestlib/quicktest.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QDECLARATIVETEST_H -#define QDECLARATIVETEST_H +#ifndef QUICKTEST_H +#define QUICKTEST_H #include "quicktestglobal.h" #include <QtGui/qwidget.h> diff --git a/src/quicktestlib/quicktestlib.pro b/src/quicktestlib/quicktestlib.pro index 1ca306e..e319c56 100644 --- a/src/quicktestlib/quicktestlib.pro +++ b/src/quicktestlib/quicktestlib.pro @@ -25,13 +25,13 @@ symbian { } SOURCES += \ - qdeclarativetest.cpp \ - qdeclarativetestresult.cpp + quicktest.cpp \ + quicktestresult.cpp HEADERS += \ quicktestglobal.h \ - qdeclarativetest.h + quicktest.h PRIVATE_HEADERS += \ - qdeclarativetestresult_p.h + quicktestresult_p.h PUBLIC_HEADERS += $$HEADERS HEADERS += $$PRIVATE_HEADERS diff --git a/src/quicktestlib/qdeclarativetestresult.cpp b/src/quicktestlib/quicktestresult.cpp index e5e8a70..b54f64f 100644 --- a/src/quicktestlib/qdeclarativetestresult.cpp +++ b/src/quicktestlib/quicktestresult.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativetestresult_p.h" +#include "quicktestresult_p.h" #include "qtestcase.h" #include "qtestsystem.h" #include "qtestresult_p.h" @@ -55,14 +55,14 @@ QT_BEGIN_NAMESPACE static const char *globalProgramName = 0; static bool loggingStarted = false; -class QDeclarativeTestResultPrivate +class QuickTestResultPrivate { public: - QDeclarativeTestResultPrivate() + QuickTestResultPrivate() : table(0) { } - ~QDeclarativeTestResultPrivate() + ~QuickTestResultPrivate() { delete table; } @@ -76,13 +76,13 @@ public: QTestTable *table; }; -QByteArray QDeclarativeTestResultPrivate::intern(const QString &str) +QByteArray QuickTestResultPrivate::intern(const QString &str) { QByteArray bstr = str.toUtf8(); return *(internedStrings.insert(bstr)); } -void QDeclarativeTestResultPrivate::updateTestObjectName() +void QuickTestResultPrivate::updateTestObjectName() { // In plain logging mode we use the TestCase name as the // class name so that multiple TestCase elements will report @@ -101,12 +101,12 @@ void QDeclarativeTestResultPrivate::updateTestObjectName() } } -QDeclarativeTestResult::QDeclarativeTestResult(QObject *parent) - : QObject(parent), d_ptr(new QDeclarativeTestResultPrivate) +QuickTestResult::QuickTestResult(QObject *parent) + : QObject(parent), d_ptr(new QuickTestResultPrivate) { } -QDeclarativeTestResult::~QDeclarativeTestResult() +QuickTestResult::~QuickTestResult() { } @@ -118,15 +118,15 @@ QDeclarativeTestResult::~QDeclarativeTestResult() \sa functionName */ -QString QDeclarativeTestResult::testCaseName() const +QString QuickTestResult::testCaseName() const { - Q_D(const QDeclarativeTestResult); + Q_D(const QuickTestResult); return d->testCaseName; } -void QDeclarativeTestResult::setTestCaseName(const QString &name) +void QuickTestResult::setTestCaseName(const QString &name) { - Q_D(QDeclarativeTestResult); + Q_D(QuickTestResult); d->testCaseName = name; d->updateTestObjectName(); emit testCaseNameChanged(); @@ -141,15 +141,15 @@ void QDeclarativeTestResult::setTestCaseName(const QString &name) \sa testCaseName */ -QString QDeclarativeTestResult::functionName() const +QString QuickTestResult::functionName() const { - Q_D(const QDeclarativeTestResult); + Q_D(const QuickTestResult); return d->functionName; } -void QDeclarativeTestResult::setFunctionName(const QString &name) +void QuickTestResult::setFunctionName(const QString &name) { - Q_D(QDeclarativeTestResult); + Q_D(QuickTestResult); if (!name.isEmpty()) { // In plain logging mode, we use the function name directly. // In XML logging mode, we use "testCase__functionName" as the @@ -169,12 +169,12 @@ void QDeclarativeTestResult::setFunctionName(const QString &name) emit functionNameChanged(); } -QDeclarativeTestResult::FunctionType QDeclarativeTestResult::functionType() const +QuickTestResult::FunctionType QuickTestResult::functionType() const { return FunctionType(QTestResult::currentTestLocation()); } -void QDeclarativeTestResult::setFunctionType(FunctionType type) +void QuickTestResult::setFunctionType(FunctionType type) { QTestResult::setCurrentTestLocation(QTestResult::TestLocation(type)); emit functionTypeChanged(); @@ -186,7 +186,7 @@ void QDeclarativeTestResult::setFunctionType(FunctionType type) This property defines the tag for the current row in a data-driven test, or an empty string if not a data-driven test. */ -QString QDeclarativeTestResult::dataTag() const +QString QuickTestResult::dataTag() const { const char *tag = QTestResult::currentDataTag(); if (tag) @@ -195,7 +195,7 @@ QString QDeclarativeTestResult::dataTag() const return QString(); } -void QDeclarativeTestResult::setDataTag(const QString &tag) +void QuickTestResult::setDataTag(const QString &tag) { if (!tag.isEmpty()) { QTestData *data = &(QTest::newRow(tag.toUtf8().constData())); @@ -215,7 +215,7 @@ void QDeclarativeTestResult::setDataTag(const QString &tag) \sa skipped, dataFailed */ -bool QDeclarativeTestResult::isFailed() const +bool QuickTestResult::isFailed() const { return QTestResult::testFailed(); } @@ -229,7 +229,7 @@ bool QDeclarativeTestResult::isFailed() const \sa failed */ -bool QDeclarativeTestResult::isDataFailed() const +bool QuickTestResult::isDataFailed() const { return QTestResult::currentTestFailed(); } @@ -242,12 +242,12 @@ bool QDeclarativeTestResult::isDataFailed() const \sa failed */ -bool QDeclarativeTestResult::isSkipped() const +bool QuickTestResult::isSkipped() const { return QTestResult::skipCurrentTest(); } -void QDeclarativeTestResult::setSkipped(bool skip) +void QuickTestResult::setSkipped(bool skip) { QTestResult::setSkipCurrentTest(skip); emit skippedChanged(); @@ -260,7 +260,7 @@ void QDeclarativeTestResult::setSkipped(bool skip) \sa failCount, skipCount */ -int QDeclarativeTestResult::passCount() const +int QuickTestResult::passCount() const { return QTestResult::passCount(); } @@ -272,7 +272,7 @@ int QDeclarativeTestResult::passCount() const \sa passCount, skipCount */ -int QDeclarativeTestResult::failCount() const +int QuickTestResult::failCount() const { return QTestResult::failCount(); } @@ -284,7 +284,7 @@ int QDeclarativeTestResult::failCount() const \sa passCount, failCount */ -int QDeclarativeTestResult::skipCount() const +int QuickTestResult::skipCount() const { return QTestResult::skipCount(); } @@ -294,7 +294,7 @@ int QDeclarativeTestResult::skipCount() const Resets all pass/fail/skip counters and prepare for testing. */ -void QDeclarativeTestResult::reset() +void QuickTestResult::reset() { if (!globalProgramName) // Only if run via qmlviewer. QTestResult::reset(); @@ -308,11 +308,11 @@ void QDeclarativeTestResult::reset() \sa stopLogging() */ -void QDeclarativeTestResult::startLogging() +void QuickTestResult::startLogging() { // The program name is used for logging headers and footers if it // is set. Otherwise the test case name is used. - Q_D(QDeclarativeTestResult); + Q_D(QuickTestResult); if (loggingStarted) return; const char *saved = QTestResult::currentTestObjectName(); @@ -334,9 +334,9 @@ void QDeclarativeTestResult::startLogging() \sa startLogging() */ -void QDeclarativeTestResult::stopLogging() +void QuickTestResult::stopLogging() { - Q_D(QDeclarativeTestResult); + Q_D(QuickTestResult); if (globalProgramName) return; // Logging will be stopped by setProgramName(0). const char *saved = QTestResult::currentTestObjectName(); @@ -345,33 +345,33 @@ void QDeclarativeTestResult::stopLogging() QTestResult::setCurrentTestObject(saved); } -void QDeclarativeTestResult::initTestTable() +void QuickTestResult::initTestTable() { - Q_D(QDeclarativeTestResult); + Q_D(QuickTestResult); delete d->table; d->table = new QTestTable; } -void QDeclarativeTestResult::clearTestTable() +void QuickTestResult::clearTestTable() { - Q_D(QDeclarativeTestResult); + Q_D(QuickTestResult); delete d->table; d->table = 0; } -void QDeclarativeTestResult::finishTestFunction() +void QuickTestResult::finishTestFunction() { QTestResult::finishedCurrentTestFunction(); } -void QDeclarativeTestResult::fail +void QuickTestResult::fail (const QString &message, const QString &file, int line) { QTestResult::addFailure(message.toLatin1().constData(), file.toLatin1().constData(), line); } -bool QDeclarativeTestResult::verify +bool QuickTestResult::verify (bool success, const QString &message, const QString &file, int line) { if (message.isEmpty()) { @@ -384,7 +384,7 @@ bool QDeclarativeTestResult::verify } } -bool QDeclarativeTestResult::compare +bool QuickTestResult::compare (bool success, const QString &message, const QString &val1, const QString &val2, const QString &file, int line) @@ -397,14 +397,14 @@ bool QDeclarativeTestResult::compare file.toLatin1().constData(), line); } -void QDeclarativeTestResult::skipSingle +void QuickTestResult::skipSingle (const QString &message, const QString &file, int line) { QTestResult::addSkip(message.toLatin1().constData(), QTest::SkipSingle, file.toLatin1().constData(), line); } -void QDeclarativeTestResult::skipAll +void QuickTestResult::skipAll (const QString &message, const QString &file, int line) { QTestResult::addSkip(message.toLatin1().constData(), @@ -412,7 +412,7 @@ void QDeclarativeTestResult::skipAll QTestResult::setSkipCurrentTest(true); } -bool QDeclarativeTestResult::expectFail +bool QuickTestResult::expectFail (const QString &tag, const QString &comment, const QString &file, int line) { return QTestResult::expectFail @@ -421,7 +421,7 @@ bool QDeclarativeTestResult::expectFail QTest::Abort, file.toLatin1().constData(), line); } -bool QDeclarativeTestResult::expectFailContinue +bool QuickTestResult::expectFailContinue (const QString &tag, const QString &comment, const QString &file, int line) { return QTestResult::expectFail @@ -430,22 +430,22 @@ bool QDeclarativeTestResult::expectFailContinue QTest::Continue, file.toLatin1().constData(), line); } -void QDeclarativeTestResult::warn(const QString &message) +void QuickTestResult::warn(const QString &message) { QTestLog::warn(message.toLatin1().constData()); } -void QDeclarativeTestResult::ignoreWarning(const QString &message) +void QuickTestResult::ignoreWarning(const QString &message) { QTestResult::ignoreMessage(QtWarningMsg, message.toLatin1().constData()); } -void QDeclarativeTestResult::wait(int ms) +void QuickTestResult::wait(int ms) { QTest::qWait(ms); } -void QDeclarativeTestResult::sleep(int ms) +void QuickTestResult::sleep(int ms) { QTest::qSleep(ms); } @@ -454,12 +454,12 @@ namespace QTest { void qtest_qParseArgs(int argc, char *argv[]); }; -void QDeclarativeTestResult::parseArgs(int argc, char *argv[]) +void QuickTestResult::parseArgs(int argc, char *argv[]) { QTest::qtest_qParseArgs(argc, argv); } -void QDeclarativeTestResult::setProgramName(const char *name) +void QuickTestResult::setProgramName(const char *name) { if (name) { QTestResult::reset(); @@ -471,7 +471,7 @@ void QDeclarativeTestResult::setProgramName(const char *name) globalProgramName = name; } -int QDeclarativeTestResult::exitCode() +int QuickTestResult::exitCode() { #if defined(QTEST_NOEXITCODE) return 0; diff --git a/src/quicktestlib/qdeclarativetestresult_p.h b/src/quicktestlib/quicktestresult_p.h index 776a77a..4896b01 100644 --- a/src/quicktestlib/qdeclarativetestresult_p.h +++ b/src/quicktestlib/quicktestresult_p.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QDECLARATIVETESTRESULT_P_H -#define QDECLARATIVETESTRESULT_P_H +#ifndef QUICKTESTRESULT_P_H +#define QUICKTESTRESULT_P_H #include "quicktestglobal.h" #include <QtCore/qobject.h> @@ -49,9 +49,9 @@ QT_BEGIN_NAMESPACE -class QDeclarativeTestResultPrivate; +class QuickTestResultPrivate; -class Q_QUICK_TEST_EXPORT QDeclarativeTestResult : public QObject +class Q_QUICK_TEST_EXPORT QuickTestResult : public QObject { Q_OBJECT Q_ENUMS(FunctionType) @@ -66,8 +66,8 @@ class Q_QUICK_TEST_EXPORT QDeclarativeTestResult : public QObject Q_PROPERTY(int failCount READ failCount) Q_PROPERTY(int skipCount READ skipCount) public: - QDeclarativeTestResult(QObject *parent = 0); - ~QDeclarativeTestResult(); + QuickTestResult(QObject *parent = 0); + ~QuickTestResult(); // Values must match QTestResult::TestLocation. enum FunctionType @@ -146,10 +146,10 @@ Q_SIGNALS: void skippedChanged(); private: - QScopedPointer<QDeclarativeTestResultPrivate> d_ptr; + QScopedPointer<QuickTestResultPrivate> d_ptr; - Q_DECLARE_PRIVATE(QDeclarativeTestResult) - Q_DISABLE_COPY(QDeclarativeTestResult) + Q_DECLARE_PRIVATE(QuickTestResult) + Q_DISABLE_COPY(QuickTestResult) }; QT_END_NAMESPACE diff --git a/tests/qmlauto/tst_qmlauto.cpp b/tests/qmlauto/tst_qmlauto.cpp index d5d85b6..0e1bd7a 100644 --- a/tests/qmlauto/tst_qmlauto.cpp +++ b/tests/qmlauto/tst_qmlauto.cpp @@ -39,6 +39,6 @@ ** ****************************************************************************/ -#include "qdeclarativetest.h" +#include "quicktest.h" QTEST_QUICK_MAIN(qmlauto) diff --git a/tests/qmlexample/tst_qmlexample.cpp b/tests/qmlexample/tst_qmlexample.cpp index 3c8aed5..4d9cc40 100644 --- a/tests/qmlexample/tst_qmlexample.cpp +++ b/tests/qmlexample/tst_qmlexample.cpp @@ -39,6 +39,6 @@ ** ****************************************************************************/ -#include "qdeclarativetest.h" +#include "quicktest.h" QTEST_QUICK_MAIN(qmlexample) |