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>
This commit is contained in:
parent
e8e9b62f72
commit
36533edf71
@ -43,6 +43,7 @@
|
|||||||
#include "qtestlogger_p.h"
|
#include "qtestlogger_p.h"
|
||||||
#include "qtestelement.h"
|
#include "qtestelement.h"
|
||||||
#include "qtestelementattribute.h"
|
#include "qtestelementattribute.h"
|
||||||
|
#include "qtestassert.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
@ -53,9 +54,10 @@
|
|||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
QTestBasicStreamer::QTestBasicStreamer()
|
QTestBasicStreamer::QTestBasicStreamer(QTestLogger *logger)
|
||||||
:testLogger(0)
|
:testLogger(logger)
|
||||||
{
|
{
|
||||||
|
QTEST_ASSERT(testLogger);
|
||||||
}
|
}
|
||||||
|
|
||||||
QTestBasicStreamer::~QTestBasicStreamer()
|
QTestBasicStreamer::~QTestBasicStreamer()
|
||||||
@ -154,11 +156,6 @@ void QTestBasicStreamer::outputString(const char *msg) const
|
|||||||
testLogger->outputString(msg);
|
testLogger->outputString(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
void QTestBasicStreamer::setLogger(QTestLogger *tstLogger)
|
|
||||||
{
|
|
||||||
testLogger = tstLogger;
|
|
||||||
}
|
|
||||||
|
|
||||||
QTestLogger *QTestBasicStreamer::logger() const
|
QTestLogger *QTestBasicStreamer::logger() const
|
||||||
{
|
{
|
||||||
return testLogger;
|
return testLogger;
|
||||||
|
@ -58,14 +58,13 @@ struct QTestCharBuffer;
|
|||||||
class QTestBasicStreamer
|
class QTestBasicStreamer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
QTestBasicStreamer();
|
QTestBasicStreamer(QTestLogger *logger);
|
||||||
virtual ~QTestBasicStreamer();
|
virtual ~QTestBasicStreamer();
|
||||||
|
|
||||||
virtual void output(QTestElement *element) const;
|
virtual void output(QTestElement *element) const;
|
||||||
|
|
||||||
void outputString(const char *msg) const;
|
void outputString(const char *msg) const;
|
||||||
|
|
||||||
void setLogger(QTestLogger *tstLogger);
|
|
||||||
QTestLogger *logger() const;
|
QTestLogger *logger() const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
@ -52,8 +52,8 @@
|
|||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
QTestLightXmlStreamer::QTestLightXmlStreamer()
|
QTestLightXmlStreamer::QTestLightXmlStreamer(QTestLogger *logger)
|
||||||
:QTestBasicStreamer()
|
: QTestBasicStreamer(logger)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ class QTestElementAttribute;
|
|||||||
class QTestLightXmlStreamer: public QTestBasicStreamer
|
class QTestLightXmlStreamer: public QTestBasicStreamer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
QTestLightXmlStreamer();
|
QTestLightXmlStreamer(QTestLogger *logger);
|
||||||
~QTestLightXmlStreamer();
|
~QTestLightXmlStreamer();
|
||||||
|
|
||||||
void formatStart(const QTestElement *element, QTestCharBuffer *formatted) const;
|
void formatStart(const QTestElement *element, QTestCharBuffer *formatted) const;
|
||||||
|
@ -84,23 +84,21 @@ void QTestLogger::startLogging(const char *filename)
|
|||||||
|
|
||||||
switch(format){
|
switch(format){
|
||||||
case TLF_LightXml:{
|
case TLF_LightXml:{
|
||||||
logFormatter = new QTestLightXmlStreamer;
|
logFormatter = new QTestLightXmlStreamer(this);
|
||||||
filelogger->init();
|
filelogger->init();
|
||||||
break;
|
break;
|
||||||
}case TLF_XML:{
|
}case TLF_XML:{
|
||||||
logFormatter = new QTestXmlStreamer;
|
logFormatter = new QTestXmlStreamer(this);
|
||||||
filelogger->init();
|
filelogger->init();
|
||||||
break;
|
break;
|
||||||
}case TLF_XunitXml:{
|
}case TLF_XunitXml:{
|
||||||
logFormatter = new QTestXunitStreamer;
|
logFormatter = new QTestXunitStreamer(this);
|
||||||
delete errorLogElement;
|
delete errorLogElement;
|
||||||
errorLogElement = new QTestElement(QTest::LET_SystemError);
|
errorLogElement = new QTestElement(QTest::LET_SystemError);
|
||||||
filelogger->init();
|
filelogger->init();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logFormatter->setLogger(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void QTestLogger::stopLogging()
|
void QTestLogger::stopLogging()
|
||||||
|
@ -53,8 +53,8 @@
|
|||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
QTestXmlStreamer::QTestXmlStreamer()
|
QTestXmlStreamer::QTestXmlStreamer(QTestLogger *logger)
|
||||||
:QTestBasicStreamer()
|
: QTestBasicStreamer(logger)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ class QTestElementAttribute;
|
|||||||
class QTestXmlStreamer: public QTestBasicStreamer
|
class QTestXmlStreamer: public QTestBasicStreamer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
QTestXmlStreamer();
|
QTestXmlStreamer(QTestLogger *logger);
|
||||||
~QTestXmlStreamer();
|
~QTestXmlStreamer();
|
||||||
|
|
||||||
void formatStart(const QTestElement *element, QTestCharBuffer *formatted) const;
|
void formatStart(const QTestElement *element, QTestCharBuffer *formatted) const;
|
||||||
|
@ -48,8 +48,8 @@
|
|||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
QTestXunitStreamer::QTestXunitStreamer()
|
QTestXunitStreamer::QTestXunitStreamer(QTestLogger *logger)
|
||||||
:QTestBasicStreamer()
|
: QTestBasicStreamer(logger)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
QTestXunitStreamer::~QTestXunitStreamer()
|
QTestXunitStreamer::~QTestXunitStreamer()
|
||||||
|
@ -55,7 +55,7 @@ class QTestLogger;
|
|||||||
class QTestXunitStreamer: public QTestBasicStreamer
|
class QTestXunitStreamer: public QTestBasicStreamer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
QTestXunitStreamer();
|
QTestXunitStreamer(QTestLogger *logger);
|
||||||
~QTestXunitStreamer();
|
~QTestXunitStreamer();
|
||||||
|
|
||||||
void formatStart(const QTestElement *element, QTestCharBuffer *formatted) const;
|
void formatStart(const QTestElement *element, QTestCharBuffer *formatted) const;
|
||||||
|
Loading…
Reference in New Issue
Block a user