From 60b1091e138c1fc84789bc99c8e3a7c9852a3127 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Thu, 28 Nov 2024 14:09:05 +0100 Subject: [PATCH] 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 --- test/testsyncconflictsmodel.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/testsyncconflictsmodel.cpp b/test/testsyncconflictsmodel.cpp index fe7ed88e1bc70..fb7b94ab67ff2 100644 --- a/test/testsyncconflictsmodel.cpp +++ b/test/testsyncconflictsmodel.cpp @@ -24,6 +24,7 @@ #include #include #include +#include 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(SyncConflictsModel::SyncConflictRoles::ExistingFileName)), QString{"a2"}); - QCOMPARE(model.data(model.index(0), static_cast(SyncConflictsModel::SyncConflictRoles::ExistingSize)), QString{"6 bytes"}); - QCOMPARE(model.data(model.index(0), static_cast(SyncConflictsModel::SyncConflictRoles::ConflictSize)), QString{"5 bytes"}); + QCOMPARE(model.data(model.index(0), static_cast(SyncConflictsModel::SyncConflictRoles::ExistingSize)), _locale.formattedDataSize(6)); + QCOMPARE(model.data(model.index(0), static_cast(SyncConflictsModel::SyncConflictRoles::ConflictSize)), _locale.formattedDataSize(5)); QVERIFY(!model.data(model.index(0), static_cast(SyncConflictsModel::SyncConflictRoles::ExistingDate)).toString().isEmpty()); QVERIFY(!model.data(model.index(0), static_cast(SyncConflictsModel::SyncConflictRoles::ConflictDate)).toString().isEmpty()); QCOMPARE(model.data(model.index(0), static_cast(SyncConflictsModel::SyncConflictRoles::ExistingPreviewUrl)), QVariant::fromValue(QUrl{QStringLiteral("image://tray-image-provider/:/fileicon%1A/a2").arg(fakeFolder.localPath())}));