tests: Convert ExpressionMatchTests into a GTest-based test case

[quassel.git] / src / common / util.cpp

diff --git a/src/common/util.cpp b/src/common/util.cpp
index 914c9a4..c6d50c1 100644 (file)
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -107,17 +107,17 @@ QString decodeString(const QByteArray &input, QTextCodec *codec)
     // Q_ASSERT(sizeof(const char) == sizeof(quint8));  // In God we trust...
     bool isUtf8 = true;
     int cnt = 0;
-    for (int i = 0; i < input.size(); i++) {
+    for (uchar c : input) {
         if (cnt) {
             // We check a part of a multibyte char. These need to be of the form 10yyyyyy.
-            if ((input[i] & 0xc0) != 0x80) { isUtf8 = false; break; }
+            if ((c & 0xc0) != 0x80) { isUtf8 = false; break; }
             cnt--;
             continue;
         }
-        if ((input[i] & 0x80) == 0x00) continue;  // 7 bit is always ok
-        if ((input[i] & 0xf8) == 0xf0) { cnt = 3; continue; } // 4-byte char 11110xxx 10yyyyyy 10zzzzzz 10vvvvvv
-        if ((input[i] & 0xf0) == 0xe0) { cnt = 2; continue; } // 3-byte char 1110xxxx 10yyyyyy 10zzzzzz
-        if ((input[i] & 0xe0) == 0xc0) { cnt = 1; continue; } // 2-byte char 110xxxxx 10yyyyyy
+        if ((c & 0x80) == 0x00) continue;  // 7 bit is always ok
+        if ((c & 0xf8) == 0xf0) { cnt = 3; continue; } // 4-byte char 11110xxx 10yyyyyy 10zzzzzz 10vvvvvv
+        if ((c & 0xf0) == 0xe0) { cnt = 2; continue; } // 3-byte char 1110xxxx 10yyyyyy 10zzzzzz
+        if ((c & 0xe0) == 0xc0) { cnt = 1; continue; } // 2-byte char 110xxxxx 10yyyyyy
         isUtf8 = false; break; // 8 bit char, but not utf8!
     }
     if (isUtf8 && cnt == 0) {
@@ -179,18 +179,17 @@ QString secondsToString(int timeInSeconds)
 
     if (timeInSeconds != 0) {
         QStringList returnString;
-        for (int i = 0; i < timeUnit.size(); i++) {
-            int n = timeInSeconds / timeUnit[i].first;
+        for (const auto &tu : timeUnit) {
+            int n = timeInSeconds / tu.first;
             if (n > 0) {
-                returnString += QString("%1 %2").arg(QString::number(n), timeUnit[i].second);
+                returnString += QString("%1 %2").arg(QString::number(n), tu.second);
             }
-            timeInSeconds = timeInSeconds % timeUnit[i].first;
+            timeInSeconds = timeInSeconds % tu.first;
         }
         return returnString.join(", ");
     }
-    else {
-        return QString("%1 %2").arg(QString::number(timeInSeconds), timeUnit.last().second);
-    }
+
+    return QString("%1 %2").arg(QString::number(timeInSeconds), timeUnit.last().second);
 }
 
 
@@ -306,9 +305,24 @@ QString tryFormatUnixEpoch(const QString &possibleEpochDate, Qt::DateFormat date
     // Return the localized date/time
     if (useUTC) {
         // Return UTC time
-        return date.toUTC().toString(dateFormat);
+        if (dateFormat == Qt::DateFormat::ISODate) {
+            // Replace the "T" date/time separator with " " for readability.  This isn't quite the
+            // ISO 8601 spec (it specifies omitting the "T" entirely), but RFC 3339 allows this.
+            // Go with RFC 3339 for human readability that's still machine-parseable, too.
+            //
+            // Before: 2018-06-21T21:35:52Z
+            // After:  2018-06-21 21:35:52Z
+            //         ..........^ (10th character)
+            //
+            // See https://en.wikipedia.org/wiki/ISO_8601#cite_note-32
+            // And https://www.ietf.org/rfc/rfc3339.txt
+            return date.toUTC().toString(dateFormat).replace(10, 1, " ");
+        } else {
+            return date.toUTC().toString(dateFormat);
+        }
     } else if (dateFormat == Qt::DateFormat::ISODate) {
         // Add in ISO local timezone information via special handling below
+        // formatDateTimeToOffsetISO() handles converting "T" to " "
         return formatDateTimeToOffsetISO(date);
     } else {
         // Return local time
@@ -324,9 +338,21 @@ QString formatDateTimeToOffsetISO(const QDateTime &dateTime)
         return "formatDateTimeToISO() invalid date/time";
     }
 
+    // Replace the "T" date/time separator with " " for readability.  This isn't quite the ISO 8601
+    // spec (it specifies omitting the "T" entirely), but RFC 3339 allows this.  Go with RFC 3339
+    // for human readability that's still machine-parseable, too.
+    //
+    // Before: 2018-08-22T18:43:10-05:00
+    // After:  2018-08-22 18:43:10-05:00
+    //         ..........^ (10th character)
+    //
+    // See https://en.wikipedia.org/wiki/ISO_8601#cite_note-32
+    // And https://www.ietf.org/rfc/rfc3339.txt
+
 #if 0
-    // The expected way to get a UTC offset on ISO8601 dates
-    return dateTime.toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate);
+    // The expected way to get a UTC offset on ISO 8601 dates
+    // Remove the "T" date/time separator
+    return dateTime.toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate).replace(10, 1, " ");
 #else
     // Work around Qt bug that converts to UTC instead of including timezone information
     // See https://bugreports.qt.io/browse/QTBUG-26161
@@ -348,6 +374,7 @@ QString formatDateTimeToOffsetISO(const QDateTime &dateTime)
     // Force the local time to follow this offset
     local.setUtcOffset(utcOffset);
     // Now the output should be correct
-    return local.toString(Qt::ISODate);
+    // Remove the "T" date/time separator
+    return local.toString(Qt::ISODate).replace(10, 1, " ");
 #endif
 }