adds tests of jsonrpc proxy

CMakeLists.txt

@@ -314,6 +314,7 @@ add_executable(alltests
 	test/adapter/jsonrpc/test_is_response.cc
 	test/adapter/jsonrpc/test_response.cc
 	test/adapter/jsonrpc/test_server.cc
+	test/adapter/jsonrpc/test_proxy.cc
 	test/provider/test_url.cc
 	test/provider/test_static_filesystem.cc
 )

lib/webfuse/adapter/impl/jsonrpc/proxy.c

@@ -3,8 +3,6 @@
 
 #include "webfuse/adapter/impl/jsonrpc/response.h"
 
-#define WF_DEFAULT_TIMEOUT (10 * 1000)
-
 static void wf_impl_jsonrpc_proxy_timeout(
     struct wf_impl_timer * timer)
 {
@@ -53,8 +51,9 @@ static json_t * wf_impl_jsonrpc_request_create(
 			break;
 			default:
 			fprintf(stderr, "fatal: unknown param_type '%c'\n", *param_type);
-			exit(EXIT_FAILURE);
+            json_decref(params);
-			break;
+            json_decref(request);
+            return NULL;
 		}
 	}
 	
@@ -71,10 +70,12 @@ static json_t * wf_impl_jsonrpc_request_create(
 void wf_impl_jsonrpc_proxy_init(
     struct wf_impl_jsonrpc_proxy * proxy,
     struct wf_impl_timeout_manager * timeout_manager,
+    int timeout,
     wf_impl_jsonrpc_send_fn * send,
     void * user_data)
 {
     proxy->send = send;
+    proxy->timeout = timeout;
     proxy->user_data = user_data;
     proxy->request.is_pending = false;
     
@@ -108,25 +109,29 @@ void wf_impl_jsonrpc_proxy_invoke(
         proxy->request.finished = finished;
         proxy->request.user_data = user_data;
         proxy->request.id = 42;
-        wf_impl_timer_start(&proxy->request.timer, wf_impl_timepoint_in_msec(WF_DEFAULT_TIMEOUT), 
+        wf_impl_timer_start(&proxy->request.timer, wf_impl_timepoint_in_msec(proxy->timeout), 
                 &wf_impl_jsonrpc_proxy_timeout, proxy);
         
         va_list args;
         va_start(args, param_info);
         json_t * request = wf_impl_jsonrpc_request_create(method_name, proxy->request.id, param_info, args);
         va_end(args);
+
+        bool const is_send = ((NULL != request) && (proxy->send(request, proxy->user_data)));
+        if (!is_send)
+        {
+            proxy->request.is_pending = false;
+            proxy->request.finished = NULL;
+            proxy->request.user_data = NULL;
+            proxy->request.id = 0;
+            wf_impl_timer_cancel(&proxy->request.timer);
+
+            finished(user_data, WF_BAD, NULL);
+
+        }
+
         if (NULL != request)
         {
-            if (!proxy->send(request, proxy->user_data))
-            {
-                proxy->request.is_pending = false;
-                proxy->request.finished = NULL;
-                proxy->request.user_data = NULL;
-                proxy->request.id = 0;
-                wf_impl_timer_cancel(&proxy->request.timer);
-
-                finished(user_data, WF_BAD, NULL);
-            }
             json_decref(request);
         }
     }

lib/webfuse/adapter/impl/jsonrpc/proxy.h

@@ -39,6 +39,7 @@ struct wf_impl_jsonrpc_request
 struct wf_impl_jsonrpc_proxy
 {
     struct wf_impl_jsonrpc_request request;
+    int timeout;
     wf_impl_jsonrpc_send_fn * send;
     void * user_data;
 };
@@ -46,6 +47,7 @@ struct wf_impl_jsonrpc_proxy
 extern void wf_impl_jsonrpc_proxy_init(
     struct wf_impl_jsonrpc_proxy * proxy,
     struct wf_impl_timeout_manager * manager,
+    int timeout,
     wf_impl_jsonrpc_send_fn * send,
     void * user_data);
 

lib/webfuse/adapter/impl/session.c

@@ -13,6 +13,8 @@
 #include <stddef.h>
 #include <stdlib.h>
 
+#define WF_DEFAULT_TIMEOUT (10 * 1000)
+
 static bool wf_impl_session_send(
     json_t * request,
     void * user_data)
@@ -55,7 +57,7 @@ struct wf_impl_session * wf_impl_session_create(
         session->is_authenticated = false;
         session->authenticators = authenticators;
         session->server = server;
-        wf_impl_jsonrpc_proxy_init(&session->rpc, timeout_manager, &wf_impl_session_send, session);
+        wf_impl_jsonrpc_proxy_init(&session->rpc, timeout_manager, WF_DEFAULT_TIMEOUT, &wf_impl_session_send, session);
         wf_slist_init(&session->messages);
     }
 

test/adapter/jsonrpc/test_proxy.cc

@@ -0,0 +1,363 @@
+#include <gtest/gtest.h>
+#include "webfuse/adapter/impl/jsonrpc/proxy.h"
+#include "webfuse/adapter/impl/time/timeout_manager.h"
+#include "msleep.hpp"
+
+using webfuse_test::msleep;
+
+#define WF_DEFAULT_TIMEOUT (10 * 1000)
+
+namespace
+{
+
+    struct SendContext
+    {
+        json_t * response;
+        bool result;
+        bool is_called;
+
+        explicit SendContext(bool result_ = true)
+        : response(nullptr)
+        , result(result_)
+        , is_called(false)
+        {
+        }
+
+        ~SendContext() 
+        {
+            if (nullptr != response)
+            {
+                json_decref(response);
+            }
+        }
+    };
+
+    bool jsonrpc_send(
+        json_t * request,
+        void * user_data)
+    {
+        SendContext * context = reinterpret_cast<SendContext*>(user_data);
+        context->is_called = true;
+        context->response = request;
+        json_incref(request);
+
+        return context->result;
+    }
+
+    struct FinishedContext
+    {
+        bool is_called;
+        wf_status status;
+        json_t * result;
+
+        FinishedContext()
+        : is_called(false)
+        , status(WF_BAD)
+        , result(nullptr)
+        {
+
+        }
+
+        ~FinishedContext()
+        {
+            if (nullptr != result)
+            {
+                json_decref(result);
+            }
+        }
+    };
+
+    void jsonrpc_finished(
+        void * user_data,
+        wf_status status,
+        struct json_t const * result)
+    {
+        FinishedContext * context = reinterpret_cast<FinishedContext*>(user_data);
+        context->is_called = true;
+        context->status = status;
+        context->result = json_deep_copy(result);
+    }
+}
+
+TEST(jsonrpc_proxy, init)
+{
+    struct wf_impl_timeout_manager timeout_manager;
+    wf_impl_timeout_manager_init(&timeout_manager);
+
+    SendContext context;
+    void * user_data = reinterpret_cast<void*>(&context);
+    struct wf_impl_jsonrpc_proxy proxy;
+    wf_impl_jsonrpc_proxy_init(&proxy, &timeout_manager, WF_DEFAULT_TIMEOUT, &jsonrpc_send, user_data);
+
+    wf_impl_jsonrpc_proxy_cleanup(&proxy);
+    wf_impl_timeout_manager_cleanup(&timeout_manager);
+
+    ASSERT_FALSE(context.is_called);
+}
+
+TEST(jsonrpc_proxy, invoke)
+{
+    struct wf_impl_timeout_manager timeout_manager;
+    wf_impl_timeout_manager_init(&timeout_manager);
+
+    SendContext send_context;
+    void * send_data = reinterpret_cast<void*>(&send_context);
+    struct wf_impl_jsonrpc_proxy proxy;
+    wf_impl_jsonrpc_proxy_init(&proxy, &timeout_manager, WF_DEFAULT_TIMEOUT, &jsonrpc_send, send_data);
+
+    FinishedContext finished_context;
+    void * finished_data = reinterpret_cast<void*>(&finished_context);
+    wf_impl_jsonrpc_proxy_invoke(&proxy, &jsonrpc_finished, finished_data, "foo", "si", "bar", 42);
+
+    ASSERT_TRUE(send_context.is_called);
+    ASSERT_TRUE(json_is_object(send_context.response));
+
+    json_t * method = json_object_get(send_context.response, "method");
+    ASSERT_TRUE(json_is_string(method));
+    ASSERT_STREQ("foo", json_string_value(method));
+
+    json_t * params = json_object_get(send_context.response, "params");
+    ASSERT_TRUE(json_is_array(params));
+    ASSERT_EQ(2, json_array_size(params));
+    ASSERT_TRUE(json_is_string(json_array_get(params, 0)));
+    ASSERT_STREQ("bar", json_string_value(json_array_get(params, 0)));
+    ASSERT_TRUE(json_is_integer(json_array_get(params, 1)));
+    ASSERT_EQ(42, json_integer_value(json_array_get(params, 1)));
+
+    json_t * id = json_object_get(send_context.response, "id");
+    ASSERT_TRUE(json_is_integer(id));
+
+    ASSERT_FALSE(finished_context.is_called);
+
+    wf_impl_jsonrpc_proxy_cleanup(&proxy);
+    wf_impl_timeout_manager_cleanup(&timeout_manager);
+
+    ASSERT_TRUE(finished_context.is_called);
+    ASSERT_FALSE(WF_GOOD == finished_context.status);
+}
+
+TEST(jsonrpc_proxy, invoke_calls_finish_if_send_fails)
+{
+    struct wf_impl_timeout_manager timeout_manager;
+    wf_impl_timeout_manager_init(&timeout_manager);
+
+    SendContext send_context(false);
+    void * send_data = reinterpret_cast<void*>(&send_context);
+    struct wf_impl_jsonrpc_proxy proxy;
+    wf_impl_jsonrpc_proxy_init(&proxy, &timeout_manager, WF_DEFAULT_TIMEOUT, &jsonrpc_send, send_data);
+
+    FinishedContext finished_context;
+    void * finished_data = reinterpret_cast<void*>(&finished_context);
+    wf_impl_jsonrpc_proxy_invoke(&proxy, &jsonrpc_finished, finished_data, "foo", "si", "bar", 42);
+
+    ASSERT_TRUE(send_context.is_called);
+    ASSERT_TRUE(json_is_object(send_context.response));
+
+    ASSERT_TRUE(finished_context.is_called);
+    ASSERT_FALSE(WF_GOOD == finished_context.status);
+
+    wf_impl_jsonrpc_proxy_cleanup(&proxy);
+    wf_impl_timeout_manager_cleanup(&timeout_manager);
+}
+
+TEST(jsonrpc_proxy, invoke_fails_if_another_request_is_pending)
+{
+    struct wf_impl_timeout_manager timeout_manager;
+    wf_impl_timeout_manager_init(&timeout_manager);
+
+    SendContext send_context;
+    void * send_data = reinterpret_cast<void*>(&send_context);
+    struct wf_impl_jsonrpc_proxy proxy;
+    wf_impl_jsonrpc_proxy_init(&proxy, &timeout_manager, WF_DEFAULT_TIMEOUT, &jsonrpc_send, send_data);
+
+    FinishedContext finished_context;
+    void * finished_data = reinterpret_cast<void*>(&finished_context);
+    wf_impl_jsonrpc_proxy_invoke(&proxy, &jsonrpc_finished, finished_data, "foo", "si", "bar", 42);
+
+    FinishedContext finished_context2;
+    void * finished_data2 = reinterpret_cast<void*>(&finished_context2);
+    wf_impl_jsonrpc_proxy_invoke(&proxy, &jsonrpc_finished, finished_data2, "foo", "");
+
+    ASSERT_TRUE(send_context.is_called);
+    ASSERT_TRUE(json_is_object(send_context.response));
+
+    ASSERT_FALSE(finished_context.is_called);
+
+    ASSERT_TRUE(finished_context2.is_called);
+    ASSERT_EQ(WF_BAD_BUSY, finished_context2.status);
+
+    wf_impl_jsonrpc_proxy_cleanup(&proxy);
+    wf_impl_timeout_manager_cleanup(&timeout_manager);
+}
+
+TEST(jsonrpc_proxy, invoke_fails_if_request_is_invalid)
+{
+    struct wf_impl_timeout_manager timeout_manager;
+    wf_impl_timeout_manager_init(&timeout_manager);
+
+    SendContext send_context;
+    void * send_data = reinterpret_cast<void*>(&send_context);
+    struct wf_impl_jsonrpc_proxy proxy;
+    wf_impl_jsonrpc_proxy_init(&proxy, &timeout_manager, WF_DEFAULT_TIMEOUT, &jsonrpc_send, send_data);
+
+    FinishedContext finished_context;
+    void * finished_data = reinterpret_cast<void*>(&finished_context);
+    wf_impl_jsonrpc_proxy_invoke(&proxy, &jsonrpc_finished, finished_data, "foo", "?", "error");
+
+    ASSERT_FALSE(send_context.is_called);
+
+    ASSERT_TRUE(finished_context.is_called);
+    ASSERT_EQ(WF_BAD, finished_context.status);
+
+    wf_impl_jsonrpc_proxy_cleanup(&proxy);
+    wf_impl_timeout_manager_cleanup(&timeout_manager);
+}
+
+TEST(jsonrpc_proxy, on_result)
+{
+    struct wf_impl_timeout_manager timeout_manager;
+    wf_impl_timeout_manager_init(&timeout_manager);
+
+    SendContext send_context;
+    void * send_data = reinterpret_cast<void*>(&send_context);
+    struct wf_impl_jsonrpc_proxy proxy;
+    wf_impl_jsonrpc_proxy_init(&proxy, &timeout_manager, WF_DEFAULT_TIMEOUT, &jsonrpc_send, send_data);
+
+    FinishedContext finished_context;
+    void * finished_data = reinterpret_cast<void*>(&finished_context);
+    wf_impl_jsonrpc_proxy_invoke(&proxy, &jsonrpc_finished, finished_data, "foo", "si", "bar", 42);
+
+    ASSERT_TRUE(send_context.is_called);
+    ASSERT_TRUE(json_is_object(send_context.response));
+
+    json_t * id = json_object_get(send_context.response, "id");
+    ASSERT_TRUE(json_is_number(id));
+
+    json_t * response = json_object();
+    json_object_set_new(response, "result", json_string("okay"));
+    json_object_set(response, "id", id);
+
+    wf_impl_jsonrpc_proxy_onresult(&proxy, response);
+    json_decref(response);
+
+    ASSERT_TRUE(finished_context.is_called);
+    ASSERT_EQ(WF_GOOD, finished_context.status);
+    ASSERT_TRUE(json_is_string(finished_context.result));
+    ASSERT_STREQ("okay", json_string_value(finished_context.result));
+
+    wf_impl_jsonrpc_proxy_cleanup(&proxy);
+    wf_impl_timeout_manager_cleanup(&timeout_manager);
+}
+
+TEST(jsonrpc_proxy, on_result_reject_response_with_unknown_id)
+{
+    struct wf_impl_timeout_manager timeout_manager;
+    wf_impl_timeout_manager_init(&timeout_manager);
+
+    SendContext send_context;
+    void * send_data = reinterpret_cast<void*>(&send_context);
+    struct wf_impl_jsonrpc_proxy proxy;
+    wf_impl_jsonrpc_proxy_init(&proxy, &timeout_manager, WF_DEFAULT_TIMEOUT, &jsonrpc_send, send_data);
+
+    FinishedContext finished_context;
+    void * finished_data = reinterpret_cast<void*>(&finished_context);
+    wf_impl_jsonrpc_proxy_invoke(&proxy, &jsonrpc_finished, finished_data, "foo", "si", "bar", 42);
+
+    ASSERT_TRUE(send_context.is_called);
+    ASSERT_TRUE(json_is_object(send_context.response));
+
+    json_t * id = json_object_get(send_context.response, "id");
+    ASSERT_TRUE(json_is_number(id));
+
+    json_t * response = json_object();
+    json_object_set_new(response, "result", json_string("okay"));
+    json_object_set_new(response, "id", json_integer(1 + json_integer_value(id)));
+
+    wf_impl_jsonrpc_proxy_onresult(&proxy, response);
+    json_decref(response);
+
+    ASSERT_FALSE(finished_context.is_called);
+
+    wf_impl_jsonrpc_proxy_cleanup(&proxy);
+    wf_impl_timeout_manager_cleanup(&timeout_manager);
+}
+
+TEST(jsonrpc_proxy, timeout)
+{
+    struct wf_impl_timeout_manager timeout_manager;
+    wf_impl_timeout_manager_init(&timeout_manager);
+
+    SendContext send_context;
+    void * send_data = reinterpret_cast<void*>(&send_context);
+    struct wf_impl_jsonrpc_proxy proxy;
+    wf_impl_jsonrpc_proxy_init(&proxy, &timeout_manager, 0, &jsonrpc_send, send_data);
+
+    FinishedContext finished_context;
+    void * finished_data = reinterpret_cast<void*>(&finished_context);
+    wf_impl_jsonrpc_proxy_invoke(&proxy, &jsonrpc_finished, finished_data, "foo", "si", "bar", 42);
+
+    ASSERT_TRUE(send_context.is_called);
+    ASSERT_TRUE(json_is_object(send_context.response));
+
+    msleep(10);
+    wf_impl_timeout_manager_check(&timeout_manager);
+
+    ASSERT_TRUE(finished_context.is_called);
+    ASSERT_EQ(WF_BAD_TIMEOUT, finished_context.status);
+
+    wf_impl_jsonrpc_proxy_cleanup(&proxy);
+    wf_impl_timeout_manager_cleanup(&timeout_manager);
+}
+
+TEST(jsonrpc_proxy, notify)
+{
+    struct wf_impl_timeout_manager timeout_manager;
+    wf_impl_timeout_manager_init(&timeout_manager);
+
+    SendContext send_context;
+    void * send_data = reinterpret_cast<void*>(&send_context);
+    struct wf_impl_jsonrpc_proxy proxy;
+    wf_impl_jsonrpc_proxy_init(&proxy, &timeout_manager, WF_DEFAULT_TIMEOUT, &jsonrpc_send, send_data);
+
+    wf_impl_jsonrpc_proxy_notify(&proxy, "foo", "si", "bar", 42);
+
+    ASSERT_TRUE(send_context.is_called);
+    ASSERT_TRUE(json_is_object(send_context.response));
+
+    json_t * method = json_object_get(send_context.response, "method");
+    ASSERT_TRUE(json_is_string(method));
+    ASSERT_STREQ("foo", json_string_value(method));
+
+    json_t * params = json_object_get(send_context.response, "params");
+    ASSERT_TRUE(json_is_array(params));
+    ASSERT_EQ(2, json_array_size(params));
+    ASSERT_TRUE(json_is_string(json_array_get(params, 0)));
+    ASSERT_STREQ("bar", json_string_value(json_array_get(params, 0)));
+    ASSERT_TRUE(json_is_integer(json_array_get(params, 1)));
+    ASSERT_EQ(42, json_integer_value(json_array_get(params, 1)));
+
+    json_t * id = json_object_get(send_context.response, "id");
+    ASSERT_EQ(nullptr, id);
+
+
+    wf_impl_jsonrpc_proxy_cleanup(&proxy);
+    wf_impl_timeout_manager_cleanup(&timeout_manager);
+}
+
+TEST(jsonrpc_proxy, notify_dont_send_invalid_request)
+{
+    struct wf_impl_timeout_manager timeout_manager;
+    wf_impl_timeout_manager_init(&timeout_manager);
+
+    SendContext send_context;
+    void * send_data = reinterpret_cast<void*>(&send_context);
+    struct wf_impl_jsonrpc_proxy proxy;
+    wf_impl_jsonrpc_proxy_init(&proxy, &timeout_manager, WF_DEFAULT_TIMEOUT, &jsonrpc_send, send_data);
+
+    wf_impl_jsonrpc_proxy_notify(&proxy, "foo", "?");
+
+    ASSERT_FALSE(send_context.is_called);
+
+    wf_impl_jsonrpc_proxy_cleanup(&proxy);
+    wf_impl_timeout_manager_cleanup(&timeout_manager);
+}