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 8F59445B0C; Fri, 11 Oct 2024 05:33:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5FB1640B90; Fri, 11 Oct 2024 05:33:41 +0200 (CEST) Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) by mails.dpdk.org (Postfix) with ESMTP id CD630402EF for ; Fri, 11 Oct 2024 05:33:34 +0200 (CEST) Received: from mail.maildlp.com (unknown [172.19.163.17]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4XPsYb0JcGz1HKms; Fri, 11 Oct 2024 11:29:23 +0800 (CST) Received: from dggpeml500024.china.huawei.com (unknown [7.185.36.10]) by mail.maildlp.com (Postfix) with ESMTPS id 9CF541A0188; Fri, 11 Oct 2024 11:33:30 +0800 (CST) Received: from localhost.localdomain (10.50.165.33) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Fri, 11 Oct 2024 11:33:30 +0800 From: Chengwen Feng To: , CC: , Subject: [PATCH v2 4/7] app/test: extract with keys testcase for kvargs Date: Fri, 11 Oct 2024 03:34:13 +0000 Message-ID: <20241011033416.10593-5-fengchengwen@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20241011033416.10593-1-fengchengwen@huawei.com> References: <20231103095325.47843-1-fengchengwen@huawei.com> <20241011033416.10593-1-fengchengwen@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.50.165.33] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500024.china.huawei.com (7.185.36.10) 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 with keys tests as one stand-alone testcase. Signed-off-by: Chengwen Feng Acked-by: Stephen Hemminger --- app/test/test_kvargs.c | 59 +++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/app/test/test_kvargs.c b/app/test/test_kvargs.c index 2147080160..2869cd16c8 100644 --- a/app/test/test_kvargs.c +++ b/app/test/test_kvargs.c @@ -43,30 +43,6 @@ static int test_valid_kvargs(void) const char *valid_keys_list[] = { "foo", "check", NULL }; const char **valid_keys; - /* second test using valid_keys */ - args = "foo=droids,check=value0,check=value1,check=wrong_value"; - valid_keys = valid_keys_list; - kvlist = rte_kvargs_parse(args, valid_keys); - if (kvlist == NULL) { - printf("rte_kvargs_parse() error"); - goto fail; - } - /* call check_handler() on all entries with key="check", it - * should fail as the value is not recognized by the handler */ - if (rte_kvargs_process(kvlist, "check", check_handler, NULL) == 0) { - printf("rte_kvargs_process() is success but should not\n"); - rte_kvargs_free(kvlist); - goto fail; - } - count = rte_kvargs_count(kvlist, "check"); - if (count != 3) { - printf("invalid count value %d after rte_kvargs_count(check)\n", - count); - rte_kvargs_free(kvlist); - goto fail; - } - rte_kvargs_free(kvlist); - /* third test using list as value */ args = "foo=[0,1],check=value2"; valid_keys = valid_keys_list; @@ -224,6 +200,40 @@ test_parse_without_valid_keys(void) return 0; } +static int +test_parse_with_valid_keys(void) +{ + const char *args = "foo=droids,check=value0,check=value1,check=wrong_value"; + const char *valid_keys[] = { "foo", "check", NULL }; + struct rte_kvargs *kvlist; + + kvlist = rte_kvargs_parse(args, valid_keys); + if (kvlist == NULL) { + printf("rte_kvargs_parse() error\n"); + return -1; + } + + /* call check_handler() on all entries with key="check", it + * should fail as the value is not recognized by the handler + */ + if (rte_kvargs_process(kvlist, "check", check_handler, NULL) == 0) { + printf("rte_kvargs_process(check) is success but should not\n"); + rte_kvargs_free(kvlist); + return -1; + } + + count = rte_kvargs_count(kvlist, "check"); + if (count != 3) { + printf("invalid count value %u after rte_kvargs_count(check)\n", + count); + rte_kvargs_free(kvlist); + return -1; + } + + rte_kvargs_free(kvlist); + return 0; +} + /* test several error cases */ static int test_invalid_kvargs(void) { @@ -267,6 +277,7 @@ static struct unit_test_suite kvargs_test_suite = { TEST_CASE(test_valid_kvargs), TEST_CASE(test_basic_token_count), TEST_CASE(test_parse_without_valid_keys), + TEST_CASE(test_parse_with_valid_keys), TEST_CASE(test_invalid_kvargs), TEST_CASES_END() /**< NULL terminate unit test array */ } -- 2.17.1