From a27d82709051b926c6e2925db6216e7edc0b2c01 Mon Sep 17 00:00:00 2001 From: Agoston Szepessy Date: Sun, 28 Dec 2025 16:57:57 -0800 Subject: [PATCH] Remove redundant test and cleanup --- src/gui/group/EditGroupWidgetMain.ui | 15 ++++ tests/gui/TestGui.cpp | 104 +-------------------------- tests/gui/TestGui.h | 9 +-- 3 files changed, 19 insertions(+), 109 deletions(-) diff --git a/src/gui/group/EditGroupWidgetMain.ui b/src/gui/group/EditGroupWidgetMain.ui index a98e735fd..93511d8e9 100644 --- a/src/gui/group/EditGroupWidgetMain.ui +++ b/src/gui/group/EditGroupWidgetMain.ui @@ -223,6 +223,9 @@ + + Toggle exclusion from database reports + Exclude from database reports @@ -244,6 +247,18 @@ + + editName + editNotes + expireCheck + expireDatePicker + searchComboBox + autotypeComboBox + autoTypeSequenceInherit + autoTypeSequenceCustomRadio + autoTypeSequenceCustomEdit + excludeReportsCheckBox + diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp index 4e1750488..ed75b98a7 100644 --- a/tests/gui/TestGui.cpp +++ b/tests/gui/TestGui.cpp @@ -2528,109 +2528,7 @@ void TestGui::testDatabaseReports() QCOMPARE(m_dbWidget->currentMode(), DatabaseWidget::Mode::ViewMode); } -void TestGui::testExcludedDatabaseReports() -{ - addGroup("Finance"); - addGroup("Entertainment"); - - // Use bad passwords to make sure they all show up in health report - addEntry("Finance", "Chase", "user1", "password"); - addEntry("Finance", "Amex", "user1", "password123"); - addEntry("Finance", "Capital One", "user1", "password456"); - - addEntry("Entertainment", "Netflix", "user1", "password"); - addEntry("Entertainment", "Hulu", "user1", "password321"); - addEntry("Entertainment", "Apple TV", "user1", "password123"); - - Group* entertainmentGroup = m_dbWidget->currentGroup()->findChildByName("Entertainment"); - m_dbWidget->groupView()->setCurrentGroup(entertainmentGroup); - - auto* toolBar = m_mainWindow->findChild("toolBar"); - QVERIFY(toolBar); - - auto *editGroupAction = m_mainWindow->findChild("actionGroupEdit"); - QVERIFY(editGroupAction->isEnabled()); - triggerAction("actionGroupEdit"); - - auto* editGroupWidget = m_dbWidget->findChild("editGroupWidget"); - QVERIFY(editGroupWidget); - - // Bring up group edit page - QTest::mouseClick(editGroupWidget, Qt::LeftButton); - - QLineEdit* nameEdit = editGroupWidget->findChild("editName"); - QCOMPARE(nameEdit->text(), QString("Entertainment")); - - // Find database report exclusion checkbox and check it - QCheckBox *excludeGroupFromReportsCheckbox = editGroupWidget->findChild("excludeReportsCheckBox"); - QVERIFY(excludeGroupFromReportsCheckbox); - - excludeGroupFromReportsCheckbox->setChecked(true); - - auto* editGroupWidgetButtonBox = editGroupWidget->findChild("buttonBox"); - QVERIFY(editGroupWidgetButtonBox); - - // Apply and go back to main view - QTest::mouseClick(editGroupWidgetButtonBox->button(QDialogButtonBox::Apply), Qt::LeftButton); - QTest::mouseClick(editGroupWidgetButtonBox->button(QDialogButtonBox::Ok), Qt::LeftButton); - QCOMPARE(m_dbWidget->currentMode(), DatabaseWidget::Mode::ViewMode); - - QVERIFY(entertainmentGroup->excludeFromReports()); - - // Verify they don't show up in the report - auto *actionReports = m_mainWindow->findChild("actionReports"); - QVERIFY(actionReports->isEnabled()); - - QWidget* actionReportsWidget = toolBar->widgetForAction(actionReports); - QVERIFY(actionReportsWidget); - QVERIFY(actionReportsWidget->isVisible()); - QVERIFY(actionReportsWidget->isEnabled()); - - QTest::mouseClick(actionReportsWidget, Qt::LeftButton); - - auto *reportsDialog = m_dbWidget->findChild("reportsDialog"); - QVERIFY(reportsDialog); - - CategoryListWidget *categoryList = reportsDialog->findChild("categoryList"); - categoryList->setCurrentCategory(1); - - QStackedWidget *stackedWidget = reportsDialog->findChild("stackedWidget"); - QVERIFY(stackedWidget); - stackedWidget->setCurrentIndex(1); - - ReportsWidgetHealthcheck* healthCheckWidget = reportsDialog->findChild(); - QVERIFY(healthCheckWidget); - - QTest::mouseClick(healthCheckWidget, Qt::LeftButton); - QTableView *healthTable = healthCheckWidget->findChild("healthcheckTableView"); - QVERIFY(healthTable); - - QSignalSpy healthCheckWidgetSpy(healthCheckWidget, &ReportsWidgetHealthcheck::tablePopulated); - - QAbstractItemModel *healthModel = healthTable->model(); - QVERIFY(healthModel); - - // There should be 3 showing - QTRY_COMPARE(healthCheckWidgetSpy.count(), 1); - QCOMPARE(healthModel->rowCount(), 5); // account for 2 existing passwords at the start of each test case - - QCheckBox *showExcludedCheckBox = healthCheckWidget->findChild("showExcluded"); - QVERIFY(showExcludedCheckBox); - QCOMPARE(showExcludedCheckBox->isChecked(), false); - - showExcludedCheckBox->click(); - QVERIFY(showExcludedCheckBox->isChecked()); - QTRY_COMPARE(healthCheckWidgetSpy.count(), 2); - - healthModel = healthTable->model(); - QCOMPARE(healthModel->rowCount(), 8); // account for 2 existing passwords at the start of each test case - - auto *reportsDialogButtonBox = reportsDialog->findChild("buttonBox"); - QTest::mouseClick(reportsDialogButtonBox->button(QDialogButtonBox::Close), Qt::LeftButton); - QCOMPARE(m_dbWidget->currentMode(), DatabaseWidget::Mode::ViewMode); -} - -void TestGui::testIncludeExcludedGroupEntryInReports() +void TestGui::testExcludedGroupEntryInReports() { addGroup("Finance"); addGroup("Entertainment"); diff --git a/tests/gui/TestGui.h b/tests/gui/TestGui.h index 9ce10e28a..c9181effe 100644 --- a/tests/gui/TestGui.h +++ b/tests/gui/TestGui.h @@ -37,12 +37,6 @@ private slots: void cleanup(); void cleanupTestCase(); - - void testDatabaseReports(); - void testExcludedDatabaseReports(); - void testIncludeExcludedGroupEntryInReports(); - -private: void testSettingsDefaultTabOrder(); void testCreateDatabase(); void testMergeDatabase(); @@ -77,7 +71,10 @@ private: void testTrayRestoreHide(); void testShortcutConfig(); void testMenuActionStates(); + void testDatabaseReports(); + void testExcludedGroupEntryInReports(); +private: void addCannedEntries(); void addGroup(const QString &name); void addEntry(const QString &groupName, const QString &title, const QString &username, const QString &password);