From d56ccbd019c9ad34c1606c89b7c14c1616954b0c Mon Sep 17 00:00:00 2001 From: Veloman Yunkan Date: Tue, 10 May 2022 12:57:37 +0400 Subject: [PATCH] First search results test-point with pagination --- static/templates/search_result.html | 6 +- test/server.cpp | 86 ++++++++++++++++++++++++++--- 2 files changed, 82 insertions(+), 10 deletions(-) diff --git a/static/templates/search_result.html b/static/templates/search_result.html index c16325aa6..ddf0ff2ab 100644 --- a/static/templates/search_result.html +++ b/static/templates/search_result.html @@ -147,7 +147,8 @@ -
- %FOOTER% +
%FOOTER%
@@ -1107,7 +1107,7 @@ std::string makeSearchResultsHtml(const std::string& pattern, html = replace(html, "%PATTERN%", pattern); html = replace(html, "%HEADER%", header); html = replace(html, "%RESULTS%", results); - html = replace(html, "%FOOTER%", ""); + html = replace(html, "%FOOTER%", footer); return html; } @@ -1513,15 +1513,27 @@ TEST_F(TaskbarlessServerTest, searchResults) { struct TestData { + struct PaginationEntry + { + std::string label; + size_t start; + bool selected; + }; + std::string pattern; size_t resultsPerPage; size_t totalResultCount; size_t firstResultIndex; std::vector results; + std::vector pagination; - std::string url() const + static std::string makeUrl(const std::string pattern, int start, size_t resultsPerPage) { - std::string url = "/ROOT/search?content=zimfile&pattern=" + pattern; + std::string url = "/ROOT/search?pattern=" + pattern + "&content=zimfile"; + + if ( start >= 0 ) { + url += "&start=" + to_string(start); + } if ( resultsPerPage != 0 ) { url += "&pageLength=" + to_string(resultsPerPage); @@ -1530,6 +1542,11 @@ TEST_F(TaskbarlessServerTest, searchResults) return url; } + std::string url() const + { + return makeUrl(pattern, -1, resultsPerPage); + } + std::string expectedHeader() const { if ( totalResultCount == 0 ) { @@ -1569,12 +1586,37 @@ TEST_F(TaskbarlessServerTest, searchResults) return s; } + std::string expectedFooter() const + { + if ( pagination.empty() ) { + return "\n "; + } + + std::ostringstream oss; + oss << "\n "; + return oss.str(); + } + std::string expectedHtml() const { return makeSearchResultsHtml( pattern, expectedHeader(), - expectedResultsString() + expectedResultsString(), + expectedFooter() ); } @@ -1591,6 +1633,7 @@ TEST_F(TaskbarlessServerTest, searchResults) /* totalResultCount */ 0, /* firstResultIndex */ 0, /* results */ {}, + /* pagination */ {} }, { @@ -1608,6 +1651,7 @@ R"SEARCHRESULT(
93 words
)SEARCHRESULT" }, + /* pagination */ {} }, { @@ -1634,6 +1678,7 @@ R"SEARCHRESULT(
134 words
)SEARCHRESULT" }, + /* pagination */ {} }, { @@ -1641,7 +1686,32 @@ R"SEARCHRESULT( /* resultsPerPage */ 100, /* totalResultCount */ 44, /* firstResultIndex */ 1, - /* results */ LARGE_SEARCH_RESULTS + /* results */ LARGE_SEARCH_RESULTS, + /* pagination */ {} + }, + + { + /* pattern */ "jazz", + /* resultsPerPage */ 5, + /* totalResultCount */ 44, + /* firstResultIndex */ 1, + /* results */ { + LARGE_SEARCH_RESULTS[0], + LARGE_SEARCH_RESULTS[1], + LARGE_SEARCH_RESULTS[2], + LARGE_SEARCH_RESULTS[3], + LARGE_SEARCH_RESULTS[4], + }, + + /* pagination */ { + { "◀", 0, false }, + { "1", 0, true }, + { "2", 5, false }, + { "3", 10, false }, + { "4", 15, false }, + { "5", 20, false }, + { "▶", 40, false }, + } }, };