1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Q_ASSERT from datetimeedit autotest

Browse Source 
The assert and the last four parameters of makeList() are not needed.
The function is always used to make lists of three integers and the data
are all >= 0.

Change-Id: I93ae5a5f541cde2ff61bd9dd21164ed4a9b57403
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit e754832eff8e1a35fc2681ae69b6e3b1ad666ddb)
This commit is contained in:
Jason McDonald 2011-04-20 16:03:42 +10:00 committed by Rohan McGovern
parent 847ee01953
commit 20d16d3f8b
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
View File

@ -2701,17 +2701,10 @@ void tst_QDateTimeEdit::task98554()
QCOMPARE(testWidget->time(), QTime(0, 0, 10, 0)); 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; QList<int> ret;
Q_ASSERT(val1 >= 0); ret << val1 << val2 << val3;
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;}
return ret; return ret;
} }