1 files changed, 91 insertions, 8 deletions

diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
index 10d78b1f2f..d424e6086d 100644
--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
@@ -137,6 +137,8 @@ private slots:
     void textDirection_data();
     void textDirection();
 
+    void formattedDataSize_data();
+    void formattedDataSize();
     void bcp47Name();
 
 private:
@@ -1221,6 +1223,9 @@ void tst_QLocale::dayOfWeek()
 
     QCOMPARE(QLocale::c().toString(date, "ddd"), shortName);
     QCOMPARE(QLocale::c().toString(date, "dddd"), longName);
+
+    QCOMPARE(QLocale::c().toString(date, QStringViewLiteral("ddd")), shortName);
+    QCOMPARE(QLocale::c().toString(date, QStringViewLiteral("dddd")), longName);
 }
 
 void tst_QLocale::formatDate_data()
@@ -1263,6 +1268,7 @@ void tst_QLocale::formatDate()
 
     QLocale l(QLocale::C);
     QCOMPARE(l.toString(date, format), result);
+    QCOMPARE(l.toString(date, QStringView(format)), result);
 }
 
 
@@ -1319,6 +1325,7 @@ void tst_QLocale::formatTime()
 
     QLocale l(QLocale::C);
     QCOMPARE(l.toString(time, format), result);
+    QCOMPARE(l.toString(time, QStringView(format)), result);
 }
 
 
@@ -1480,6 +1487,7 @@ void tst_QLocale::formatDateTime()
 
     QLocale l(localeName);
     QCOMPARE(l.toString(dateTime, format), result);
+    QCOMPARE(l.toString(dateTime, QStringView(format)), result);
 }
 
 void tst_QLocale::formatTimeZone()
@@ -2203,9 +2211,9 @@ void tst_QLocale::timeFormat()
     QCOMPARE(c.timeFormat(QLocale::NarrowFormat), c.timeFormat(QLocale::ShortFormat));
 
     const QLocale no("no_NO");
-    QCOMPARE(no.timeFormat(QLocale::NarrowFormat), QLatin1String("HH.mm"));
-    QCOMPARE(no.timeFormat(QLocale::ShortFormat), QLatin1String("HH.mm"));
-    QCOMPARE(no.timeFormat(QLocale::LongFormat), QLatin1String("HH.mm.ss t"));
+    QCOMPARE(no.timeFormat(QLocale::NarrowFormat), QLatin1String("HH:mm"));
+    QCOMPARE(no.timeFormat(QLocale::ShortFormat), QLatin1String("HH:mm"));
+    QCOMPARE(no.timeFormat(QLocale::LongFormat), QLatin1String("HH:mm:ss t"));
 
     const QLocale id("id_ID");
     QCOMPARE(id.timeFormat(QLocale::ShortFormat), QLatin1String("HH.mm"));
@@ -2227,9 +2235,9 @@ void tst_QLocale::dateTimeFormat()
     QCOMPARE(c.dateTimeFormat(QLocale::NarrowFormat), c.dateTimeFormat(QLocale::ShortFormat));
 
     const QLocale no("no_NO");
-    QCOMPARE(no.dateTimeFormat(QLocale::NarrowFormat), QLatin1String("dd.MM.yyyy HH.mm"));
-    QCOMPARE(no.dateTimeFormat(QLocale::ShortFormat), QLatin1String("dd.MM.yyyy HH.mm"));
-    QCOMPARE(no.dateTimeFormat(QLocale::LongFormat), QLatin1String("dddd d. MMMM yyyy HH.mm.ss t"));
+    QCOMPARE(no.dateTimeFormat(QLocale::NarrowFormat), QLatin1String("dd.MM.yyyy HH:mm"));
+    QCOMPARE(no.dateTimeFormat(QLocale::ShortFormat), QLatin1String("dd.MM.yyyy HH:mm"));
+    QCOMPARE(no.dateTimeFormat(QLocale::LongFormat), QLatin1String("dddd d. MMMM yyyy HH:mm:ss t"));
 }
 
 void tst_QLocale::monthName()
@@ -2510,8 +2518,8 @@ void tst_QLocale::textDirection_data()
         default:
             break;
         }
-        QString testName = QLocalePrivate::languageToCode(QLocale::Language(language));
-        QTest::newRow(testName.toLatin1().constData()) << language << int(QLocale::AnyScript) << rightToLeft;
+        const QLatin1String testName = QLocalePrivate::languageToCode(QLocale::Language(language));
+        QTest::newRow(qPrintable(testName)) << language << int(QLocale::AnyScript) << rightToLeft;
     }
     QTest::newRow("pa_Arab") << int(QLocale::Punjabi) << int(QLocale::ArabicScript) << true;
     QTest::newRow("uz_Arab") << int(QLocale::Uzbek) << int(QLocale::ArabicScript) << true;
@@ -2527,6 +2535,81 @@ void tst_QLocale::textDirection()
     QCOMPARE(locale.textDirection() == Qt::RightToLeft, rightToLeft);
 }
 
+void tst_QLocale::formattedDataSize_data()
+{
+    QTest::addColumn<QLocale::Language>("language");
+    QTest::addColumn<int>("decimalPlaces");
+    QTest::addColumn<QLocale::DataSizeFormats>("units");
+    QTest::addColumn<int>("bytes");
+    QTest::addColumn<QString>("output");
+
+    struct {
+        const char *name;
+        QLocale::Language lang;
+        const char *bytes;
+        const char abbrev;
+        const char sep; // decimal separator
+    } data[] = {
+        { "English", QLocale::English, "bytes", 'B', '.' },
+        { "French", QLocale::French, "octets", 'o', ',' },
+        { "C", QLocale::C, "bytes", 'B', '.' }
+    };
+
+    for (const auto row : data) {
+#define ROWB(id, deci, num, text)                 \
+        QTest::addRow("%s-%s", row.name, id)      \
+            << row.lang << deci << format         \
+            << num << (QString(text) + QChar(' ') + QString(row.bytes))
+#define ROWQ(id, deci, num, head, tail)           \
+        QTest::addRow("%s-%s", row.name, id)      \
+            << row.lang << deci << format         \
+            << num << (QString(head) + QChar(row.sep) + QString(tail) + QChar(row.abbrev))
+
+        // Metatype system fails to handle raw enum members as format; needs variable
+        {
+            const QLocale::DataSizeFormats format = QLocale::DataSizeIecFormat;
+            ROWB("IEC-0", 2, 0, "0");
+            ROWB("IEC-10", 2, 10, "10");
+            ROWQ("IEC-12Ki", 2, 12345, "12", "06 Ki");
+            ROWQ("IEC-16Ki", 2, 16384, "16", "00 Ki");
+            ROWQ("IEC-1235k", 2, 1234567, "1", "18 Mi");
+            ROWQ("IEC-1374k", 2, 1374744, "1", "31 Mi");
+            ROWQ("IEC-1234M", 2, 1234567890, "1", "15 Gi");
+        }
+        {
+            const QLocale::DataSizeFormats format = QLocale::DataSizeTraditionalFormat;
+            ROWB("Trad-0", 2, 0, "0");
+            ROWB("Trad-10", 2, 10, "10");
+            ROWQ("Trad-12Ki", 2, 12345, "12", "06 k");
+            ROWQ("Trad-16Ki", 2, 16384, "16", "00 k");
+            ROWQ("Trad-1235k", 2, 1234567, "1", "18 M");
+            ROWQ("Trad-1374k", 2, 1374744, "1", "31 M");
+            ROWQ("Trad-1234M", 2, 1234567890, "1", "15 G");
+        }
+        {
+            const QLocale::DataSizeFormats format = QLocale::DataSizeSIFormat;
+            ROWB("Decimal-0", 2, 0, "0");
+            ROWB("Decimal-10", 2, 10, "10");
+            ROWQ("Decimal-16Ki", 2, 16384, "16", "38 k");
+            ROWQ("Decimal-1234k", 2, 1234567, "1", "23 M");
+            ROWQ("Decimal-1374k", 2, 1374744, "1", "37 M");
+            ROWQ("Decimal-1234M", 2, 1234567890, "1", "23 G");
+        }
+#undef ROWQ
+#undef ROWB
+    }
+}
+
+void tst_QLocale::formattedDataSize()
+{
+    QFETCH(QLocale::Language, language);
+    QFETCH(int, decimalPlaces);
+    QFETCH(QLocale::DataSizeFormats, units);
+    QFETCH(int, bytes);
+    QFETCH(QString, output);
+    QCOMPARE(QLocale(language).formattedDataSize(bytes, decimalPlaces, units), output);
+}
+
 void tst_QLocale::bcp47Name()
 {
     QCOMPARE(QLocale("C").bcp47Name(), QStringLiteral("en"));