Adding tests

etr · etr · commit 09df543730cb · 2018-12-23T07:44:09.000Z
diff --git a/src/http_utils.cpp b/src/http_utils.cpp
@@ -243,7 +243,7 @@ std::string get_ip_str(
     socklen_t maxlen
 )
 {
-    if (!sa) throw new std::invalid_argument("socket pointer is null");
+    if (!sa) throw std::invalid_argument("socket pointer is null");
 
     char to_ret[NI_MAXHOST];
     if (AF_INET6 == sa->sa_family)
@@ -258,13 +258,13 @@ std::string get_ip_str(
     }
     else
     {
-        throw new std::invalid_argument("IP family must be either AF_INET or AF_INET6");
+        throw std::invalid_argument("IP family must be either AF_INET or AF_INET6");
     }
 }
 
 unsigned short get_port(const struct sockaddr* sa)
 {
-    if (!sa) throw new std::invalid_argument("socket pointer is null");
+    if (!sa) throw std::invalid_argument("socket pointer is null");
 
     if (sa->sa_family == AF_INET)
     {
@@ -276,7 +276,7 @@ unsigned short get_port(const struct sockaddr* sa)
     }
     else
     {
-        throw new std::invalid_argument("IP family must be either AF_INET or AF_INET6");
+        throw std::invalid_argument("IP family must be either AF_INET or AF_INET6");
     }
 }
 
diff --git a/test/unit/http_utils_test.cpp b/test/unit/http_utils_test.cpp
@@ -58,6 +58,18 @@ LT_BEGIN_AUTO_TEST(http_utils_suite, unescape)
     LT_CHECK_EQ(expected_size, 3);
 LT_END_AUTO_TEST(unescape)
 
+LT_BEGIN_AUTO_TEST(http_utils_suite, unescape_plus)
+    char* string_with_plus = (char*) malloc(6 * sizeof(char));
+    sprintf(string_with_plus, "%s", "A+B");
+    int expected_size = http::http_unescape(string_with_plus);
+
+    char* expected = (char*) malloc(4 * sizeof(char));
+    sprintf(expected, "%s", "A B");
+
+    LT_CHECK_EQ(string(string_with_plus), string(expected));
+    LT_CHECK_EQ(expected_size, 3);
+LT_END_AUTO_TEST(unescape_plus)
+
 LT_BEGIN_AUTO_TEST(http_utils_suite, standardize_url)
     string url = "/", result;
     result = http::http_utils::standardize_url(url);

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ std::string get_ip_str(`
`243`	`243`	`socklen_t maxlen`
`244`	`244`	`)`
`245`	`245`	`{`
`246`		`- if (!sa) throw new std::invalid_argument("socket pointer is null");`
	`246`	`+ if (!sa) throw std::invalid_argument("socket pointer is null");`
`247`	`247`
`248`	`248`	`char to_ret[NI_MAXHOST];`
`249`	`249`	`if (AF_INET6 == sa->sa_family)`
`@@ -258,13 +258,13 @@ std::string get_ip_str(`
`258`	`258`	`}`
`259`	`259`	`else`
`260`	`260`	`{`
`261`		`- throw new std::invalid_argument("IP family must be either AF_INET or AF_INET6");`
	`261`	`+ throw std::invalid_argument("IP family must be either AF_INET or AF_INET6");`
`262`	`262`	`}`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`unsigned short get_port(const struct sockaddr* sa)`
`266`	`266`	`{`
`267`		`- if (!sa) throw new std::invalid_argument("socket pointer is null");`
	`267`	`+ if (!sa) throw std::invalid_argument("socket pointer is null");`
`268`	`268`
`269`	`269`	`if (sa->sa_family == AF_INET)`
`270`	`270`	`{`
`@@ -276,7 +276,7 @@ unsigned short get_port(const struct sockaddr* sa)`
`276`	`276`	`}`
`277`	`277`	`else`
`278`	`278`	`{`
`279`		`- throw new std::invalid_argument("IP family must be either AF_INET or AF_INET6");`
	`279`	`+ throw std::invalid_argument("IP family must be either AF_INET or AF_INET6");`
`280`	`280`	`}`
`281`	`281`	`}`
`282`	`282`