emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mu-query-match-decider: add 'Related' to flags 

We were _replacing_ the flags (such as Duplicate), but we should add to
them instead.

Add a unit-test for this.
This commit is contained in:
Dirk-Jan C. Binnema 2022-12-08 19:31:07 +02:00
parent ca05c82451
commit d5fb15574b
2 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mu-query-match-deciders.cc
View File

@ -180,7 +180,7 @@ struct MatchDeciderRelated final : public MatchDecider {
auto qm{make_query_match(doc)};
if (should_include(qm)) {
qm.flags = QueryMatch::Flags::Related;
qm.flags |= QueryMatch::Flags::Related;
decider_info_.matches.emplace(doc.get_docid(), std::move(qm));
return true;
} else

53
lib/tests/test-mu-store-query.cc
View File

@ -669,6 +669,57 @@ Boo!
}
}
static void
test_related_dup_threaded()
{
// test message sent to self, and copy of received msg.
const auto test_msg = R"(From: "Edward Mallory" <ed@leviathan.gb>
To: "Laurence Oliphant <oli@hotmail.com>
Subject: Boo
Date: Wed, 07 Dec 2022 18:38:06 +0200
Message-ID: <875yentbhg.fsf@djcbsoftware.nl>
MIME-Version: 1.0
Content-Type: text/plain
Boo!
)";
const TestMap test_msgs = {
{"sent/cur/msg1", test_msg },
{"inbox/cur/msg1", test_msg },
{"inbox/cur/msg2", test_msg }};
TempDir tdir;
auto store{make_test_store(tdir.path(), test_msgs, {})};
g_assert_cmpuint(store.size(), ==, 3);
// normal query should give 2
{
auto qr = store.run_query("maildir:/inbox", Field::Id::Date,
QueryFlags::None);
assert_valid_result(qr);
g_assert_cmpuint(qr->size(), ==, 2);
}
// a related query should give 3
{
auto qr = store.run_query("maildir:/inbox", Field::Id::Date,
QueryFlags::IncludeRelated);
assert_valid_result(qr);
g_assert_cmpuint(qr->size(), ==, 3);
}
// a related/threading query should give 3.
{
auto qr = store.run_query("maildir:/inbox", Field::Id::Date,
QueryFlags::IncludeRelated | QueryFlags::Threading);
assert_valid_result(qr);
g_assert_cmpuint(qr->size(), ==, 3);
}
}
int
main(int argc, char* argv[])
@ -692,6 +743,8 @@ main(int argc, char* argv[])
test_duplicate_refresh_rename);
g_test_add_func("/store/query/term-split",
test_term_split);
g_test_add_func("/store/query/related-dup-threaded",
test_related_dup_threaded);
return g_test_run();
}