From 60ef5535c6e96592f24548c2e290dfd01bdeeb18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Fri, 13 Sep 2013 17:30:53 +0200 Subject: [PATCH] fixing testOctetsToString (cherry picked from commit 78c8f136457676ff18fea53d9ac32bfe1a43fbb6) --- test/testutility.h | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/test/testutility.h b/test/testutility.h index 3eb7ef1424..de871741ee 100644 --- a/test/testutility.h +++ b/test/testutility.h @@ -26,27 +26,31 @@ private slots: } void testOctetsToString() { + QLocale::setDefault(QLocale("en")); QCOMPARE(octetsToString(999) , QString("999 B")); - QCOMPARE(octetsToString(1000) , QString("1 kB")); - QCOMPARE(octetsToString(1010) , QString("1 kB")); + QCOMPARE(octetsToString(1000) , QString("1,000 B")); + QCOMPARE(octetsToString(1010) , QString("1,010 B")); + QCOMPARE(octetsToString(1024) , QString("1 kB")); QCOMPARE(octetsToString(1110) , QString("1.1 kB")); - QCOMPARE(octetsToString(9110) , QString("9.1 kB")); - QCOMPARE(octetsToString(9910) , QString("9.9 kB")); - QCOMPARE(octetsToString(9999) , QString("10 kB")); + QCOMPARE(octetsToString(9110) , QString("8.9 kB")); + QCOMPARE(octetsToString(9910) , QString("9.7 kB")); + QCOMPARE(octetsToString(9999) , QString("9.8 kB")); + QCOMPARE(octetsToString(10240) , QString("10 kB")); - QCOMPARE(octetsToString(123456) , QString("123 kB")); + QCOMPARE(octetsToString(123456) , QString("121 kB")); QCOMPARE(octetsToString(1234567) , QString("1.2 MB")); QCOMPARE(octetsToString(12345678) , QString("12 MB")); - QCOMPARE(octetsToString(123456789) , QString("123 MB")); - QCOMPARE(octetsToString(1000LL*1000*1000 * 5) , QString("5 GB")); + QCOMPARE(octetsToString(123456789) , QString("118 MB")); + QCOMPARE(octetsToString(1000LL*1000*1000 * 5) , QString("4.7 GB")); + QCOMPARE(octetsToString(1024LL*1024*1024 * 5) , QString("5 GB")); QCOMPARE(octetsToString(1), QString("1 B")); QCOMPARE(octetsToString(2), QString("2 B")); QCOMPARE(octetsToString(1024), QString("1 kB")); QCOMPARE(octetsToString(1024*1024), QString("1 MB")); - QCOMPARE(octetsToString(1024LL*1024*1024), QString("1.1 GB")); - QCOMPARE(octetsToString(1024LL*1024*1024*1024), QString("1.1 TB")); + QCOMPARE(octetsToString(1024LL*1024*1024), QString("1 GB")); + QCOMPARE(octetsToString(1024LL*1024*1024*1024), QString("1 TB")); } void testLaunchOnStartup()