summaryrefslogtreecommitdiffstats
path: root/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp')
-rw-r--r--tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
index 9d0c5f7d22..f5dbea49d3 100644
--- a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
+++ b/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
@@ -2701,17 +2701,10 @@ void tst_QDateTimeEdit::task98554()
QCOMPARE(testWidget->time(), QTime(0, 0, 10, 0));
}
-static QList<int> makeList(int val1, int val2 = -1, int val3 = -1, int val4 = -1, int val5 = -1, int val6 = -1, int val7 = -1)
+static QList<int> makeList(int val1, int val2, int val3)
{
QList<int> ret;
- Q_ASSERT(val1 >= 0);
- ret << val1;
- if (val2 < 0) {return ret;} else {ret << val2;}
- if (val3 < 0) {return ret;} else {ret << val3;}
- if (val4 < 0) {return ret;} else {ret << val4;}
- if (val5 < 0) {return ret;} else {ret << val5;}
- if (val6 < 0) {return ret;} else {ret << val6;}
- if (val7 >= 0) {ret << val2;}
+ ret << val1 << val2 << val3;
return ret;
}
@@ -2753,7 +2746,7 @@ void tst_QDateTimeEdit::setCurrentSection()
QFETCH(QList<int>, setCurrentSections);
QFETCH(QList<int>, expectedCursorPositions);
- Q_ASSERT(setCurrentSections.size() == expectedCursorPositions.size());
+ QCOMPARE(setCurrentSections.size(), expectedCursorPositions.size());
testWidget->setDisplayFormat(format);
testWidget->setDateTime(dateTime);
#ifdef Q_WS_MAC