Changeset 561 for trunk/src/testlib/qtestlog.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/testlib/qtestlog.cpp (modified) (11 diffs)

trunk/src/testlib/qtestlog.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtTest module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -47 +47 @@
 #include "QtTest/private/qplaintestlogger_p.h"
 #include "QtTest/private/qxmltestlogger_p.h"
-
 #include <QtCore/qatomic.h>
 #include <QtCore/qbytearray.h>
@@ -54 +53 @@
 #include <string.h>
 #include <limits.h>
+
+
+
 
 QT_BEGIN_NAMESPACE
@@ -84 +86 @@
 
     static QTestLog::LogMode logMode = QTestLog::Plain;
+
     static int verbosity = 0;
     static int maxWarnings = 2002;
@@ -137 +140 @@
             if (!counter.deref()) {
                 QTest::testLogger->addMessage(QAbstractTestLogger::QSystem,
-                        "Maximum amount of warnings exceeded.");
+                        "Maximum amount of warnings exceeded.");
                 return;
             }
@@ -271 +274 @@
 
     switch (QTest::logMode) {
-    case QTestLog::Plain:
-        QTest::testLogger = new QPlainTestLogger();
-        break;
-    case QTestLog::XML:
-        QTest::testLogger = new QXmlTestLogger(QXmlTestLogger::Complete);
-        break;
-    case QTestLog::LightXML:
-        QTest::testLogger = new QXmlTestLogger(QXmlTestLogger::Light);
-    }
+        case QTestLog::Plain:
+            QTest::testLogger = new QPlainTestLogger;
+            break;
+        case QTestLog::XML:{
+            if(QTest::flushMode == QTestLog::FLushOn)
+                QTest::testLogger = new QXmlTestLogger(QXmlTestLogger::Complete);
+            else
+                QTest::testLogger = new QTestLogger(QTestLogger::TLF_XML);
+            break;
+        }case QTestLog::LightXML:{
+            if(QTest::flushMode == QTestLog::FLushOn)
+                QTest::testLogger = new QXmlTestLogger(QXmlTestLogger::Light);
+            else
+                QTest::testLogger = new QTestLogger(QTestLogger::TLF_LightXml);
+            break;
+        }case QTestLog::XunitXML:
+            QTest::testLogger = new QTestLogger(QTestLogger::TLF_XunitXml);
+        }
 
     QTest::testLogger->startLogging();
@@ -298 +310 @@
 void QTestLog::warn(const char *msg)
 {
+
     QTEST_ASSERT(msg);
 
@@ -308 +321 @@
 
     if (QTest::testLogger)
-    QTest::testLogger->addMessage(QAbstractTestLogger::Info, msg, file, line);
+    QTest::testLogger->addMessage(QAbstractTestLogger::Info, msg, file, line);
 }
 
@@ -362 +375 @@
 }
 
+
+
+
+
+
 QT_END_NAMESPACE