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

QComboBox: replace homebrew with QSignalSpy for editTextChanged test

Browse Source 
Change-Id: Id4c81ae71d6dc87f9ad7cfb99a89d335162e1f75
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Mark Brand 2012-10-16 01:46:44 +02:00 committed by The Qt Project
parent e0ad6e5f7d
commit e437051ff5
1 changed files with 12 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
View File

@ -160,15 +160,10 @@ private slots:
void task_QTBUG_10491_currentIndexAndModelColumn();
void highlightedSignal();
protected slots:
void onEditTextChanged( const QString &newString );
private:
QComboBox *testWidget;
QWidget *parent;
QPushButton* ok;
int editTextCount;
QString editText;
};
class MyAbstractItemDelegate : public QAbstractItemDelegate
@ -403,10 +398,6 @@ void tst_QComboBox::initTestCase()
testWidget = new QComboBox(parent);
testWidget->setObjectName("testObject");
testWidget->setGeometry(0, 0, 100, 100);
editTextCount = 0;
editText.clear();
connect(testWidget, SIGNAL(editTextChanged(const QString&)),
this, SLOT(onEditTextChanged(const QString&)));
parent->show();
}
@ -1375,23 +1366,19 @@ void tst_QComboBox::editTextChanged()
testWidget->setEditable(false);
QCOMPARE(testWidget->isEditable(), false);
QSignalSpy spy(testWidget, SIGNAL(editTextChanged(QString)));
// no signal should be sent when current is set to the same
QCOMPARE(testWidget->currentIndex(), 0);
editTextCount = 0;
editText.clear();
testWidget->setCurrentIndex(0);
QCOMPARE(testWidget->currentIndex(), 0);
QCOMPARE(editTextCount, 0);
QCOMPARE(editText.isEmpty(), true);
QCOMPARE(spy.count(), 0);
// no signal should be sent when changing to other index because we are not editable
QCOMPARE(testWidget->currentIndex(), 0);
editTextCount = 0;
editText.clear();
testWidget->setCurrentIndex(1);
QCOMPARE(testWidget->currentIndex(), 1);
QCOMPARE(editTextCount, 0);
QCOMPARE(editText.isEmpty(), true);
QCOMPARE(spy.count(), 0);
// now set to editable and reset current index
testWidget->setEditable(true);
@ -1399,35 +1386,25 @@ void tst_QComboBox::editTextChanged()
testWidget->setCurrentIndex(0);
// no signal should be sent when current is set to the same
spy.clear();
QCOMPARE(testWidget->currentIndex(), 0);
editTextCount = 0;
editText.clear();
testWidget->setCurrentIndex(0);
QCOMPARE(testWidget->currentIndex(), 0);
QCOMPARE(editTextCount, 0);
QCOMPARE(editText.isEmpty(), true);
QCOMPARE(spy.count(), 0);
// signal should be sent when changing to other index
QCOMPARE(testWidget->currentIndex(), 0);
editTextCount = 0;
editText.clear();
testWidget->setCurrentIndex(1);
QCOMPARE(testWidget->currentIndex(), 1);
QCOMPARE(editTextCount, 1);
QCOMPARE(editText, QString("bar"));
QCOMPARE(spy.count(), 1);
QCOMPARE(qvariant_cast<QString>(spy.at(0).at(0)), QString("bar"));
// insert some keys and notice they are all signaled
editTextCount = 0;
editText.clear();
spy.clear();
QTest::keyClicks(testWidget, "bingo");
QCOMPARE(editTextCount, 5);
QCOMPARE(editText, QString("barbingo"));
}
void tst_QComboBox::onEditTextChanged(const QString &text)
{
editTextCount++;
editText = text;
QCOMPARE(spy.count(), 5);
QCOMPARE(qvariant_cast<QString>(spy.at(4).at(0)), QString("barbingo"));
}
void tst_QComboBox::setModel()