aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/cache.cpp106
-rw-r--r--test/controller.cpp2
-rw-r--r--test/feedcontainer.cpp78
-rw-r--r--test/feedretriever.cpp10
-rw-r--r--test/itemlistformaction.cpp36
-rw-r--r--test/itemrenderer.cpp18
-rw-r--r--test/opml.cpp2
-rw-r--r--test/queuemanager.cpp22
-rw-r--r--test/rssfeed.cpp24
-rw-r--r--test/rssignores.cpp2
-rw-r--r--test/rssitem.cpp6
-rw-r--r--test/rssparser.cpp10
-rw-r--r--test/view.cpp2
13 files changed, 159 insertions, 159 deletions
diff --git a/test/cache.cpp b/test/cache.cpp
index 2d196752..8fea3463 100644
--- a/test/cache.cpp
+++ b/test/cache.cpp
@@ -19,7 +19,7 @@ using namespace newsboat;
TEST_CASE("items in search result can be marked read", "[Cache]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const std::string uri = "file://data/rss.xml";
CurlHandle easyHandle;
FeedRetriever feed_retriever(cfg, rsscache, easyHandle);
@@ -47,7 +47,7 @@ TEST_CASE("Cleaning old articles works", "[Cache]")
{
test_helpers::TempFile dbfile;
auto cfg = std::make_unique<ConfigContainer>();
- auto rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg.get());
+ auto rsscache = std::make_unique<Cache>(dbfile.get_path(), *cfg);
const std::string uri = "file://data/rss.xml";
CurlHandle easyHandle;
FeedRetriever feed_retriever(*cfg, *rsscache, easyHandle);
@@ -78,7 +78,7 @@ TEST_CASE("Cleaning old articles works", "[Cache]")
* are dating back to 2006. */
cfg = std::make_unique<ConfigContainer>();
cfg->set_configvalue("keep-articles-days", "42");
- rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg.get());
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), *cfg);
feed = rsscache->internalize_rssfeed("file://data/rss.xml", nullptr);
/* The important part: old articles should be gone, new one remains. */
@@ -89,7 +89,7 @@ TEST_CASE("Last-Modified and ETag values are persisted to DB", "[Cache]")
{
auto cfg = std::make_unique<ConfigContainer>();
test_helpers::TempFile dbfile;
- auto rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg.get());
+ auto rsscache = std::make_unique<Cache>(dbfile.get_path(), *cfg);
const auto feedurl = "file://data/rss.xml";
CurlHandle easyHandle;
FeedRetriever feed_retriever(*cfg, *rsscache, easyHandle);
@@ -107,7 +107,7 @@ TEST_CASE("Last-Modified and ETag values are persisted to DB", "[Cache]")
feedurl, last_modified, etag));
cfg = std::make_unique<ConfigContainer>();
- rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg.get());
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), *cfg);
/* Scrambling the value to make sure the following call changes
* it. */
@@ -140,7 +140,7 @@ TEST_CASE("Last-Modified and ETag values are also stored in DB if feed was not y
"[Cache]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const std::string feedurl = "http://example.com/feed.xml";
const time_t lastmodified = 42;
@@ -160,7 +160,7 @@ TEST_CASE("mark_all_read marks all items in the feed read", "[Cache]")
std::shared_ptr<RssFeed> feed, test_feed;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
test_feed = std::make_shared<RssFeed>(&rsscache, "");
test_feed->set_title("Test feed");
@@ -274,7 +274,7 @@ TEST_CASE(
std::vector<std::shared_ptr<RssFeed>> feeds;
auto cfg = std::make_unique<ConfigContainer>();
- auto rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg.get());
+ auto rsscache = std::make_unique<Cache>(dbfile.get_path(), *cfg);
for (const auto& url : feedurls) {
CurlHandle easyHandle;
FeedRetriever feed_retriever(*cfg, *rsscache, easyHandle);
@@ -289,7 +289,7 @@ TEST_CASE(
rsscache->cleanup_cache(feeds);
cfg = std::make_unique<ConfigContainer>();
- rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg.get());
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), *cfg);
for (const auto& url : feedurls) {
std::shared_ptr<RssFeed> feed =
@@ -308,7 +308,7 @@ TEST_CASE(
rsscache->cleanup_cache(feeds);
cfg = std::make_unique<ConfigContainer>();
- rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg.get());
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), *cfg);
std::shared_ptr<RssFeed> feed =
rsscache->internalize_rssfeed(
@@ -329,7 +329,7 @@ TEST_CASE(
rsscache->cleanup_cache(feeds);
cfg = std::make_unique<ConfigContainer>();
- rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg.get());
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), *cfg);
std::shared_ptr<RssFeed> feed =
rsscache->internalize_rssfeed(
@@ -349,7 +349,7 @@ TEST_CASE(
rsscache->cleanup_cache(feeds, always_clean);
cfg = std::make_unique<ConfigContainer>();
- rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg.get());
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), *cfg);
std::shared_ptr<RssFeed> feed =
rsscache->internalize_rssfeed(
@@ -370,7 +370,7 @@ TEST_CASE(
rsscache->cleanup_cache(feeds, always_clean);
cfg = std::make_unique<ConfigContainer>();
- rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg.get());
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), *cfg);
std::shared_ptr<RssFeed> feed =
rsscache->internalize_rssfeed(
@@ -383,7 +383,7 @@ TEST_CASE(
TEST_CASE("fetch_descriptions fills out feed item's descriptions", "[Cache]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto feedurl = "file://data/rss.xml";
CurlHandle easyHandle;
FeedRetriever feed_retriever(cfg, rsscache, easyHandle);
@@ -408,7 +408,7 @@ TEST_CASE("get_read_item_guids returns GUIDs of items that are marked read",
{
test_helpers::TempFile dbfile;
ConfigContainer cfg;
- auto rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ auto rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
// We'll keep our own count of which GUIDs are unread
std::unordered_set<std::string> read_guids;
@@ -460,7 +460,7 @@ TEST_CASE("get_read_item_guids returns GUIDs of items that are marked read",
// Lastly, let's make sure the info is indeed retrieved from the
// database and isn't just stored in the Cache object
- rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
INFO("Testing on two feeds with new `Cache` object");
check(rsscache->get_read_item_guids());
}
@@ -470,7 +470,7 @@ TEST_CASE("mark_item_deleted changes \"deleted\" flag of item with given GUID ",
{
test_helpers::TempFile dbfile;
ConfigContainer cfg;
- auto rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ auto rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
auto feedurl = "file://data/rss.xml";
CurlHandle easyHandle;
FeedRetriever feed_retriever(cfg, *rsscache, easyHandle);
@@ -483,7 +483,7 @@ TEST_CASE("mark_item_deleted changes \"deleted\" flag of item with given GUID ",
rsscache->externalize_rssfeed(*feed, false);
rsscache->mark_item_deleted(guid, true);
- rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
feed = rsscache->internalize_rssfeed(feedurl, nullptr);
// One item was deleted, so shouldn't have been loaded
REQUIRE(feed->total_item_count() == 7);
@@ -494,7 +494,7 @@ TEST_CASE("mark_items_read_by_guid marks items with given GUIDs as unread ",
{
test_helpers::TempFile dbfile;
ConfigContainer cfg;
- auto rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ auto rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
auto feedurl = "file://data/rss.xml";
CurlHandle easyHandle;
FeedRetriever feed_retriever(cfg, *rsscache, easyHandle);
@@ -508,7 +508,7 @@ TEST_CASE("mark_items_read_by_guid marks items with given GUIDs as unread ",
REQUIRE_NOTHROW(rsscache->mark_items_read_by_guid({}));
- rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
feed = rsscache->internalize_rssfeed(feedurl, nullptr);
REQUIRE(feed->unread_item_count() == 8);
}
@@ -521,7 +521,7 @@ TEST_CASE("mark_items_read_by_guid marks items with given GUIDs as unread ",
REQUIRE_NOTHROW(rsscache->mark_items_read_by_guid(guids));
- rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
feed = rsscache->internalize_rssfeed(feedurl, nullptr);
REQUIRE(feed->unread_item_count() == 6);
}
@@ -533,7 +533,7 @@ TEST_CASE(
"[Cache]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
auto feedurl = "file://data/rss.xml";
CurlHandle easyHandle;
FeedRetriever feed_retriever(cfg, rsscache, easyHandle);
@@ -586,7 +586,7 @@ TEST_CASE("search_for_items finds all items with matching title or content",
"[Cache]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
std::vector<std::string> feedurls = {
"file://data/atom10_1.xml", "file://data/rss20_1.xml"
};
@@ -624,7 +624,7 @@ TEST_CASE("update_rssitem_flags dumps `rss_item` object's flags to DB",
{
test_helpers::TempFile dbfile;
ConfigContainer cfg;
- auto rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ auto rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
const auto feedurl = "file://data/rss.xml";
CurlHandle easyHandle;
FeedRetriever feed_retriever(cfg, *rsscache, easyHandle);
@@ -636,7 +636,7 @@ TEST_CASE("update_rssitem_flags dumps `rss_item` object's flags to DB",
item->set_flags("abc");
REQUIRE_NOTHROW(rsscache->update_rssitem_flags(item.get()));
- rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
feed = rsscache->internalize_rssfeed("file://data/rss.xml", nullptr);
REQUIRE(feed->items()[0]->flags() == "abc");
@@ -649,7 +649,7 @@ TEST_CASE(
{
test_helpers::TempFile dbfile;
ConfigContainer cfg;
- auto rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ auto rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
const auto feedurl = "file://data/rss.xml";
CurlHandle easyHandle;
FeedRetriever feed_retriever(cfg, *rsscache, easyHandle);
@@ -666,7 +666,7 @@ TEST_CASE(
REQUIRE_NOTHROW(rsscache->update_rssitem_unread_and_enqueued(
*item, feedurl));
- rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
feed = rsscache->internalize_rssfeed(feedurl, nullptr);
REQUIRE_FALSE(feed->items()[0]->unread());
@@ -678,7 +678,7 @@ TEST_CASE(
REQUIRE_NOTHROW(rsscache->update_rssitem_unread_and_enqueued(
*item, feedurl));
- rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
feed = rsscache->internalize_rssfeed(feedurl, nullptr);
REQUIRE(feed->items()[0]->enqueued());
@@ -692,7 +692,7 @@ TEST_CASE(
REQUIRE_NOTHROW(rsscache->update_rssitem_unread_and_enqueued(
*item, feedurl));
- rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
feed = rsscache->internalize_rssfeed(feedurl, nullptr);
REQUIRE_FALSE(feed->items()[0]->unread());
@@ -750,7 +750,7 @@ TEST_CASE(
test_helpers::TempFile dbfile;
ConfigContainer cfg;
- auto rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ auto rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
const auto feedurl = "file://data/rss.xml";
CurlHandle easyHandle;
FeedRetriever feed_retriever(cfg, *rsscache, easyHandle);
@@ -763,7 +763,7 @@ TEST_CASE(
SECTION("Simple case") {
rsscache->externalize_rssfeed(*initial_feed, false);
- rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
auto new_feed = rsscache->internalize_rssfeed(feedurl, nullptr);
new_feed->load();
@@ -775,7 +775,7 @@ TEST_CASE(
rsscache->externalize_rssfeed(*initial_feed, false);
rsscache->externalize_rssfeed(*initial_feed, false);
- rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
auto new_feed = rsscache->internalize_rssfeed(feedurl, nullptr);
new_feed->load();
@@ -788,7 +788,7 @@ TEST_CASE("externalize_rssfeed doesn't store more than `max-items` items",
{
test_helpers::TempFile dbfile;
auto cfg = std::make_unique<ConfigContainer>();
- auto rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg.get());
+ auto rsscache = std::make_unique<Cache>(dbfile.get_path(), *cfg);
cfg->set_configvalue("max-items", "3");
const auto feedurl = "file://data/rss.xml";
@@ -800,7 +800,7 @@ TEST_CASE("externalize_rssfeed doesn't store more than `max-items` items",
rsscache->externalize_rssfeed(*feed, false);
cfg = std::make_unique<ConfigContainer>();
- rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg.get());
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), *cfg);
feed = rsscache->internalize_rssfeed(feedurl, nullptr);
REQUIRE(feed->total_item_count() == 3);
}
@@ -817,7 +817,7 @@ TEST_CASE(
{
test_helpers::TempFile dbfile;
auto cfg = std::make_unique<ConfigContainer>();
- auto rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg.get());
+ auto rsscache = std::make_unique<Cache>(dbfile.get_path(), *cfg);
const auto feedurl = "file://data/rss.xml";
CurlHandle easyHandle;
@@ -831,7 +831,7 @@ TEST_CASE(
cfg = std::make_unique<ConfigContainer>();
cfg->set_configvalue("max-items", "3");
- rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg.get());
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), *cfg);
feed = rsscache->internalize_rssfeed(feedurl, nullptr);
REQUIRE(feed->total_item_count() == 3);
}
@@ -845,7 +845,7 @@ TEST_CASE(
cfg = std::make_unique<ConfigContainer>();
cfg->set_configvalue("max-items", "1");
- rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg.get());
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), *cfg);
feed = rsscache->internalize_rssfeed(feedurl, nullptr);
// All flagged items should be present no matter what
unsigned int flagged_count = 0;
@@ -863,7 +863,7 @@ TEST_CASE(
"[Cache]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
auto feedurl = "query:misc:age between 0:10";
auto feed = rsscache.internalize_rssfeed(feedurl, nullptr);
@@ -875,7 +875,7 @@ TEST_CASE("internalize_rssfeed doesn't return items that are ignored",
"[Cache]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const std::string feedurl("file://data/rss092_1.xml");
CurlHandle easyHandle;
@@ -901,7 +901,7 @@ TEST_CASE(
{
test_helpers::TempFile dbfile;
ConfigContainer cfg;
- auto rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ auto rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
auto feedurl = "file://data/rss.xml";
CurlHandle easyHandle;
FeedRetriever feed_retriever(cfg, *rsscache, easyHandle);
@@ -910,7 +910,7 @@ TEST_CASE(
feed->items()[0]->set_unread_nowrite(false);
rsscache->externalize_rssfeed(*feed, false);
- rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
feed = rsscache->internalize_rssfeed(feedurl, nullptr);
feed->load();
REQUIRE_FALSE(feed->items()[0]->unread());
@@ -919,14 +919,14 @@ TEST_CASE(
SECTION("reset_unread = false; item remains read") {
rsscache->externalize_rssfeed(*feed, false);
- rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
feed = rsscache->internalize_rssfeed(feedurl, nullptr);
REQUIRE_FALSE(feed->items()[0]->unread());
}
SECTION("reset_unread = true; item becomes unread") {
rsscache->externalize_rssfeed(*feed, true);
- rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
feed = rsscache->internalize_rssfeed(feedurl, nullptr);
REQUIRE(feed->items()[0]->unread());
}
@@ -939,7 +939,7 @@ TEST_CASE(
{
test_helpers::TempFile dbfile;
ConfigContainer cfg;
- auto rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ auto rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
auto feedurl = "file://data/rss.xml";
CurlHandle easyHandle;
FeedRetriever feed_retriever(cfg, *rsscache, easyHandle);
@@ -948,14 +948,14 @@ TEST_CASE(
feed->items()[0]->set_unread_nowrite(false);
rsscache->externalize_rssfeed(*feed, false);
- rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
feed = rsscache->internalize_rssfeed(feedurl, nullptr);
auto item = feed->items()[0];
item->set_unread_nowrite(true);
SECTION("override_unread not set; item remains read") {
rsscache->externalize_rssfeed(*feed, false);
- rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
feed = rsscache->internalize_rssfeed(feedurl, nullptr);
REQUIRE_FALSE(feed->items()[0]->unread());
}
@@ -963,7 +963,7 @@ TEST_CASE(
SECTION("override_unread is set; item becomes unread") {
item->set_override_unread(true);
rsscache->externalize_rssfeed(*feed, false);
- rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
feed = rsscache->internalize_rssfeed(feedurl, nullptr);
REQUIRE(feed->items()[0]->unread());
}
@@ -976,7 +976,7 @@ TEST_CASE(
{
test_helpers::TempFile dbfile;
ConfigContainer cfg;
- auto rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ auto rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
auto feed = std::make_shared<RssFeed>(rsscache.get(),
"query:All unread:unread = \"yes\"");
@@ -1032,7 +1032,7 @@ TEST_CASE("do_vacuum doesn't throw an exception", "[Cache]")
{
test_helpers::TempFile dbfile;
ConfigContainer cfg;
- auto rsscache = std::make_unique<Cache>(dbfile.get_path(), &cfg);
+ auto rsscache = std::make_unique<Cache>(dbfile.get_path(), cfg);
const std::string uri = "file://data/rss.xml";
CurlHandle easyHandle;
FeedRetriever feed_retriever(cfg, *rsscache, easyHandle);
@@ -1043,14 +1043,14 @@ TEST_CASE("do_vacuum doesn't throw an exception", "[Cache]")
REQUIRE_NOTHROW(rsscache->do_vacuum());
// Checking that Cache can still be opened
- REQUIRE_NOTHROW(rsscache.reset(new Cache(dbfile.get_path(), &cfg)));
+ REQUIRE_NOTHROW(rsscache.reset(new Cache(dbfile.get_path(), cfg)));
}
TEST_CASE("search_in_items returns items that contain given substring",
"[Cache]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const std::string uri = "file://data/rss.xml";
CurlHandle easyHandle;
FeedRetriever feed_retriever(cfg, rsscache, easyHandle);
@@ -1093,7 +1093,7 @@ TEST_CASE("search_in_items returns items that contain given substring",
TEST_CASE("search_in_items returns empty set if input set is empty", "[Cache]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const std::string uri = "file://data/rss.xml";
CurlHandle easyHandle;
FeedRetriever feed_retriever(cfg, rsscache, easyHandle);
@@ -1110,7 +1110,7 @@ TEST_CASE("search_in_items returns empty set if input set is empty", "[Cache]")
TEST_CASE("Ignoring articles in search", "[Cache]")
{
ConfigContainer cfg{};
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const std::string uri = "file://data/rss.xml";
CurlHandle easyHandle;
diff --git a/test/controller.cpp b/test/controller.cpp
index 40e0cf28..c1a9785e 100644
--- a/test/controller.cpp
+++ b/test/controller.cpp
@@ -33,7 +33,7 @@ TEST_CASE("write_item correctly parses path", "[Controller]")
auto cfg = c.get_config();
cfg->set_configvalue("save-path", save_path);
- Cache rsscache(":memory:", cfg);
+ Cache rsscache(":memory:", *cfg);
RssItem item(&rsscache);
diff --git a/test/feedcontainer.cpp b/test/feedcontainer.cpp
index 0ea66cff..880fc677 100644
--- a/test/feedcontainer.cpp
+++ b/test/feedcontainer.cpp
@@ -32,7 +32,7 @@ TEST_CASE("get_feed() returns feed by its position number", "[FeedContainer]")
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const std::vector<std::shared_ptr<RssFeed>> feeds = {
std::make_shared<RssFeed>(&rsscache, "url/0"),
std::make_shared<RssFeed>(&rsscache, "url/1"),
@@ -59,7 +59,7 @@ TEST_CASE("get_all_feeds() returns copy of FeedContainer's feed vector",
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto feeds = get_five_empty_feeds(&rsscache);
feedcontainer.set_feeds(feeds);
@@ -71,7 +71,7 @@ TEST_CASE("add_feed() adds specific feed to its \"feeds\" vector",
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
feedcontainer.set_feeds({});
const auto feed = std::make_shared<RssFeed>(&rsscache, "");
feed->set_title("Example feed");
@@ -85,7 +85,7 @@ TEST_CASE("populate_query_feeds() populates query feeds", "[FeedContainer]")
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
auto feeds = get_five_empty_feeds(&rsscache);
for (int j = 0; j < 5; ++j) {
const auto item = std::make_shared<RssItem>(&rsscache);
@@ -108,7 +108,7 @@ TEST_CASE("set_feeds() sets FeedContainer's feed vector to the given one",
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto feeds = get_five_empty_feeds(&rsscache);
feedcontainer.set_feeds(feeds);
@@ -120,7 +120,7 @@ TEST_CASE("get_feed_by_url() returns feed by its URL", "[FeedContainer]")
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const std::vector<std::shared_ptr<RssFeed>> feeds = {
std::make_shared<RssFeed>(&rsscache, "url/0"),
std::make_shared<RssFeed>(&rsscache, "url/1"),
@@ -149,7 +149,7 @@ TEST_CASE(
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const std::vector<std::shared_ptr<RssFeed>> feeds = {
std::make_shared<RssFeed>(&rsscache, "url/0"),
std::make_shared<RssFeed>(&rsscache, "url/1"),
@@ -166,7 +166,7 @@ TEST_CASE("get_feed() returns nullptr if pos is out of range",
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
feedcontainer.set_feeds(get_five_empty_feeds(&rsscache));
REQUIRE_NOTHROW(feedcontainer.get_feed(4));
@@ -179,7 +179,7 @@ TEST_CASE("Returns correct number using get_feed_count_by_tag()",
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
feedcontainer.set_feeds(get_five_empty_feeds(&rsscache));
feedcontainer.get_feed(0)->set_tags({"Chicken", "Horse"});
feedcontainer.get_feed(1)->set_tags({"Horse", "Duck"});
@@ -196,7 +196,7 @@ TEST_CASE("Correctly returns pos of next unread item", "[FeedContainer]")
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto feeds = get_five_empty_feeds(&rsscache);
int i = 0;
for (const auto& feed : feeds) {
@@ -220,7 +220,7 @@ TEST_CASE("feeds_size() returns FeedContainer's current feed vector size",
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto feeds = get_five_empty_feeds(&rsscache);
feedcontainer.set_feeds(feeds);
@@ -233,7 +233,7 @@ TEST_CASE("sort_feeds() sorts by position in urls file if `feed-sort-order` "
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto feeds = get_five_empty_feeds(&rsscache);
feedcontainer.set_feeds(feeds);
@@ -272,7 +272,7 @@ TEST_CASE("sort_feeds() sorts by feed's first tag if `feed-sort-order` "
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto feeds = get_five_empty_feeds(&rsscache);
feedcontainer.set_feeds(feeds);
@@ -311,7 +311,7 @@ TEST_CASE("sort_feeds() sorts by feed's title if `feed-sort-order` "
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto feeds = get_five_empty_feeds(&rsscache);
feedcontainer.set_feeds(feeds);
@@ -350,7 +350,7 @@ TEST_CASE("sort_feeds() sorts by number of articles in a feed "
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto feeds = get_five_empty_feeds(&rsscache);
feedcontainer.set_feeds(feeds);
@@ -389,7 +389,7 @@ TEST_CASE("sort_feeds() and keep in-group order when sorting by unread articles"
"[FeedContainer]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const std::map<std::string, int> name_to_unreads = {
{"a", 3}, {"b", 2}, {"c", 1}, {"d", 1}, {"e", 1}
@@ -443,7 +443,7 @@ TEST_CASE("sort_feeds() and keep in-group order when sorting by unread articles"
TEST_CASE("sort_feeds() and keep in-group order when sorting by order", "[FeedContainer]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const std::map<std::string, int> name_to_order = {
{"a", 3}, {"b", 2}, {"c", 1}, {"d", 1}, {"e", 1}
@@ -496,7 +496,7 @@ TEST_CASE("sort_feeds() and keep in-group order when sorting by articles",
"[FeedContainer]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const std::map<std::string, int> name_to_articles = {
{"a", 3}, {"b", 2}, {"c", 1}, {"d", 1}, {"e", 1}
@@ -551,7 +551,7 @@ TEST_CASE("sort_feeds() and keep in-group order when sorting by last updated ite
"[FeedContainer]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const std::map<std::string, int> name_to_date = {
{"a", 3}, {"b", 2}, {"c", 1}, {"d", 1}, {"e", 1}
@@ -606,7 +606,7 @@ TEST_CASE("sort_feeds() and keep in-group order when sorting by title",
"[FeedContainer]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const std::map<std::string, std::string> url_to_title = {
{"1", "c"}, {"2", "b"}, {"3", "a"}, {"4", "a"}, {"5", "a"}
@@ -660,7 +660,7 @@ TEST_CASE("sort_feeds() sorts by number of unread articles if `feed-sort-order`
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto feeds = get_five_empty_feeds(&rsscache);
feedcontainer.set_feeds(feeds);
@@ -714,7 +714,7 @@ TEST_CASE("sort_feeds() sorts by publish date of newest item "
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto feeds = get_five_empty_feeds(&rsscache);
feedcontainer.set_feeds(feeds);
@@ -765,7 +765,7 @@ TEST_CASE("Sorting by firsttag-asc puts empty tags on top", "[FeedContainer]")
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto feeds = get_five_empty_feeds(&rsscache);
feedcontainer.set_feeds(feeds);
@@ -803,7 +803,7 @@ TEST_CASE("Sorting by lastupdated-asc puts empty feeds on top",
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto feeds = get_five_empty_feeds(&rsscache);
feedcontainer.set_feeds(feeds);
@@ -853,7 +853,7 @@ TEST_CASE("Sorting by firsttag-asc reverses the order of feeds with the same fir
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto feeds = get_five_empty_feeds(&rsscache);
feedcontainer.set_feeds(feeds);
@@ -891,7 +891,7 @@ TEST_CASE("mark_all_feed_items_read() marks all of feed's items as read",
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto feeds = get_five_empty_feeds(&rsscache);
const auto feed = feeds.at(0);
for (int j = 0; j < 5; ++j) {
@@ -913,7 +913,7 @@ TEST_CASE("mark_all_feeds_read() marks all items in all feeds as read",
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto feeds = get_five_empty_feeds(&rsscache);
for (const auto& feed : feeds) {
@@ -941,7 +941,7 @@ TEST_CASE(
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto feeds = get_five_empty_feeds(&rsscache);
feeds[0]->set_status(DlStatus::SUCCESS);
feeds[1]->set_status(DlStatus::TO_BE_DOWNLOADED);
@@ -963,7 +963,7 @@ TEST_CASE(
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto feeds = get_five_empty_feeds(&rsscache);
for (int j = 0; j < 5; ++j) {
// Make sure that number of unread items in feed doesn't matter
@@ -987,7 +987,7 @@ TEST_CASE("unread_item_count() returns number of distinct unread items "
{
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
SECTION("No query feeds") {
const auto feeds = get_five_empty_feeds(&rsscache);
@@ -1106,7 +1106,7 @@ TEST_CASE("get_unread_feed_count_per_tag returns 0 if there are no feeds "
SECTION("Non-empty FeedContainer, but no feeds are tagged") {
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
feedcontainer.add_feed(std::make_shared<RssFeed>(&rsscache, ""));
feedcontainer.add_feed(std::make_shared<RssFeed>(&rsscache, ""));
@@ -1119,7 +1119,7 @@ TEST_CASE("get_unread_feed_count_per_tag returns 0 if there are no feeds "
SECTION("Non-empty FeedContainer, no feeds are tagged with our desired tag") {
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
auto feed = std::make_shared<RssFeed>(&rsscache, "");
feed->set_tags({"one", "two", "three"});
@@ -1146,7 +1146,7 @@ TEST_CASE("get_unread_feed_count_per_tag returns 0 if feeds with given tag "
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto desired_tag = std::string("target");
const auto different_tag = std::string("something else entirely");
@@ -1184,7 +1184,7 @@ TEST_CASE("get_unread_feed_count_per_tag returns the number of feeds that have "
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto desired_tag = std::string("target");
const auto different_tag = std::string("something else entirely");
@@ -1253,7 +1253,7 @@ TEST_CASE("get_unread_item_count_per_tag returns 0 if there are no feeds "
SECTION("Non-empty FeedContainer, but no feeds are tagged") {
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
feedcontainer.add_feed(std::make_shared<RssFeed>(&rsscache, ""));
feedcontainer.add_feed(std::make_shared<RssFeed>(&rsscache, ""));
@@ -1266,7 +1266,7 @@ TEST_CASE("get_unread_item_count_per_tag returns 0 if there are no feeds "
SECTION("Non-empty FeedContainer, no feeds are tagged with our desired tag") {
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
auto feed = std::make_shared<RssFeed>(&rsscache, "");
feed->set_tags({"one", "two", "three"});
@@ -1293,7 +1293,7 @@ TEST_CASE("get_unread_item_count_per_tag returns 0 if feeds with given tag "
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto desired_tag = std::string("target");
const auto different_tag = std::string("something else entirely");
@@ -1331,7 +1331,7 @@ TEST_CASE("get_unread_item_count_per_tag returns the number of unread items "
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto desired_tag = std::string("target");
const auto different_tag = std::string("something else entirely");
@@ -1392,7 +1392,7 @@ TEST_CASE("replace_feed() puts given feed into the specified position",
FeedContainer feedcontainer;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto feeds = get_five_empty_feeds(&rsscache);
const auto first_feed = *feeds.begin();
diff --git a/test/feedretriever.cpp b/test/feedretriever.cpp
index 42d6ce52..fcda39fc 100644
--- a/test/feedretriever.cpp
+++ b/test/feedretriever.cpp
@@ -21,7 +21,7 @@ TEST_CASE("Feed retriever retrieves feed successfully", "[FeedRetriever]")
auto feed_xml = test_helpers::read_binary_file("data/atom10_1.xml");
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
CurlHandle easyHandle;
FeedRetriever feedRetriever(cfg, rsscache, easyHandle);
@@ -41,7 +41,7 @@ TEST_CASE("Feed retriever retrieves feed successfully", "[FeedRetriever]")
TEST_CASE("Feed retriever adds header with etag info if available", "[FeedRetriever]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
CurlHandle easyHandle;
FeedRetriever feedRetriever(cfg, rsscache, easyHandle);
@@ -67,7 +67,7 @@ TEST_CASE("Feed retriever retries download if no data is received",
"[FeedRetriever]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
CurlHandle easyHandle;
FeedRetriever feedRetriever(cfg, rsscache, easyHandle);
@@ -90,7 +90,7 @@ TEST_CASE("Feed retriever does not retry download on HTTP 304 (Not Modified), 42
{
auto http_status = GENERATE(as<std::uint16_t> {}, 304, 429);
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
CurlHandle easyHandle;
FeedRetriever feedRetriever(cfg, rsscache, easyHandle);
@@ -121,7 +121,7 @@ TEST_CASE("Feed retriever does not retry download on HTTP 304 (Not Modified), 42
TEST_CASE("Feed retriever throws on HTTP error status codes", "[FeedRetriever]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
CurlHandle easyHandle;
FeedRetriever feedRetriever(cfg, rsscache, easyHandle);
diff --git a/test/itemlistformaction.cpp b/test/itemlistformaction.cpp
index aa66788f..9f3e6aa9 100644
--- a/test/itemlistformaction.cpp
+++ b/test/itemlistformaction.cpp
@@ -42,7 +42,7 @@ TEST_CASE("OP_OPEN displays article using an external pager",
FilterContainer filters;
RegexManager rxman;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
cfg.set_configvalue("pager", "cat %f > " + pagerfile.get_path());
std::shared_ptr<RssFeed> feed = std::make_shared<RssFeed>(&rsscache, "");
@@ -80,7 +80,7 @@ TEST_CASE("OP_PURGE_DELETED purges previously deleted items",
Controller c(paths);
newsboat::View v(&c);
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
FilterContainer filters;
RegexManager rxman;
std::shared_ptr<RssFeed> feed = std::make_shared<RssFeed>(&rsscache, "");
@@ -122,7 +122,7 @@ TEST_CASE(
ConfigContainer cfg;
cfg.set_configvalue("browser", "echo %u >> " + browserfile.get_path());
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
FilterContainer filters;
RegexManager rxman;
@@ -160,7 +160,7 @@ TEST_CASE(
ConfigContainer cfg;
cfg.set_configvalue("browser", "false %u");
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
FilterContainer filters;
RegexManager rxman;
@@ -194,7 +194,7 @@ TEST_CASE("OP_OPENINBROWSER passes the url to the browser",
ConfigContainer cfg;
cfg.set_configvalue("browser", "echo %u >> " + browserfile.get_path());
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
FilterContainer filters;
RegexManager rxman;
@@ -229,7 +229,7 @@ TEST_CASE("OP_OPENINBROWSER_NONINTERACTIVE passes the url to the browser",
ConfigContainer cfg;
cfg.set_configvalue("browser", "echo %u >> " + browserfile.get_path());
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
FilterContainer filters;
RegexManager rxman;
@@ -266,7 +266,7 @@ TEST_CASE("OP_OPENALLUNREADINBROWSER passes the url list to the browser",
ConfigContainer cfg;
cfg.set_configvalue("browser", "echo %u >> " + browserfile.get_path());
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
FilterContainer filters;
RegexManager rxman;
@@ -352,7 +352,7 @@ TEST_CASE(
ConfigContainer cfg;
cfg.set_configvalue("browser", "echo %u >> " + browserfile.get_path());
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
FilterContainer filters;
RegexManager rxman;
@@ -429,7 +429,7 @@ TEST_CASE("OP_SHOWURLS shows the article's properties", "[ItemListFormAction]")
Controller c(paths);
newsboat::View v(&c);
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
FilterContainer filters;
RegexManager rxman;
test_helpers::TempFile urlFile;
@@ -495,7 +495,7 @@ TEST_CASE("OP_BOOKMARK pipes articles url and title to bookmark-command",
Controller c(paths);
newsboat::View v(&c);
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
FilterContainer filters;
RegexManager rxman;
test_helpers::TempFile bookmarkFile;
@@ -558,7 +558,7 @@ TEST_CASE("OP_EDITFLAGS arguments are added to an item's flags",
Controller c(paths);
newsboat::View v(&c);
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
FilterContainer filters;
RegexManager rxman;
@@ -617,7 +617,7 @@ TEST_CASE("OP_SAVE writes an article's attributes to the specified file",
newsboat::View v(&c);
test_helpers::TempFile saveFile;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
FilterContainer filters;
RegexManager rxman;
@@ -679,7 +679,7 @@ TEST_CASE("OP_HELP command is processed", "[ItemListFormAction]")
Controller c(paths);
newsboat::View v(&c);
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
KeyMap k(KM_NEWSBOAT);
v.set_keymap(&k);
@@ -704,7 +704,7 @@ TEST_CASE("OP_HARDQUIT command is processed", "[ItemListFormAction]")
Controller c(paths);
newsboat::View v(&c);
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
FilterContainer filters;
RegexManager rxman;
@@ -736,7 +736,7 @@ TEST_CASE("Navigate back and forth using OP_NEXT and OP_PREV",
ConfigContainer cfg;
cfg.set_configvalue(
"external-url-viewer", "tee > " + articleFile.get_path());
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
std::string line;
std::string first_article_title = "First_Article";
@@ -784,7 +784,7 @@ TEST_CASE("OP_TOGGLESHOWREAD switches the value of show-read-articles",
Controller c(paths);
newsboat::View v(&c);
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
KeyMap k(KM_NEWSBOAT);
v.set_keymap(&k);
@@ -823,7 +823,7 @@ TEST_CASE("OP_PIPE_TO pipes an article's content to an external command",
newsboat::View v(&c);
test_helpers::TempFile articleFile;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
FilterContainer filters;
RegexManager rxman;
@@ -888,7 +888,7 @@ TEST_CASE("OP_OPENINBROWSER does not result in itemlist invalidation",
newsboat::View v(&c);
v.set_config_container(&cfg);
v.set_keymap(&k);
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
FilterContainer filters;
RegexManager rxman;
diff --git a/test/itemrenderer.cpp b/test/itemrenderer.cpp
index 763f8ed6..bc09ca20 100644
--- a/test/itemrenderer.cpp
+++ b/test/itemrenderer.cpp
@@ -70,7 +70,7 @@ TEST_CASE("item_renderer::to_plain_text() produces a rendered representation "
// reproducible
cfg.set_configvalue("text-width", "80");
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
std::shared_ptr<RssItem> item;
std::shared_ptr<RssFeed> feed;
@@ -221,7 +221,7 @@ TEST_CASE("item_renderer::to_plain_text() renders text to the width specified "
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
std::shared_ptr<RssItem> item;
std::shared_ptr<RssFeed> feed;
@@ -328,7 +328,7 @@ TEST_CASE("to_plain_text() does not escape '<' and '>' in header and body",
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
std::shared_ptr<RssItem> item;
std::shared_ptr<RssFeed> feed;
@@ -363,7 +363,7 @@ TEST_CASE("Empty fields are not rendered", "[item_renderer]")
// reproducible
cfg.set_configvalue("text-width", "80");
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
std::shared_ptr<RssItem> item;
std::shared_ptr<RssFeed> feed;
@@ -477,7 +477,7 @@ TEST_CASE("item_renderer::to_plain_text honours `html-renderer` setting",
ConfigContainer cfg;
cfg.set_configvalue("text-width", "80");
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
std::shared_ptr<RssItem> item;
std::shared_ptr<RssFeed> feed;
@@ -590,7 +590,7 @@ TEST_CASE("item_renderer::get_feedtitle() returns item's feed title without "
"[item_renderer]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
std::shared_ptr<RssItem> item;
std::shared_ptr<RssFeed> feed;
@@ -617,7 +617,7 @@ TEST_CASE("item_renderer::get_feedtitle() returns item's feed self-link "
"[item_renderer]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
std::shared_ptr<RssItem> item;
std::shared_ptr<RssFeed> feed;
@@ -637,7 +637,7 @@ TEST_CASE("item_renderer::get_feedtitle() returns item's feed URL "
"[item_renderer]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto feedurl = std::string("https://example.com/~joe/entries.rss");
@@ -662,7 +662,7 @@ TEST_CASE("Functions used for rendering articles escape '<' into `<>` for use wi
ConfigContainer cfg;
RegexManager rxman;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
std::shared_ptr<RssItem> item;
std::shared_ptr<RssFeed> feed;
diff --git a/test/opml.cpp b/test/opml.cpp
index b36006e9..bcf6fd8c 100644
--- a/test/opml.cpp
+++ b/test/opml.cpp
@@ -54,7 +54,7 @@ TEST_CASE("opml::generate creates an XML document with feed URLs in OPML format"
SECTION("A few feeds") {
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
FeedContainer feeds;
std::shared_ptr<RssFeed> feed =
diff --git a/test/queuemanager.cpp b/test/queuemanager.cpp
index a9308342..5baffb0c 100644
--- a/test/queuemanager.cpp
+++ b/test/queuemanager.cpp
@@ -20,7 +20,7 @@ SCENARIO("Smoke test for QueueManager", "[QueueManager]")
GIVEN("A fresh instance of QueueManager") {
ConfigContainer cfg;
- Cache cache(":memory:", &cfg);
+ Cache cache(":memory:", cfg);
RssItem item(&cache);
const std::string enclosure_url("https://example.com/podcast.mp3");
@@ -134,7 +134,7 @@ SCENARIO("enqueue_url() errors if the filename is already used", "[QueueManager]
GIVEN("Pristine QueueManager and two RssItems") {
ConfigContainer cfg;
- Cache cache(":memory:", &cfg);
+ Cache cache(":memory:", cfg);
RssItem item1(&cache);
const std::string enclosure_url1("https://example.com/podcast.mp3");
@@ -210,7 +210,7 @@ SCENARIO("enqueue_url() errors if the queue file can't be opened for writing",
GIVEN("Pristine QueueManager, an RssItem, and an uneditable queue file") {
ConfigContainer cfg;
- Cache cache(":memory:", &cfg);
+ Cache cache(":memory:", cfg);
RssItem item(&cache);
item.set_enclosure_url("https://example.com/podcast.mp3");
@@ -251,7 +251,7 @@ TEST_CASE("QueueManager puts files into a location configured by `download-path`
cfg.set_configvalue("download-path", "/tmp/nonexistent-newsboat");
}
- Cache cache(":memory:", &cfg);
+ Cache cache(":memory:", cfg);
RssItem item1(&cache);
const std::string enclosure_url1("https://example.com/podcast.mp3");
@@ -299,7 +299,7 @@ TEST_CASE("QueueManager names files according to the `download-filename-format`
// *exactly* how the result should look.
cfg.set_configvalue("download-path", "/example/");
- Cache cache(":memory:", &cfg);
+ Cache cache(":memory:", cfg);
RssItem item(&cache);
item.set_enclosure_url("https://example.com/~adam/podcast.mp3");
@@ -428,7 +428,7 @@ TEST_CASE("autoenqueue() adds all enclosures of all items to the queue", "[Queue
GIVEN("Pristine QueueManager and a feed of three items") {
ConfigContainer cfg;
- Cache cache(":memory:", &cfg);
+ Cache cache(":memory:", cfg);
RssFeed feed(&cache, "https://example.com/podcasts.atom");
@@ -483,7 +483,7 @@ SCENARIO("autoenqueue() errors if the filename is already used", "[QueueManager]
GIVEN("Pristine QueueManager and a feed of two items") {
ConfigContainer cfg;
- Cache cache(":memory:", &cfg);
+ Cache cache(":memory:", cfg);
RssFeed feed(&cache, "https://example.com/news.atom");
@@ -537,7 +537,7 @@ SCENARIO("autoenqueue() errors if the queue file can't be opened for writing",
GIVEN("Pristine QueueManager, a single-item feed, and an uneditable queue file") {
ConfigContainer cfg;
- Cache cache(":memory:", &cfg);
+ Cache cache(":memory:", cfg);
RssFeed feed(&cache, "https://example.com/news.atom");
@@ -575,7 +575,7 @@ TEST_CASE("autoenqueue() skips already-enqueued items", "[QueueManager]")
// *exactly* how the result should look.
cfg.set_configvalue("download-path", "/example/");
- Cache cache(":memory:", &cfg);
+ Cache cache(":memory:", cfg);
RssFeed feed(&cache, "https://example.com/news.atom");
@@ -618,7 +618,7 @@ TEST_CASE("autoenqueue() only enqueues HTTP and HTTPS URLs", "[QueueManager]")
// *exactly* how the result should look.
cfg.set_configvalue("download-path", "/example/");
- Cache cache(":memory:", &cfg);
+ Cache cache(":memory:", cfg);
RssFeed feed(&cache, "https://example.com/news.atom");
@@ -658,7 +658,7 @@ TEST_CASE("autoenqueue() does not enqueue items with an invalid podcast type",
{
GIVEN("Pristine QueueManager and a feed of three items with one of them having an image enclosure") {
ConfigContainer cfg;
- Cache cache(":memory:", &cfg);
+ Cache cache(":memory:", cfg);
RssFeed feed(&cache, "https://example.com/news.atom");
diff --git a/test/rssfeed.cpp b/test/rssfeed.cpp
index 8aeccd9f..8cb8cb58 100644
--- a/test/rssfeed.cpp
+++ b/test/rssfeed.cpp
@@ -18,7 +18,7 @@ TEST_CASE("RssFeed constructor checks if query feed has a valid query",
"[RssFeed]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
SECTION("invalid query results in exception") {
REQUIRE_THROWS(RssFeed(&rsscache, "query:a title:unread ="));
@@ -37,7 +37,7 @@ TEST_CASE("RssFeed constructor checks if query feed has a valid query",
TEST_CASE("RssFeed::sort() correctly sorts articles", "[RssFeed]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
RssFeed f(&rsscache, "");
for (int i = 0; i < 5; ++i) {
const auto item = std::make_shared<RssItem>(&rsscache);
@@ -217,7 +217,7 @@ TEST_CASE("RssFeed::unread_item_count() returns number of unread articles",
"[RssFeed]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
RssFeed f(&rsscache, "");
for (int i = 0; i < 5; ++i) {
const auto item = std::make_shared<RssItem>(&rsscache);
@@ -247,7 +247,7 @@ TEST_CASE("RssFeed::matches_tag() returns true if article has a specified tag",
"[RssFeed]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
RssFeed f(&rsscache, "");
const std::vector<std::string> tags = {"One", "Two", "Three", "Four"};
f.set_tags(tags);
@@ -263,7 +263,7 @@ TEST_CASE("RssFeed::matches_tag() returns true if article has a specified tag",
TEST_CASE("RssFeed::get_firsttag() returns first tag", "[RssFeed]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
RssFeed f(&rsscache, "");
SECTION("Empty tag array") {
@@ -296,7 +296,7 @@ TEST_CASE(
"[RssFeed]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
RssFeed f(&rsscache, "");
REQUIRE_FALSE(f.hidden());
@@ -319,7 +319,7 @@ TEST_CASE(
"[RssFeed]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
RssFeed f(&rsscache, "");
for (int i = 0; i < 5; ++i) {
const auto item = std::make_shared<RssItem>(&rsscache);
@@ -337,7 +337,7 @@ TEST_CASE(
TEST_CASE("RssFeed::set_tags() sets tags for a feed", "[RssFeed]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
RssFeed f(&rsscache, "");
std::vector<std::string> tags = {"One", "Two"};
@@ -354,7 +354,7 @@ TEST_CASE(
"[RssFeed]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
RssFeed f(&rsscache, "");
for (int i = 0; i < 5; ++i) {
const auto item = std::make_shared<RssItem>(&rsscache);
@@ -372,7 +372,7 @@ TEST_CASE("If item's <title> is empty, try to deduce it from the URL",
"[RssFeed]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
CurlHandle easyHandle;
FeedRetriever feed_retriever(cfg, rsscache, easyHandle);
const std::string uri = "file://data/items_without_titles.xml";
@@ -396,7 +396,7 @@ TEST_CASE(
"[RssFeed]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
const auto check_if_query_feed = [&](const std::string& rssurl) {
RssFeed f(&rsscache, rssurl);
@@ -413,7 +413,7 @@ TEST_CASE(
TEST_CASE("RssFeed contains a number of matchable attributes", "[RssFeed]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
RssFeed f(&rsscache, "");
SECTION("`feedtitle`, containing feed's title") {
diff --git a/test/rssignores.cpp b/test/rssignores.cpp
index 705d06bc..e6b0a838 100644
--- a/test/rssignores.cpp
+++ b/test/rssignores.cpp
@@ -244,7 +244,7 @@ TEST_CASE("RssIgnores::matches() returns true if given RssItem matches any "
RssIgnores ignores;
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
RssItem item(&rsscache);
const auto feedurl = "https://example.com/feed.xml";
diff --git a/test/rssitem.cpp b/test/rssitem.cpp
index 33b0492b..db39b72a 100644
--- a/test/rssitem.cpp
+++ b/test/rssitem.cpp
@@ -17,7 +17,7 @@ using namespace newsboat;
TEST_CASE("RssItem::sort_flags() cleans up flags", "[RssItem]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
RssItem item(&rsscache);
SECTION("Repeated letters do not erase other letters") {
@@ -37,7 +37,7 @@ TEST_CASE("RssItem::sort_flags() cleans up flags", "[RssItem]")
TEST_CASE("RssItem contains a number of matchable attributes", "[RssItem]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
RssItem item(&rsscache);
SECTION("title") {
@@ -256,7 +256,7 @@ TEST_CASE("RssItem contains a number of matchable attributes", "[RssItem]")
TEST_CASE("set_title() removes superfluous whitespace", "[RssItem]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
RssItem item(&rsscache);
SECTION("duplicate whitespace") {
diff --git a/test/rssparser.cpp b/test/rssparser.cpp
index 04c04fbd..ca68518b 100644
--- a/test/rssparser.cpp
+++ b/test/rssparser.cpp
@@ -15,7 +15,7 @@ using namespace newsboat;
TEST_CASE("parse() ignores uninitialized upstream feed", "[RssParser]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
RssIgnores ignores;
RssParser parser("http://example.com", rsscache, cfg, &ignores);
@@ -28,7 +28,7 @@ TEST_CASE("parse() with no item GUID falls back to link+pubdate, link, and title
"[RssParser]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
RssIgnores ignores;
RssParser parser("http://example.com", rsscache, cfg, &ignores);
@@ -83,7 +83,7 @@ TEST_CASE("parse() renders html titles into plaintext if type indicates html",
"[RssParser]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
RssIgnores ignores;
RssParser parser("http://example.com", rsscache, cfg, &ignores);
@@ -128,7 +128,7 @@ TEST_CASE("parse() generates a title when title element is missing",
"[RssParser]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
RssIgnores ignores;
RssParser parser("http://example.com", rsscache, cfg, &ignores);
@@ -167,7 +167,7 @@ TEST_CASE("parse() generates a title when title element is missing",
TEST_CASE("parse() extracts best enclosure", "[RssParser]")
{
ConfigContainer cfg;
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
RssIgnores ignores;
RssParser parser("http://example.com", rsscache, cfg, &ignores);
diff --git a/test/view.cpp b/test/view.cpp
index 015ebb7c..04653656 100644
--- a/test/view.cpp
+++ b/test/view.cpp
@@ -25,7 +25,7 @@ TEST_CASE("get_filename_suggestion() normalizes filenames for saving articles",
newsboat::View v(&c);
ConfigContainer cfg{};
- Cache rsscache(":memory:", &cfg);
+ Cache rsscache(":memory:", cfg);
v.set_config_container(&cfg);
c.set_view(&v);
generated by cgit v1.2.3 (git 2.46.0) at 2025-09-28 11:31:39 +0000