From: Chengwen Feng <fengchengwen@huawei.com>
To: <thomas@monjalon.net>, <david.marchand@redhat.com>
Cc: <dev@dpdk.org>
Subject: [PATCH v4 5/6] test/argparse: refine testcases
Date: Mon, 18 Mar 2024 11:18:37 +0000 [thread overview]
Message-ID: <20240318111838.16991-6-fengchengwen@huawei.com> (raw)
In-Reply-To: <20240318111838.16991-1-fengchengwen@huawei.com>
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: 6c5c6571601c ("argparse: verify argument config")
Fixes: 31ed9f9f43bb ("argparse: parse parameters")
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
app/test/test_argparse.c | 40 +++++++++++++++++++++++++---------------
1 file changed, 25 insertions(+), 15 deletions(-)
diff --git a/app/test/test_argparse.c b/app/test/test_argparse.c
index 1a7211eb01..fcea620501 100644
--- a/app/test/test_argparse.c
+++ b/app/test/test_argparse.c
@@ -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";
@@ -268,6 +270,7 @@ 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 |
@@ -275,16 +278,18 @@ test_argparse_invalid_arg_flags(void)
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);
@@ -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!");
@@ -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!");
@@ -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);
@@ -418,6 +423,7 @@ 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";
@@ -425,7 +431,7 @@ test_argparse_opt_autosave_parse_int_of_optional_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!");
@@ -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;
@@ -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!");
@@ -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);
@@ -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!");
@@ -653,6 +660,7 @@ 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;
@@ -660,19 +668,20 @@ test_argparse_pos_autosave_parse_int(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("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");
@@ -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;
@@ -724,7 +734,7 @@ 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);
@@ -732,7 +742,7 @@ test_argparse_pos_callback_parse_int(void)
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");
--
2.17.1
next prev parent reply other threads:[~2024-03-18 11:21 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-20 13:14 [PATCH 0/4] refine argparse library Chengwen Feng
2024-02-20 13:14 ` [PATCH 1/4] argparse: refine error message Chengwen Feng
2024-02-20 13:15 ` [PATCH 2/4] argparse: remove dead code Chengwen Feng
2024-02-20 13:15 ` [PATCH 3/4] argparse: fix argument flags operate as uint32 type Chengwen Feng
2024-03-06 17:34 ` David Marchand
2024-03-07 13:14 ` fengchengwen
2024-02-20 13:15 ` [PATCH 4/4] test/argparse: refine testcases Chengwen Feng
2024-03-07 13:07 ` [PATCH v2 0/5] refine argparse library Chengwen Feng
2024-03-07 13:07 ` [PATCH v2 1/5] argparse: refine error message Chengwen Feng
2024-03-07 13:07 ` [PATCH v2 2/5] argparse: remove dead code Chengwen Feng
2024-03-07 13:07 ` [PATCH v2 3/5] argparse: replace flag enum with marco Chengwen Feng
2024-03-07 17:43 ` Tyler Retzlaff
2024-03-07 17:58 ` David Marchand
2024-03-07 18:37 ` Tyler Retzlaff
2024-03-07 13:07 ` [PATCH v2 4/5] argparse: fix argument flags operate as uint32 type Chengwen Feng
2024-03-18 2:31 ` Thomas Monjalon
2024-03-18 9:22 ` fengchengwen
2024-03-07 13:07 ` [PATCH v2 5/5] test/argparse: refine testcases Chengwen Feng
2024-03-18 9:18 ` [PATCH v3 0/6] refine argparse library Chengwen Feng
2024-03-18 9:18 ` [PATCH v3 1/6] argparse: refine error message Chengwen Feng
2024-03-18 9:18 ` [PATCH v3 2/6] argparse: remove dead code Chengwen Feng
2024-03-18 9:18 ` [PATCH v3 3/6] argparse: replace flag enum with marco Chengwen Feng
2024-03-18 9:18 ` [PATCH v3 4/6] argparse: fix argument flags operate as uint32 type Chengwen Feng
2024-03-18 9:38 ` Thomas Monjalon
2024-03-18 11:24 ` fengchengwen
2024-03-18 9:18 ` [PATCH v3 5/6] test/argparse: refine testcases Chengwen Feng
2024-03-18 9:18 ` [PATCH v3 6/6] argparse: fix doc don't display two hyphens Chengwen Feng
2024-03-18 11:18 ` [PATCH v4 0/6] refine argparse library Chengwen Feng
2024-03-18 11:18 ` [PATCH v4 1/6] argparse: refine error message Chengwen Feng
2024-03-18 11:18 ` [PATCH v4 2/6] argparse: remove dead code Chengwen Feng
2024-03-18 11:18 ` [PATCH v4 3/6] argparse: replace flag enum with marco Chengwen Feng
2024-03-18 11:18 ` [PATCH v4 4/6] argparse: fix argument flags operate as uint32 type Chengwen Feng
2024-03-18 11:18 ` Chengwen Feng [this message]
2024-03-18 11:18 ` [PATCH v4 6/6] argparse: fix doc don't display two hyphens Chengwen Feng
2024-03-21 17:27 ` [PATCH v4 0/6] refine argparse library Thomas Monjalon
2024-03-22 1:24 ` fengchengwen
2024-05-08 9:10 ` fengchengwen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240318111838.16991-6-fengchengwen@huawei.com \
--to=fengchengwen@huawei.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).