diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-08-31 18:53:46 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-01 03:10:58 +0200 |
| commit | 964793718fee83d46103acb5deb0bde4fa78a9af (patch) | |
| tree | 55a9d44e9d37a1fffe0cee0a305e6e7587bcbd47 /src/testlib/qtestxunitstreamer.cpp | |
| parent | d88b335d08bdf67edd21310f8202a3e62cbde085 (diff) | |
Simplify qtestlib logging code, part 3
Collapse the QTestBasicStreamer class into QTestXunitStreamer.
Change-Id: I349b8db432fd45f9352084f60b36b460f3b61f6a
Reviewed-on: http://codereview.qt.nokia.com/3925
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/testlib/qtestxunitstreamer.cpp')
| -rw-r--r-- | src/testlib/qtestxunitstreamer.cpp | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/src/testlib/qtestxunitstreamer.cpp b/src/testlib/qtestxunitstreamer.cpp index 93b40de1cf..f70945add0 100644 --- a/src/testlib/qtestxunitstreamer.cpp +++ b/src/testlib/qtestxunitstreamer.cpp @@ -40,7 +40,10 @@ ****************************************************************************/ #include "qtestxunitstreamer.h" +#include "qxunittestlogger_p.h" #include "qtestelement.h" +#include "qtestelementattribute.h" +#include "qtestassert.h" #include "QtTest/private/qtestlog_p.h" #include "QtTest/private/qtestresult_p.h" @@ -49,8 +52,10 @@ QT_BEGIN_NAMESPACE QTestXunitStreamer::QTestXunitStreamer(QXunitTestLogger *logger) - : QTestBasicStreamer(logger) -{} + : testLogger(logger) +{ + QTEST_ASSERT(testLogger); +} QTestXunitStreamer::~QTestXunitStreamer() {} @@ -165,8 +170,10 @@ void QTestXunitStreamer::formatAfterAttributes(const QTestElement *element, QTes void QTestXunitStreamer::output(QTestElement *element) const { + QTEST_ASSERT(element); + outputString("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"); - QTestBasicStreamer::output(element); + outputElements(element); } void QTestXunitStreamer::outputElements(QTestElement *element, bool) const @@ -187,9 +194,6 @@ void QTestXunitStreamer::outputElements(QTestElement *element, bool) const formatStart(element, &buf); outputString(buf.data()); - formatBeforeAttributes(element, &buf); - outputString(buf.data()); - outputElementAttributes(element, element->attributes()); formatAfterAttributes(element, &buf); @@ -205,5 +209,19 @@ void QTestXunitStreamer::outputElements(QTestElement *element, bool) const } } -QT_END_NAMESPACE +void QTestXunitStreamer::outputElementAttributes(const QTestElement* element, QTestElementAttribute *attribute) const +{ + QTestCharBuffer buf; + while(attribute){ + formatAttributes(element, attribute, &buf); + outputString(buf.data()); + attribute = attribute->nextElement(); + } +} +void QTestXunitStreamer::outputString(const char *msg) const +{ + testLogger->outputString(msg); +} + +QT_END_NAMESPACE |