diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-11 21:43:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-11 21:43:02 (GMT) |
| commit | e61071a2a170eaeb524778e9e903100323b88bbe (patch) | |
| tree | 03cfc506e95751cb074429a4b6b4e1ffb2ae621c /tests | |
| parent | 7a81735272b5ee065f499a492cca4b4a703e0659 (diff) | |
| parent | 285f49d680a824e788eb6cf107f70cd94d358dfe (diff) | |
| download | Qt-e61071a2a170eaeb524778e9e903100323b88bbe.zip Qt-e61071a2a170eaeb524778e9e903100323b88bbe.tar.gz Qt-e61071a2a170eaeb524778e9e903100323b88bbe.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Doc: Fixing typo
Fix auto-test regression in tst_QDoubleValidator
QS60Style: Color calculation should be optimized
QS60Style: Color calculation should be optimized
With some locales, QDoubleValidator would not accept "C" locale valid numbers
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qdoublevalidator/tst_qdoublevalidator.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/qdoublevalidator/tst_qdoublevalidator.cpp b/tests/auto/qdoublevalidator/tst_qdoublevalidator.cpp index 26890b3..98c4740 100644 --- a/tests/auto/qdoublevalidator/tst_qdoublevalidator.cpp +++ b/tests/auto/qdoublevalidator/tst_qdoublevalidator.cpp @@ -214,6 +214,13 @@ void tst_QDoubleValidator::validate_data() arabicNum += QChar(1643); arabicNum += QChar(1636); QTest::newRow("arabic") << "ar" << 0.0 << 20.0 << 2 << arabicNum << ACC << ACC; + + QTest::newRow("data_QTBUG_14935-1") << "de" << 0.0 << 1.0 << 5 << QString("0.31") << ACC << ACC; + QTest::newRow("data_QTBUG_14935-2") << "de" << 0.0 << 1000000.0 << 5 << QString("3.123") << ACC << ACC; + QTest::newRow("data_QTBUG_14935-3") << "de" << 0.0 << 1000000.0 << 5 << QString("123,345.678") << ACC << ACC; + + QTest::newRow("data_de_problem-1") << "de" << 0.0 << 10.0 << 0 << QString("1.0") << ITM << ITM; + QTest::newRow("data_de_problem-2") << "de" << 0.0 << 10.0 << 0 << QString("0.1") << INV << INV; } void tst_QDoubleValidator::validate() @@ -226,6 +233,9 @@ void tst_QDoubleValidator::validate() QFETCH(QValidator::State, scientific_state); QFETCH(QValidator::State, standard_state); + QEXPECT_FAIL("data_de_problem-1", "To be fixed. See QTBUG-15210.", Abort); + QEXPECT_FAIL("data_de_problem-2", "To be fixed. See QTBUG-15210.", Abort); + QLocale::setDefault(QLocale(localeName)); QDoubleValidator dv(minimum, maximum, decimals, 0); @@ -308,6 +318,8 @@ void tst_QDoubleValidator::validateIntEquiv() QFETCH(QString, input); QFETCH(QValidator::State, state); + QLocale::setDefault(QLocale("C")); + QDoubleValidator dv(minimum, maximum, 0, 0); dv.setNotation(QDoubleValidator::StandardNotation); int dummy; |