diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2015-01-15 15:54:39 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2015-01-15 15:56:51 +0300 |
| commit | 863731fd6a2ce461f51eea8e02591041dbe40c17 (patch) | |
| tree | 382b480de2af69a40cb70f29ee955c25a9a420f3 /test | |
| parent | c9f1b3229bc0a120ef4114f3ec83c3b1819daecf (diff) | |
Revert "Utility: Use SI units"
This reverts commit 7445fa7ef77ccefbd9eb1153cec9523ca62bd4fe.
and commit f654c53c35f41e40973c827606c061524cc1b2eb.
The server still use wrong powers, so we still need to use the same
Diffstat (limited to 'test')
| -rw-r--r-- | test/testutility.h | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/test/testutility.h b/test/testutility.h index 0f34bec5e..27f7f1270 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() |