summaryrefslogtreecommitdiffstats
path: root/src/testlib/qtestresult.cpp
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2012-02-07 12:50:54 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-16 02:00:37 +0100
commit45cf303d3a873ff96cad1e1e8ff736602d0e8a5a (patch)
treec7377533821bf0c3abf7c024c5957ef83964700a /src/testlib/qtestresult.cpp
parent1b23336a297681dc12700880540a5a8d31f146fe (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 the code is no longer needed. Change-Id: I1a464116179f3e26efadad6901f00f3c33e0ce84 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/testlib/qtestresult.cpp')
-rw-r--r--src/testlib/qtestresult.cpp15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp
index cfa85eb065..79ea22bb43 100644
--- a/src/testlib/qtestresult.cpp
+++ b/src/testlib/qtestresult.cpp
@@ -59,7 +59,6 @@ namespace QTest
static const char *currentTestObjectName = 0;
static bool failed = false;
static bool skipCurrentTest = false;
- static QTestResult::TestLocation location = QTestResult::NoWhere;
static const char *expectFailComment = 0;
static int expectFailMode = 0;
@@ -74,7 +73,6 @@ void QTestResult::reset()
QTest::currentTestFunc = 0;
QTest::currentTestObjectName = 0;
QTest::failed = false;
- QTest::location = QTestResult::NoWhere;
QTest::expectFailComment = 0;
QTest::expectFailMode = 0;
@@ -112,8 +110,6 @@ void QTestResult::setCurrentTestFunction(const char *func)
{
QTest::currentTestFunc = func;
QTest::failed = false;
- if (!func)
- QTest::location = NoWhere;
if (func)
QTestLog::enterTestFunction(func);
}
@@ -152,7 +148,6 @@ void QTestResult::finishedCurrentTestFunction()
{
QTest::currentTestFunc = 0;
QTest::failed = false;
- QTest::location = NoWhere;
QTestLog::leaveTestFunction();
}
@@ -289,16 +284,6 @@ void QTestResult::addSkip(const char *message, const char *file, int line)
QTestLog::addSkip(message, file, line);
}
-QTestResult::TestLocation QTestResult::currentTestLocation()
-{
- return QTest::location;
-}
-
-void QTestResult::setCurrentTestLocation(TestLocation loc)
-{
- QTest::location = loc;
-}
-
void QTestResult::setCurrentTestObject(const char *name)
{
QTest::currentTestObjectName = name;