Fixed bug #4 where the operator basic_string<> was not properly encod…

…ing the port. This leads to changes where the port is now always present when we serialize the source endpoint as we derive the port from the scheme/protocol if not explicitly provided.
SiddiqSoft · Aug 18, 2021 · c6ea2ac · c6ea2ac
1 parent 5292fa2
commit c6ea2ac
Show file tree

Hide file tree

Showing 4 changed files with 594 additions and 545 deletions.
diff --git a/src/SplitUri.hpp b/src/SplitUri.hpp
@@ -379,7 +379,11 @@ namespace siddiqsoft
         /// @brief Operator rebuilds the Uri string
         operator std::basic_string<CharT>() const
         {
-            return std::format(_NORW(CharT, "{}://{}{}"), to_string<CharT>(scheme), authority.host, urlPart);
+            return std::format(_NORW(CharT, "{}://{}{}{}"),
+                               to_string<CharT>(scheme),
+                               authority.host,
+                               (authority.port > 0) ? std::format(_NORW(CharT, ":{}"), authority.port) : _NORW(CharT, ""),
+                               urlPart);
         }
 
 

diff --git a/tests/examples.cpp b/tests/examples.cpp
@@ -86,7 +86,7 @@ namespace siddiqsoft
 		std::cerr << std::format("{}", u.authority) << std::endl;
 
 		// The "rebuilt" endpoint
-		EXPECT_EQ("https://www.google.com/search?q=siddiqsoft&from=example_1_narrow#v1", std::format("{}", u));
+		EXPECT_EQ("https://www.google.com:443/search?q=siddiqsoft&from=example_1_narrow#v1", std::format("{}", u));
 		std::cerr << std::format("{}", u) << std::endl;
 	}
 
@@ -135,7 +135,7 @@ namespace siddiqsoft
 		std::wcerr << std::format(L"{}", u.authority) << std::endl;
 
 		// The "rebuilt" endpoint
-		EXPECT_EQ(L"https://www.google.com/search?q=siddiqsoft&from=example_1_wide#v1", std::format(L"{}", u));
+		EXPECT_EQ(L"https://www.google.com:443/search?q=siddiqsoft&from=example_1_wide#v1", std::format(L"{}", u));
 		std::wcerr << std::format(L"{}", u) << std::endl;
 	}
 } // namespace siddiqsoft