Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Library::removeBookById() updates the reader list and the search DB #485

Merged
merged 5 commits into from
Apr 12, 2021
Merged

Library::removeBookById() updates the reader list and the search DB #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ccdc316
Two unit-tests for Library::removeBookById
veloman-yunkan Apr 9, 2021
24ed96a
Library.removeBookById() drops the reader too
veloman-yunkan Apr 9, 2021
49940a3
XmlLibraryTest.removeBookByIdUpdatesTheSearchDB
veloman-yunkan Apr 9, 2021
aaaa5a6
Library::filter() doesn't create empty books
veloman-yunkan Apr 9, 2021
ec9186b
Library::removeBookById() updates the search DB
veloman-yunkan Apr 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/library.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ bool Library::removeBookmark(const std::string& zimId, const std::string& url)

bool Library::removeBookById(const std::string& id)
{
m_bookDB->delete_document("Q" + id);
m_readers.erase(id);
return m_books.erase(id) == 1;
}

Expand Down Expand Up @@ -330,7 +332,7 @@ Library::BookIdCollection Library::filter(const Filter& filter)
{
BookIdCollection result;
for(auto id : getBooksByTitleOrDescription(filter)) {
if(filter.acceptByNonQueryCriteria(m_books[id])) {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This bug was introduced in #460 because Library::filter() is not declared const.

if(filter.acceptByNonQueryCriteria(m_books.at(id))) {
result.push_back(id);
}
}
Expand Down
45 changes: 45 additions & 0 deletions test/library.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,4 +283,49 @@ TEST_F(LibraryTest, getBookByPath)
EXPECT_EQ(lib.getBookByPath(path).getId(), book.getId());
EXPECT_THROW(lib.getBookByPath("non/existant/path.zim"), std::out_of_range);
}

class XmlLibraryTest : public ::testing::Test {
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));
EXPECT_NO_THROW(lib.getBookById("raycharles"));
lib.removeBookById("raycharles");
EXPECT_EQ(2U, lib.getBookCount(true, true));
EXPECT_THROW(lib.getBookById("raycharles"), std::out_of_range);
};

TEST_F(XmlLibraryTest, removeBookByIdDropsTheReader)
{
EXPECT_NE(nullptr, lib.getReaderById("raycharles"));
lib.removeBookById("raycharles");
EXPECT_THROW(lib.getReaderById("raycharles"), std::out_of_range);
};

TEST_F(XmlLibraryTest, removeBookByIdUpdatesTheSearchDB)
{
kiwix::Filter f;
f.local(true).valid(true).query(R"(title:"ray charles")", false);

EXPECT_NO_THROW(lib.getBookById("raycharles"));
EXPECT_EQ(1U, lib.filter(f).size());

lib.removeBookById("raycharles");

EXPECT_THROW(lib.getBookById("raycharles"), std::out_of_range);
EXPECT_EQ(0U, lib.filter(f).size());

// make sure that Library::filter() doesn't add an empty book with
// an id surviving in the search DB
EXPECT_THROW(lib.getBookById("raycharles"), std::out_of_range);
};

};