From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 67D3843279; Fri, 3 Nov 2023 10:56:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2CC4B42D83; Fri, 3 Nov 2023 10:56:13 +0100 (CET) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id DDEAD402EB for ; Fri, 3 Nov 2023 10:56:08 +0100 (CET) Received: from dggpeml100024.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4SMGN32K1qzvQbZ; Fri, 3 Nov 2023 17:56:03 +0800 (CST) Received: from localhost.localdomain (10.50.165.33) by dggpeml100024.china.huawei.com (7.185.36.115) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Fri, 3 Nov 2023 17:56:04 +0800 From: Chengwen Feng To: , CC: Subject: [PATCH 2/7] app/test: extract basic token count testcase for kvargs Date: Fri, 3 Nov 2023 09:53:20 +0000 Message-ID: <20231103095325.47843-3-fengchengwen@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231103095325.47843-1-fengchengwen@huawei.com> References: <20231103095325.47843-1-fengchengwen@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.50.165.33] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpeml100024.china.huawei.com (7.185.36.115) X-CFilter-Loop: Reflected X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The test_valid_kvargs() function is too long to understand, extract the basic token count tests as one stand-alone testcase. Signed-off-by: Chengwen Feng --- app/test/test_kvargs.c | 120 ++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 75 deletions(-) diff --git a/app/test/test_kvargs.c b/app/test/test_kvargs.c index 9aeb9aa0aa..a27b2aabfb 100644 --- a/app/test/test_kvargs.c +++ b/app/test/test_kvargs.c @@ -36,25 +36,6 @@ static int check_handler(const char *key, const char *value, return 0; } -/* test parsing. */ -static int test_kvargs_parsing(const char *args, unsigned int n) -{ - struct rte_kvargs *kvlist; - - kvlist = rte_kvargs_parse(args, NULL); - if (kvlist == NULL) { - printf("rte_kvargs_parse() error: %s\n", args); - return -1; - } - if (kvlist->count != n) { - printf("invalid count value %d: %s\n", kvlist->count, args); - rte_kvargs_free(kvlist); - return -1; - } - rte_kvargs_free(kvlist); - return 0; -} - /* test a valid case */ static int test_valid_kvargs(void) { @@ -62,29 +43,6 @@ static int test_valid_kvargs(void) const char *args; const char *valid_keys_list[] = { "foo", "check", NULL }; const char **valid_keys; - static const struct { - unsigned int expected; - const char *input; - } valid_inputs[] = { - { 2, "foo=1,foo=" }, - { 2, "foo=1,foo=" }, - { 2, "foo=1,foo" }, - { 2, "foo=1,=2" }, - { 1, "foo=[1,2" }, - { 1, ",=" }, - { 1, "foo=[" }, - }; - unsigned int i; - - /* empty args is valid */ - args = ""; - valid_keys = NULL; - kvlist = rte_kvargs_parse(args, valid_keys); - if (kvlist == NULL) { - printf("rte_kvargs_parse() error"); - goto fail; - } - rte_kvargs_free(kvlist); /* first test without valid_keys */ args = "foo=1234,check=value0,check=value1"; @@ -128,14 +86,6 @@ static int test_valid_kvargs(void) rte_kvargs_free(kvlist); goto fail; } - /* count all entries */ - count = rte_kvargs_count(kvlist, NULL); - if (count != 3) { - printf("invalid count value %d after rte_kvargs_count(NULL)\n", - count); - rte_kvargs_free(kvlist); - goto fail; - } /* count all entries with key="nonexistent_key" */ count = rte_kvargs_count(kvlist, "nonexistent_key"); if (count != 0) { @@ -190,19 +140,6 @@ static int test_valid_kvargs(void) } rte_kvargs_free(kvlist); - /* test using empty string (it is valid) */ - args = ""; - kvlist = rte_kvargs_parse(args, NULL); - if (kvlist == NULL) { - printf("rte_kvargs_parse() error\n"); - goto fail; - } - if (rte_kvargs_count(kvlist, NULL) != 0) { - printf("invalid count value\n"); - goto fail; - } - rte_kvargs_free(kvlist); - /* test using empty elements (it is valid) */ args = "foo=1,,check=value2,,"; kvlist = rte_kvargs_parse(args, NULL); @@ -210,10 +147,6 @@ static int test_valid_kvargs(void) printf("rte_kvargs_parse() error\n"); goto fail; } - if (rte_kvargs_count(kvlist, NULL) != 2) { - printf("invalid count value\n"); - goto fail; - } if (rte_kvargs_count(kvlist, "foo") != 1) { printf("invalid count value for 'foo'\n"); goto fail; @@ -224,14 +157,6 @@ static int test_valid_kvargs(void) } rte_kvargs_free(kvlist); - valid_keys = NULL; - - for (i = 0; i < RTE_DIM(valid_inputs); ++i) { - args = valid_inputs[i].input; - if (test_kvargs_parsing(args, valid_inputs[i].expected)) - goto fail; - } - return 0; fail: @@ -246,6 +171,50 @@ static int test_valid_kvargs(void) return -1; } +static int +test_basic_token_count(void) +{ + static const struct { + unsigned int expected; + const char *input; + } valid_inputs[] = { + { 3, "foo=1,check=1,check=2" }, + { 3, "foo=1,check,check=2" }, + { 2, "foo=1,foo=" }, + { 2, "foo=1,foo=" }, + { 2, "foo=1,foo" }, + { 2, "foo=1,=2" }, + { 2, "foo=1,,foo=2,," }, + { 1, "foo=[1,2" }, + { 1, ",=" }, + { 1, "foo=[" }, + { 0, "" }, + }; + struct rte_kvargs *kvlist; + unsigned int count; + const char *args; + unsigned int i; + + for (i = 0; i < RTE_DIM(valid_inputs); i++) { + args = valid_inputs[i].input; + kvlist = rte_kvargs_parse(args, NULL); + if (kvlist == NULL) { + printf("rte_kvargs_parse() error: %s\n", args); + return -1; + } + count = rte_kvargs_count(kvlist, NULL); + if (count != valid_inputs[i].expected) { + printf("invalid count value %u (expected %u): %s\n", + count, valid_inputs[i].expected, args); + rte_kvargs_free(kvlist); + return -1; + } + rte_kvargs_free(kvlist); + } + + return 0; +} + /* test several error cases */ static int test_invalid_kvargs(void) { @@ -287,6 +256,7 @@ static struct unit_test_suite kvargs_test_suite = { .teardown = NULL, .unit_test_cases = { TEST_CASE(test_valid_kvargs), + TEST_CASE(test_basic_token_count), TEST_CASE(test_invalid_kvargs), TEST_CASES_END() /**< NULL terminate unit test array */ } -- 2.17.1