commit bf8ab7a3ee67977fe8e1f1958af94c9da215cb6f
author Nan Zhou <nanzhoumails@gmail.com> Sun Jun 26 23:43:28 2022 +0000
committer Ed Tanous <ed@tanous.net> Tue Jun 28 00:08:36 2022 +0000
tree d3f0ed1a8883504f3f9c069c3531b90a785c181d
parent 26500f2dac8a59bc184b105c7b0a551286e9da9d

http: utility_test: fix namespace

Removed unnecessary using directives. Add necessary using directives.

Tested: unit test passed.

Signed-off-by: Nan Zhou <nanzhoumails@gmail.com>
Change-Id: I36948b531c4e75dbae6837601894839b23b2d3d1

http/ut/utility_test.cpp

diff --git a/http/ut/utility_test.cpp b/http/ut/utility_test.cpp
index ca915f6..23e8ae3 100644
--- a/http/ut/utility_test.cpp
+++ b/http/ut/utility_test.cpp
@@ -21,6 +21,8 @@
 namespace
 {
 
+using ::crow::black_magic::getParameterTag;
+
 TEST(Utility, Base64DecodeAuthString)
 {
     std::string authString("dXNlcm40bWU6cGFzc3cwcmQ=");
@@ -78,8 +80,6 @@
 
 TEST(Utility, GetDateTimeStdtime)
 {
-    using crow::utility::getDateTimeStdtime;
-
     // some time before the epoch
     EXPECT_EQ(getDateTimeStdtime(std::time_t{-1234567}),
               "1969-12-17T17:03:53+00:00");
@@ -124,7 +124,6 @@
 
 TEST(Utility, UrlFromPieces)
 {
-    using crow::utility::urlFromPieces;
     boost::urls::url url = urlFromPieces("redfish", "v1", "foo");
     EXPECT_EQ(std::string_view(url.data(), url.size()), "/redfish/v1/foo");
 
@@ -140,8 +139,6 @@
 
 TEST(Utility, readUrlSegments)
 {
-    using crow::utility::readUrlSegments;
-
     boost::urls::result<boost::urls::url_view> parsed =
         boost::urls::parse_relative_ref("/redfish/v1/Chassis#/Fans/0/Reading");
 
@@ -195,7 +192,6 @@
 
 TEST(Utility, ValidateAndSplitUrlPositive)
 {
-    using crow::utility::validateAndSplitUrl;
     std::string host;
     std::string urlProto;
     uint16_t port = 0;
@@ -241,30 +237,24 @@
 
 TEST(Router, ParameterTagging)
 {
-    EXPECT_EQ(6 * 6 + 6 * 3 + 2,
-              crow::black_magic::getParameterTag("<uint><double><int>"));
-    EXPECT_EQ(1, crow::black_magic::getParameterTag("<int>"));
-    EXPECT_EQ(2, crow::black_magic::getParameterTag("<uint>"));
-    EXPECT_EQ(3, crow::black_magic::getParameterTag("<float>"));
-    EXPECT_EQ(3, crow::black_magic::getParameterTag("<double>"));
-    EXPECT_EQ(4, crow::black_magic::getParameterTag("<str>"));
-    EXPECT_EQ(4, crow::black_magic::getParameterTag("<string>"));
-    EXPECT_EQ(5, crow::black_magic::getParameterTag("<path>"));
-    EXPECT_EQ(6 * 6 + 6 + 1,
-              crow::black_magic::getParameterTag("<int><int><int>"));
-    EXPECT_EQ(6 * 6 + 6 + 2,
-              crow::black_magic::getParameterTag("<uint><int><int>"));
-    EXPECT_EQ(6 * 6 + 6 * 3 + 2,
-              crow::black_magic::getParameterTag("<uint><double><int>"));
+    EXPECT_EQ(6 * 6 + 6 * 3 + 2, getParameterTag("<uint><double><int>"));
+    EXPECT_EQ(1, getParameterTag("<int>"));
+    EXPECT_EQ(2, getParameterTag("<uint>"));
+    EXPECT_EQ(3, getParameterTag("<float>"));
+    EXPECT_EQ(3, getParameterTag("<double>"));
+    EXPECT_EQ(4, getParameterTag("<str>"));
+    EXPECT_EQ(4, getParameterTag("<string>"));
+    EXPECT_EQ(5, getParameterTag("<path>"));
+    EXPECT_EQ(6 * 6 + 6 + 1, getParameterTag("<int><int><int>"));
+    EXPECT_EQ(6 * 6 + 6 + 2, getParameterTag("<uint><int><int>"));
+    EXPECT_EQ(6 * 6 + 6 * 3 + 2, getParameterTag("<uint><double><int>"));
 }
 
 TEST(URL, JsonEncoding)
 {
-    using nlohmann::json;
-
     std::string urlString = "/foo";
-    EXPECT_EQ(json(boost::urls::url(urlString)), urlString);
-    EXPECT_EQ(json(boost::urls::url_view(urlString)), urlString);
+    EXPECT_EQ(nlohmann::json(boost::urls::url(urlString)), urlString);
+    EXPECT_EQ(nlohmann::json(boost::urls::url_view(urlString)), urlString);
 }
 
 } // namespace