diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-02-07 12:42:05 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-09 06:29:37 +0100 |
commit | 3233e8052d2d25fd36567f67f9cd314cf0eaef92 (patch) | |
tree | 9457848b778ead5e9ba5696153f854b7e3642307 /src/qmltest | |
parent | 5b76b0de4848912cb9901524ff07d03bc9b71a5f (diff) |
Remove code related to test location.
Testlib no longer does anything with the test location and neither do
any of Qt's tests, so this code is no longer needed.
Change-Id: Ic370b6b741382a90454c893bffcab4a7328a2f9e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Diffstat (limited to 'src/qmltest')
-rw-r--r-- | src/qmltest/quicktest.cpp | 2 | ||||
-rw-r--r-- | src/qmltest/quicktestresult.cpp | 11 | ||||
-rw-r--r-- | src/qmltest/quicktestresult_p.h | 17 |
3 files changed, 1 insertions, 29 deletions
diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp index ed5fa7b3f8..551311cd28 100644 --- a/src/qmltest/quicktest.cpp +++ b/src/qmltest/quicktest.cpp @@ -142,7 +142,6 @@ template <class View> void handleCompileErrors(const QFileInfo &fi, const View & results.setTestCaseName(fi.baseName()); results.startLogging(); results.setFunctionName(QLatin1String("compile")); - results.setFunctionType(QuickTestResult::Func); // Verbose warning output of all messages and relevant parameters QString message; QTextStream str(&message); @@ -176,7 +175,6 @@ template <class View> void handleCompileErrors(const QFileInfo &fi, const View & results.finishTestData(); results.finishTestFunction(); results.setFunctionName(QString()); - results.setFunctionType(QuickTestResult::NoWhere); results.stopLogging(); } diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp index c1c5368eeb..ddfa928f96 100644 --- a/src/qmltest/quicktestresult.cpp +++ b/src/qmltest/quicktestresult.cpp @@ -163,17 +163,6 @@ void QuickTestResult::setFunctionName(const QString &name) emit functionNameChanged(); } -QuickTestResult::FunctionType QuickTestResult::functionType() const -{ - return FunctionType(QTestResult::currentTestLocation()); -} - -void QuickTestResult::setFunctionType(FunctionType type) -{ - QTestResult::setCurrentTestLocation(QTestResult::TestLocation(type)); - emit functionTypeChanged(); -} - /*! \qmlproperty string TestResult::dataTag diff --git a/src/qmltest/quicktestresult_p.h b/src/qmltest/quicktestresult_p.h index 2c37faba7e..f6f0c3a1b3 100644 --- a/src/qmltest/quicktestresult_p.h +++ b/src/qmltest/quicktestresult_p.h @@ -56,10 +56,9 @@ class QuickTestResultPrivate; class Q_QUICK_TEST_EXPORT QuickTestResult : public QObject { Q_OBJECT - Q_ENUMS(FunctionType RunMode) + Q_ENUMS(RunMode) Q_PROPERTY(QString testCaseName READ testCaseName WRITE setTestCaseName NOTIFY testCaseNameChanged) Q_PROPERTY(QString functionName READ functionName WRITE setFunctionName NOTIFY functionNameChanged) - Q_PROPERTY(FunctionType functionType READ functionType WRITE setFunctionType NOTIFY functionTypeChanged) Q_PROPERTY(QString dataTag READ dataTag WRITE setDataTag NOTIFY dataTagChanged) Q_PROPERTY(bool failed READ isFailed) Q_PROPERTY(bool dataFailed READ isDataFailed) @@ -72,16 +71,6 @@ public: QuickTestResult(QObject *parent = 0); ~QuickTestResult(); - // Values must match QTestResult::TestLocation. - enum FunctionType - { - NoWhere = 0, - DataFunc = 1, - InitFunc = 2, - Func = 3, - CleanupFunc = 4 - }; - // Values must match QBenchmarkIterationController::RunMode. enum RunMode { @@ -95,9 +84,6 @@ public: QString functionName() const; void setFunctionName(const QString &name); - FunctionType functionType() const; - void setFunctionType(FunctionType type); - QString dataTag() const; void setDataTag(const QString &tag); @@ -164,7 +150,6 @@ Q_SIGNALS: void programNameChanged(); void testCaseNameChanged(); void functionNameChanged(); - void functionTypeChanged(); void dataTagChanged(); void skippedChanged(); |