From 5414a9a03bec65fd180f3c29811397df14130881 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 27 Sep 2012 15:28:11 +0200 Subject: tst_QDateTimeEdit: cleanup whitespace & follow Qt coding style Change-Id: Iae04cd0c9ac6ea85621b293f2ce184d673548e9b Reviewed-by: Caroline Chao --- .../widgets/qdatetimeedit/tst_qdatetimeedit.cpp | 107 ++++++--------------- 1 file changed, 31 insertions(+), 76 deletions(-) (limited to 'tests') diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp index 3bd80320b7..916b60ab6f 100644 --- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp +++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp @@ -277,7 +277,7 @@ private slots: void focusNextPrevChild(); void taskQTBUG_12384_timeSpecShowTimeOnly(); - + void deleteCalendarWidget(); #ifdef QT_BUILD_INTERNAL @@ -332,7 +332,6 @@ tst_QDateTimeEdit::tst_QDateTimeEdit() tst_QDateTimeEdit::~tst_QDateTimeEdit() { - } void tst_QDateTimeEdit::initTestCase() @@ -356,7 +355,6 @@ void tst_QDateTimeEdit::cleanupTestCase() testWidget = 0; } - void tst_QDateTimeEdit::init() { QLocale::setDefault(QLocale(QLocale::C)); @@ -400,18 +398,16 @@ void tst_QDateTimeEdit::constructor_qdatetime_data() QTest::addColumn("maximumTime"); QTest::newRow("normal") << QDateTime(QDate(2004, 6, 16), QTime(13, 46, 32, 764)) - << QDateTime(QDate(2004, 6, 16), QTime(13, 46, 32, 764)) - << QDate(1752, 9, 14) << QTime(0, 0, 0, 0) - << QDate(7999, 12, 31) << QTime(23, 59, 59, 999); + << QDateTime(QDate(2004, 6, 16), QTime(13, 46, 32, 764)) + << QDate(1752, 9, 14) << QTime(0, 0, 0, 0) + << QDate(7999, 12, 31) << QTime(23, 59, 59, 999); QTest::newRow("invalid") << QDateTime(QDate(9999, 99, 99), QTime(13, 46, 32, 764)) - << QDateTime(QDate(2000, 1, 1), QTime(0, 0, 0, 0)) - << QDate(1752, 9, 14) << QTime(0, 0, 0, 0) - << QDate(7999, 12, 31) << QTime(23, 59, 59, 999); + << QDateTime(QDate(2000, 1, 1), QTime(0, 0, 0, 0)) + << QDate(1752, 9, 14) << QTime(0, 0, 0, 0) + << QDate(7999, 12, 31) << QTime(23, 59, 59, 999); } - - void tst_QDateTimeEdit::constructor_qdatetime() { QFETCH(QDateTime, parameter); @@ -442,18 +438,16 @@ void tst_QDateTimeEdit::constructor_qdate_data() QTest::addColumn("maximumTime"); QTest::newRow("normal") << QDate(2004, 6, 16) - << QDateTime(QDate(2004, 6, 16), QTime(0, 0, 0, 0)) - << QDate(1752, 9, 14) << QTime(0, 0, 0, 0) - << QDate(7999, 12, 31) << QTime(23, 59, 59, 999); + << QDateTime(QDate(2004, 6, 16), QTime(0, 0, 0, 0)) + << QDate(1752, 9, 14) << QTime(0, 0, 0, 0) + << QDate(7999, 12, 31) << QTime(23, 59, 59, 999); QTest::newRow("invalid") << QDate(9999, 99, 99) - << QDateTime(QDate(2000, 1, 1), QTime(0, 0, 0, 0)) - << QDate(1752, 9, 14) << QTime(0, 0, 0, 0) - << QDate(7999, 12, 31) << QTime(23, 59, 59, 999); + << QDateTime(QDate(2000, 1, 1), QTime(0, 0, 0, 0)) + << QDate(1752, 9, 14) << QTime(0, 0, 0, 0) + << QDate(7999, 12, 31) << QTime(23, 59, 59, 999); } - - void tst_QDateTimeEdit::constructor_qdate() { QFETCH(QDate, parameter); @@ -484,18 +478,16 @@ void tst_QDateTimeEdit::constructor_qtime_data() QTest::addColumn("maximumTime"); QTest::newRow("normal") << QTime(13, 46, 32, 764) - << QDateTime(QDate(2000, 1, 1), QTime(13, 46, 32, 764)) - << QDate(2000, 1, 1) << QTime(0, 0, 0, 0) - << QDate(2000, 1, 1) << QTime(23, 59, 59, 999); + << QDateTime(QDate(2000, 1, 1), QTime(13, 46, 32, 764)) + << QDate(2000, 1, 1) << QTime(0, 0, 0, 0) + << QDate(2000, 1, 1) << QTime(23, 59, 59, 999); QTest::newRow("invalid") << QTime(99, 99, 99, 5000) - << QDateTime(QDate(2000, 1, 1), QTime(0, 0, 0, 0)) - << QDate(2000, 1, 1) << QTime(0, 0, 0, 0) - << QDate(2000, 1, 1) << QTime(23, 59, 59, 999); + << QDateTime(QDate(2000, 1, 1), QTime(0, 0, 0, 0)) + << QDate(2000, 1, 1) << QTime(0, 0, 0, 0) + << QDate(2000, 1, 1) << QTime(23, 59, 59, 999); } - - void tst_QDateTimeEdit::constructor_qtime() { QFETCH(QTime, parameter); @@ -568,7 +560,6 @@ void tst_QDateTimeEdit::minimumDateTime() QCOMPARE(testWidget->minimumDateTime(), expectedMinDateTime); } - void tst_QDateTimeEdit::maximumDateTime_data() { QTest::addColumn("maximumDateTime"); @@ -638,9 +629,8 @@ void tst_QDateTimeEdit::clearMinimumDate() QFETCH(QDate, expectedMinDateAfterClear); testWidget->setMinimumDate(minimumDate); - if (valid) { - QCOMPARE(testWidget->minimumDate(), minimumDate); - } + if (valid) + QCOMPARE(testWidget->minimumDate(), minimumDate); testWidget->clearMinimumDate(); QCOMPARE(testWidget->minimumDate(), expectedMinDateAfterClear); } @@ -662,7 +652,6 @@ void tst_QDateTimeEdit::clearMinimumDateTime_data() QTest::newRow("invalid-0") << QDateTime() << false << QDateTime(QDate(1752, 9, 14), QTime(0, 0)); QTest::newRow("old") << QDateTime(QDate(1492, 8, 3), QTime(2, 3, 1)) << true << QDateTime(QDate(1752, 9, 14), QTime(0, 0)); - } void tst_QDateTimeEdit::clearMinimumDateTime() @@ -672,14 +661,12 @@ void tst_QDateTimeEdit::clearMinimumDateTime() QFETCH(QDateTime, expectedMinDateTimeAfterClear); testWidget->setMinimumDateTime(minimumDateTime); - if (valid) { - QCOMPARE(testWidget->minimumDateTime(), minimumDateTime); - } + if (valid) + QCOMPARE(testWidget->minimumDateTime(), minimumDateTime); testWidget->clearMinimumDateTime(); QCOMPARE(testWidget->minimumDateTime(), expectedMinDateTimeAfterClear); } - void tst_QDateTimeEdit::clearMaximumDateTime_data() { QTest::addColumn("maximumDateTime"); @@ -705,14 +692,12 @@ void tst_QDateTimeEdit::clearMaximumDateTime() QFETCH(QDateTime, expectedMinDateTimeAfterClear); testWidget->setMaximumDateTime(maximumDateTime); - if (valid) { - QCOMPARE(testWidget->maximumDateTime(), maximumDateTime); - } + if (valid) + QCOMPARE(testWidget->maximumDateTime(), maximumDateTime); testWidget->clearMaximumDateTime(); QCOMPARE(testWidget->maximumDateTime(), expectedMinDateTimeAfterClear); } - void tst_QDateTimeEdit::clearMaximumDate_data() { QTest::addColumn("maximumDate"); @@ -733,9 +718,8 @@ void tst_QDateTimeEdit::clearMaximumDate() QFETCH(QDate, expectedMaxDateAfterClear); testWidget->setMaximumDate(maximumDate); - if (valid) { - QCOMPARE(testWidget->maximumDate(), maximumDate); - } + if (valid) + QCOMPARE(testWidget->maximumDate(), maximumDate); testWidget->clearMaximumDate(); QCOMPARE(testWidget->maximumDate(), expectedMaxDateAfterClear); } @@ -777,7 +761,7 @@ void tst_QDateTimeEdit::displayFormat() QString compareFormat = format; if (!valid) - compareFormat = testWidget->displayFormat(); + compareFormat = testWidget->displayFormat(); testWidget->setDisplayFormat(format); QCOMPARE(testWidget->displayFormat(), compareFormat); if (valid) @@ -910,16 +894,15 @@ void tst_QDateTimeEdit::backspaceKey() QCOMPARE(testWidget->text(), QString("11/05/20")); // Check that moving into another field reverts it for (int i=0;i<3;i++) - QTest::keyClick(testWidget, Qt::Key_Left); + QTest::keyClick(testWidget, Qt::Key_Left); QCOMPARE(testWidget->text(), QString("11/05/2004")); #ifdef Q_OS_MAC QTest::keyClick(testWidget, Qt::Key_Right, Qt::ControlModifier); #else QTest::keyClick(testWidget, Qt::Key_End); #endif - for (int i=0;i<4;i++) { - QTest::keyClick(testWidget, Qt::Key_Left, Qt::ShiftModifier); - } + for (int i=0;i<4;i++) + QTest::keyClick(testWidget, Qt::Key_Left, Qt::ShiftModifier); QTest::keyClick(testWidget, Qt::Key_Backspace); QCOMPARE(testWidget->text(), QString("11/05/")); @@ -1027,7 +1010,6 @@ void tst_QDateTimeEdit::tabKeyNavigationWithSuffix() QCOMPARE(testWidget->lineEdit()->selectedText(), QString("11")); } - void tst_QDateTimeEdit::enterKey() { qApp->setActiveWindow(testWidget); @@ -1145,7 +1127,6 @@ void tst_QDateTimeEdit::specialValueText() QCOMPARE(testWidget->text(), QString("fOo")); } - void tst_QDateTimeEdit::setRange_data() { QTest::addColumn("minTime"); @@ -1283,7 +1264,6 @@ void tst_QDateTimeEdit::wrappingTime_data() << QTime(1,1,59); } - void tst_QDateTimeEdit::wrappingTime() { QFETCH(bool, startWithMin); @@ -2005,7 +1985,6 @@ void tst_QDateTimeEdit::wrappingDate_data() << QDate(2000, 1, 1); } - void tst_QDateTimeEdit::wrappingDate() { QFETCH(bool, startWithMin); @@ -2164,7 +2143,6 @@ void tst_QDateTimeEdit::dateTimeSignalChecking() } } - void tst_QDateTimeEdit::sectionText_data() { QTest::addColumn("format"); @@ -2242,7 +2220,6 @@ void tst_QDateTimeEdit::mousePress() // Send mouseClick to center of SC_SpinBoxUp QTest::mouseClick(testWidget, Qt::LeftButton, 0, rectUp.center()); QCOMPARE(testWidget->date().year(), 2005); - } void tst_QDateTimeEdit::stepHourAMPM_data() @@ -2359,7 +2336,6 @@ void tst_QDateTimeEdit::stepHourAMPM_data() QTest::newRow("HH:ap 2") << QString("HH:ap") << keys << expected << QTime(0, 0) << QTime(0, 0) << QTime(23, 59, 59); - } { KeyList keys; @@ -2402,7 +2378,6 @@ void tst_QDateTimeEdit::stepHourAMPM() QFETCH(QTime, min); QFETCH(QTime, max); - testWidget->setDisplayFormat(format); testWidget->setTime(start); testWidget->setMinimumTime(min); @@ -2418,7 +2393,6 @@ void tst_QDateTimeEdit::stepHourAMPM() } } - void tst_QDateTimeEdit::displayedSections_data() { QTest::addColumn("format"); @@ -2580,7 +2554,6 @@ void tst_QDateTimeEdit::newCase() QTest::keyClick(testWidget, Qt::Key_Delete); QTest::keyClick(testWidget, Qt::Key_Left); - QCOMPARE(testWidget->text(), QString("Jula7bJulc07")); QTest::keyClick(testWidget, Qt::Key_Delete); QCOMPARE(testWidget->text(), QString("Jua7bJulc07")); @@ -2619,7 +2592,6 @@ void tst_QDateTimeEdit::newCase3() QTest::keyClick(testWidget, Qt::Key_R); } - void tst_QDateTimeEdit::cursorPos() { if (QDate::longMonthName(1) != "January") @@ -2711,7 +2683,6 @@ void tst_QDateTimeEdit::newCase6() QCOMPARE(testWidget->lineEdit()->displayText(), QString("12-2005-10-12")); } - void tst_QDateTimeEdit::task98554() { testWidget->setDisplayFormat("mm.ss.zzz(ms)"); @@ -2732,7 +2703,6 @@ static QList makeList(int val1, int val2, int val3) return ret; } - void tst_QDateTimeEdit::setCurrentSection_data() { QTest::addColumn("format"); @@ -2787,7 +2757,6 @@ void tst_QDateTimeEdit::setCurrentSection() } } - void tst_QDateTimeEdit::setSelectedSection() { testWidget->setDisplayFormat("mm.ss.zzz('ms') m"); @@ -2888,7 +2857,6 @@ void tst_QDateTimeEdit::calendarPopup() QWidget *wid3 = qFindChild(&dateEdit, "qt_datetimedit_calendar"); QVERIFY(wid3 == 0); dateEdit.hide(); - } class RestoreLayoutDirectioner @@ -2927,7 +2895,6 @@ void tst_QDateTimeEdit::reverseTest() QCOMPARE(testWidget->lineEdit()->displayText(), QString("2001/03/31")); } - void tst_QDateTimeEdit::hour12Test() { testWidget->setDisplayFormat("hh a"); @@ -3169,7 +3136,6 @@ void tst_QDateTimeEdit::nextPrevSection_data() #endif } - void tst_QDateTimeEdit::nextPrevSection() { QFETCH(Qt::Key, key); @@ -3197,7 +3163,6 @@ void tst_QDateTimeEdit::dateEditTimeEditFormats() QCOMPARE(d.displayedSections(), QDateTimeEdit::YearSection); } - void tst_QDateTimeEdit::timeSpec_data() { QTest::addColumn("useSetProperty"); @@ -3205,7 +3170,6 @@ void tst_QDateTimeEdit::timeSpec_data() QTest::newRow("setTimeSpec") << false; } - void tst_QDateTimeEdit::timeSpec() { QFETCH(bool, useSetProperty); @@ -3259,7 +3223,6 @@ void tst_QDateTimeEdit::timeSpecBug() QCOMPARE(oldText, testWidget->text()); } - void tst_QDateTimeEdit::cachedDayTest() { testWidget->setDisplayFormat("MM/dd"); @@ -3287,7 +3250,6 @@ void tst_QDateTimeEdit::cachedDayTest() testWidget->setCurrentSection(QDateTimeEdit::MonthSection); QTest::keyClick(testWidget, Qt::Key_Up); QCOMPARE(testWidget->date(), QDate(2007, 3, 30)); - } void tst_QDateTimeEdit::monthEdgeCase() @@ -3317,9 +3279,6 @@ private: const QLocale old; }; - - - void tst_QDateTimeEdit::setLocale() { RestoreLocaler r; @@ -3350,7 +3309,6 @@ void tst_QDateTimeEdit::setLocale() } } - void tst_QDateTimeEdit::potentialYYValueBug() { EditorDateEdit edit; @@ -3398,7 +3356,6 @@ void tst_QDateTimeEdit::keypadAutoAdvance_data() QTest::newRow("Keypad+Shift") << (Qt::KeyboardModifiers)(Qt::KeypadModifier|Qt::ShiftModifier); } - void tst_QDateTimeEdit::keypadAutoAdvance() { QFETCH(Qt::KeyboardModifiers, modifiers); @@ -3418,7 +3375,6 @@ void tst_QDateTimeEdit::keypadAutoAdvance() QCOMPARE(edit.lineEdit()->selectedText(), QString("02")); } - void tst_QDateTimeEdit::task196924() { EditorDateEdit edit; @@ -3440,7 +3396,6 @@ void tst_QDateTimeEdit::task196924() QTest::keyClick(&edit, Qt::Key_3); QCOMPARE(edit.lineEdit()->selectedText(), QString("2345")); QCOMPARE(edit.text(), QString("17/03/2345")); - } void tst_QDateTimeEdit::focusNextPrevChild() -- cgit v1.2.3