Add Error Handler.

src/tests/test_rest.c

@@ -25,11 +25,13 @@
 
 /*--------------------------------------------------------------------------*/
 
-#define ksuccess_get_body "{\"status\":\"ok\"}"
-#define ksuccess_delete_body "{\"status\":\"delete\"}"
-#define ksuccess_put_body "{\"status\":\"put\"}"
-#define ksuccess_post_body "{\"status\":\"post\"}"
-#define kerror_body "{\"status\":\"error\"}"
+#define ksuccess_get_body "{ \"status\": \"ok\" }"
+#define ksuccess_delete_body "{ \"status\": \"delete\" }"
+#define ksuccess_put_body "{ \"status\": \"put\" }"
+#define ksuccess_post_body "{ \"status\": \"post\" }"
+#define kerror_body_not_allowed "{ \"status\": \"error\", \"reason\": \"not allowed\" }"
+#define kerror_body_not_found "{ \"status\": \"error\", \"reason\": \"not found\" }"
+#define kerror_body "{ \"status\": \"error\" }"
 
 #define ksuccess_put_param1 "{ \"id\": 1 }"
 #define ksuccess_put_param2 "{ \"year\": 1977, \"action\": \"todo\" }"
@@ -49,9 +51,15 @@
 
 /*--------------------------------------------------------------------------*/
 
-int my_error_handler(restd_resp_t *response, void *arg)
+int my_error_handler(restd_resp_t *response, int reason, void *arg)
 {
-    restd_http_response(response, 200, "application/json", kerror_body);
+    if (reason == RESTD_ERROR_METHOD_NOT_ALLOWED)
+        restd_http_response(response, 200, "application/json", kerror_body_not_allowed);
+    else if (reason == RESTD_ERROR_PATH_NOT_FOUND)
+        restd_http_response(response, 200, "application/json", kerror_body_not_found);
+    else
+        restd_http_response(response, 200, "application/json", kerror_body);
+
     return RESTD_OK;
 }
 
@@ -158,7 +166,7 @@ size_t write_callback(void *ptr, size_t size, size_t nmemb, void *stream)
 
 /*--------------------------------------------------------------------------*/
 
-int exec_request(const char *request, const char *path, int expected_code, const char *body, const char *expected_body)
+int exec_request(const char *request, const char *path, int expected_code, const char *body, const char *expected_body, bool debug)
 {
     int ret = 0;
     CURL *curl_handle;
@@ -200,8 +208,8 @@ int exec_request(const char *request, const char *path, int expected_code, const
 
     curl_easy_setopt(curl_handle, CURLOPT_TIMEOUT, 2);
 
-    // Debug Only
-    // curl_easy_setopt(curl_handle, CURLOPT_VERBOSE, 1);
+    if (debug)
+        curl_easy_setopt(curl_handle, CURLOPT_VERBOSE, 1);
 
     /* send all data to this function  */
     curl_easy_setopt(curl_handle, CURLOPT_WRITEFUNCTION, write_callback);
@@ -227,7 +235,10 @@ int exec_request(const char *request, const char *path, int expected_code, const
     {
         res = strcmp(expected_body, resp_body);
     }
-    //printf ("body: %s != expected_body: %s\n", resp_body, expected_body);
+
+    if (debug)
+      printf ("body: %s != expected_body: %s\n", resp_body, expected_body);
+
     if (res != 0)
     {
         ret = 2;
@@ -346,7 +357,7 @@ TEST("Rest      - create free\t")
 
     restd_server_set_option(rest_server, "server.port", kserver_port);
 
-    restd_server_register_hook_on_path(rest_server, EVHTTP_REQ_POST, "/api/v1/test", my_error_handler, NULL);
+    restd_server_register_hook_on_path(rest_server, EVHTTP_REQ_POST, "/api/v1/test", my_success_http_handler, NULL);
 
     restd_server_free(rest_server);
 }
@@ -440,7 +451,7 @@ TEST("Rest      - create start access http hook free\t")
     ret = restd_server_start(rest_server);
     ASSERT_EQUAL_INT(ret, 0);
 
-    ret = exec_request(kget_method, "http://localhost:" kserver_port kapi_test_get, 200, ksuccess_get_body, ksuccess_get_body);
+    ret = exec_request(kget_method, "http://localhost:" kserver_port kapi_test_get, 200, ksuccess_get_body, ksuccess_get_body, false);
     ASSERT_EQUAL_INT(ret, 0);
 
     restd_server_free(rest_server);
@@ -474,19 +485,19 @@ TEST("Rest      - create start access to all rest hook free\t")
     sleep(1);
 
     //PRINTLN("\n     - GET");
-    ret = exec_request(kget_method, "http://localhost:" kserver_port kapi_test_get, 200, ksuccess_get_body, ksuccess_get_body);
+    ret = exec_request(kget_method, "http://localhost:" kserver_port kapi_test_get, 200, ksuccess_get_body, ksuccess_get_body, false);
     ASSERT_EQUAL_INT(ret, 0);
 
     //PRINTLN("\n     - DELETE");
-    ret = exec_request(kdelete_method, "http://localhost:" kserver_port kapi_test_get, 200, ksuccess_delete_body, ksuccess_delete_body);
+    ret = exec_request(kdelete_method, "http://localhost:" kserver_port kapi_test_get, 200, ksuccess_delete_body, ksuccess_delete_body, false);
     ASSERT_EQUAL_INT(ret, 0);
 
     //PRINTLN("\n     - PUT");
-    ret = exec_request(kput_method, "http://localhost:" kserver_port kapi_test_get, 200, ksuccess_put_body, ksuccess_put_body);
+    ret = exec_request(kput_method, "http://localhost:" kserver_port kapi_test_get, 200, ksuccess_put_body, ksuccess_put_body, false);
     ASSERT_EQUAL_INT(ret, 0);
 
     //PRINTLN("\n     - POST");
-    ret = exec_request(kpost_method, "http://localhost:" kserver_port kapi_test_get, 200, ksuccess_post_body, ksuccess_post_body);
+    ret = exec_request(kpost_method, "http://localhost:" kserver_port kapi_test_get, 200, ksuccess_post_body, ksuccess_post_body, false);
     ASSERT_EQUAL_INT(ret, 0);
 
     restd_server_free(rest_server);
@@ -519,11 +530,41 @@ TEST("Rest      - create start access to rest hook with params free\t")
     sleep(1);
 
     //PRINTLN("\n     - Param1");
-    ret = exec_request(kput_method, "http://localhost:" kserver_port kapi_test_put_id1_body, 200, "", ksuccess_put_param1);
+    ret = exec_request(kput_method, "http://localhost:" kserver_port kapi_test_put_id1_body, 200, "", ksuccess_put_param1, false);
     ASSERT_EQUAL_INT(ret, 0);
 
     //PRINTLN("\n     - Param2");
-    ret = exec_request(kput_method, "http://localhost:" kserver_port kapi_test_put_id2_body, 200, "", ksuccess_put_param2);
+    ret = exec_request(kput_method, "http://localhost:" kserver_port kapi_test_put_id2_body, 200, "", ksuccess_put_param2, false);
+    ASSERT_EQUAL_INT(ret, 0);
+
+    restd_server_free(rest_server);
+}
+
+/*--------------------------------------------------------------------------*/
+
+TEST("Rest      - create start access to wrong path\t")
+{
+    int ret;
+    restd_server_t *rest_server;
+
+    rest_server = restd_server_new();
+    ASSERT_NOT_NULL(rest_server);
+
+    restd_server_set_option(rest_server, "server.port", kserver_port);
+    restd_server_set_option(rest_server, "server.thread", "1");
+
+    restd_server_register_hook_on_path(rest_server, EVHTTP_REQ_GET, kapi_test_get, my_success_rest_get_handler, NULL);
+    restd_server_register_error_handler(rest_server, my_error_handler, NULL);
+
+    ret = restd_server_start(rest_server);
+    ASSERT_EQUAL_INT(ret, 0);
+
+    sleep(1);
+
+    ret = exec_request(kput_method, "http://localhost:" kserver_port kapi_test_get, 200, "", kerror_body_not_found, false);
+    ASSERT_EQUAL_INT(ret, 0);
+
+    ret = exec_request(kput_method, "http://localhost:" kserver_port "/api/v1/donkey", 200, "", kerror_body_not_found, false);
     ASSERT_EQUAL_INT(ret, 0);
 
     restd_server_free(rest_server);