diff options
| author | dac <qt-info@nokia.com> | 2010-08-13 14:08:43 +1000 |
|---|---|---|
| committer | dac <qt-info@nokia.com> | 2010-08-13 14:08:43 +1000 |
| commit | 4519b7fa1d026cd63b8b515c6bfb8c2118ed0288 (patch) | |
| tree | d62453bbba155843cbcfe63cd7fb92e252e496a5 | |
| parent | dea2f1eb79583641554c3bcca2a242f8393ddab9 (diff) | |
Some results were not getting output.
| -rw-r--r-- | interpreter/qscriptsystemtest.cpp | 2 | ||||
| -rw-r--r-- | libqsystemtest/qtestresult.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/interpreter/qscriptsystemtest.cpp b/interpreter/qscriptsystemtest.cpp index c06e62e..99ea621 100644 --- a/interpreter/qscriptsystemtest.cpp +++ b/interpreter/qscriptsystemtest.cpp @@ -929,7 +929,7 @@ bool QScriptSystemTest::invokeTestMethod(const char *slotName, const char *data) do { if (!data || !qstrcmp(data, table.testData(curDataIndex)->dataTag())) { foundFunction = true; - test_result.setCurrentTestData(curDataIndex >= dataCount ? "" + test_result.setCurrentTestData(curDataIndex >= dataCount ? "..." : table.testData(curDataIndex)->dataTag()); invokeTestMethodDataEntry(slotName); test_result.setCurrentTestData(""); diff --git a/libqsystemtest/qtestresult.cpp b/libqsystemtest/qtestresult.cpp index 4e1b57b..d307087 100644 --- a/libqsystemtest/qtestresult.cpp +++ b/libqsystemtest/qtestresult.cpp @@ -2573,7 +2573,6 @@ void QTestResultTestFunc::setNext( QTestResultTestFunc *n ) void QTestResultTestFunc::setCurrentTestData( const QString &dataName ) { -/* if (dataName.isEmpty()) { if (cur_data == 0 ) return; @@ -2589,7 +2588,6 @@ void QTestResultTestFunc::setCurrentTestData( const QString &dataName ) cur_data = 0; } else { -*/ if (cur_data != 0 && cur_data->name() == dataName) return; @@ -2615,7 +2613,7 @@ void QTestResultTestFunc::setCurrentTestData( const QString &dataName ) last->setNext( tmp ); } cur_data = tmp; -// } + } } QTestResultTestData* QTestResultTestFunc::findData( const QString &dataName ) |