Changeset 561 for trunk/src/testlib/qplaintestlogger.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/qplaintestlogger.cpp (modified) (15 diffs)

trunk/src/testlib/qplaintestlogger.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -53 +53 @@
 #ifdef Q_OS_WIN
 #include "windows.h"
+#endif
+
+#if defined(Q_OS_SYMBIAN)
+#include <e32debug.h>
 #endif
 
@@ -126 +130 @@
     static const char *messageType2String(QAbstractTestLogger::MessageTypes type)
     {
+#ifdef Q_OS_WIN
         static bool colored = (!qgetenv("QTEST_COLORED").isEmpty());
+#else
+        static bool colored = ::getenv("QTEST_COLORED");
+#endif
         switch (type) {
         case QAbstractTestLogger::Skip:
@@ -149 +157 @@
     {
 #if defined(Q_OS_WINCE)
-        int length = strlen(str);
-        for (int pos = 0; pos < length; pos +=255) {
-            QString uniText = QString::fromLatin1(str + pos, 255);
-            OutputDebugStringW((const LPCWSTR) uniText.utf16());
-        }
+        QString strUtf16 = QString::fromLatin1(str);
+        const int maxOutputLength = 255;
+        do {
+            QString tmp = strUtf16.left(maxOutputLength);
+            OutputDebugString((wchar_t*)tmp.utf16());
+            strUtf16.remove(0, maxOutputLength);
+        } while (!strUtf16.isEmpty());
         if (QTestLog::outputFileName())
 #elif defined(Q_OS_WIN)
@@ -160 +170 @@
         OutputDebugStringA(str);
         LeaveCriticalSection(&outputCriticalSection);
+#elif defined(Q_OS_SYMBIAN)
+        // RDebug::Print has a cap of 256 characters so break it up
+        TPtrC8 ptr(reinterpret_cast<const TUint8*>(str));
+        _LIT(format, "[QTestLib] %S");
+        const int maxBlockSize = 256 - ((const TDesC &)format).Length();
+        HBufC* hbuffer = HBufC::New(maxBlockSize);
+        if(hbuffer) {
+            for (int i = 0; i < ptr.Length(); i += maxBlockSize) {
+                int size = Min(maxBlockSize, ptr.Length() - i);
+                hbuffer->Des().Copy(ptr.Mid(i, size));
+                RDebug::Print(format, hbuffer);
+            }
+        }
+        else {
+            // fast, no allocations, but truncates silently
+            RDebug::RawPrint(format);
+            TPtrC8 ptr(reinterpret_cast<const TUint8*>(str));
+            RDebug::RawPrint(ptr);
+            RDebug::RawPrint(_L8("\n"));
+        }
 #endif
         QAbstractTestLogger::outputString(str);
@@ -169 +199 @@
         QTEST_ASSERT(msg);
 
-        char buf[1024];
+        QTestCharBuffer buf;
 
         const char *fn = QTestResult::currentTestFunction() ? QTestResult::currentTestFunction()
@@ -179 +209 @@
         const char *filler = (tag[0] && gtag[0]) ? ":" : "";
         if (file) {
-            QTest::qt_snprintf(buf, sizeof(buf), "%s: %s::%s(%s%s%s)%s%s\n"
+            QTest::qt_asprintf(&buf, "%s: %s::%s(%s%s%s)%s%s\n"
 #ifdef Q_OS_WIN
                           "%s(%d) : failure location\n"
@@ -188 +218 @@
                           msg[0] ? " " : "", msg, file, line);
         } else {
-            QTest::qt_snprintf(buf, sizeof(buf), "%s: %s::%s(%s%s%s)%s%s\n",
+            QTest::qt_asprintf(&buf, "%s: %s::%s(%s%s%s)%s%s\n",
                     type, QTestResult::currentTestObjectName(), fn, gtag, filler, tag,
                     msg[0] ? " " : "", msg);
         }
-        memcpy(buf, type, strlen(type));
-        outputMessage(buf);
+        // In colored mode, printf above stripped our nonprintable control characters.
+        // Put them back.
+        memcpy(buf.data(), type, strlen(type));
+        outputMessage(buf.data());
     }
 
@@ -204 +236 @@
         int digits = 0;
         qreal divisor = 1;
-        
+
         while (num / divisor >= 1) {
             divisor *= 10;
@@ -217 +249 @@
     {
         if (number < T(0))
-            return QString(QLatin1String("NAN"));
+            return QLatin1String("NAN");
         if (number == T(0))
-            return QString(QLatin1String("0"));
+            return QLatin1String("0");
 
         QString beforeDecimalPoint = QString::number(qint64(number), 'f', 0);
         QString afterDecimalPoint = QString::number(number, 'f', 20);
         afterDecimalPoint.remove(0, beforeDecimalPoint.count() + 1);
-        
+
         int beforeUse = qMin(beforeDecimalPoint.count(), significantDigits);
         int beforeRemove = beforeDecimalPoint.count() - beforeUse;
-        
+
         // Replace insignificant digits before the decimal point with zeros.
         beforeDecimalPoint.chop(beforeRemove);
@@ -265 +297 @@
         if (afterUse > 0)
             print.append(decimalPoint);
-         
+
         print += afterDecimalPoint;
 
-            
+
         return print;
     }
@@ -289 +321 @@
         QTest::qt_snprintf(
             buf1, sizeof(buf1), "%s: %s::%s",
-            bmtag, 
+            bmtag,
             QTestResult::currentTestObjectName(),
             result.context.slotName.toAscii().data());
@@ -300 +332 @@
             QTest::qt_snprintf(bufTag, sizeof(bufTag), ":\"%s\"", tag.data());
         }
-        
+
 
         char fillFormat[8];