summaryrefslogtreecommitdiffstats
path: root/tests/auto/qlocale
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@nokia.com>2011-03-21 08:26:27 (GMT)
committerZeno Albisser <zeno.albisser@nokia.com>2011-03-21 08:26:27 (GMT)
commit209201b7047c605405a83e9c104f8c81f9195feb (patch)
tree3e2768430364eaee879a3a134579003e781bc7e4 /tests/auto/qlocale
parent08d5655d4ac291f97d164c96ecfe0a0d7e4ba654 (diff)
downloadQt-209201b7047c605405a83e9c104f8c81f9195feb.zip
Qt-209201b7047c605405a83e9c104f8c81f9195feb.tar.gz
Qt-209201b7047c605405a83e9c104f8c81f9195feb.tar.bz2
replaced weekendStart and weekendEnd with weekdays function
Reviewed-by: Denis Dzyubenko Task-number: QTBUG-17088
Diffstat (limited to 'tests/auto/qlocale')
-rw-r--r--tests/auto/qlocale/tst_qlocale.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/auto/qlocale/tst_qlocale.cpp b/tests/auto/qlocale/tst_qlocale.cpp
index b6c66d5..6f4de91 100644
--- a/tests/auto/qlocale/tst_qlocale.cpp
+++ b/tests/auto/qlocale/tst_qlocale.cpp
@@ -1154,11 +1154,13 @@ void tst_QLocale::macDefaultLocale()
QCOMPARE(locale.monthName(1), QString("January"));
QCOMPARE(locale.monthName(12), QString("December"));
QCOMPARE(locale.firstDayOfWeek(), Qt::Sunday);
- QCOMPARE(locale.weekendStart(), Qt::Saturday);
- QCOMPARE(locale.weekendEnd(), Qt::Sunday);
QCOMPARE(locale.quoteString("string"), QString::fromUtf8("\xe2\x80\x9c" "string" "\xe2\x80\x9d"));
QCOMPARE(locale.quoteString("string", QLocale::AlternateQuotation), QString::fromUtf8("\xe2\x80\x98" "string" "\xe2\x80\x99"));
+ QList<Qt::DayOfWeek> days;
+ days << Qt::Monday << Qt::Tuesday << Qt::Wednesday << Qt::Thursday << Qt::Friday;
+ QCOMPARE(locale.weekdays(), days);
+
}
#ifdef Q_OS_WIN
@@ -2233,8 +2235,9 @@ void tst_QLocale::uiLanguages()
void tst_QLocale::weekendDays()
{
const QLocale c(QLocale::C);
- QCOMPARE(c.weekendStart(), Qt::Saturday);
- QCOMPARE(c.weekendEnd(), Qt::Sunday);
+ QList<Qt::DayOfWeek> days;
+ days << Qt::Monday << Qt::Tuesday << Qt::Wednesday << Qt::Thursday << Qt::Friday;
+ QCOMPARE(c.weekdays(), days);
}
void tst_QLocale::listPatterns()