diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-08-25 16:21:36 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-26 08:02:32 +0200 |
| commit | 3c48d26c5b297f851615f942b30a3346d8b0df5c (patch) | |
| tree | f2322d235453f8b8f71a6203dd88d53182662e7e /src/testlib/qtestbasicstreamer.cpp | |
| parent | c478ebc91445b3f7b42a594208aca4d8e9c71a70 (diff) | |
Remove duplicated code from QTestBasicStreamer.
Instead of using the file output functions inherited from
QAbstractTestLogger, QTestLogger relied on QTestBasicStreamer having a
copy of these functions. This commit removes the copied functions from
QTestBasicStreamer and makes it and QTestLogger use the original
functions from QAbstractTestLogger.
Change-Id: Icac1ae9d85cd39efd4c67c79104404dd56766b17
Reviewed-on: http://codereview.qt.nokia.com/3565
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/testlib/qtestbasicstreamer.cpp')
| -rw-r--r-- | src/testlib/qtestbasicstreamer.cpp | 53 |
1 files changed, 1 insertions, 52 deletions
diff --git a/src/testlib/qtestbasicstreamer.cpp b/src/testlib/qtestbasicstreamer.cpp index 25e48ee4d52..50933b91cd1 100644 --- a/src/testlib/qtestbasicstreamer.cpp +++ b/src/testlib/qtestbasicstreamer.cpp @@ -43,8 +43,6 @@ #include "qtestlogger_p.h" #include "qtestelement.h" #include "qtestelementattribute.h" -#include "QtTest/private/qtestlog_p.h" -#include "qtestassert.h" #include <stdio.h> #include <stdlib.h> @@ -55,11 +53,6 @@ QT_BEGIN_NAMESPACE -namespace QTest -{ - static FILE *stream = 0; -} - QTestBasicStreamer::QTestBasicStreamer() :testLogger(0) { @@ -158,51 +151,7 @@ void QTestBasicStreamer::outputElementAttributes(const QTestElement* element, QT void QTestBasicStreamer::outputString(const char *msg) const { - QTEST_ASSERT(QTest::stream); - - ::fputs(msg, QTest::stream); - ::fflush(QTest::stream); -} - -void QTestBasicStreamer::startStreaming() -{ - QTEST_ASSERT(!QTest::stream); - - const char *out = QTestLog::outputFileName(); - if (!out) { - QTest::stream = stdout; - return; - } - #if defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(Q_OS_WINCE) - if (::fopen_s(&QTest::stream, out, "wt")) { - #else - QTest::stream = ::fopen(out, "wt"); - if (!QTest::stream) { - #endif - printf("Unable to open file for logging: %s", out); - ::exit(1); - } -} - -bool QTestBasicStreamer::isTtyOutput() -{ - QTEST_ASSERT(QTest::stream); - -#if defined(Q_OS_WIN) || defined(Q_OS_INTEGRITY) - return true; -#else - static bool ttyoutput = isatty(fileno(QTest::stream)); - return ttyoutput; -#endif -} - -void QTestBasicStreamer::stopStreaming() -{ - QTEST_ASSERT(QTest::stream); - if (QTest::stream != stdout) - fclose(QTest::stream); - - QTest::stream = 0; + testLogger->outputString(msg); } void QTestBasicStreamer::setLogger(const QTestLogger *tstLogger) |