AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Qt3Support code from QComboBox autotest

Browse Source 
This commit removes the second-last column of test data
(labeled testQt3Support) of the insertItem test function.

Change-Id: I2158bdb5a77c9eaf1424998f51fb03a8df934490
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
This commit is contained in:
Jason McDonald 2011-05-17 13:48:10 +10:00
parent 4a52cc3ac0
commit f075a7afec
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/auto/qcombobox/tst_qcombobox.cpp
View File

@ -1230,21 +1230,17 @@ void tst_QComboBox::insertItem_data()
QTest::addColumn<int>("insertIndex"); QTest::addColumn<int>("insertIndex");
QTest::addColumn<QString>("itemLabel"); QTest::addColumn<QString>("itemLabel");
QTest::addColumn<int>("expectedIndex"); QTest::addColumn<int>("expectedIndex");
QTest::addColumn<bool>("testQt3Support");
QTest::addColumn<bool>("editable"); QTest::addColumn<bool>("editable");
QStringList initialItems; QStringList initialItems;
initialItems << "foo" << "bar"; initialItems << "foo" << "bar";
for(int e = 0 ; e<2 ; e++) { for(int e = 0 ; e<2 ; e++) {
bool editable = (e==0); bool editable = (e==0);
QTest::newRow("Insert less then 0") << initialItems << -1 << "inserted" << 0 << false << editable; QTest::newRow("Insert less then 0") << initialItems << -1 << "inserted" << 0 << editable;
QTest::newRow("Insert at 0") << initialItems << 0 << "inserted" << 0 << false << editable; QTest::newRow("Insert at 0") << initialItems << 0 << "inserted" << 0 << editable;
QTest::newRow("Insert beyond count") << initialItems << 3 << "inserted" << 2 << false << editable; QTest::newRow("Insert beyond count") << initialItems << 3 << "inserted" << 2 << editable;
QTest::newRow("Insert at count") << initialItems << 2 << "inserted" << 2 << false << editable; QTest::newRow("Insert at count") << initialItems << 2 << "inserted" << 2 << editable;
QTest::newRow("Insert in the middle") << initialItems << 1 << "inserted" << 1 << false << editable; QTest::newRow("Insert in the middle") << initialItems << 1 << "inserted" << 1 << editable;
#if defined(QT3_SUPPORT)
QTest::newRow("Qt3Support: Insert less then 0") << initialItems << -1 << "inserted" << 2 << true << editable;
#endif
} }
} }
@ -1254,7 +1250,6 @@ void tst_QComboBox::insertItem()
QFETCH(int, insertIndex); QFETCH(int, insertIndex);
QFETCH(QString, itemLabel); QFETCH(QString, itemLabel);
QFETCH(int, expectedIndex); QFETCH(int, expectedIndex);
QFETCH(bool, testQt3Support);
QFETCH(bool, editable); QFETCH(bool, editable);
testWidget->insertItems(0, initialItems); testWidget->insertItems(0, initialItems);
@ -1263,16 +1258,7 @@ void tst_QComboBox::insertItem()
testWidget->setEditable(true); testWidget->setEditable(true);
if (editable) if (editable)
testWidget->setEditText("FOO"); testWidget->setEditText("FOO");
#if defined (QT3_SUPPORT)
if (testQt3Support)
testWidget->insertItem(itemLabel, insertIndex);
else
testWidget->insertItem(insertIndex, itemLabel);
#else
Q_UNUSED(testQt3Support);
testWidget->insertItem(insertIndex, itemLabel); testWidget->insertItem(insertIndex, itemLabel);
#endif
QCOMPARE(testWidget->count(), initialItems.count() + 1); QCOMPARE(testWidget->count(), initialItems.count() + 1);
QCOMPARE(testWidget->itemText(expectedIndex), itemLabel); QCOMPARE(testWidget->itemText(expectedIndex), itemLabel);