From 36533edf7159547bdcf5b7def02870d1b04d09ac Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 26 Aug 2011 11:44:17 +1000 Subject: [PATCH] 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 Reviewed-by: Rohan McGovern --- src/testlib/qtestbasicstreamer.cpp | 11 ++++------- src/testlib/qtestbasicstreamer.h | 3 +-- src/testlib/qtestlightxmlstreamer.cpp | 4 ++-- src/testlib/qtestlightxmlstreamer.h | 2 +- src/testlib/qtestlogger.cpp | 8 +++----- src/testlib/qtestxmlstreamer.cpp | 4 ++-- src/testlib/qtestxmlstreamer.h | 2 +- src/testlib/qtestxunitstreamer.cpp | 4 ++-- src/testlib/qtestxunitstreamer.h | 2 +- 9 files changed, 17 insertions(+), 23 deletions(-) diff --git a/src/testlib/qtestbasicstreamer.cpp b/src/testlib/qtestbasicstreamer.cpp index 70f51bf..d371b4d 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 #include @@ -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; diff --git a/src/testlib/qtestbasicstreamer.h b/src/testlib/qtestbasicstreamer.h index af0bc06..04bc406 100644 --- a/src/testlib/qtestbasicstreamer.h +++ b/src/testlib/qtestbasicstreamer.h @@ -58,14 +58,13 @@ struct QTestCharBuffer; class QTestBasicStreamer { public: - QTestBasicStreamer(); + QTestBasicStreamer(QTestLogger *logger); virtual ~QTestBasicStreamer(); virtual void output(QTestElement *element) const; void outputString(const char *msg) const; - void setLogger(QTestLogger *tstLogger); QTestLogger *logger() const; protected: diff --git a/src/testlib/qtestlightxmlstreamer.cpp b/src/testlib/qtestlightxmlstreamer.cpp index 5a8f96d..8ac4e03 100644 --- a/src/testlib/qtestlightxmlstreamer.cpp +++ b/src/testlib/qtestlightxmlstreamer.cpp @@ -52,8 +52,8 @@ QT_BEGIN_NAMESPACE -QTestLightXmlStreamer::QTestLightXmlStreamer() - :QTestBasicStreamer() +QTestLightXmlStreamer::QTestLightXmlStreamer(QTestLogger *logger) + : QTestBasicStreamer(logger) { } diff --git a/src/testlib/qtestlightxmlstreamer.h b/src/testlib/qtestlightxmlstreamer.h index c8ac681..b3076c1 100644 --- a/src/testlib/qtestlightxmlstreamer.h +++ b/src/testlib/qtestlightxmlstreamer.h @@ -56,7 +56,7 @@ class QTestElementAttribute; class QTestLightXmlStreamer: public QTestBasicStreamer { public: - QTestLightXmlStreamer(); + QTestLightXmlStreamer(QTestLogger *logger); ~QTestLightXmlStreamer(); void formatStart(const QTestElement *element, QTestCharBuffer *formatted) const; diff --git a/src/testlib/qtestlogger.cpp b/src/testlib/qtestlogger.cpp index 9cf4320..af069d7 100644 --- a/src/testlib/qtestlogger.cpp +++ b/src/testlib/qtestlogger.cpp @@ -84,23 +84,21 @@ void QTestLogger::startLogging(const char *filename) switch(format){ case TLF_LightXml:{ - logFormatter = new QTestLightXmlStreamer; + logFormatter = new QTestLightXmlStreamer(this); filelogger->init(); break; }case TLF_XML:{ - logFormatter = new QTestXmlStreamer; + logFormatter = new QTestXmlStreamer(this); filelogger->init(); break; }case TLF_XunitXml:{ - logFormatter = new QTestXunitStreamer; + logFormatter = new QTestXunitStreamer(this); delete errorLogElement; errorLogElement = new QTestElement(QTest::LET_SystemError); filelogger->init(); break; } } - - logFormatter->setLogger(this); } void QTestLogger::stopLogging() diff --git a/src/testlib/qtestxmlstreamer.cpp b/src/testlib/qtestxmlstreamer.cpp index 6a7f9ae..7a41152 100644 --- a/src/testlib/qtestxmlstreamer.cpp +++ b/src/testlib/qtestxmlstreamer.cpp @@ -53,8 +53,8 @@ QT_BEGIN_NAMESPACE -QTestXmlStreamer::QTestXmlStreamer() - :QTestBasicStreamer() +QTestXmlStreamer::QTestXmlStreamer(QTestLogger *logger) + : QTestBasicStreamer(logger) { } diff --git a/src/testlib/qtestxmlstreamer.h b/src/testlib/qtestxmlstreamer.h index 46318a9..3009408 100644 --- a/src/testlib/qtestxmlstreamer.h +++ b/src/testlib/qtestxmlstreamer.h @@ -56,7 +56,7 @@ class QTestElementAttribute; class QTestXmlStreamer: public QTestBasicStreamer { public: - QTestXmlStreamer(); + QTestXmlStreamer(QTestLogger *logger); ~QTestXmlStreamer(); void formatStart(const QTestElement *element, QTestCharBuffer *formatted) const; diff --git a/src/testlib/qtestxunitstreamer.cpp b/src/testlib/qtestxunitstreamer.cpp index c4b3192..fb9699e 100644 --- a/src/testlib/qtestxunitstreamer.cpp +++ b/src/testlib/qtestxunitstreamer.cpp @@ -48,8 +48,8 @@ QT_BEGIN_NAMESPACE -QTestXunitStreamer::QTestXunitStreamer() - :QTestBasicStreamer() +QTestXunitStreamer::QTestXunitStreamer(QTestLogger *logger) + : QTestBasicStreamer(logger) {} QTestXunitStreamer::~QTestXunitStreamer() diff --git a/src/testlib/qtestxunitstreamer.h b/src/testlib/qtestxunitstreamer.h index f99e231..4d1cb27 100644 --- a/src/testlib/qtestxunitstreamer.h +++ b/src/testlib/qtestxunitstreamer.h @@ -55,7 +55,7 @@ class QTestLogger; class QTestXunitStreamer: public QTestBasicStreamer { public: - QTestXunitStreamer(); + QTestXunitStreamer(QTestLogger *logger); ~QTestXunitStreamer(); void formatStart(const QTestElement *element, QTestCharBuffer *formatted) const; -- 2.7.4