smallsolar/libkiwix
1
0
Fork 0
mirror of https://github.com/kiwix/libkiwix.git synced 2025-06-26 10:11:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Introduce a pagination object to render search result.

Browse Source
This commit is contained in:
Matthieu Gautier
2022-05-23 19:12:17 +02:00
parent cb62da65c3
commit bbdde93f49
5 changed files with 294 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/meson.build
View File

@ -9,7 +9,8 @@ tests = [
'book',
'manager',
'name_mapper',
'opds_catalog'
'opds_catalog',
'server_helper'
]
if build_machine.system() != 'windows'
@ -59,6 +60,7 @@ if gtest_dep.found() and not meson.is_cross_build()
# XXX: '#include <regex>' includes the regex unit test binary
test_exe = executable(test_name, [test_name+'.cpp'],
implicit_include_directories: false,
include_directories : inc,
link_with : kiwixlib,
link_args: extra_link_args,
dependencies : all_deps + [gtest_dep],

11
test/server.cpp
View File

@ -1849,7 +1849,6 @@ R"SEARCHRESULT(
},
/* pagination */ {
{ "◀", 0, false },
{ "1", 0, true },
{ "2", 5, false },
{ "3", 10, false },
@ -1874,7 +1873,6 @@ R"SEARCHRESULT(
},
/* pagination */ {
{ "◀", 0, false },
{ "1", 0, false },
{ "2", 5, true },
{ "3", 10, false },
@ -1900,7 +1898,6 @@ R"SEARCHRESULT(
},
/* pagination */ {
{ "◀", 0, false },
{ "1", 0, false },
{ "2", 5, false },
{ "3", 10, true },
@ -1927,7 +1924,6 @@ R"SEARCHRESULT(
},
/* pagination */ {
{ "◀", 0, false },
{ "1", 0, false },
{ "2", 5, false },
{ "3", 10, false },
@ -1955,7 +1951,6 @@ R"SEARCHRESULT(
},
/* pagination */ {
{ "◀", 0, false },
{ "1", 0, false },
{ "2", 5, false },
{ "3", 10, false },
@ -1965,7 +1960,6 @@ R"SEARCHRESULT(
{ "7", 30, false },
{ "8", 35, false },
{ "9", 40, false },
{ "▶", 40, false },
}
},
@ -1993,7 +1987,6 @@ R"SEARCHRESULT(
{ "7", 30, false },
{ "8", 35, false },
{ "9", 40, false },
{ "▶", 40, false },
}
},
@ -2020,7 +2013,6 @@ R"SEARCHRESULT(
{ "7", 30, true },
{ "8", 35, false },
{ "9", 40, false },
{ "▶", 40, false },
}
},
@ -2046,7 +2038,6 @@ R"SEARCHRESULT(
{ "7", 30, false },
{ "8", 35, true },
{ "9", 40, false },
{ "▶", 40, false },
}
},
@ -2070,7 +2061,6 @@ R"SEARCHRESULT(
{ "7", 30, false },
{ "8", 35, false },
{ "9", 40, true },
{ "▶", 40, false },
}
},
@ -2117,7 +2107,6 @@ R"SEARCHRESULT(
{ "7", 30, false },
{ "8", 35, false },
{ "9", 40, false },
{ "▶", 40, false },
}
},
};

215
test/server_helper.cpp Normal file
View File

@ -0,0 +1,215 @@
#include <mustache.hpp>
#include "gtest/gtest.h"
#include "../src/tools/stringTools.h"
namespace {
struct ExpectedPage {
ExpectedPage(const std::string& label, unsigned int start, bool current)
: label(label),
start(start),
current(current)
{}
testing::AssertionResult isEqual(const kainjow::mustache::data& data) {
if (!data.is_object()
|| data.get("label") == nullptr
|| data.get("start") == nullptr
|| data.get("current") == nullptr) {
return testing::AssertionFailure() << "data is not a valid object";
}
if (data.get("label")->string_value() != label) {
return testing::AssertionFailure() << data.get("label")->string_value()
<< " is not equal to "
<< label;
}
if (data.get("start")->string_value() != kiwix::to_string(start)) {
return testing::AssertionFailure() << data.get("start")->string_value()
<< " is not equal to "
<< kiwix::to_string(start);
}
if (current && !data.get("current")->is_true()) {
return testing::AssertionFailure() << "data is not true";
}
if (!current && !data.get("current")->is_false()) {
return testing::AssertionFailure() << "data is not false";
}
return testing::AssertionSuccess();
}
std::string label;
unsigned int start;
bool current;
};
class ExpectedPages : public std::vector<ExpectedPage>
{
public:
ExpectedPages(std::vector<ExpectedPage>&& v)
: std::vector<ExpectedPage>(v)
{}
testing::AssertionResult isEqual(const kainjow::mustache::data& data) {
if (empty()) {
if (data.is_empty_list()) {
return testing::AssertionSuccess();
} else {
return testing::AssertionFailure() << "data is not an empty list.";
}
}
if (! data.is_non_empty_list()) {
return testing::AssertionFailure() << "data is not a non empty list.";
}
auto& data_pages = data.list_value();
if (size() != data_pages.size()) {
return testing::AssertionFailure() << "data (size " << data_pages.size() << ")"
<< " and expected (size " << size() << ")"
<< " must have the same size";
}
auto it1 = begin();
auto it2 = data_pages.begin();
while (it1!=end()) {
auto result = it1->isEqual(*it2);
if(!result) {
return result;
}
it1++; it2++;
}
return testing::AssertionSuccess();
}
};
}
namespace kiwix {
kainjow::mustache::data buildPagination(
unsigned int pageLength,
unsigned int resultsCount,
unsigned int resultsStart
);
}
TEST(SearchRenderer, buildPagination) {
{
auto pagination = kiwix::buildPagination(10, 0, 0);
ASSERT_EQ(pagination.get("itemsPerPage")->string_value(), "10");
ASSERT_TRUE(pagination.get("hasPages")->is_false());
ASSERT_TRUE(ExpectedPages({}).isEqual(*pagination.get("pages")));
}
{
auto pagination = kiwix::buildPagination(10, 1, 0);
ASSERT_EQ(pagination.get("itemsPerPage")->string_value(), "10");
ASSERT_TRUE(pagination.get("hasPages")->is_false());
ASSERT_TRUE(ExpectedPages({}).isEqual(*pagination.get("pages")));
}
{
auto pagination = kiwix::buildPagination(10, 10, 0);
ASSERT_EQ(pagination.get("itemsPerPage")->string_value(), "10");
ASSERT_TRUE(pagination.get("hasPages")->is_false());
ASSERT_TRUE(ExpectedPages({}).isEqual(*pagination.get("pages")));
}
{
auto pagination = kiwix::buildPagination(10, 11, 0);
ASSERT_EQ(pagination.get("itemsPerPage")->string_value(), "10");
ASSERT_TRUE(pagination.get("hasPages")->is_true());
ASSERT_TRUE(ExpectedPages({
{"1", 0, true},
{"2", 10, false},
}).isEqual(*pagination.get("pages")));
}
{
auto pagination = kiwix::buildPagination(10, 20, 0);
ASSERT_EQ(pagination.get("itemsPerPage")->string_value(), "10");
ASSERT_TRUE(pagination.get("hasPages")->is_true());
ASSERT_TRUE(ExpectedPages({
{"1", 0, true},
{"2", 10, false},
}).isEqual(*pagination.get("pages")));
}
{
auto pagination = kiwix::buildPagination(10, 21, 0);
ASSERT_EQ(pagination.get("itemsPerPage")->string_value(), "10");
ASSERT_TRUE(pagination.get("hasPages")->is_true());
ASSERT_TRUE(ExpectedPages({
{"1", 0, true},
{"2", 10, false},
{"3", 20, false}
}).isEqual(*pagination.get("pages")));
}
{
auto pagination = kiwix::buildPagination(10, 21, 11);
ASSERT_EQ(pagination.get("itemsPerPage")->string_value(), "10");
ASSERT_TRUE(pagination.get("hasPages")->is_true());
ASSERT_TRUE(ExpectedPages({
{"1", 0, false},
{"2", 10, true},
{"3", 20, false}
}).isEqual(*pagination.get("pages")));
}
{
auto pagination = kiwix::buildPagination(10, 21, 21);
ASSERT_EQ(pagination.get("itemsPerPage")->string_value(), "10");
ASSERT_TRUE(pagination.get("hasPages")->is_true());
ASSERT_TRUE(ExpectedPages({
{"1", 0, false},
{"2", 10, false},
{"3", 20, true}
}).isEqual(*pagination.get("pages")));
}
{
auto pagination = kiwix::buildPagination(10, 200, 0);
ASSERT_EQ(pagination.get("itemsPerPage")->string_value(), "10");
ASSERT_TRUE(pagination.get("hasPages")->is_true());
ASSERT_TRUE(ExpectedPages({
{"1", 0, true},
{"2", 10, false},
{"3", 20, false},
{"4", 30, false},
{"5", 40, false},
{"▶", 190, false}
}).isEqual(*pagination.get("pages")));
}
{
auto pagination = kiwix::buildPagination(10, 200, 105);
ASSERT_EQ(pagination.get("itemsPerPage")->string_value(), "10");
ASSERT_TRUE(pagination.get("hasPages")->is_true());
ASSERT_TRUE(ExpectedPages({
{"◀", 0, false},
{"7", 60, false},
{"8", 70, false},
{"9", 80, false},
{"10", 90, false},
{"11", 100, true},
{"12", 110, false},
{"13", 120, false},
{"14", 130, false},
{"15", 140, false},
{"▶", 190, false}
}).isEqual(*pagination.get("pages")));
}
{
auto pagination = kiwix::buildPagination(10, 200, 199);
ASSERT_EQ(pagination.get("itemsPerPage")->string_value(), "10");
ASSERT_TRUE(pagination.get("hasPages")->is_true());
ASSERT_TRUE(ExpectedPages({
{"◀", 0, false},
{"16", 150, false},
{"17", 160, false},
{"18", 170, false},
{"19", 180, false},
{"20", 190, true}
}).isEqual(*pagination.get("pages")));
}
}