From 82cb1133e5fa88fb6a1f1bbc539a81f5851524ff Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Fri, 19 Jan 2024 11:45:28 +0100 Subject: [PATCH] [Test] Add missing name in sample library.xml --- test/library.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/test/library.cpp b/test/library.cpp index 7f364e42f..6e37dcb71 100644 --- a/test/library.cpp +++ b/test/library.cpp @@ -28,8 +28,8 @@ const char * sampleOpdsStream = R"( 00000000-0000-0000-0000-000000000000 Encyclopédie de la Tunisie - wikipedia_fr_tunisie_novid_2018-10 - unforgettable + wikipedia_fr_tunisie + novid urn:uuid:0c45160e-f917-760a-9159-dfe3c53cdcdd /meta?name=favicon&content=wikipedia_fr_tunisie_novid_2018-10 2018-10-08T00:00::00:Z @@ -52,6 +52,7 @@ const char * sampleOpdsStream = R"( Tania Louis urn:uuid:0d0bcd57-d3f6-cb22-44cc-a723ccb4e1b2 + biologie-tout-compris_fr_all /meta?name=favicon&content=biologie-tout-compris_fr_all_2018-06 2018-06-23T00:00::00:Z fra @@ -67,6 +68,7 @@ const char * sampleOpdsStream = R"( Wikiquote urn:uuid:0ea1cde6-441d-6c58-f2c7-21c2838e659f + wikiquote_fr_all /meta?name=favicon&content=wikiquote_fr_all_nopic_2019-06 2019-06-05T00:00::00:Z fra,ita @@ -83,6 +85,7 @@ const char * sampleOpdsStream = R"( Géographie par Wikipédia urn:uuid:1123e574-6eef-6d54-28fc-13e4caeae474 + wikipedia_fr_geography /meta?name=favicon&content=wikipedia_fr_geography_nopic_2019-06 2019-06-02T00:00::00:Z Une sélection d'articles de Wikipédia sur la géographie @@ -99,6 +102,7 @@ const char * sampleOpdsStream = R"( Mathématiques urn:uuid:14829621-c490-c376-0792-9de558b57efa + wikipedia_fr_mathematics /meta?name=favicon&content=wikipedia_fr_mathematics_nopic_2019-05 2019-05-13T00:00::00:Z fra @@ -115,6 +119,7 @@ const char * sampleOpdsStream = R"( Granblue Fantasy Wiki urn:uuid:006cbd1b-16d8-b00d-a584-c1ae110a94ed + grandbluefantasy_en_all /meta?name=favicon&content=granbluefantasy_en_all_all_nopic_2018-10 2018-10-14T00:00::00:Z eng @@ -130,6 +135,7 @@ const char * sampleOpdsStream = R"( Movies & TV Stack Exchange urn:uuid:00f37b00-f4da-0675-995a-770f9c72903e + movies.stackexchange.com_en_all /meta?name=favicon&content=movies.stackexchange.com_en_all_2019-02 2019-02-03T00:00::00:Z eng @@ -145,6 +151,7 @@ const char * sampleOpdsStream = R"( TED talks - Business urn:uuid:0189d9be-2fd0-b4b6-7300-20fab0b5cdc8 + ted_en_business /meta?name=favicon&content=ted_en_business_2018-07 2018-07-23T00:00::00:Z eng @@ -160,6 +167,7 @@ const char * sampleOpdsStream = R"( Mythology & Folklore Stack Exchange urn:uuid:028055ac-4acc-1d54-65e0-a96de45e1b22 + mythology.stackexchange.com_en_all /meta?name=favicon&content=mythology.stackexchange.com_en_all_2019-02 2019-02-03T00:00::00:Z eng @@ -175,6 +183,7 @@ const char * sampleOpdsStream = R"( Islam Stack Exchange urn:uuid:02e9c7ff-36fc-9c6e-6ac7-cd7085989029 + islam.stackexchange.com_en_all /meta?name=favicon&content=islam.stackexchange.com_en_all_2019-01 2019-01-31T00:00::00:Z eng @@ -248,8 +257,8 @@ TEST(LibraryOpdsImportTest, allInOne) const kiwix::Book& book1 = lib->getBookById("0c45160e-f917-760a-9159-dfe3c53cdcdd"); 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.getName(), "wikipedia_fr_tunisie"); + EXPECT_EQ(book1.getFlavour(), "novid"); EXPECT_EQ(book1.getLanguages(), Langs{ "fra" }); EXPECT_EQ(book1.getCommaSeparatedLanguages(), "fra"); EXPECT_EQ(book1.getDate(), "8 Oct 2018"); @@ -273,7 +282,7 @@ TEST(LibraryOpdsImportTest, allInOne) { const kiwix::Book& book2 = lib->getBookById("0189d9be-2fd0-b4b6-7300-20fab0b5cdc8"); EXPECT_EQ(book2.getTitle(), "TED talks - Business"); - EXPECT_EQ(book2.getName(), ""); + EXPECT_EQ(book2.getName(), "ted_en_business"); EXPECT_EQ(book2.getFlavour(), ""); EXPECT_EQ(book2.getLanguages(), Langs{ "eng" }); EXPECT_EQ(book2.getCommaSeparatedLanguages(), "eng");