alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all: update for API changes (config etc.)

Browse Source 
Use the new & improved APIs.
This commit is contained in:
Dirk-Jan C. Binnema
2023-07-01 18:20:51 +03:00
parent 2acc1c2271
commit c6fff6a281
16 changed files with 72 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tests/bench-indexer.cc
View File

@ -465,7 +465,7 @@ benchmark_indexer(gconstpointer testdata)
auto start = Clock::now();
{
auto store{Store::make_new(BENCH_STORE, BENCH_MAILDIRS, {}, {})};
auto store{Store::make_new(BENCH_STORE, BENCH_MAILDIRS)};
g_assert_true(!!store);
Indexer::Config conf{};
conf.max_threads = tdata->num_threads;

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

@ -64,7 +64,11 @@ make_test_store(const std::string& test_path, const TestMap& test_map,
}
/* make the store */
auto store = Store::make_new(test_path, maildir, personal_addresses, {});
MemDb mdb;
Config conf{mdb};
conf.set<Config::Id::PersonalAddresses>(personal_addresses);
auto store = Store::make_new(test_path, maildir, conf);
assert_valid_result(store);
/* index the messages */
@ -544,9 +548,9 @@ Boo!
/* create maildir with message */
TempDir tdir;
auto store{make_test_store(tdir.path(), test_msgs, {})};
g_debug("%s", store.properties().root_maildir.c_str());
g_debug("%s", store.root_maildir().c_str());
/* ensure we have a proper maildir, with new/, cur/ */
auto mres = maildir_mkdir(store.properties().root_maildir + "/inbox");
auto mres = maildir_mkdir(store.root_maildir() + "/inbox");
assert_valid_result(mres);
g_assert_cmpuint(store.size(), ==, 1U);
@ -572,7 +576,7 @@ Boo!
const auto& moved_msg{moved_msgs->at(0).second};
const auto new_path = moved_msg.path();
if (!rename)
assert_equal(new_path, store.properties().root_maildir + "/inbox/cur/msg:2,S");
assert_equal(new_path, store.root_maildir() + "/inbox/cur/msg:2,S");
g_assert_cmpuint(store.size(), ==, 1);
g_assert_false(::access(old_path.c_str(), F_OK) == 0);
g_assert_true(::access(new_path.c_str(), F_OK) == 0);

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

@ -1,5 +1,5 @@
/*
** Copyright (C) 2008-2022 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
** Copyright (C) 2008-2023 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
**
** This program is free software; you can redistribute it and/or modify it
** under the terms of the GNU General Public License as published by the
@ -45,37 +45,36 @@ static void
test_store_ctor_dtor()
{
TempDir tempdir;
auto store{Store::make_new(tempdir.path(), "/tmp", {}, {})};
auto store{Store::make_new(tempdir.path(), "/tmp")};
assert_valid_result(store);
g_assert_true(store->empty());
g_assert_cmpuint(0, ==, store->size());
g_assert_cmpstr(MU_STORE_SCHEMA_VERSION, ==,
store->properties().schema_version.c_str());
g_assert_cmpuint(MU_STORE_SCHEMA_VERSION, ==,
store->config().get<Config::Id::SchemaVersion>());
}
static void
test_store_reinit()
{
TempDir tempdir;
{
Store::Config conf{};
conf.max_message_size = 1234567;
conf.batch_size = 7654321;
MemDb mdb;
Config conf{mdb};
conf.set<Config::Id::MaxMessageSize>(1234567);
conf.set<Config::Id::BatchSize>(7654321);
conf.set<Config::Id::PersonalAddresses>(
StringVec{ "foo@example.com", "bar@example.com" });
StringVec my_addresses{ "foo@example.com", "bar@example.com" };
auto store{Store::make_new(tempdir.path(), MuTestMaildir, my_addresses, conf)};
auto store{Store::make_new(tempdir.path(), MuTestMaildir, conf)};
assert_valid_result(store);
g_assert_true(store->empty());
g_assert_cmpuint(0, ==, store->size());
g_assert_cmpstr(MU_STORE_SCHEMA_VERSION, ==,
store->properties().schema_version.c_str());
g_assert_cmpuint(MU_STORE_SCHEMA_VERSION, ==,
store->config().get<Config::Id::SchemaVersion>());
const auto msgpath{MuTestMaildir + "/cur/1283599333.1840_11.cthulhu!2,"};
const auto id = store->add_message(msgpath);
@ -92,11 +91,13 @@ test_store_reinit()
assert_valid_result(store);
g_assert_true(store->empty());
assert_equal(store->properties().database_path, tempdir.path());
g_assert_cmpuint(store->properties().batch_size,==,7654321);
g_assert_cmpuint(store->properties().max_message_size,==,1234567);
assert_equal(store->path(), tempdir.path());
assert_equal(store->root_maildir(), MuTestMaildir);
const auto addrs{store->properties().personal_addresses};
g_assert_cmpuint(store->config().get<Config::Id::BatchSize>(),==,7654321);
g_assert_cmpuint(store->config().get<Config::Id::MaxMessageSize>(),==,1234567);
const auto addrs{store->config().get<Config::Id::PersonalAddresses>()};
g_assert_cmpuint(addrs.size(),==,2);
g_assert_true(seq_some(addrs, [](auto&& a){return a=="foo@example.com";}));
g_assert_true(seq_some(addrs, [](auto&& a){return a=="bar@example.com";}));
@ -116,9 +117,12 @@ test_store_add_count_remove()
{
TempDir tempdir{false};
auto store{Store::make_new(tempdir.path() + "/xapian", MuTestMaildir, {}, {})};
auto store{Store::make_new(tempdir.path() + "/xapian", MuTestMaildir)};
assert_valid_result(store);
assert_equal(store->path(), tempdir.path() + "/xapian");
assert_equal(store->root_maildir(), MuTestMaildir);
const auto msgpath{MuTestMaildir + "/cur/1283599333.1840_11.cthulhu!2,"};
const auto id1 = store->add_message(msgpath);
assert_valid_result(id1);
@ -184,7 +188,7 @@ statement you can use something like:
goto * instructions[pOp->opcode];
)";
TempDir tempdir;
auto store{Store::make_new(tempdir.path(), "/home/test/Maildir", {}, {})};
auto store{Store::make_new(tempdir.path(), "/home/test/Maildir")};
assert_valid_result(store);
const auto msgpath{"/home/test/Maildir/inbox/cur/1649279256.107710_1.evergrey:2,S"};
@ -269,7 +273,7 @@ World!
)";
TempDir tempdir;
auto store{Store::make_new(tempdir.path(), "/home/test/Maildir", {}, {})};
auto store{Store::make_new(tempdir.path(), "/home/test/Maildir")};
assert_valid_result(store);
auto message{Message::make_from_text(
@ -343,7 +347,7 @@ Yes, that would be excellent.
// Index it into a store.
TempDir tempdir;
auto store{Store::make_new(tempdir.path(), tempdir2.path() + "/Maildir", {}, {})};
auto store{Store::make_new(tempdir.path(), tempdir2.path() + "/Maildir")};
assert_valid_result(store);
store->indexer().start({});
@ -414,7 +418,7 @@ Yes, that would be excellent.
auto msg3_path = tempdir2.path() + "/Maildir/b/cur/msgdef:2,RS";
TempDir tempdir;
auto store{Store::make_new(tempdir.path(), tempdir2.path() + "/Maildir", {}, {})};
auto store{Store::make_new(tempdir.path(), tempdir2.path() + "/Maildir")};
assert_valid_result(store);
std::vector<Store::Id> ids;
@ -473,8 +477,7 @@ test_store_fail()
{
const auto store = Store::make_new("/../../root/non-existent-path/12345",
"/../../root/non-existent-path/54321",
{}, {});
"/../../root/non-existent-path/54321");
g_assert_false(!!store);
}
}

2
lib/tests/test-parser.cc
View File

@ -43,7 +43,7 @@ test_cases(const CaseVec& cases)
{
char* tmpdir = test_mu_common_get_random_tmpdir();
g_assert(tmpdir);
auto dummy_store{Store::make_new(tmpdir, "/tmp", {}, {})};
auto dummy_store{Store::make_new(tmpdir, "/tmp")};
assert_valid_result(dummy_store);
g_free(tmpdir);

2
lib/tests/test-query.cc
View File

@ -41,7 +41,7 @@ test_query()
char* tdir;
tdir = test_mu_common_get_random_tmpdir();
auto store = Store::make_new(tdir, std::string{MU_TESTMAILDIR}, {}, {});
auto store = Store::make_new(tdir, std::string{MU_TESTMAILDIR});
assert_valid_result(store);
g_free(tdir);