mirror of
https://github.com/kiwix/libkiwix.git
synced 2025-06-26 10:11:30 +00:00
Deprecated Book::getLanguage()
Introduced `Book::getCommaSeparatedLanguages()` instead.
This commit is contained in:
committed by
Matthieu Gautier
parent
2550306052
commit
eb002ae306
@ -203,14 +203,14 @@ TEST(BookTest, getLanguages)
|
||||
{
|
||||
const kiwix::Book book = makeBook(R"(id="abcd" language="fra")");
|
||||
|
||||
EXPECT_EQ(book.getLanguage(), "fra");
|
||||
EXPECT_EQ(book.getCommaSeparatedLanguages(), "fra");
|
||||
EXPECT_EQ(book.getLanguages(), Langs{ "fra" });
|
||||
}
|
||||
|
||||
{
|
||||
const kiwix::Book book = makeBook(R"(id="abcd" language="eng,ong,ing")");
|
||||
|
||||
EXPECT_EQ(book.getLanguage(), "eng,ong,ing");
|
||||
EXPECT_EQ(book.getCommaSeparatedLanguages(), "eng,ong,ing");
|
||||
EXPECT_EQ(book.getLanguages(), Langs({ "eng", "ong", "ing" }));
|
||||
}
|
||||
}
|
||||
|
@ -234,6 +234,8 @@ const char sampleLibraryXML[] = R"(
|
||||
namespace
|
||||
{
|
||||
|
||||
typedef std::vector<std::string> Langs;
|
||||
|
||||
TEST(LibraryOpdsImportTest, allInOne)
|
||||
{
|
||||
kiwix::Library lib;
|
||||
@ -248,7 +250,8 @@ TEST(LibraryOpdsImportTest, allInOne)
|
||||
EXPECT_EQ(book1.getTitle(), "Encyclopédie de la Tunisie");
|
||||
EXPECT_EQ(book1.getName(), "wikipedia_fr_tunisie_novid_2018-10");
|
||||
EXPECT_EQ(book1.getFlavour(), "unforgettable");
|
||||
EXPECT_EQ(book1.getLanguage(), "fra");
|
||||
EXPECT_EQ(book1.getLanguages(), Langs{ "fra" });
|
||||
EXPECT_EQ(book1.getCommaSeparatedLanguages(), "fra");
|
||||
EXPECT_EQ(book1.getDate(), "8 Oct 2018");
|
||||
EXPECT_EQ(book1.getDescription(), "Le meilleur de Wikipédia sur la Tunisie");
|
||||
EXPECT_EQ(book1.getCreator(), "Wikipedia");
|
||||
@ -272,7 +275,8 @@ TEST(LibraryOpdsImportTest, allInOne)
|
||||
EXPECT_EQ(book2.getTitle(), "TED talks - Business");
|
||||
EXPECT_EQ(book2.getName(), "");
|
||||
EXPECT_EQ(book2.getFlavour(), "");
|
||||
EXPECT_EQ(book2.getLanguage(), "eng");
|
||||
EXPECT_EQ(book2.getLanguages(), Langs{ "eng" });
|
||||
EXPECT_EQ(book2.getCommaSeparatedLanguages(), "eng");
|
||||
EXPECT_EQ(book2.getDate(), "2018-07-23");
|
||||
EXPECT_EQ(book2.getDescription(), "Ideas worth spreading");
|
||||
EXPECT_EQ(book2.getCreator(), "TED");
|
||||
|
@ -57,7 +57,7 @@ TEST(ManagerTest, readXml)
|
||||
EXPECT_EQ("https://example.com/zimfiles/unittest.zim", book.getUrl());
|
||||
EXPECT_EQ("Unit Test", book.getTitle());
|
||||
EXPECT_EQ("Wikipedia articles about unit testing", book.getDescription());
|
||||
EXPECT_EQ("eng", book.getLanguage());
|
||||
EXPECT_EQ("eng", book.getCommaSeparatedLanguages());
|
||||
EXPECT_EQ("Wikipedia", book.getCreator());
|
||||
EXPECT_EQ("Kiwix", book.getPublisher());
|
||||
EXPECT_EQ("2020-03-31", book.getDate());
|
||||
|
Reference in New Issue
Block a user