fix TestSyncConflictsModel by using locale aware test data
authorMatthieu Gallien <matthieu.gallien@nextcloud.com>
Thu, 28 Nov 2024 13:09:05 +0000 (14:09 +0100)
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>
Fri, 29 Nov 2024 10:09:53 +0000 (10:09 +0000)
should ensure comparisons of locale aware text is compared against
locale aware test data

will remove portability issues especially on Windows

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
test/testsyncconflictsmodel.cpp

index fe7ed88e1bc704418e0d60e1a56569d2ee6bf12d..fb7b94ab67ff2e28c43794a7dd49d19d5f1f2fe8 100644 (file)
@@ -24,6 +24,7 @@
 #include <QTest>
 #include <QAbstractItemModelTester>
 #include <QSignalSpy>
+#include <QLocale>
 
 namespace {
 
@@ -47,6 +48,7 @@ class TestSyncConflictsModel : public QObject
     Q_OBJECT
 
 private:
+    QLocale _locale;
 
 private slots:
     void initTestCase()
@@ -104,8 +106,8 @@ private slots:
 
         QCOMPARE(model.rowCount(), 1);
         QCOMPARE(model.data(model.index(0), static_cast<int>(SyncConflictsModel::SyncConflictRoles::ExistingFileName)), QString{"a2"});
-        QCOMPARE(model.data(model.index(0), static_cast<int>(SyncConflictsModel::SyncConflictRoles::ExistingSize)), QString{"6 bytes"});
-        QCOMPARE(model.data(model.index(0), static_cast<int>(SyncConflictsModel::SyncConflictRoles::ConflictSize)), QString{"5 bytes"});
+        QCOMPARE(model.data(model.index(0), static_cast<int>(SyncConflictsModel::SyncConflictRoles::ExistingSize)), _locale.formattedDataSize(6));
+        QCOMPARE(model.data(model.index(0), static_cast<int>(SyncConflictsModel::SyncConflictRoles::ConflictSize)), _locale.formattedDataSize(5));
         QVERIFY(!model.data(model.index(0), static_cast<int>(SyncConflictsModel::SyncConflictRoles::ExistingDate)).toString().isEmpty());
         QVERIFY(!model.data(model.index(0), static_cast<int>(SyncConflictsModel::SyncConflictRoles::ConflictDate)).toString().isEmpty());
         QCOMPARE(model.data(model.index(0), static_cast<int>(SyncConflictsModel::SyncConflictRoles::ExistingPreviewUrl)), QVariant::fromValue(QUrl{QStringLiteral("image://tray-image-provider/:/fileicon%1A/a2").arg(fakeFolder.localPath())}));