Skip to content

Getting ready to Qt 6 (8/n). Use QRegularExpression in AddressBookSortFilterProxyModel class #593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hebasto merged 2 commits into from
May 24, 2022
Merged

Getting ready to Qt 6 (8/n). Use QRegularExpression in AddressBookSortFilterProxyModel class #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c5d8f2
qt, test: Add tests for searching in `AddressBookPage` dialog
hebasto Apr 23, 2022
e280087
qt: Use `QRegularExpression` in `AddressBookSortFilterProxyModel` class
hebasto May 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/qt/addressbookpage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
#include <QMenu>
#include <QMessageBox>
#include <QSortFilterProxyModel>
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
#include <QRegularExpression>
#else
#include <QRegExp>
#endif

class AddressBookSortFilterProxyModel final : public QSortFilterProxyModel
{
Expand Down Expand Up @@ -46,12 +51,13 @@ class AddressBookSortFilterProxyModel final : public QSortFilterProxyModel

auto address = model->index(row, AddressTableModel::Address, parent);

if (filterRegExp().indexIn(model->data(address).toString()) < 0 &&
filterRegExp().indexIn(model->data(label).toString()) < 0) {
return false;
}

return true;
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
const auto pattern = filterRegularExpression();
#else
const auto pattern = filterRegExp();
#endif
return (model->data(address).toString().contains(pattern) ||
model->data(label).toString().contains(pattern));
}
};

Expand Down
52 changes: 49 additions & 3 deletions src/qt/test/addressbooktests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <chrono>

#include <QApplication>
#include <QLineEdit>
#include <QMessageBox>
#include <QTableView>
#include <QTimer>
Expand Down Expand Up @@ -102,11 +103,13 @@ void TestAddAddressesToSendBook(interfaces::Node& node)
QString s_label("already here (s)");

// Define a new address (which should add to the address book successfully).
QString new_address;
QString new_address_a;
QString new_address_b;

std::tie(r_key_dest, preexisting_r_address) = build_address();
std::tie(s_key_dest, preexisting_s_address) = build_address();
std::tie(std::ignore, new_address) = build_address();
std::tie(std::ignore, new_address_a) = build_address();
std::tie(std::ignore, new_address_b) = build_address();

{
LOCK(wallet->cs_wallet);
Expand Down Expand Up @@ -159,9 +162,52 @@ void TestAddAddressesToSendBook(interfaces::Node& node)
// Submit a new address which should add successfully - we expect the
// warning message to be blank.
EditAddressAndSubmit(
&editAddressDialog, QString("new"), new_address, QString(""));
&editAddressDialog, QString("io - new A"), new_address_a, QString(""));
check_addbook_size(3);
QCOMPARE(table_view->model()->rowCount(), 2);

EditAddressAndSubmit(
&editAddressDialog, QString("io - new B"), new_address_b, QString(""));
check_addbook_size(4);
QCOMPARE(table_view->model()->rowCount(), 3);

auto search_line = address_book.findChild<QLineEdit*>("searchLineEdit");

search_line->setText(r_label);
QCOMPARE(table_view->model()->rowCount(), 0);

search_line->setText(s_label);
QCOMPARE(table_view->model()->rowCount(), 1);

search_line->setText("io");
QCOMPARE(table_view->model()->rowCount(), 2);

// Check wilcard "?".
search_line->setText("io?new");
QCOMPARE(table_view->model()->rowCount(), 0);
search_line->setText("io???new");
QCOMPARE(table_view->model()->rowCount(), 2);

// Check wilcard "*".
search_line->setText("io*new");
QCOMPARE(table_view->model()->rowCount(), 2);
search_line->setText("*");
QCOMPARE(table_view->model()->rowCount(), 3);

search_line->setText(preexisting_r_address);
QCOMPARE(table_view->model()->rowCount(), 0);

search_line->setText(preexisting_s_address);
QCOMPARE(table_view->model()->rowCount(), 1);

search_line->setText(new_address_a);
QCOMPARE(table_view->model()->rowCount(), 1);

search_line->setText(new_address_b);
QCOMPARE(table_view->model()->rowCount(), 1);

search_line->setText("");
QCOMPARE(table_view->model()->rowCount(), 3);
}

} // namespace
Expand Down