From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Thu, 28 Nov 2024 13:09:05 +0000 (+0100)
Subject: fix TestSyncConflictsModel by using locale aware test data
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~4^2~38^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b922f5dc6463c260c997497cd32440a0e6720122;p=nextcloud-desktop.git

fix TestSyncConflictsModel by using locale aware test data

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>
---

diff --git a/test/testsyncconflictsmodel.cpp b/test/testsyncconflictsmodel.cpp
index fe7ed88e1..fb7b94ab6 100644
--- a/test/testsyncconflictsmodel.cpp
+++ b/test/testsyncconflictsmodel.cpp
@@ -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())}));