commit after reset

1 files changed, 54 insertions, 0 deletions

diff --git a/test/feedcontainer.cpp b/test/feedcontainer.cpp
index a66cd419..8e34df62 100644
--- a/test/feedcontainer.cpp
+++ b/test/feedcontainer.cpp
@@ -382,6 +382,60 @@ TEST_CASE("sort_feeds() sorts by number of articles in a feed "
 	}
 }
 
+TEST_CASE("sort_feeds() and keep in-group order", "[FeedContainer]")
+{
+	ConfigContainer cfg;
+	Cache rsscache(":memory:", &cfg);
+
+	const std::map<std::string, int> name_to_unreads = {
+		{"a", 3}, {"b", 2}, {"c", 1}, {"d", 1}, {"e", 1}
+	};
+
+	std::vector<std::shared_ptr<RssFeed>> feeds;
+	for (const auto& entry : name_to_unreads) {
+		const auto feed = std::make_shared<RssFeed>(&rsscache, "");
+		feed->set_title(entry.first);
+		for (int i = 0; i < entry.second; ++i) {
+			feed->add_item(std::make_shared<RssItem>(&rsscache));
+		}
+		feeds.push_back(feed);
+	}
+	FeedContainer feedcontainer;
+	feedcontainer.set_feeds(feeds);
+
+	FeedSortStrategy strategy;
+	strategy.sm = FeedSortMethod::UNREAD_ARTICLE_COUNT;
+	SECTION("acsending order") {
+		strategy.sd = SortDirection::ASC;
+		feedcontainer.sort_feeds(strategy);
+		const auto sorted_feeds = feedcontainer.get_all_feeds();
+
+		std::vector<std::string> actual;
+		for (const auto& feed : sorted_feeds) {
+			auto title = feed->title();
+			actual.push_back(title);
+		}
+
+		const std::vector<std::string> expected = {"a", "b", "c", "d", "e"};
+		REQUIRE(expected == actual);
+	}
+
+	SECTION("descending order") {
+		strategy.sd = SortDirection::DESC;
+		feedcontainer.sort_feeds(strategy);
+		const auto sorted_feeds = feedcontainer.get_all_feeds();
+
+		std::vector<std::string> actual;
+		for (const auto& feed : sorted_feeds) {
+			auto title = feed->title();
+			actual.push_back(title);
+		}
+
+		const std::vector<std::string> expected = {"c", "d", "e", "b", "a"};
+		REQUIRE(expected == actual);
+	}
+}
+
 TEST_CASE("sort_feeds() sorts by number of unread articles if `feed-sort-order` "
 	"is \"unreadarticlecount\"",
 	"[FeedContainer]")