diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-08-26 11:44:17 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-29 06:47:10 +0200 |
| commit | 36533edf7159547bdcf5b7def02870d1b04d09ac (patch) | |
| tree | 8b50318430b41d61e75b20de438fc239b55b7166 /src/testlib/qtestbasicstreamer.cpp | |
| parent | e8e9b62f725f2229ae9e6d0218bbcbf7d54425ee (diff) | |
Remove ability to change XML logger during a test.
It doesn't make sense to change the logger associated with a streamer in
the middle of a test run, so only allow the logger to be set when
constructing a streamer.
Change-Id: I02661de2b6071c74d10bc854cbe436581978d2d9
Reviewed-on: http://codereview.qt.nokia.com/3622
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 | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/testlib/qtestbasicstreamer.cpp b/src/testlib/qtestbasicstreamer.cpp index 70f51bfdaa5..d371b4d08ee 100644 --- a/src/testlib/qtestbasicstreamer.cpp +++ b/src/testlib/qtestbasicstreamer.cpp @@ -43,6 +43,7 @@ #include "qtestlogger_p.h" #include "qtestelement.h" #include "qtestelementattribute.h" +#include "qtestassert.h" #include <stdio.h> #include <stdlib.h> @@ -53,9 +54,10 @@ QT_BEGIN_NAMESPACE -QTestBasicStreamer::QTestBasicStreamer() - :testLogger(0) +QTestBasicStreamer::QTestBasicStreamer(QTestLogger *logger) + :testLogger(logger) { + QTEST_ASSERT(testLogger); } QTestBasicStreamer::~QTestBasicStreamer() @@ -154,11 +156,6 @@ void QTestBasicStreamer::outputString(const char *msg) const testLogger->outputString(msg); } -void QTestBasicStreamer::setLogger(QTestLogger *tstLogger) -{ - testLogger = tstLogger; -} - QTestLogger *QTestBasicStreamer::logger() const { return testLogger; |