path: root/src/testlib/qtestresult_p.h
diff options
authorJason McDonald <>2012-02-02 17:08:44 +1000
committerQt by Nokia <>2012-02-13 01:46:09 +0100
commit9b2971cbb4ebf102198c2320a575e2fd718c182e (patch)
tree05e227d3607eda50b7e39255407c157f68b83e6f /src/testlib/qtestresult_p.h
parenta6d3983ef6b7affef1d2aa48ed8bf8000a6e4267 (diff)
testlib: Count passes, fails and skips consistently.
For data-driven tests, testlib previously counted one fail or skip for each data row that failed or skipped, while it counted only one pass for a test function where all rows passed and counted no passes for a test function where some rows passed and some rows failed. A similar problem also existed for benchmark tests, which could run multiple iterations of the same test, with each fail and skip being counted but only a single pass being counted for the entire series of iterations. This commit makes testlib count one pass, fail or skip for each data row. Test functions that are not data-driven count one result for the test function, as before. Benchmark tests count one pass, fail or skip per iteration. A side-effect of this change is that the test output in plain text, xml and light xml formats now shows a result for every data row and benchmark iteration executed, allowing post-processors to correctly calculate the total number of tests executed. Previously, individual rows were not shown in the test output if they passed, making such calculations impossible. The only change to the xunitxml output format is to correct a bug where no test result was recorded for a test function if the last data row was skipped and all other rows passed -- in which case the overall result should be a pass. Note that there is also a pre-existing bug in the xunit logger, where no result is reported if all rows are skipped; that bug is unaffected by this commit. Task-number: QTBUG-21848 Task-number: QTBUG-22124 Change-Id: I7e17177e10d6e89e55b9684c159bd506f21d002b Reviewed-by: Ed Baak <>
Diffstat (limited to 'src/testlib/qtestresult_p.h')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testlib/qtestresult_p.h b/src/testlib/qtestresult_p.h
index 81e11180ef..5c6c4fba90 100644
--- a/src/testlib/qtestresult_p.h
+++ b/src/testlib/qtestresult_p.h
@@ -74,6 +74,7 @@ public:
static const char *currentDataTag();
static const char *currentGlobalDataTag();
static void finishedCurrentTestData();
+ static void finishedCurrentTestDataCleanup();
static void finishedCurrentTestFunction();
static void reset();
@@ -92,7 +93,6 @@ public:
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();