smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Supporting varying page title in HTML response tests

This commit is contained in:
Veloman Yunkan 2022-03-18 15:50:25 +04:00
parent e4a4b2f961
commit a3460f6f48
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
test/server.cpp
View File

@ -328,11 +328,12 @@ namespace TestingOfHtmlResponses
struct ExpectedResponseData struct ExpectedResponseData
{ {
const std::string bookName, bookTitle, expectedBody; const std::string expectedPageTitle, bookName, bookTitle, expectedBody;
}; };
enum ExpectedResponseDataType enum ExpectedResponseDataType
{ {
expected_page_title,
book_name, book_name,
book_title, book_title,
expected_body expected_body
@ -345,9 +346,10 @@ ExpectedResponseData operator==(ExpectedResponseDataType t, std::string s)
{ {
switch (t) switch (t)
{ {
case book_name: return ExpectedResponseData{s, "", ""}; case expected_page_title: return ExpectedResponseData{s, "", "", ""};
case book_title: return ExpectedResponseData{"", s, ""}; case book_name: return ExpectedResponseData{"", s, "", ""};
case expected_body: return ExpectedResponseData{"", "", s}; case book_title: return ExpectedResponseData{"", "", s, ""};
case expected_body: return ExpectedResponseData{"", "", "", s};
default: assert(false); return ExpectedResponseData{}; default: assert(false); return ExpectedResponseData{};
} }
} }
@ -364,6 +366,7 @@ ExpectedResponseData operator&&(const ExpectedResponseData& a,
const ExpectedResponseData& b) const ExpectedResponseData& b)
{ {
return ExpectedResponseData{ return ExpectedResponseData{
selectNonEmpty(a.expectedPageTitle, b.expectedPageTitle),
selectNonEmpty(a.bookName, b.bookName), selectNonEmpty(a.bookName, b.bookName),
selectNonEmpty(a.bookTitle, b.bookTitle), selectNonEmpty(a.bookTitle, b.bookTitle),
selectNonEmpty(a.expectedBody, b.expectedBody) selectNonEmpty(a.expectedBody, b.expectedBody)
@ -384,6 +387,7 @@ public:
std::string expectedResponse() const; std::string expectedResponse() const;
private: private:
std::string pageTitle() const;
std::string hiddenBookNameInput() const; std::string hiddenBookNameInput() const;
std::string searchPatternInput() const; std::string searchPatternInput() const;
std::string taskbarLinks() const; std::string taskbarLinks() const;
@ -396,7 +400,9 @@ std::string TestContentIn404HtmlResponse::expectedResponse() const
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta content="text/html;charset=UTF-8" http-equiv="content-type" /> <meta content="text/html;charset=UTF-8" http-equiv="content-type" />
<title>Content not found</title> <title>)FRAG",
R"FRAG(</title>
<link type="root" href="/ROOT"><link type="text/css" href="/ROOT/skin/jquery-ui/jquery-ui.min.css" rel="Stylesheet" /> <link type="root" href="/ROOT"><link type="text/css" href="/ROOT/skin/jquery-ui/jquery-ui.min.css" rel="Stylesheet" />
<link type="text/css" href="/ROOT/skin/jquery-ui/jquery-ui.theme.min.css" rel="Stylesheet" /> <link type="text/css" href="/ROOT/skin/jquery-ui/jquery-ui.theme.min.css" rel="Stylesheet" />
<link type="text/css" href="/ROOT/skin/taskbar.css" rel="Stylesheet" /> <link type="text/css" href="/ROOT/skin/taskbar.css" rel="Stylesheet" />
@ -436,14 +442,23 @@ std::string TestContentIn404HtmlResponse::expectedResponse() const
}; };
return frag[0] return frag[0]
+ hiddenBookNameInput() + pageTitle()
+ frag[1] + frag[1]
+ searchPatternInput() + hiddenBookNameInput()
+ frag[2] + frag[2]
+ taskbarLinks() + searchPatternInput()
+ frag[3] + frag[3]
+ taskbarLinks()
+ frag[4]
+ removeEOLWhitespaceMarkers(expectedBody) + removeEOLWhitespaceMarkers(expectedBody)
+ frag[4]; + frag[5];
}
std::string TestContentIn404HtmlResponse::pageTitle() const
{
return expectedPageTitle.empty()
? "Content not found"
: expectedPageTitle;
} }
std::string TestContentIn404HtmlResponse::hiddenBookNameInput() const std::string TestContentIn404HtmlResponse::hiddenBookNameInput() const