diff options
Diffstat (limited to 'tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp')
-rw-r--r-- | tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp | 93 |
1 files changed, 45 insertions, 48 deletions
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index ae516639a6..2a356f574c 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -1,31 +1,26 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -2315,9 +2310,10 @@ void tst_QComboBox::task191329_size() QStandardItemModel model(rows, 2); for (int row = 0; row < model.rowCount(); ++row) { + const QString rowS = QLatin1String("row ") + QString::number(row); for (int column = 0; column < model.columnCount(); ++column) { - QStandardItem *item = new QStandardItem(QString("row %0, column %1").arg(row).arg(column)); - model.setItem(row, column, item); + const QString text = rowS + QLatin1String(", column ") + QString::number(column); + model.setItem(row, column, new QStandardItem(text)); } } QTableView *table = new QTableView(); @@ -2400,7 +2396,7 @@ void tst_QComboBox::task248169_popupWithMinimalSize() QTest::qWaitForWindowExposed(comboBox.view()); QTRY_VERIFY(comboBox.view()->isVisible()); -#if defined QT_BUILD_INTERNAL && !defined Q_OS_BLACKBERRY +#if defined QT_BUILD_INTERNAL QFrame *container = comboBox.findChild<QComboBoxPrivateContainer *>(); QVERIFY(container); QTRY_VERIFY(desktop.screenGeometry(container).contains(container->geometry())); @@ -2694,7 +2690,8 @@ void tst_QComboBox::resetModel() void reset() { - QStringListModel::reset(); + QStringListModel::beginResetModel(); + QStringListModel::endResetModel(); } }; QComboBox cb; @@ -2866,10 +2863,11 @@ void tst_QComboBox::task_QTBUG_10491_currentIndexAndModelColumn() QStandardItemModel model(4, 4, &comboBox); for (int i = 0; i < 4; i++){ - model.setItem(i, 0, new QStandardItem(QString("Employee Nr %1").arg(i))); - model.setItem(i, 1, new QStandardItem(QString("Street Nr %1").arg(i))); - model.setItem(i, 2, new QStandardItem(QString("Town Nr %1").arg(i))); - model.setItem(i, 3, new QStandardItem(QString("Phone Nr %1").arg(i))); + const QString iS = QString::number(i); + model.setItem(i, 0, new QStandardItem(QLatin1String("Employee Nr ") + iS)); + model.setItem(i, 1, new QStandardItem(QLatin1String("Street Nr ") + iS)); + model.setItem(i, 2, new QStandardItem(QLatin1String("Town Nr ") + iS)); + model.setItem(i, 3, new QStandardItem(QLatin1String("Phone Nr ") + iS)); } comboBox.setModel(&model); comboBox.setModelColumn(0); @@ -2915,12 +2913,12 @@ void tst_QComboBox::itemData() // ensure that the currentText(), the DisplayRole and the EditRole // stay in sync when using QComboBox's default model for (int i = 0; i < itemCount; ++i) { - QString itemText = QString("item text %1").arg(i); + QString itemText = QLatin1String("item text ") + QString::number(i); comboBox.addItem(itemText); } for (int i = 0; i < itemCount; ++i) { - QString itemText = QString("item text %1").arg(i); + QString itemText = QLatin1String("item text ") + QString::number(i); QCOMPARE(comboBox.itemText(i), itemText); QCOMPARE(comboBox.itemData(i, Qt::DisplayRole).toString(), itemText); QCOMPARE(comboBox.itemData(i, Qt::EditRole).toString(), itemText); @@ -2932,14 +2930,11 @@ void tst_QComboBox::itemData() QCOMPARE(comboBox.currentData(Qt::EditRole).toString(), itemText); } - for (int i = 0; i < itemCount; ++i) { - // now change by using setItemText - QString itemText = QString("setItemText %1").arg(i); - comboBox.setItemText(i, itemText); - } + for (int i = 0; i < itemCount; ++i) // now change by using setItemText + comboBox.setItemText(i, QLatin1String("setItemText ") + QString::number(i)); for (int i = 0; i < itemCount; ++i) { - QString itemText = QString("setItemText %1").arg(i); + QString itemText = QLatin1String("setItemText ") + QString::number(i); QCOMPARE(comboBox.itemText(i), itemText); QCOMPARE(comboBox.itemData(i, Qt::DisplayRole).toString(), itemText); QCOMPARE(comboBox.itemData(i, Qt::EditRole).toString(), itemText); @@ -2953,12 +2948,12 @@ void tst_QComboBox::itemData() for (int i = 0; i < itemCount; ++i) { // now change by changing the DisplayRole's data - QString itemText = QString("setItemData(DisplayRole) %1").arg(i); + QString itemText = QLatin1String("setItemData(DisplayRole) ") + QString::number(i); comboBox.setItemData(i, QVariant(itemText), Qt::DisplayRole); } for (int i = 0; i < itemCount; ++i) { - QString itemText = QString("setItemData(DisplayRole) %1").arg(i); + QString itemText = QLatin1String("setItemData(DisplayRole) ") + QString::number(i); QCOMPARE(comboBox.itemText(i), itemText); QCOMPARE(comboBox.itemData(i, Qt::DisplayRole).toString(), itemText); QCOMPARE(comboBox.itemData(i, Qt::EditRole).toString(), itemText); @@ -2972,12 +2967,12 @@ void tst_QComboBox::itemData() for (int i = 0; i < itemCount; ++i) { // now change by changing the EditRole's data - QString itemText = QString("setItemData(EditRole) %1").arg(i); + QString itemText = QLatin1String("setItemData(EditRole) ") + QString::number(i); comboBox.setItemData(i, QVariant(itemText), Qt::EditRole); } for (int i = 0; i < itemCount; ++i) { - QString itemText = QString("setItemData(EditRole) %1").arg(i); + QString itemText = QLatin1String("setItemData(EditRole) ") + QString::number(i); QCOMPARE(comboBox.itemText(i), itemText); QCOMPARE(comboBox.itemData(i, Qt::DisplayRole).toString(), itemText); QCOMPARE(comboBox.itemData(i, Qt::EditRole).toString(), itemText); @@ -2994,14 +2989,14 @@ void tst_QComboBox::itemData() // set additional user data in the addItem call for (int i = 0; i < itemCount; ++i) { - QString itemText = QString("item text %1").arg(i); - QString itemDataText = QString("item data %1").arg(i); - comboBox.addItem(itemText, QVariant(itemDataText)); + const QString iS = QString::number(i); + comboBox.addItem(QLatin1String("item text ") + iS, QVariant(QLatin1String("item data ") + iS)); } for (int i = 0; i < itemCount; ++i) { - QString itemText = QString("item text %1").arg(i); - QString itemDataText = QString("item data %1").arg(i); + const QString iS = QString::number(i); + QString itemText = QLatin1String("item text ") + iS; + QString itemDataText = QLatin1String("item data ") + iS; QCOMPARE(comboBox.itemData(i, Qt::DisplayRole).toString(), itemText); QCOMPARE(comboBox.itemData(i, Qt::EditRole).toString(), itemText); QCOMPARE(comboBox.itemData(i).toString(), itemDataText); @@ -3024,8 +3019,9 @@ void tst_QComboBox::itemData() QString qtlogoPath = QFINDTESTDATA("qtlogo.png"); QIcon icon = QIcon(QPixmap(qtlogoPath)); for (int i = 0; i < itemCount; ++i) { - QString itemText = QString("item text %1").arg(i); - QString itemDataText = QString("item data %1").arg(i); + const QString iS = QString::number(i); + QString itemText = QLatin1String("item text ") + iS; + QString itemDataText = QLatin1String("item data ") + iS; double d = i; comboBox.addItem(itemText); comboBox.setItemData(i, QVariant(itemDataText), Qt::UserRole); @@ -3034,8 +3030,9 @@ void tst_QComboBox::itemData() } for (int i = 0; i < itemCount; ++i) { - QString itemText = QString("item text %1").arg(i); - QString itemDataText = QString("item data %1").arg(i); + const QString iS = QString::number(i); + QString itemText = QLatin1String("item text ") + iS; + QString itemDataText = QLatin1String("item data ") + iS; double d = i; QCOMPARE(comboBox.itemData(i, Qt::DisplayRole).toString(), itemText); QCOMPARE(comboBox.itemData(i, Qt::EditRole).toString(), itemText); @@ -3218,12 +3215,12 @@ void tst_QComboBox::task_QTBUG_49831_scrollerNotActivated() box.setModel(&model); box.setCurrentIndex(500); box.show(); - QTest::qWaitForWindowShown(&box); + QTest::qWaitForWindowExposed(&box); QTest::mouseMove(&box, QPoint(5, 5), 100); box.showPopup(); QFrame *container = box.findChild<QComboBoxPrivateContainer *>(); QVERIFY(container); - QTest::qWaitForWindowShown(container); + QTest::qWaitForWindowExposed(container); QList<QComboBoxPrivateScroller *> scrollers = container->findChildren<QComboBoxPrivateScroller *>(); // Not all styles support scrollers. We rely only on those platforms that do to catch any regression. |