From 9165df21359cc5e93ddeb16bf9623a03441bed62 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sun, 1 Oct 2017 23:53:15 +0300 Subject: [PATCH] test: expand argument parsing tests Test and use the new .present field, only output the parameters given. Test space between parameter name and value. --- test/T410-argument-parsing.sh | 22 ++++++++++++++++++++++ test/arg-test.c | 33 ++++++++++++++++++--------------- 2 files changed, 40 insertions(+), 15 deletions(-) diff --git a/test/T410-argument-parsing.sh b/test/T410-argument-parsing.sh index 4505c583..4a2b25c6 100755 --- a/test/T410-argument-parsing.sh +++ b/test/T410-argument-parsing.sh @@ -15,4 +15,26 @@ positional arg 2 pos2 EOF test_expect_equal_file EXPECTED OUTPUT +test_begin_subtest "sanity check zero values" +$TEST_DIRECTORY/arg-test --keyword=zero --boolean=false --int=0 > OUTPUT +cat < EXPECTED +boolean 0 +keyword 0 +int 0 +EOF +test_expect_equal_file EXPECTED OUTPUT + +test_begin_subtest "space instead of = between parameter name and value" +# Note: spaces aren't allowed for booleans. false turns into a positional arg! +$TEST_DIRECTORY/arg-test --keyword one --boolean false --string foo --int 7 --flag one --flag three > OUTPUT +cat < EXPECTED +boolean 1 +keyword 1 +flags 5 +int 7 +string foo +positional arg 1 false +EOF +test_expect_equal_file EXPECTED OUTPUT + test_done diff --git a/test/arg-test.c b/test/arg-test.c index a379f23e..64751df4 100644 --- a/test/arg-test.c +++ b/test/arg-test.c @@ -13,27 +13,30 @@ int main(int argc, char **argv){ const char *pos_arg2=NULL; const char *string_val=NULL; notmuch_bool_t bool_val = FALSE; + notmuch_bool_t fl_set = FALSE, int_set = FALSE, bool_set = FALSE, + kw_set = FALSE, string_set = FALSE, pos1_set = FALSE, pos2_set = FALSE; notmuch_opt_desc_t parent_options[] = { - { .opt_flags = &fl_val, .name = "flag", .keywords = + { .opt_flags = &fl_val, .name = "flag", .present = &fl_set, .keywords = (notmuch_keyword_t []){ { "one", 1 << 0}, { "two", 1 << 1 }, { "three", 1 << 2 }, { 0, 0 } } }, - { .opt_int = &int_val, .name = "int" }, + { .opt_int = &int_val, .name = "int", .present = &int_set }, { } }; notmuch_opt_desc_t options[] = { - { .opt_bool = &bool_val, .name = "boolean" }, - { .opt_keyword = &kw_val, .name = "keyword", .keywords = - (notmuch_keyword_t []){ { "one", 1 }, + { .opt_bool = &bool_val, .name = "boolean", .present = &bool_set }, + { .opt_keyword = &kw_val, .name = "keyword", .present = &kw_set, .keywords = + (notmuch_keyword_t []){ { "zero", 0 }, + { "one", 1 }, { "two", 2 }, { 0, 0 } } }, { .opt_inherit = parent_options }, - { .opt_string = &string_val, .name = "string" }, - { .opt_position = &pos_arg1 }, - { .opt_position = &pos_arg2 }, + { .opt_string = &string_val, .name = "string", .present = &string_set }, + { .opt_position = &pos_arg1, .present = &pos1_set }, + { .opt_position = &pos_arg2, .present = &pos2_set }, { } }; @@ -42,25 +45,25 @@ int main(int argc, char **argv){ if (opt_index < 0) return 1; - if (bool_val) + if (bool_set) printf("boolean %d\n", bool_val); - if (kw_val) + if (kw_set) printf("keyword %d\n", kw_val); - if (fl_val) + if (fl_set) printf("flags %d\n", fl_val); - if (int_val) + if (int_set) printf("int %d\n", int_val); - if (string_val) + if (string_set) printf("string %s\n", string_val); - if (pos_arg1) + if (pos1_set) printf("positional arg 1 %s\n", pos_arg1); - if (pos_arg2) + if (pos2_set) printf("positional arg 2 %s\n", pos_arg2); -- 2.26.2