Fix digit grouping: m_grouping_top doesn't mean what I thought it did

I'd previously understood CLDR's minimumGroupingDigits to mean the
most significant group must have that many digits. It turns out to
mean only that the first grouping separator doesn't get added unless
the more significant group has this many. Once we have one separator,
more can be added that do isolate a single digit.

In the process, I discover some of the prior arithmetic is incorrect;
it is now fixed. Added some basic testing, amended some existing
tests. In the process, fixed naming of some double validator tests.

Pick-to: 6.6 6.5
Fixes: QTBUG-115740
Change-Id: Ia6ce011ba72e72428b015ca22b97d815ebf751b2
Reviewed-by: Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io>

1 files changed, 22 insertions, 6 deletions

diff --git a/tests/auto/gui/util/qdoublevalidator/tst_qdoublevalidator.cpp b/tests/auto/gui/util/qdoublevalidator/tst_qdoublevalidator.cpp
index 859c198595..b4c3b45420 100644
--- a/tests/auto/gui/util/qdoublevalidator/tst_qdoublevalidator.cpp
+++ b/tests/auto/gui/util/qdoublevalidator/tst_qdoublevalidator.cpp
@@ -417,7 +417,7 @@ void tst_QDoubleValidator::fixup_data()
     QTest::newRow("C standard with invalid digit grouping")
             << "C" << QDoubleValidator::StandardNotation << -1 << "1,234,5.678"
             << "12345.678";
-    QTest::newRow("C standard with invalid number of decimals")
+    QTest::newRow("C standard with invalid group size")
             << "C" << QDoubleValidator::StandardNotation << 2 << "-12,34.678"
             << "-1234.68";
     QTest::newRow("C standard truncate decimals")
@@ -446,7 +446,7 @@ void tst_QDoubleValidator::fixup_data()
     QTest::newRow("C scientific with invalid digit grouping")
             << "C" << QDoubleValidator::ScientificNotation << -1 << "12,34.98765e2"
             << "1.23498765e+05";
-    QTest::newRow("C scientific with invalid number of decimals")
+    QTest::newRow("C scientific with invalid group size")
             << "C" << QDoubleValidator::ScientificNotation << 2 << "-12,34.98765e2"
             << "-1.23e+05";
     QTest::newRow("C scientific truncate decimals")
@@ -486,7 +486,7 @@ void tst_QDoubleValidator::fixup_data()
     QTest::newRow("en standard with invalid digit grouping")
             << "en" << QDoubleValidator::StandardNotation << -1 << "-1,234,5.678"
             << "-12,345.678";
-    QTest::newRow("en standard with invalid number of decimals")
+    QTest::newRow("en standard with invalid group size")
             << "en" << QDoubleValidator::StandardNotation << 2 << "12,34.678"
             << "1,234.68";
     QTest::newRow("en standard no fractional part")
@@ -502,7 +502,7 @@ void tst_QDoubleValidator::fixup_data()
     QTest::newRow("en scientific with invalid digit grouping")
             << "en" << QDoubleValidator::ScientificNotation << -1 << "-12,34.98765e2"
             << "-1.23498765E+05";
-    QTest::newRow("en scientific with invalid number of decimals")
+    QTest::newRow("en scientific with invalid group size")
             << "en" << QDoubleValidator::ScientificNotation << 2 << "12,34.98765e2"
             << "1.23E+05";
     QTest::newRow("en scientific no fractional part")
@@ -529,7 +529,7 @@ void tst_QDoubleValidator::fixup_data()
     QTest::newRow("de standard with invalid digit grouping")
             << "de" << QDoubleValidator::StandardNotation << -1 << "1.234.5,678"
             << "12.345,678";
-    QTest::newRow("de standard with invalid number of decimals")
+    QTest::newRow("de standard with invalid group size")
             << "de" << QDoubleValidator::StandardNotation << 2 << "-12.34,678"
             << "-1.234,68";
     QTest::newRow("de standard no fractional part")
@@ -544,7 +544,7 @@ void tst_QDoubleValidator::fixup_data()
     QTest::newRow("de scientific with invalid digit grouping")
             << "de" << QDoubleValidator::ScientificNotation << -1 << "12.34,98765e2"
             << "1,23498765E+05";
-    QTest::newRow("de scientific with invalid number of decimals")
+    QTest::newRow("de scientific with invalid group size")
             << "de" << QDoubleValidator::ScientificNotation << 2 << "-12.34,98765e2"
             << "-1,23E+05";
     QTest::newRow("de scientific no fractional part")
@@ -560,6 +560,22 @@ void tst_QDoubleValidator::fixup_data()
             << "de" << QDoubleValidator::ScientificNotation << -1 << "-12.34"
             << "-1,234E+03";
 
+    // es locale uses ',' as decimal point and '.' as grouping separator.
+    // It doesn't apply grouping unless the the next-to-least significant group
+    // has more than one digit in it.
+    QTest::newRow("es standard no digit grouping")
+            << "es" << QDoubleValidator::StandardNotation << -1 << "1234,567" << "1234,567";
+    QTest::newRow("es standard with digit grouping")
+            << "es" << QDoubleValidator::StandardNotation << -1 << "-12.345,678" << "-12.345,678";
+    QTest::newRow("es standard with invalid group size")
+            << "es" << QDoubleValidator::StandardNotation << -1 << "1.234.5,678" << "12.345,678";
+    QTest::newRow("es standard with invalid digit grouping")
+            << "es" << QDoubleValidator::StandardNotation << 2 << "-1.234,678" << "-1234,68";
+    QTest::newRow("es standard big with invalid digit grouping")
+            << "es" << QDoubleValidator::StandardNotation << 2 << "-1234.678,9" << "-1.234.678,9";
+    QTest::newRow("es standard no fractional part")
+            << "es" << QDoubleValidator::StandardNotation << -1 << "12.34" << "1234";
+
     // hi locale uses '.' as decimal point and ',' as grouping separator.
     // The rightmost group is of three digits, all the others contain two
     // digits.