smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged XmlLibraryTest with LibraryTest 

The library set up by LibraryTest now contains two valid books
initialized via XML. Therefore XmlLibraryTest is not needed as a
separate test suite.
This commit is contained in:
Veloman Yunkan 2021-04-13 23:48:22 +04:00
parent f751aff2fb
commit 59e9a0cd77
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
test/library.cpp
View File

@ -232,7 +232,7 @@ class LibraryTest : public ::testing::Test {
void SetUp() override { void SetUp() override {
kiwix::Manager manager(&lib); kiwix::Manager manager(&lib);
manager.readOpds(sampleOpdsStream, "foo.urlHost"); manager.readOpds(sampleOpdsStream, "foo.urlHost");
manager.readXml(sampleLibraryXML, true, "/data/library.xml", true); manager.readXml(sampleLibraryXML, true, "./test/library.xml", true);
} }
kiwix::Bookmark createBookmark(const std::string &id) { kiwix::Bookmark createBookmark(const std::string &id) {
@ -637,33 +637,24 @@ TEST_F(LibraryTest, getBookByPath)
EXPECT_THROW(lib.getBookByPath("non/existant/path.zim"), std::out_of_range); EXPECT_THROW(lib.getBookByPath("non/existant/path.zim"), std::out_of_range);
} }
class XmlLibraryTest : public ::testing::Test { TEST_F(LibraryTest, removeBookByIdRemovesTheBook)
protected:
void SetUp() override {
kiwix::Manager manager(&lib);
manager.readFile( "./test/library.xml", true, true);
}
kiwix::Library lib;
};
TEST_F(XmlLibraryTest, removeBookByIdRemovesTheBook)
{ {
EXPECT_EQ(3U, lib.getBookCount(true, true)); const auto initialBookCount = lib.getBookCount(true, true);
ASSERT_GT(initialBookCount, 0U);
EXPECT_NO_THROW(lib.getBookById("raycharles")); EXPECT_NO_THROW(lib.getBookById("raycharles"));
lib.removeBookById("raycharles"); lib.removeBookById("raycharles");
EXPECT_EQ(2U, lib.getBookCount(true, true)); EXPECT_EQ(initialBookCount - 1, lib.getBookCount(true, true));
EXPECT_THROW(lib.getBookById("raycharles"), std::out_of_range); EXPECT_THROW(lib.getBookById("raycharles"), std::out_of_range);
}; };
TEST_F(XmlLibraryTest, removeBookByIdDropsTheReader) TEST_F(LibraryTest, removeBookByIdDropsTheReader)
{ {
EXPECT_NE(nullptr, lib.getReaderById("raycharles")); EXPECT_NE(nullptr, lib.getReaderById("raycharles"));
lib.removeBookById("raycharles"); lib.removeBookById("raycharles");
EXPECT_THROW(lib.getReaderById("raycharles"), std::out_of_range); EXPECT_THROW(lib.getReaderById("raycharles"), std::out_of_range);
}; };
TEST_F(XmlLibraryTest, removeBookByIdUpdatesTheSearchDB) TEST_F(LibraryTest, removeBookByIdUpdatesTheSearchDB)
{ {
kiwix::Filter f; kiwix::Filter f;
f.local(true).valid(true).query(R"(title:"ray charles")", false); f.local(true).valid(true).query(R"(title:"ray charles")", false);