diff options
| -rw-r--r-- | src/plugins/relay/api/relay-api-msg.c | 8 | ||||
| -rw-r--r-- | tests/unit/plugins/relay/api/test-relay-api-msg.cpp | 19 |
2 files changed, 14 insertions, 13 deletions
diff --git a/src/plugins/relay/api/relay-api-msg.c b/src/plugins/relay/api/relay-api-msg.c index 5b48b50a2..67c7ef4c4 100644 --- a/src/plugins/relay/api/relay-api-msg.c +++ b/src/plugins/relay/api/relay-api-msg.c @@ -370,7 +370,7 @@ relay_api_msg_buffer_to_json (struct t_gui_buffer *buffer, { struct t_hdata *hdata; struct t_gui_buffer *pointer; - cJSON *json, *json_local_vars, *json_lines, *json_nicks; + cJSON *json, *json_local_vars, *json_lines, *json_nicklist; const char *ptr_string; char *string; @@ -414,10 +414,10 @@ relay_api_msg_buffer_to_json (struct t_gui_buffer *buffer, /* nicks */ if (nicks) { - json_nicks = relay_api_msg_nick_group_to_json ( + json_nicklist = relay_api_msg_nick_group_to_json ( weechat_hdata_pointer (hdata, buffer, "nicklist_root")); - if (json_nicks) - cJSON_AddItemToObject (json, "nicks", json_nicks); + if (json_nicklist) + cJSON_AddItemToObject (json, "nicklist", json_nicklist); } return json; diff --git a/tests/unit/plugins/relay/api/test-relay-api-msg.cpp b/tests/unit/plugins/relay/api/test-relay-api-msg.cpp index 378f1ecb1..51bbdced9 100644 --- a/tests/unit/plugins/relay/api/test-relay-api-msg.cpp +++ b/tests/unit/plugins/relay/api/test-relay-api-msg.cpp @@ -119,7 +119,8 @@ TEST(RelayApiMsg, SendEvent) TEST(RelayApiMsg, BufferToJson) { cJSON *json, *json_obj, *json_local_vars, *json_lines; - cJSON *json_nicks, *json_groups, *json_group, *json_group_nicks, *json_nick; + cJSON *json_nicklist, *json_nicks, *json_groups, *json_group; + cJSON *json_group_nicks, *json_nick; struct t_gui_buffer *buffer; struct t_gui_nick_group *group; long long group_id; @@ -177,13 +178,13 @@ TEST(RelayApiMsg, BufferToJson) CHECK(json_lines); CHECK(cJSON_IsArray (json_lines)); LONGS_EQUAL(0, cJSON_GetArraySize (json_lines)); - json_nicks = cJSON_GetObjectItem (json, "nicks"); - CHECK(json_nicks); - CHECK(cJSON_IsObject (json_nicks)); - WEE_CHECK_OBJ_NUM(0, json_nicks, "id"); - WEE_CHECK_OBJ_STR("root", json_nicks, "name"); - WEE_CHECK_OBJ_STR("", json_nicks, "color"); - json_groups = cJSON_GetObjectItem (json_nicks, "groups"); + json_nicklist = cJSON_GetObjectItem (json, "nicklist"); + CHECK(json_nicklist); + CHECK(cJSON_IsObject (json_nicklist)); + WEE_CHECK_OBJ_NUM(0, json_nicklist, "id"); + WEE_CHECK_OBJ_STR("root", json_nicklist, "name"); + WEE_CHECK_OBJ_STR("", json_nicklist, "color"); + json_groups = cJSON_GetObjectItem (json_nicklist, "groups"); CHECK(json_groups); CHECK(cJSON_IsArray (json_groups)); LONGS_EQUAL(1, cJSON_GetArraySize (json_groups)); @@ -244,7 +245,7 @@ TEST(RelayApiMsg, BufferToJson) WEE_CHECK_OBJ_STR("nick3", json_nick, "name"); WEE_CHECK_OBJ_STR("yellow", json_nick, "color"); WEE_CHECK_OBJ_BOOL(1, json_nick, "visible"); - json_nicks = cJSON_GetObjectItem (json_nicks, "nicks"); + json_nicks = cJSON_GetObjectItem (json_nicklist, "nicks"); CHECK(json_nicks); CHECK(cJSON_IsArray (json_nicks)); LONGS_EQUAL(1, cJSON_GetArraySize (json_nicks)); |