diff options
Diffstat (limited to 'tests/auto/quickdialogs')
5 files changed, 48 insertions, 48 deletions
diff --git a/tests/auto/quickdialogs/qquickcolordialogimpl/tst_qquickcolordialogimpl.cpp b/tests/auto/quickdialogs/qquickcolordialogimpl/tst_qquickcolordialogimpl.cpp index 488036808d..c8a1eb2231 100644 --- a/tests/auto/quickdialogs/qquickcolordialogimpl/tst_qquickcolordialogimpl.cpp +++ b/tests/auto/quickdialogs/qquickcolordialogimpl/tst_qquickcolordialogimpl.cpp @@ -167,7 +167,7 @@ void tst_QQuickColorDialogImpl::moveColorPickerHandle() // Move handle to where the saturation is the highest and the lightness is 'neutral' QTest::mouseClick(dialogHelper.window(), Qt::LeftButton, Qt::NoModifier, topCenter); - QCOMPARE(colorChangedSpy.count(), 1); + QCOMPARE(colorChangedSpy.size(), 1); const qreal floatingPointComparisonThreshold = 1.0 / colorPicker->width(); const QString floatComparisonErrorString( @@ -195,7 +195,7 @@ void tst_QQuickColorDialogImpl::moveColorPickerHandle() QCOMPARE(colorPicker->hue(), QColorConstants::Cyan.hslHueF()); QCOMPARE(colorPicker->color().rgba(), QColorConstants::Cyan.rgba()); - QCOMPARE(colorChangedSpy.count(), 2); + QCOMPARE(colorChangedSpy.size(), 2); QPoint bottomCenter = colorPicker->mapToScene({ colorPicker->width() / 2, colorPicker->height() }).toPoint(); @@ -208,7 +208,7 @@ void tst_QQuickColorDialogImpl::moveColorPickerHandle() // This means that the current color was changed twice. // (The press happens 1 pixel above the release, to work around an issue where the mouse event // wasn't received by the color picker) - QCOMPARE(colorChangedSpy.count(), 4); + QCOMPARE(colorChangedSpy.size(), 4); FUZZYCOMPARE(colorPicker->saturation(), 0.0, floatingPointComparisonThreshold, qPrintable(floatComparisonErrorString.arg("saturation()").arg(colorPicker->saturation()).arg(0.0).arg(floatingPointComparisonThreshold))); FUZZYCOMPARE(dialogHelper.quickDialog->saturation(), 0.0, floatingPointComparisonThreshold, @@ -317,7 +317,7 @@ void tst_QQuickColorDialogImpl::changeHex() // Modify the value in the TextField to something else. colorTextField->forceActiveFocus(); - colorTextField->select(1, colorTextField->text().length()); + colorTextField->select(1, colorTextField->text().size()); QVERIFY(colorTextField->hasActiveFocus()); QTest::keyClick(dialogHelper.window(), Qt::Key_Backspace); QTest::keyClick(dialogHelper.window(), '0'); diff --git a/tests/auto/quickdialogs/qquickfiledialogimpl/tst_qquickfiledialogimpl.cpp b/tests/auto/quickdialogs/qquickfiledialogimpl/tst_qquickfiledialogimpl.cpp index 80f452d479..d2b3a2f961 100644 --- a/tests/auto/quickdialogs/qquickfiledialogimpl/tst_qquickfiledialogimpl.cpp +++ b/tests/auto/quickdialogs/qquickfiledialogimpl/tst_qquickfiledialogimpl.cpp @@ -316,8 +316,8 @@ void tst_QQuickFileDialogImpl::chooseFileViaStandardButtons() COMPARE_URL(delegate->file(), QUrl::fromLocalFile(tempFile2->fileName())); QVERIFY(clickButton(delegate)); VERIFY_FILE_SELECTED_AND_FOCUSED(QUrl::fromLocalFile(tempDir.path()), QUrl::fromLocalFile(tempFile2->fileName()), 2); - QCOMPARE(dialogSelectedFileChangedSpy.count(), 1); - QCOMPARE(dialogCurrentFileChangedSpy.count(), 1); + QCOMPARE(dialogSelectedFileChangedSpy.size(), 1); + QCOMPARE(dialogCurrentFileChangedSpy.size(), 1); // Click the "Open" button. QVERIFY(dialogHelper.quickDialog->footer()); @@ -329,8 +329,8 @@ void tst_QQuickFileDialogImpl::chooseFileViaStandardButtons() COMPARE_URL(dialogHelper.dialog->selectedFile(), QUrl::fromLocalFile(tempFile2->fileName())); COMPARE_URLS(dialogHelper.dialog->selectedFiles(), { QUrl::fromLocalFile(tempFile2->fileName()) }); COMPARE_URL(dialogHelper.quickDialog->selectedFile(), QUrl::fromLocalFile(tempFile2->fileName())); - QCOMPARE(dialogSelectedFileChangedSpy.count(), 1); - QCOMPARE(dialogCurrentFileChangedSpy.count(), 1); + QCOMPARE(dialogSelectedFileChangedSpy.size(), 1); + QCOMPARE(dialogCurrentFileChangedSpy.size(), 1); QTRY_VERIFY(!dialogHelper.quickDialog->isVisible()); QVERIFY(!dialogHelper.dialog->isVisible()); } @@ -911,7 +911,7 @@ void tst_QQuickFileDialogImpl::changeNameFilters() const QStringList nameFilters = { "Text files (*.txt)", "HTML files (*.html)" }; dialogHelper.dialog->setNameFilters(nameFilters); QCOMPARE(dialogHelper.dialog->nameFilters(), nameFilters); - QCOMPARE(nameFiltersChangedSpy.count(), 1); + QCOMPARE(nameFiltersChangedSpy.size(), 1); QCOMPARE(dialogHelper.dialog->selectedNameFilter()->name(), "Text files"); QCOMPARE(dialogHelper.dialog->selectedNameFilter()->index(), 0); QCOMPARE(dialogHelper.dialog->selectedNameFilter()->extensions(), { "txt" }); diff --git a/tests/auto/quickdialogs/qquickfolderdialogimpl/tst_qquickfolderdialogimpl.cpp b/tests/auto/quickdialogs/qquickfolderdialogimpl/tst_qquickfolderdialogimpl.cpp index 097bc3a9af..a4b445b50b 100644 --- a/tests/auto/quickdialogs/qquickfolderdialogimpl/tst_qquickfolderdialogimpl.cpp +++ b/tests/auto/quickdialogs/qquickfolderdialogimpl/tst_qquickfolderdialogimpl.cpp @@ -231,10 +231,10 @@ void tst_QQuickFolderDialogImpl::chooseFolderViaStandardButtons() COMPARE_URL(dialogHelper.quickDialog->selectedFolder(), QUrl::fromLocalFile(tempSubDir2.path())); COMPARE_URL(dialogHelper.dialog->selectedFolder(), QUrl::fromLocalFile(tempSubDir2.path())); // Only selectedFile-related signals should be emitted. - QCOMPARE(signalHelper.dialogSelectedFolderChangedSpy.count(), 1); - QCOMPARE(signalHelper.quickDialogSelectedFolderChangedSpy.count(), 1); - QCOMPARE(signalHelper.dialogCurrentFolderChangedSpy.count(), 0); - QCOMPARE(signalHelper.quickDialogCurrentFolderChangedSpy.count(), 0); + QCOMPARE(signalHelper.dialogSelectedFolderChangedSpy.size(), 1); + QCOMPARE(signalHelper.quickDialogSelectedFolderChangedSpy.size(), 1); + QCOMPARE(signalHelper.dialogCurrentFolderChangedSpy.size(), 0); + QCOMPARE(signalHelper.quickDialogCurrentFolderChangedSpy.size(), 0); // Click the "Open" button. QVERIFY(dialogHelper.quickDialog->footer()); @@ -245,10 +245,10 @@ void tst_QQuickFolderDialogImpl::chooseFolderViaStandardButtons() QVERIFY(clickButton(openButton)); COMPARE_URL(dialogHelper.dialog->selectedFolder(), QUrl::fromLocalFile(tempSubDir2.path())); COMPARE_URL(dialogHelper.quickDialog->selectedFolder(), QUrl::fromLocalFile(tempSubDir2.path())); - QCOMPARE(signalHelper.dialogSelectedFolderChangedSpy.count(), 1); - QCOMPARE(signalHelper.quickDialogSelectedFolderChangedSpy.count(), 1); - QCOMPARE(signalHelper.dialogCurrentFolderChangedSpy.count(), 0); - QCOMPARE(signalHelper.quickDialogCurrentFolderChangedSpy.count(), 0); + QCOMPARE(signalHelper.dialogSelectedFolderChangedSpy.size(), 1); + QCOMPARE(signalHelper.quickDialogSelectedFolderChangedSpy.size(), 1); + QCOMPARE(signalHelper.dialogCurrentFolderChangedSpy.size(), 0); + QCOMPARE(signalHelper.quickDialogCurrentFolderChangedSpy.size(), 0); QTRY_VERIFY(!dialogHelper.quickDialog->isVisible()); QVERIFY(!dialogHelper.dialog->isVisible()); } @@ -323,10 +323,10 @@ void tst_QQuickFolderDialogImpl::changeFolderViaDoubleClick() COMPARE_URL(dialogHelper.dialog->selectedFolder(), QUrl()); // selectedFolder is set to the folder when clicked and then set to an empty URL after // the double click. - QCOMPARE(signalHelper.dialogSelectedFolderChangedSpy.count(), 2); - QCOMPARE(signalHelper.quickDialogSelectedFolderChangedSpy.count(), 2); - QCOMPARE(signalHelper.dialogCurrentFolderChangedSpy.count(), 1); - QCOMPARE(signalHelper.quickDialogCurrentFolderChangedSpy.count(), 1); + QCOMPARE(signalHelper.dialogSelectedFolderChangedSpy.size(), 2); + QCOMPARE(signalHelper.quickDialogSelectedFolderChangedSpy.size(), 2); + QCOMPARE(signalHelper.dialogCurrentFolderChangedSpy.size(), 1); + QCOMPARE(signalHelper.quickDialogCurrentFolderChangedSpy.size(), 1); // Since we only changed the current folder, the dialog should still be open. QVERIFY(dialogHelper.dialog->isVisible()); @@ -396,10 +396,10 @@ void tst_QQuickFolderDialogImpl::changeFolderViaEnter() QTest::keyClick(dialogHelper.window(), Qt::Key_Return); COMPARE_URL(dialogHelper.dialog->currentFolder(), QUrl::fromLocalFile(tempSubDir1.path())); COMPARE_URL(dialogHelper.dialog->selectedFolder(), QUrl::fromLocalFile(tempSubSubDir.path())); - QCOMPARE(signalHelper.dialogSelectedFolderChangedSpy.count(), 1); - QCOMPARE(signalHelper.quickDialogSelectedFolderChangedSpy.count(), 1); - QCOMPARE(signalHelper.dialogCurrentFolderChangedSpy.count(), 1); - QCOMPARE(signalHelper.quickDialogCurrentFolderChangedSpy.count(), 1); + QCOMPARE(signalHelper.dialogSelectedFolderChangedSpy.size(), 1); + QCOMPARE(signalHelper.quickDialogSelectedFolderChangedSpy.size(), 1); + QCOMPARE(signalHelper.dialogCurrentFolderChangedSpy.size(), 1); + QCOMPARE(signalHelper.quickDialogCurrentFolderChangedSpy.size(), 1); // Since we only changed the current folder, the dialog should still be open. QVERIFY(dialogHelper.dialog->isVisible()); diff --git a/tests/auto/quickdialogs/qquickfontdialogimpl/tst_qquickfontdialogimpl.cpp b/tests/auto/quickdialogs/qquickfontdialogimpl/tst_qquickfontdialogimpl.cpp index 78a0060824..5de4fe291b 100644 --- a/tests/auto/quickdialogs/qquickfontdialogimpl/tst_qquickfontdialogimpl.cpp +++ b/tests/auto/quickdialogs/qquickfontdialogimpl/tst_qquickfontdialogimpl.cpp @@ -151,7 +151,7 @@ void tst_QQuickFontDialogImpl::changingWritingSystem() QVERIFY(anyDelegate); QCOMPARE(anyDelegate->text(), QFontDatabase::writingSystemName(QFontDatabase::Any)); - QCOMPARE(fontFamilyModelSpy.count(), 0); + QCOMPARE(fontFamilyModelSpy.size(), 0); // Select "Japanese" from the ComboBox. const int japaneseIndex = QFontDatabase::Japanese; @@ -162,7 +162,7 @@ void tst_QQuickFontDialogImpl::changingWritingSystem() QTRY_VERIFY(!writingSystemComboBox->popup()->isVisible()); // Check that the contents of the font family listview changed - QCOMPARE(fontFamilyModelSpy.count(), 1); + QCOMPARE(fontFamilyModelSpy.size(), 1); // And that the sample text is correctly set QCOMPARE(sampleEdit->text(), QFontDatabase::writingSystemSample(QFontDatabase::Japanese)); @@ -235,11 +235,11 @@ void tst_QQuickFontDialogImpl::clickAroundInTheFamilyListView() const QString expected2 = fontListModel[i], actual2 = dialogHelper.dialog->selectedFont().family(); QVERIFY2(expected2 == actual2, qPrintable(err.arg(expected2, actual2).append(", FONT ").append(fontDelegate->text()))); - const int selectedFontSpyCount = selectedFontSpy.count(); + const int selectedFontSpyCount = selectedFontSpy.size(); QVERIFY2(selectedFontSpyCount == 1, qPrintable(err.arg(1).arg(selectedFontSpyCount).append(", FONT ").append(fontDelegate->text()))); - QVERIFY2((oldStyleModel == fontStyleListView->model()) != (styleModelSpy.count() == 1), + QVERIFY2((oldStyleModel == fontStyleListView->model()) != (styleModelSpy.size() == 1), qPrintable(QString("LOOP INDEX %1").arg(i))); - QVERIFY2((oldSizeModel == fontSizeListView->model()) != (sizeModelSpy.count() == 1), + QVERIFY2((oldSizeModel == fontSizeListView->model()) != (sizeModelSpy.size() == 1), qPrintable(QString("LOOP INDEX %1").arg(i))); } @@ -269,25 +269,25 @@ void tst_QQuickFontDialogImpl::settingUnderlineAndStrikeoutEffects() QVERIFY(clickButton(underlineCheckBox)); - QCOMPARE(selectedFontSpy.count(), 1); + QCOMPARE(selectedFontSpy.size(), 1); QVERIFY(dialogHelper.dialog->selectedFont().underline()); QVERIFY(!dialogHelper.dialog->selectedFont().strikeOut()); QVERIFY(clickButton(underlineCheckBox)); - QCOMPARE(selectedFontSpy.count(), 2); + QCOMPARE(selectedFontSpy.size(), 2); QVERIFY(!dialogHelper.dialog->selectedFont().underline()); QVERIFY(!dialogHelper.dialog->selectedFont().strikeOut()); QVERIFY(clickButton(strikeoutCheckBox)); - QCOMPARE(selectedFontSpy.count(), 3); + QCOMPARE(selectedFontSpy.size(), 3); QVERIFY(!dialogHelper.dialog->selectedFont().underline()); QVERIFY(dialogHelper.dialog->selectedFont().strikeOut()); QVERIFY(clickButton(strikeoutCheckBox)); - QCOMPARE(selectedFontSpy.count(), 4); + QCOMPARE(selectedFontSpy.size(), 4); QVERIFY(!dialogHelper.dialog->selectedFont().underline()); QVERIFY(!dialogHelper.dialog->selectedFont().strikeOut()); @@ -401,7 +401,7 @@ public: do { m_searchText.append(searchText); - for (int i = 0; i < m_model.count(); ++i) { + for (int i = 0; i < m_model.size(); ++i) { if (m_model.at(i).startsWith(m_searchText, Qt::CaseInsensitive)) return i; } @@ -512,7 +512,7 @@ void tst_QQuickFontDialogImpl::setCurrentFontFromApi() QVERIFY(fontSizeEdit); // From when the listviews are populated - QCOMPARE(selectedFontSpy.count(), 1); + QCOMPARE(selectedFontSpy.size(), 1); selectedFontSpy.clear(); @@ -538,16 +538,16 @@ void tst_QQuickFontDialogImpl::setCurrentFontFromApi() QCOMPARE(styleModel.at(fontStyleListView->currentIndex()), style); QCOMPARE(fontSizeEdit->text(), QString::number(size++)); - QCOMPARE(selectedFontSpy.count(), ++spyCounter); + QCOMPARE(selectedFontSpy.size(), ++spyCounter); - for (int styleIt = 0; styleIt < qMin(styleModel.count(), maxNumberOfStyles); ++styleIt) { + for (int styleIt = 0; styleIt < qMin(styleModel.size(), maxNumberOfStyles); ++styleIt) { const QString currentStyle = styleModel.at(styleIt); const QFont f = QFontDatabase::font(*family, currentStyle, size); dialogHelper.dialog->setSelectedFont(f); QCOMPARE(styleModel.at(fontStyleListView->currentIndex()), currentStyle); - QCOMPARE(selectedFontSpy.count(), ++spyCounter); + QCOMPARE(selectedFontSpy.size(), ++spyCounter); } } diff --git a/tests/auto/quickdialogs/qquickmessagedialogimpl/tst_qquickmessagedialogimpl.cpp b/tests/auto/quickdialogs/qquickmessagedialogimpl/tst_qquickmessagedialogimpl.cpp index 93b29d6a16..b2f3d6456c 100644 --- a/tests/auto/quickdialogs/qquickmessagedialogimpl/tst_qquickmessagedialogimpl.cpp +++ b/tests/auto/quickdialogs/qquickmessagedialogimpl/tst_qquickmessagedialogimpl.cpp @@ -79,7 +79,7 @@ void tst_QQuickMessageDialogImpl::changeText() // update the text property dialogHelper.dialog->setText(testString1); - QCOMPARE(textSpy.count(), 1); + QCOMPARE(textSpy.size(), 1); // The textLabel is empty until dialog is re-opened QCOMPARE(dialogHelper.dialog->text(), testString1); @@ -91,7 +91,7 @@ void tst_QQuickMessageDialogImpl::changeText() // The textLabel isn't updated immediately dialogHelper.dialog->setText(testString2); - QCOMPARE(textSpy.count(), 2); + QCOMPARE(textSpy.size(), 2); QCOMPARE(textLabel->text(), testString1); dialogHelper.dialog->close(); @@ -128,7 +128,7 @@ void tst_QQuickMessageDialogImpl::changeInformativeText() // update the informativeText property dialogHelper.dialog->setInformativeText(testString1); - QCOMPARE(informativeTextSpy.count(), 1); + QCOMPARE(informativeTextSpy.size(), 1); // The textLabel is empty until dialog is re-opened QCOMPARE(dialogHelper.dialog->informativeText(), testString1); @@ -140,7 +140,7 @@ void tst_QQuickMessageDialogImpl::changeInformativeText() // The textLabel shouldn't update immediately dialogHelper.dialog->setInformativeText(testString2); - QCOMPARE(informativeTextSpy.count(), 2); + QCOMPARE(informativeTextSpy.size(), 2); QCOMPARE(informativeTextLabel->text(), testString1); dialogHelper.dialog->close(); @@ -169,7 +169,7 @@ void tst_QQuickMessageDialogImpl::changeStandardButtons() QPlatformDialogHelper::StandardButtons(QPlatformDialogHelper::StandardButton::Save | QPlatformDialogHelper::StandardButton::Cancel | QPlatformDialogHelper::StandardButton::Apply)); - QCOMPARE(buttonBoxSpy.count(), 1); + QCOMPARE(buttonBoxSpy.size(), 1); QCOMPARE(buttonBox->count(), 1); dialogHelper.dialog->close(); dialogHelper.dialog->open(); @@ -190,7 +190,7 @@ void tst_QQuickMessageDialogImpl::changeStandardButtons() dialogHelper.dialog->setButtons( QPlatformDialogHelper::StandardButton(QPlatformDialogHelper::StandardButton::Ok | QPlatformDialogHelper::StandardButton::Close)); - QCOMPARE(buttonBoxSpy.count(), 2); + QCOMPARE(buttonBoxSpy.size(), 2); QCOMPARE(buttonBox->count(), 3); dialogHelper.dialog->open(); QCOMPARE(buttonBox->count(), 2); @@ -233,7 +233,7 @@ void tst_QQuickMessageDialogImpl::detailedText() // Set the detailed text to a non-empty string dialogHelper.dialog->setDetailedText(nonEmptyString); QCOMPARE(dialogHelper.dialog->detailedText(), nonEmptyString); - QCOMPARE(detailedTextSpy.count(), 1); + QCOMPARE(detailedTextSpy.size(), 1); QCOMPARE(detailedTextArea->text(), emptyString); QVERIFY(!detailedTextButton->isVisible()); dialogHelper.dialog->close(); @@ -246,7 +246,7 @@ void tst_QQuickMessageDialogImpl::detailedText() // Set the detailed text to an empty string dialogHelper.dialog->setDetailedText(emptyString); - QCOMPARE(detailedTextSpy.count(), 2); + QCOMPARE(detailedTextSpy.size(), 2); QCOMPARE(dialogHelper.dialog->detailedText(), emptyString); QCOMPARE(detailedTextArea->text(), nonEmptyString); QVERIFY(detailedTextButton->isVisible()); @@ -260,7 +260,7 @@ void tst_QQuickMessageDialogImpl::detailedText() // Change the detailed text property while the dialog is already open, should not immediately // update the dialog ui dialogHelper.dialog->setDetailedText(nonEmptyString); - QCOMPARE(detailedTextSpy.count(), 3); + QCOMPARE(detailedTextSpy.size(), 3); QCOMPARE(dialogHelper.dialog->detailedText(), nonEmptyString); QCOMPARE(detailedTextArea->text(), emptyString); QVERIFY2(!detailedTextButton->isVisible(), |