Skip to content

Commit

Permalink
test/argparse: rework test cases
Browse files Browse the repository at this point in the history 
Refine testcases, including:
1. add testcase comment.
2. argv[0] should set obj->prog_name.
3. set val_set as NULL in test_argparse_invalid_arg_flags, let it
test to the specified code logic.
4. enable index verification in opt_callback_parse_int_of_no_val.

Fixes: 6c5c657 ("argparse: verify argument config")
Fixes: 31ed9f9 ("argparse: parse parameters")
Cc: stable@dpdk.org

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Reviewed-by: Dengdui Huang <huangdengdui@huawei.com>
Acked-by: Jie Hai <haijie1@huawei.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
  • Loading branch information
@fengchengwen @tmonjalo
fengchengwen authored and tmonjalo committed Oct 18, 2024
1 parent f48e4ee commit 9684dfe
Showing 1 changed file with 25 additions and 15 deletions.
40 changes: 25 additions & 15 deletions app/test/test_argparse.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,13 @@ test_argparse_invalid_has_val(void)
uint32_t index;
int ret;

/* test optional arg don't config has-value. */
obj = test_argparse_init_obj();
obj->args[0].flags &= ~RTE_ARGPARSE_HAS_VAL_BITMASK;
ret = rte_argparse_parse(obj, default_argc, default_argv);
TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");

/* test positional arg don't config required-value. */
for (index = 0; index < RTE_DIM(set_mask); index++) {
obj = test_argparse_init_obj();
obj->args[0].name_long = "abc";
Expand Down Expand Up @@ -268,23 +270,26 @@ test_argparse_invalid_arg_flags(void)
struct rte_argparse *obj;
int ret;

/* test set unused bits. */
obj = test_argparse_init_obj();
obj->args[0].flags |= ~(RTE_ARGPARSE_HAS_VAL_BITMASK |
RTE_ARGPARSE_VAL_TYPE_BITMASK |
RTE_ARGPARSE_ARG_SUPPORT_MULTI);
ret = rte_argparse_parse(obj, default_argc, default_argv);
TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");

/* test positional arg should not config multiple. */
obj = test_argparse_init_obj();
obj->args[0].name_long = "positional";
obj->args[0].name_short = NULL;
obj->args[0].val_saver = (void *)1;
obj->args[0].val_set = (void *)1;
obj->args[0].val_set = NULL;
obj->args[0].flags = RTE_ARGPARSE_ARG_REQUIRED_VALUE | RTE_ARGPARSE_ARG_VALUE_INT |
RTE_ARGPARSE_ARG_SUPPORT_MULTI;
ret = rte_argparse_parse(obj, default_argc, default_argv);
TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");

/* test optional arg enabled multiple but prased by autosave. */
obj = test_argparse_init_obj();
obj->args[0].flags |= RTE_ARGPARSE_ARG_SUPPORT_MULTI;
ret = rte_argparse_parse(obj, default_argc, default_argv);
Expand Down Expand Up @@ -322,13 +327,13 @@ test_argparse_invalid_option(void)
int ret;

obj = test_argparse_init_obj();
argv[0] = test_strdup(obj->usage);
argv[0] = test_strdup(obj->prog_name);
argv[1] = test_strdup("--invalid");
ret = rte_argparse_parse(obj, 2, argv);
TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");

obj = test_argparse_init_obj();
argv[0] = test_strdup(obj->usage);
argv[0] = test_strdup(obj->prog_name);
argv[1] = test_strdup("invalid");
ret = rte_argparse_parse(obj, 2, argv);
TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");
Expand All @@ -352,7 +357,7 @@ test_argparse_opt_autosave_parse_int_of_no_val(void)
obj->args[0].val_set = (void *)100;
obj->args[0].flags = flags;
obj->args[1].name_long = NULL;
argv[0] = test_strdup(obj->usage);
argv[0] = test_strdup(obj->prog_name);
argv[1] = test_strdup("--test-long");
ret = rte_argparse_parse(obj, 2, argv);
TEST_ASSERT(ret == 0, "Argparse parse expect success!");
Expand Down Expand Up @@ -384,7 +389,7 @@ test_argparse_opt_autosave_parse_int_of_required_val(void)
obj->args[0].val_set = NULL;
obj->args[0].flags = flags;
obj->args[1].name_long = NULL;
argv[0] = test_strdup(obj->usage);
argv[0] = test_strdup(obj->prog_name);
argv[1] = test_strdup("--test-long");
argv[2] = test_strdup("100");
ret = rte_argparse_parse(obj, 3, argv);
Expand Down Expand Up @@ -418,14 +423,15 @@ test_argparse_opt_autosave_parse_int_of_optional_val(void)
char *argv[2];
int ret;

/* test without value. */
obj = test_argparse_init_obj();
obj->args[0].name_long = "--test-long";
obj->args[0].name_short = "-t";
obj->args[0].val_saver = (void *)&val_saver;
obj->args[0].val_set = (void *)100;
obj->args[0].flags = flags;
obj->args[1].name_long = NULL;
argv[0] = test_strdup(obj->usage);
argv[0] = test_strdup(obj->prog_name);
argv[1] = test_strdup("--test-long");
ret = rte_argparse_parse(obj, 2, argv);
TEST_ASSERT(ret == 0, "Argparse parse expect success!");
Expand Down Expand Up @@ -469,7 +475,8 @@ test_argparse_opt_autosave_parse_int_of_optional_val(void)
static int
opt_callback_parse_int_of_no_val(uint32_t index, const char *value, void *opaque)
{
RTE_SET_USED(index);
if (index != 1)
return -EINVAL;
if (value != NULL)
return -EINVAL;
*(int *)opaque = 100;
Expand All @@ -490,10 +497,10 @@ test_argparse_opt_callback_parse_int_of_no_val(void)
obj->args[0].name_long = "--test-long";
obj->args[0].name_short = "-t";
obj->args[0].val_saver = NULL;
obj->args[0].val_set = (void *)100;
obj->args[0].val_set = (void *)1;
obj->args[0].flags = RTE_ARGPARSE_ARG_NO_VALUE;
obj->args[1].name_long = NULL;
argv[0] = test_strdup(obj->usage);
argv[0] = test_strdup(obj->prog_name);
argv[1] = test_strdup("--test-long");
ret = rte_argparse_parse(obj, 2, argv);
TEST_ASSERT(ret == 0, "Argparse parse expect success!");
Expand Down Expand Up @@ -544,7 +551,7 @@ test_argparse_opt_callback_parse_int_of_required_val(void)
obj->args[0].val_set = (void *)1;
obj->args[0].flags = RTE_ARGPARSE_ARG_REQUIRED_VALUE;
obj->args[1].name_long = NULL;
argv[0] = test_strdup(obj->usage);
argv[0] = test_strdup(obj->prog_name);
argv[1] = test_strdup("--test-long");
argv[2] = test_strdup("100");
ret = rte_argparse_parse(obj, 3, argv);
Expand Down Expand Up @@ -608,7 +615,7 @@ test_argparse_opt_callback_parse_int_of_optional_val(void)
obj->args[0].val_set = (void *)1;
obj->args[0].flags = RTE_ARGPARSE_ARG_OPTIONAL_VALUE;
obj->args[1].name_long = NULL;
argv[0] = test_strdup(obj->usage);
argv[0] = test_strdup(obj->prog_name);
argv[1] = test_strdup("--test-long");
ret = rte_argparse_parse(obj, 2, argv);
TEST_ASSERT(ret == 0, "Argparse parse expect success!");
Expand Down Expand Up @@ -653,26 +660,28 @@ test_argparse_pos_autosave_parse_int(void)
char *argv[3];
int ret;

/* test positional autosave parse successful. */
obj = test_argparse_init_obj();
obj->args[0].name_long = "test-long";
obj->args[0].name_short = NULL;
obj->args[0].val_saver = (void *)&val_saver;
obj->args[0].val_set = NULL;
obj->args[0].flags = flags;
obj->args[1].name_long = NULL;
argv[0] = test_strdup(obj->usage);
argv[0] = test_strdup(obj->prog_name);
argv[1] = test_strdup("100");
ret = rte_argparse_parse(obj, 2, argv);
TEST_ASSERT(ret == 0, "Argparse parse expect success!");
TEST_ASSERT(val_saver == 100, "Argparse parse expect success!");

/* test positional autosave parse failed. */
obj->args[0].flags = flags;
val_saver = 0;
argv[1] = test_strdup("100a");
ret = rte_argparse_parse(obj, 2, argv);
TEST_ASSERT(ret == -EINVAL, "Argparse parse expect failed!");

/* test over position parameters. */
/* test too much position parameters. */
obj->args[0].flags = flags;
argv[1] = test_strdup("100");
argv[2] = test_strdup("200");
Expand Down Expand Up @@ -710,6 +719,7 @@ test_argparse_pos_callback_parse_int(void)
char *argv[3];
int ret;

/* test positional callback parse successful. */
obj = test_argparse_init_obj();
obj->callback = pos_callback_parse_int;
obj->opaque = (void *)val_saver;
Expand All @@ -724,15 +734,15 @@ test_argparse_pos_callback_parse_int(void)
obj->args[1].val_set = (void *)2;
obj->args[1].flags = RTE_ARGPARSE_ARG_REQUIRED_VALUE;
obj->args[2].name_long = NULL;
argv[0] = test_strdup(obj->usage);
argv[0] = test_strdup(obj->prog_name);
argv[1] = test_strdup("100");
argv[2] = test_strdup("200");
ret = rte_argparse_parse(obj, 3, argv);
TEST_ASSERT(ret == 0, "Argparse parse expect success!");
TEST_ASSERT(val_saver[1] == 100, "Argparse parse expect success!");
TEST_ASSERT(val_saver[2] == 200, "Argparse parse expect success!");

/* test callback return failed. */
/* test positional callback parse failed. */
obj->args[0].flags = RTE_ARGPARSE_ARG_REQUIRED_VALUE;
obj->args[1].flags = RTE_ARGPARSE_ARG_REQUIRED_VALUE;
argv[2] = test_strdup("200a");
Expand Down

0 comments on commit 9684dfe

Please sign in to comment.