Rename autotest and unittest files

autotest/CMakeLists.txt

@@ -1,7 +1,7 @@
 # Auto test
 
 set(AT_SRCS
-    test_http_client.cc
+    http_client_autotest.cc
     )
 
 set(AT_TARGET_NAME webcc_autotest)

autotest/http_client_autotest.cc

@@ -17,10 +17,11 @@ bool kSslVerify = true;
 #endif
 
 // -----------------------------------------------------------------------------
+
 // JSON helper functions (based on jsoncpp).
 
 // Parse a string to JSON object.
-Json::Value StringToJson(const std::string& str) {
+static Json::Value StringToJson(const std::string& str) {
   Json::Value json;
 
   Json::CharReaderBuilder builder;
@@ -51,7 +52,7 @@ static void AssertGet(webcc::HttpResponsePtr r) {
   EXPECT_EQ("httpbin.org", headers["Host"].asString());
 }
 
-TEST(TestHttpClient, Get_RequestFunc) {
+TEST(HttpClientTest, Get_RequestFunc) {
   webcc::HttpClientSession session;
 
   try {
@@ -69,12 +70,10 @@ TEST(TestHttpClient, Get_RequestFunc) {
   }
 }
 
-TEST(TestHttpClient, Get_Shortcut) {
+TEST(HttpClientTest, Get_Shortcut) {
   webcc::HttpClientSession session;
 
   try {
-    // Use predefined shortcuts.
-
     auto r = session.Get("http://httpbin.org/get",
                          { "key1", "value1", "key2", "value2" },
                          { "Accept", "application/json" });
@@ -87,14 +86,13 @@ TEST(TestHttpClient, Get_Shortcut) {
 }
 
 #if WEBCC_ENABLE_SSL
-TEST(TestHttpClient, Get_SSL) {
+TEST(HttpClientTest, Get_SSL) {
   webcc::HttpClientSession session;
 
   session.set_ssl_verify(kSslVerify);
 
   try {
     // HTTPS is auto-detected from the URL scheme.
-
     auto r = session.Request(webcc::HttpRequestBuilder{}.Get().
                              Url("https://httpbin.org/get").
                              Query("key1", "value1").
@@ -113,7 +111,7 @@ TEST(TestHttpClient, Get_SSL) {
 // -----------------------------------------------------------------------------
 
 // Test Gzip compressed response.
-TEST(TestHttpClient, Compression_Gzip) {
+TEST(HttpClientTest, Compression_Gzip) {
   webcc::HttpClientSession session;
 
   try {
@@ -129,7 +127,7 @@ TEST(TestHttpClient, Compression_Gzip) {
 }
 
 // Test Deflate compressed response.
-TEST(TestHttpClient, Compression_Deflate) {
+TEST(HttpClientTest, Compression_Deflate) {
   webcc::HttpClientSession session;
 
   try {
@@ -159,7 +157,7 @@ TEST(TestHttpClient, Compression_Deflate) {
 //   "https://www.google.com";
 //   "https://api.github.com/events";
 //
-TEST(TestHttpClient, KeepAlive) {
+TEST(HttpClientTest, KeepAlive) {
   webcc::HttpClientSession session;
 
   std::string url = "http://httpbin.org/get";
@@ -199,7 +197,7 @@ TEST(TestHttpClient, KeepAlive) {
 // -----------------------------------------------------------------------------
 
 // Get a JPEG image.
-TEST(TestHttpClient, GetImageJpeg) {
+TEST(HttpClientTest, GetImageJpeg) {
   webcc::HttpClientSession session;
 
   std::string url = "http://httpbin.org/get";

unittest/CMakeLists.txt

@@ -1,10 +1,10 @@
 # Unit test
 
 set(UT_SRCS
-    base64_test.cc
-    http_parser_test.cc
-    rest_service_manager_test.cc
-    url_test.cc
+    base64_unittest.cc
+    http_parser_unittest.cc
+    rest_service_manager_unittest.cc
+    url_unittest.cc
     )
 
 set(UT_TARGET_NAME webcc_unittest)

unittest/base64_unittest.cc

@@ -2,7 +2,7 @@
 
 #include "webcc/base64.h"
 
-TEST(Base64, Encode) {
+TEST(Base64Test, Encode) {
   std::string encoded;
 
   encoded = webcc::Base64Encode("ban");
@@ -15,7 +15,7 @@ TEST(Base64, Encode) {
   EXPECT_EQ("YmFuYW4=", encoded);
 }
 
-TEST(Base64, Decode) {
+TEST(Base64Test, Decode) {
   std::string decoded;
 
   decoded = webcc::Base64Decode("YmFu");

unittest/rest_service_manager_unittest.cc

@@ -4,7 +4,7 @@
 
 // -----------------------------------------------------------------------------
 
-class TestRestService : public webcc::RestService {
+class MyRestService : public webcc::RestService {
 public:
   void Handle(const webcc::RestRequest& request,
               webcc::RestResponse* response) final {
@@ -14,10 +14,10 @@ public:
 
 // -----------------------------------------------------------------------------
 
-TEST(RestServiceManager, URL_RegexBasic) {
+TEST(RestServiceManagerTest, URL_RegexBasic) {
   webcc::RestServiceManager service_manager;
 
-  service_manager.AddService(std::make_shared<TestRestService>(),
+  service_manager.AddService(std::make_shared<MyRestService>(),
                              "/instance/(\\d+)", true);
 
   std::vector<std::string> matches;
@@ -37,10 +37,10 @@ TEST(RestServiceManager, URL_RegexBasic) {
   EXPECT_FALSE(!!service);
 }
 
-TEST(RestServiceManager, URL_RegexMultiple) {
+TEST(RestServiceManagerTest, URL_RegexMultiple) {
   webcc::RestServiceManager service_manager;
 
-  service_manager.AddService(std::make_shared<TestRestService>(),
+  service_manager.AddService(std::make_shared<MyRestService>(),
                              "/study/(\\d+)/series/(\\d+)/instance/(\\d+)",
                              true);
 
@@ -63,10 +63,10 @@ TEST(RestServiceManager, URL_RegexMultiple) {
   EXPECT_FALSE(!!service);
 }
 
-TEST(RestServiceManager, URL_NonRegex) {
+TEST(RestServiceManagerTest, URL_NonRegex) {
   webcc::RestServiceManager service_manager;
 
-  service_manager.AddService(std::make_shared<TestRestService>(), "/instances",
+  service_manager.AddService(std::make_shared<MyRestService>(), "/instances",
                              false);
 
   std::vector<std::string> matches;

unittest/url_unittest.cc

@@ -2,7 +2,7 @@
 
 #include "webcc/url.h"
 
-TEST(Url, Basic) {
+TEST(UrlTest, Basic) {
   webcc::Url url("http://example.com/path", false);
 
   EXPECT_EQ("http", url.scheme());
@@ -12,7 +12,7 @@ TEST(Url, Basic) {
   EXPECT_EQ("", url.query());
 }
 
-TEST(Url, NoPath) {
+TEST(UrlTest, NoPath) {
   webcc::Url url("http://example.com", false);
 
   EXPECT_EQ("http", url.scheme());
@@ -22,7 +22,7 @@ TEST(Url, NoPath) {
   EXPECT_EQ("", url.query());
 }
 
-TEST(Url, NoPath2) {
+TEST(UrlTest, NoPath2) {
   webcc::Url url("http://example.com/", false);
 
   EXPECT_EQ("http", url.scheme());
@@ -32,7 +32,7 @@ TEST(Url, NoPath2) {
   EXPECT_EQ("", url.query());
 }
 
-TEST(Url, NoPath3) {
+TEST(UrlTest, NoPath3) {
   webcc::Url url("http://example.com?key=value", false);
 
   EXPECT_EQ("http", url.scheme());
@@ -42,7 +42,7 @@ TEST(Url, NoPath3) {
   EXPECT_EQ("key=value", url.query());
 }
 
-TEST(Url, NoPath4) {
+TEST(UrlTest, NoPath4) {
   webcc::Url url("http://example.com/?key=value", false);
 
   EXPECT_EQ("http", url.scheme());
@@ -52,7 +52,7 @@ TEST(Url, NoPath4) {
   EXPECT_EQ("key=value", url.query());
 }
 
-TEST(Url, NoScheme) {
+TEST(UrlTest, NoScheme) {
   webcc::Url url("/path/to", false);
 
   EXPECT_EQ("", url.scheme());
@@ -62,7 +62,7 @@ TEST(Url, NoScheme) {
   EXPECT_EQ("", url.query());
 }
 
-TEST(Url, NoScheme2) {
+TEST(UrlTest, NoScheme2) {
   webcc::Url url("/path/to?key=value", false);
 
   EXPECT_EQ("", url.scheme());
@@ -72,7 +72,7 @@ TEST(Url, NoScheme2) {
   EXPECT_EQ("key=value", url.query());
 }
 
-TEST(Url, Full) {
+TEST(UrlTest, Full) {
   webcc::Url url("https://localhost:3000/path/to?key=value", false);
 
   EXPECT_EQ("https", url.scheme());