diff options
| author | Mitch Curtis <mitch.curtis@digia.com> | 2012-09-21 11:30:55 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-24 01:38:49 +0200 |
| commit | 811bf4da67cedea0daa40f2fff805003687e9d6e (patch) | |
| tree | 079edf87129a3c16bc8e8562dbc4669527084f2b /tests/auto/corelib/tools/qlocale | |
| parent | d1ad991bee52e17452cae9dca55b3b340c6f0955 (diff) | |
Output leading zeroes for yyyy date formats in QLocale::toString().
Converting the date 1 January 0001 to a string in the format
"dd MMMM yyyy" currently results in the string "01 January 1", but it
should be "01 January 0001".
Task-number: QTBUG-27287
Change-Id: Ia025da7343d1c36aaee34c47c6db551a6e89595f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/tools/qlocale')
| -rw-r--r-- | tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp index a8aded5646..299ae104f1 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp @@ -875,6 +875,7 @@ void tst_QLocale::formatDate_data() QTest::newRow("28") << QDate() << "'\"yy\"'" << ""; QTest::newRow("29") << QDate(1974, 12, 1) << "hh:mm:ss.zzz ap d'd'dd/M/yy" << "hh:mm:ss.zzz ap 1d01/12/74"; + QTest::newRow("dd MMMM yyyy") << QDate(1, 1, 1) << "dd MMMM yyyy" << "01 January 0001"; } void tst_QLocale::formatDate() @@ -974,6 +975,9 @@ void tst_QLocale::formatDateTime_data() QTest::newRow("12C") << "C" << QDateTime(QDate(1974, 12, 1), QTime(15, 14, 13)) << "d'd'dd/M/yyh" << "1d01/12/7415"; + QTest::newRow("dd MMMM yyyy, hh:mm:ss") << "C" << QDateTime(QDate(1, 1, 1), QTime(12, 00, 00)) + << "dd MMMM yyyy, hh:mm:ss" << "01 January 0001, 12:00:00"; + QTest::newRow("20C") << "C" << QDateTime(QDate(1974, 12, 1), QTime(15, 14, 13)) << "foo" << "foo"; QTest::newRow("21C") << "C" << QDateTime(QDate(1974, 12, 1), QTime(15, 14, 13)) |