null+****@clear*****
null+****@clear*****
2011年 3月 28日 (月) 00:04:55 JST
Kouhei Sutou 2011-03-27 15:04:55 +0000 (Sun, 27 Mar 2011) New Revision: e23699b250fe7b257421f11f6e761ede130895e9 Log: add error check on grn_ctx_send. Modified files: test/unit/core/test-command-select-sort.c test/unit/lib/grn-test-utils.c Modified: test/unit/core/test-command-select-sort.c (+17 -13) =================================================================== --- test/unit/core/test-command-select-sort.c 2011-03-27 15:00:37 +0000 (3db926c) +++ test/unit/core/test-command-select-sort.c 2011-03-27 15:04:55 +0000 (1e68e3b) @@ -200,24 +200,28 @@ test_drilldown(void) void test_score_without_query(void) { - cut_assert_equal_string( - "[]", - send_command("select Sites " - "--sortby \"_score\" " - "--output_columns \"_key\"")); + grn_test_assert_send_command_error( + context, + GRN_INVALID_ARGUMENT, + "invalid sort key: <_score>(<_score>)", + "select Sites " + "--sortby \"_score\" " + "--output_columns \"_key\""); } void test_score_drilldown_without_query(void) { - cut_assert_equal_string( - "[]", - send_command("select Bookmarks " - "--sortby \"_score\" " - "--output_columns \"site._key, user._key\" " - "--drilldown \"site user rank\" " - "--drilldown_output_columns \"_key, _nsubrecs\" " - "--drilldown_sortby \"_key\"")); + grn_test_assert_send_command_error( + context, + GRN_INVALID_ARGUMENT, + "invalid sort key: <_score>(<_score>)", + "select Bookmarks " + "--sortby \"_score\" " + "--output_columns \"site._key, user._key\" " + "--drilldown \"site user rank\" " + "--drilldown_output_columns \"_key, _nsubrecs\" " + "--drilldown_sortby \"_key\""); } void Modified: test/unit/lib/grn-test-utils.c (+3 -0) =================================================================== --- test/unit/lib/grn-test-utils.c 2011-03-27 15:00:37 +0000 (8ef429a) +++ test/unit/lib/grn-test-utils.c 2011-03-27 15:04:55 +0000 (34fdf65) @@ -642,6 +642,9 @@ grn_test_send_command(grn_ctx *context, const gchar *command) int flags = 0; send_id = grn_ctx_send(context, *lines, strlen(*lines), 0); + grn_test_assert_context(context, + cut_message("<%s>:<%s>:<%s>", + *lines, command, result->str)); receive_id = grn_ctx_recv(context, &command_result, &command_result_length, &flags); cut_assert_equal_uint(send_id, receive_id);