1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QLocale: Add tests for toFloat()

Browse Source 
Mirror those for toDouble().

Change-Id: Ide0ef3cd99528d575f6a578ef19547f3b1119c5d
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Edward Welbourne 2018-11-16 15:44:44 +01:00
parent 108c9015b9
commit 704137f8de
1 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
View File

@ -83,6 +83,8 @@ private slots:
void matchingLocales(); void matchingLocales();
void stringToDouble_data(); void stringToDouble_data();
void stringToDouble(); void stringToDouble();
void stringToFloat_data() { stringToDouble_data(); }
void stringToFloat();
void doubleToString_data(); void doubleToString_data();
void doubleToString(); void doubleToString();
void strtod_data(); void strtod_data();
@ -801,7 +803,7 @@ void tst_QLocale::stringToDouble_data()
void tst_QLocale::stringToDouble() void tst_QLocale::stringToDouble()
{ {
#define MY_DOUBLE_EPSILON (2.22045e-16) #define MY_DOUBLE_EPSILON (2.22045e-16) // 1/2^{52}; double has a 53-bit mantissa
QFETCH(QString, locale_name); QFETCH(QString, locale_name);
QFETCH(QString, num_str); QFETCH(QString, num_str);
@ -824,6 +826,8 @@ void tst_QLocale::stringToDouble()
} }
if (ok) { if (ok) {
// First use fuzzy-compare, then a more precise check:
QCOMPARE(d, num);
double diff = d - num; double diff = d - num;
if (diff < 0) if (diff < 0)
diff = -diff; diff = -diff;
@ -834,11 +838,60 @@ void tst_QLocale::stringToDouble()
QCOMPARE(ok, good); QCOMPARE(ok, good);
if (ok) { if (ok) {
QCOMPARE(d, num);
double diff = d - num; double diff = d - num;
if (diff < 0) if (diff < 0)
diff = -diff; diff = -diff;
QVERIFY(diff <= MY_DOUBLE_EPSILON); QVERIFY(diff <= MY_DOUBLE_EPSILON);
} }
#undef MY_DOUBLE_EPSILON
}
void tst_QLocale::stringToFloat()
{
#define MY_FLOAT_EPSILON (2.384e-7) // 1/2^{22}; float has a 23-bit mantissa
QFETCH(QString, locale_name);
QFETCH(QString, num_str);
QFETCH(bool, good);
QFETCH(double, num);
QStringRef num_strRef = num_str.leftRef(-1);
float fnum = num;
QLocale locale(locale_name);
QCOMPARE(locale.name(), locale_name);
bool ok;
float f = locale.toFloat(num_str, &ok);
QCOMPARE(ok, good);
{
// Make sure result is independent of locale:
TransientLocale ignoreme(LC_ALL, "ar_SA");
QCOMPARE(locale.toFloat(num_str, &ok), f);
QCOMPARE(ok, good);
}
if (ok) {
// First use fuzzy-compare, then a more precise check:
QCOMPARE(f, fnum);
float diff = f - fnum;
if (diff < 0)
diff = -diff;
QVERIFY(diff <= MY_FLOAT_EPSILON);
}
f = locale.toFloat(num_strRef, &ok);
QCOMPARE(ok, good);
if (ok) {
QCOMPARE(f, fnum);
float diff = f - fnum;
if (diff < 0)
diff = -diff;
QVERIFY(diff <= MY_FLOAT_EPSILON);
}
#undef MY_FLOAT_EPSILON
} }
void tst_QLocale::doubleToString_data() void tst_QLocale::doubleToString_data()