diff options
Diffstat (limited to 'src/testlib/qtestresult_p.h')
-rw-r--r-- | src/testlib/qtestresult_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/testlib/qtestresult_p.h b/src/testlib/qtestresult_p.h index fc7f834756..b060926f2a 100644 --- a/src/testlib/qtestresult_p.h +++ b/src/testlib/qtestresult_p.h @@ -63,16 +63,15 @@ class QTestData; class Q_TESTLIB_EXPORT QTestResult { public: - enum TestLocation { NoWhere = 0, DataFunc = 1, InitFunc = 2, Func = 3, CleanupFunc = 4 }; - static const char *currentTestObjectName(); static bool currentTestFailed(); static QTestData *currentTestData(); static QTestData *currentGlobalTestData(); static const char *currentTestFunction(); - static TestLocation currentTestLocation(); static const char *currentDataTag(); static const char *currentGlobalDataTag(); + static void finishedCurrentTestData(); + static void finishedCurrentTestDataCleanup(); static void finishedCurrentTestFunction(); static void reset(); @@ -84,17 +83,18 @@ public: static void setCurrentGlobalTestData(QTestData *data); static void setCurrentTestData(QTestData *data); static void setCurrentTestFunction(const char *func); - static void setCurrentTestLocation(TestLocation loc); static void setCurrentTestObject(const char *name); static void addSkip(const char *message, const char *file, int line); static bool expectFail(const char *dataIndex, const char *comment, QTest::TestFailMode mode, const char *file, int line); static bool verify(bool statement, const char *statementStr, const char *extraInfo, const char *file, int line); - static bool testFailed(); static void setSkipCurrentTest(bool value); static bool skipCurrentTest(); + static void setCurrentAppname(const char *appname); + static const char *currentAppname(); + private: Q_DISABLE_COPY(QTestResult) }; |