-
-
Notifications
You must be signed in to change notification settings - Fork 56
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #843 from kiwix/backslash_handling_in_suggestions
Backslash handling in suggestions
- Loading branch information
Showing
6 changed files
with
275 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,6 +4,7 @@ tests = [ | |
'tagParsing', | ||
'stringTools', | ||
'pathTools', | ||
'otherTools', | ||
'kiwixserve', | ||
'book', | ||
'manager', | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,174 @@ | ||
/* | ||
* Copyright (C) 2022 Veloman Yunkan | ||
* | ||
* This program is free software; you can redistribute it and/or | ||
* modify it under the terms of the GNU General Public License as | ||
* published by the Free Software Foundation; either version 2 of the | ||
* License, or (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, but | ||
* is provided AS IS, WITHOUT ANY WARRANTY; without even the implied | ||
* warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and | ||
* NON-INFRINGEMENT. See the GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with this program; if not, write to the Free Software | ||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
* | ||
*/ | ||
|
||
#include "gtest/gtest.h" | ||
#include "../src/tools/otherTools.h" | ||
#include "zim/suggestion_iterator.h" | ||
|
||
#include <regex> | ||
|
||
namespace | ||
{ | ||
|
||
// Output generated via mustache templates sometimes contains end-of-line | ||
// whitespace. This complicates representing the expected output of a unit-test | ||
// as C++ raw strings in editors that are configured to delete EOL whitespace. | ||
// A workaround is to put special markers (//EOLWHITESPACEMARKER) at the end | ||
// of such lines in the expected output string and remove them at runtime. | ||
// This is exactly what this function is for. | ||
std::string removeEOLWhitespaceMarkers(const std::string& s) | ||
{ | ||
const std::regex pattern("//EOLWHITESPACEMARKER"); | ||
return std::regex_replace(s, pattern, ""); | ||
} | ||
|
||
} // unnamed namespace | ||
|
||
#define CHECK_SUGGESTIONS(actual, expected) \ | ||
EXPECT_EQ(actual, removeEOLWhitespaceMarkers(expected)) | ||
|
||
TEST(Suggestions, basicTest) | ||
{ | ||
kiwix::Suggestions s; | ||
CHECK_SUGGESTIONS(s.getJSON(), | ||
R"EXPECTEDJSON([ | ||
//EOLWHITESPACEMARKER | ||
] | ||
)EXPECTEDJSON" | ||
); | ||
|
||
s.add(zim::SuggestionItem("Title", "/PATH", "Snippet")); | ||
|
||
CHECK_SUGGESTIONS(s.getJSON(), | ||
R"EXPECTEDJSON([ | ||
{ | ||
"value" : "Title", | ||
"label" : "Snippet", | ||
"kind" : "path" | ||
, "path" : "/PATH" | ||
} | ||
] | ||
)EXPECTEDJSON" | ||
); | ||
|
||
s.add(zim::SuggestionItem("Title Without Snippet", "/P/a/t/h")); | ||
s.addFTSearchSuggestion("en", "kiwi"); | ||
|
||
CHECK_SUGGESTIONS(s.getJSON(), | ||
R"EXPECTEDJSON([ | ||
{ | ||
"value" : "Title", | ||
"label" : "Snippet", | ||
"kind" : "path" | ||
, "path" : "/PATH" | ||
}, | ||
{ | ||
"value" : "Title Without Snippet", | ||
"label" : "Title Without Snippet", | ||
"kind" : "path" | ||
, "path" : "/P/a/t/h" | ||
}, | ||
{ | ||
"value" : "kiwi ", | ||
"label" : "containing 'kiwi'...", | ||
"kind" : "pattern" | ||
//EOLWHITESPACEMARKER | ||
} | ||
] | ||
)EXPECTEDJSON" | ||
); | ||
} | ||
|
||
TEST(Suggestions, specialCharHandling) | ||
{ | ||
// HTML special symbols (<, >, &, ", and ') must be HTML-escaped | ||
// Backslash symbols (\) must be duplicated. | ||
const std::string SYMBOLS(R"(\<>&'"~!@#$%^*()_+`-=[]{}|:;,.?)"); | ||
{ | ||
kiwix::Suggestions s; | ||
s.add(zim::SuggestionItem("Title with " + SYMBOLS, | ||
"Path with " + SYMBOLS, | ||
"Snippet with " + SYMBOLS)); | ||
|
||
CHECK_SUGGESTIONS(s.getJSON(), | ||
R"EXPECTEDJSON([ | ||
{ | ||
"value" : "Title with \\<>&'"~!@#$%^*()_+`-=[]{}|:;,.?", | ||
"label" : "Snippet with \\<>&'"~!@#$%^*()_+`-=[]{}|:;,.?", | ||
"kind" : "path" | ||
, "path" : "Path with \\<>&'"~!@#$%^*()_+`-=[]{}|:;,.?" | ||
} | ||
] | ||
)EXPECTEDJSON" | ||
); | ||
} | ||
|
||
{ | ||
kiwix::Suggestions s; | ||
s.add(zim::SuggestionItem("Snippetless title with " + SYMBOLS, | ||
"Path with " + SYMBOLS)); | ||
|
||
CHECK_SUGGESTIONS(s.getJSON(), | ||
R"EXPECTEDJSON([ | ||
{ | ||
"value" : "Snippetless title with \\<>&'"~!@#$%^*()_+`-=[]{}|:;,.?", | ||
"label" : "Snippetless title with \\<>&'"~!@#$%^*()_+`-=[]{}|:;,.?", | ||
"kind" : "path" | ||
, "path" : "Path with \\<>&'"~!@#$%^*()_+`-=[]{}|:;,.?" | ||
} | ||
] | ||
)EXPECTEDJSON" | ||
); | ||
} | ||
|
||
{ | ||
kiwix::Suggestions s; | ||
s.addFTSearchSuggestion("eng", "text with " + SYMBOLS); | ||
|
||
CHECK_SUGGESTIONS(s.getJSON(), | ||
R"EXPECTEDJSON([ | ||
{ | ||
"value" : "text with \\<>&'"~!@#$%^*()_+`-=[]{}|:;,.? ", | ||
"label" : "containing 'text with \\<>&'"~!@#$%^*()_+`-=[]{}|:;,.?'...", | ||
"kind" : "pattern" | ||
//EOLWHITESPACEMARKER | ||
} | ||
] | ||
)EXPECTEDJSON" | ||
); | ||
} | ||
} | ||
|
||
TEST(Suggestions, fulltextSearchSuggestionIsTranslated) | ||
{ | ||
kiwix::Suggestions s; | ||
s.addFTSearchSuggestion("it", "kiwi"); | ||
|
||
CHECK_SUGGESTIONS(s.getJSON(), | ||
R"EXPECTEDJSON([ | ||
{ | ||
"value" : "kiwi ", | ||
"label" : "contenente 'kiwi'...", | ||
"kind" : "pattern" | ||
//EOLWHITESPACEMARKER | ||
} | ||
] | ||
)EXPECTEDJSON" | ||
); | ||
} |