Added test for no response use case

etr · etr · commit 65ce5d19bc52 · 2018-12-31T02:21:12.000Z
diff --git a/src/http_response.cpp b/src/http_response.cpp
@@ -69,8 +69,7 @@ http_response::http_response(const http_response_builder& builder):
 
 http_response::~http_response()
 {
-    if(ce != 0x0)
-        webserver::unlock_cache_entry(ce);
+    if(ce != 0x0) webserver::unlock_cache_entry(ce);
 }
 
 //RESPONSE
diff --git a/src/httpserver/http_response.hpp b/src/httpserver/http_response.hpp
@@ -104,7 +104,14 @@ class http_response
         {
         }
 
-        http_response(): response_code(-1)
+        http_response():
+            response_code(-1),
+            fp(-1),
+            underlying_connection(0x0),
+            ce(0x0),
+            completed(false),
+            ws(0x0),
+            connection_id(0x0)
         {
         }
 
diff --git a/src/webserver.cpp b/src/webserver.cpp
@@ -646,9 +646,14 @@ const http_response webserver::method_not_allowed_page(details::modded_request*
 const http_response webserver::internal_error_page(details::modded_request* mr, bool force_our) const
 {
     if(internal_error_resource != 0x0 && !force_our)
+    {
         return internal_error_resource(*mr->dhr);
+    }
     else
-        return http_response_builder(GENERIC_ERROR, http_utils::http_internal_server_error).string_response();
+    {
+        http_response hr = http_response_builder(GENERIC_ERROR, http_utils::http_internal_server_error, "text/plain").string_response();
+        return hr;
+    }
 }
 
 int webserver::bodyless_requests_answer(
@@ -872,7 +877,10 @@ int webserver::finalize_answer(
             if(hrm->is_allowed(method))
             {
                 mr->dhrs = NEW_OR_MOVE(http_response, ((hrm)->*(mr->callback))(*mr->dhr)); //copy in memory (move in case)
-                if (mr->dhrs->get_response_code() == -1) mr->dhrs = NEW_OR_MOVE(http_response, internal_error_page(mr));
+                if (mr->dhrs->get_response_code() == -1)
+                {
+                    mr->dhrs = NEW_OR_MOVE(http_response, internal_error_page(mr));
+                }
             }
             else
             {
diff --git a/test/integ/basic.cpp b/test/integ/basic.cpp
@@ -157,7 +157,6 @@ LT_BEGIN_SUITE(basic_suite)
 LT_END_SUITE(basic_suite)
 
 LT_BEGIN_AUTO_TEST(basic_suite, two_endpoints)
-
     ok_resource* ok = new ok_resource();
     ws->register_resource("OK", ok);
     nok_resource* nok = new nok_resource();
@@ -413,26 +412,21 @@ LT_BEGIN_AUTO_TEST(basic_suite, empty_arg)
     curl_easy_cleanup(curl);
 LT_END_AUTO_TEST(empty_arg)
 
-/*
 LT_BEGIN_AUTO_TEST(basic_suite, no_response)
     no_response_resource* resource = new no_response_resource();
     ws->register_resource("base", resource);
     curl_global_init(CURL_GLOBAL_ALL);
-    std::string s;
-    CURL* curl;
-    CURLcode res;
 
-    curl = curl_easy_init();
+    CURL* curl = curl_easy_init();
     curl_easy_setopt(curl, CURLOPT_URL, "localhost:8080/base");
     curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
-    res = curl_easy_perform(curl);
+    CURLcode res = curl_easy_perform(curl);
     LT_ASSERT_EQ(res, 0);
     long http_code = 0;
     curl_easy_getinfo (curl, CURLINFO_RESPONSE_CODE, &http_code);
     LT_ASSERT_EQ(http_code, 500);
     curl_easy_cleanup(curl);
 LT_END_AUTO_TEST(no_response)
-*/
 
 LT_BEGIN_AUTO_TEST_ENV()
     AUTORUN_TESTS()

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,7 @@ http_response::http_response(const http_response_builder& builder):`
`69`	`69`
`70`	`70`	`http_response::~http_response()`
`71`	`71`	`{`
`72`		`- if(ce != 0x0)`
`73`		`- webserver::unlock_cache_entry(ce);`
	`72`	`+ if(ce != 0x0) webserver::unlock_cache_entry(ce);`
`74`	`73`	`}`
`75`	`74`
`76`	`75`	`//RESPONSE`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,14 @@ class http_response`
`104`	`104`	`{`
`105`	`105`	`}`
`106`	`106`
`107`		`- http_response(): response_code(-1)`
	`107`	`+ http_response():`
	`108`	`+ response_code(-1),`
	`109`	`+ fp(-1),`
	`110`	`+ underlying_connection(0x0),`
	`111`	`+ ce(0x0),`
	`112`	`+ completed(false),`
	`113`	`+ ws(0x0),`
	`114`	`+ connection_id(0x0)`
`108`	`115`	`{`
`109`	`116`	`}`
`110`	`117`
Original file line number	Diff line number	Diff line change
`@@ -646,9 +646,14 @@ const http_response webserver::method_not_allowed_page(details::modded_request*`
`646`	`646`	`const http_response webserver::internal_error_page(details::modded_request* mr, bool force_our) const`
`647`	`647`	`{`
`648`	`648`	`if(internal_error_resource != 0x0 && !force_our)`
	`649`	`+ {`
`649`	`650`	`return internal_error_resource(*mr->dhr);`
	`651`	`+ }`
`650`	`652`	`else`
`651`		`- return http_response_builder(GENERIC_ERROR, http_utils::http_internal_server_error).string_response();`
	`653`	`+ {`
	`654`	`+ http_response hr = http_response_builder(GENERIC_ERROR, http_utils::http_internal_server_error, "text/plain").string_response();`
	`655`	`+ return hr;`
	`656`	`+ }`
`652`	`657`	`}`
`653`	`658`
`654`	`659`	`int webserver::bodyless_requests_answer(`
`@@ -872,7 +877,10 @@ int webserver::finalize_answer(`
`872`	`877`	`if(hrm->is_allowed(method))`
`873`	`878`	`{`
`874`	`879`	`mr->dhrs = NEW_OR_MOVE(http_response, ((hrm)->(mr->callback))(mr->dhr)); //copy in memory (move in case)`
`875`		`- if (mr->dhrs->get_response_code() == -1) mr->dhrs = NEW_OR_MOVE(http_response, internal_error_page(mr));`
	`880`	`+ if (mr->dhrs->get_response_code() == -1)`
	`881`	`+ {`
	`882`	`+ mr->dhrs = NEW_OR_MOVE(http_response, internal_error_page(mr));`
	`883`	`+ }`
`876`	`884`	`}`
`877`	`885`	`else`
`878`	`886`	`{`