Made 2nd param of urlEncode() mandatory

This is a precautionary step before dropping the said parameter.
kiwix · Jan 25, 2023 · 77c35d1 · 77c35d1
1 parent 44c9460
commit 77c35d1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/src/tools/stringTools.h b/src/tools/stringTools.h
@@ -55,7 +55,7 @@ class ICULanguageInfo
 };
 
 
-std::string urlEncode(const std::string& value, bool encodeReserved = false);
+std::string urlEncode(const std::string& value, bool encodeReserved);
 std::string urlDecode(const std::string& value, bool component = false);
 
 std::string join(const std::vector<std::string>& list, const std::string& sep);

diff --git a/test/stringTools.cpp b/test/stringTools.cpp
@@ -125,26 +125,26 @@ TEST(stringTools, urlEncode)
 {
   using namespace URLEncoding;
 
-  EXPECT_EQ(urlEncode(letters),       letters);
+  EXPECT_EQ(urlEncode(letters,false), letters);
   EXPECT_EQ(urlEncode(letters, true), letters);
 
-  EXPECT_EQ(urlEncode(digits),       digits);
+  EXPECT_EQ(urlEncode(digits,false), digits);
   EXPECT_EQ(urlEncode(digits, true), digits);
 
-  EXPECT_EQ(urlEncode(nonEncodableSymbols),       nonEncodableSymbols);
+  EXPECT_EQ(urlEncode(nonEncodableSymbols,false), nonEncodableSymbols);
   EXPECT_EQ(urlEncode(nonEncodableSymbols, true), nonEncodableSymbols);
 
-  EXPECT_EQ(urlEncode(uriDelimSymbols), uriDelimSymbols);
+  EXPECT_EQ(urlEncode(uriDelimSymbols,false), uriDelimSymbols);
   EXPECT_EQ(urlEncode(uriDelimSymbols, true), "%3A%40%3F%3D%2B%26%23%24%3B%2C");
 
-  EXPECT_EQ(urlEncode(otherSymbols), "%60%25%5E%5B%5D%7B%7D%5C%7C%22%3C%3E");
-  EXPECT_EQ(urlEncode(otherSymbols), urlEncode(otherSymbols, true));
+  EXPECT_EQ(urlEncode(otherSymbols,false), "%60%25%5E%5B%5D%7B%7D%5C%7C%22%3C%3E");
+  EXPECT_EQ(urlEncode(otherSymbols,false), urlEncode(otherSymbols, true));
 
-  EXPECT_EQ(urlEncode(whitespace), "%20%0A%09%0D");
-  EXPECT_EQ(urlEncode(whitespace), urlEncode(whitespace, true));
+  EXPECT_EQ(urlEncode(whitespace,false), "%20%0A%09%0D");
+  EXPECT_EQ(urlEncode(whitespace,false), urlEncode(whitespace, true));
 
-  EXPECT_EQ(urlEncode(someNonASCIIChars), "%CE%A3%E2%99%82%E2%99%80%E3%83%84");
-  EXPECT_EQ(urlEncode(someNonASCIIChars), urlEncode(someNonASCIIChars, true));
+  EXPECT_EQ(urlEncode(someNonASCIIChars,false), "%CE%A3%E2%99%82%E2%99%80%E3%83%84");
+  EXPECT_EQ(urlEncode(someNonASCIIChars,false), urlEncode(someNonASCIIChars, true));
 }
 
 TEST(stringTools, urlDecode)
@@ -161,11 +161,12 @@ TEST(stringTools, urlDecode)
 
   for ( const char c : allTestChars ) {
     const std::string str(1, c);
-    EXPECT_EQ(urlDecode(urlEncode(str)), str);
+    EXPECT_EQ(urlDecode(urlEncode(str,false),false), str);
     EXPECT_EQ(urlDecode(urlEncode(str, true), true), str);
+    EXPECT_EQ(urlDecode(urlEncode(str,false)),       str);
   }
 
-  EXPECT_EQ(urlDecode(urlEncode(allTestChars)), allTestChars);
+  EXPECT_EQ(urlDecode(urlEncode(allTestChars,false),false), allTestChars);
   EXPECT_EQ(urlDecode(urlEncode(allTestChars, true), true), allTestChars);
 }