From patchwork Fri Nov 3 09:53:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fengchengwen X-Patchwork-Id: 133825 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D9ED143279; Fri, 3 Nov 2023 10:56:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1A34A40ED8; Fri, 3 Nov 2023 10:56:11 +0100 (CET) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id 292F9402E8 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 4SMGN32ZNlzvQbj; 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:05 +0800 From: Chengwen Feng To: , CC: Subject: [PATCH 3/7] app/test: extract without keys testcase for kvargs Date: Fri, 3 Nov 2023 09:53:21 +0000 Message-ID: <20231103095325.47843-4-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 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 without keys tests as one stand-alone testcase. Signed-off-by: Chengwen Feng --- app/test/test_kvargs.c | 115 ++++++++++++++++++++++------------------- 1 file changed, 63 insertions(+), 52 deletions(-) diff --git a/app/test/test_kvargs.c b/app/test/test_kvargs.c index a27b2aabfb..7ab4becc0b 100644 --- a/app/test/test_kvargs.c +++ b/app/test/test_kvargs.c @@ -44,58 +44,6 @@ static int test_valid_kvargs(void) const char *valid_keys_list[] = { "foo", "check", NULL }; const char **valid_keys; - /* first test without valid_keys */ - args = "foo=1234,check=value0,check=value1"; - valid_keys = NULL; - kvlist = rte_kvargs_parse(args, valid_keys); - if (kvlist == NULL) { - printf("rte_kvargs_parse() error"); - goto fail; - } - /* call check_handler() for all entries with key="check" */ - count = 0; - if (rte_kvargs_process(kvlist, "check", check_handler, NULL) < 0) { - printf("rte_kvargs_process() error\n"); - rte_kvargs_free(kvlist); - goto fail; - } - if (count != 2) { - printf("invalid count value %d after rte_kvargs_process(check)\n", - count); - rte_kvargs_free(kvlist); - goto fail; - } - count = 0; - /* call check_handler() for all entries with key="nonexistent_key" */ - if (rte_kvargs_process(kvlist, "nonexistent_key", check_handler, NULL) < 0) { - printf("rte_kvargs_process() error\n"); - rte_kvargs_free(kvlist); - goto fail; - } - if (count != 0) { - printf("invalid count value %d after rte_kvargs_process(nonexistent_key)\n", - count); - rte_kvargs_free(kvlist); - goto fail; - } - /* count all entries with key="foo" */ - count = rte_kvargs_count(kvlist, "foo"); - if (count != 1) { - printf("invalid count value %d after rte_kvargs_count(foo)\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) { - printf("invalid count value %d after rte_kvargs_count(nonexistent_key)\n", - count); - rte_kvargs_free(kvlist); - goto fail; - } - rte_kvargs_free(kvlist); - /* second test using valid_keys */ args = "foo=droids,check=value0,check=value1,check=wrong_value"; valid_keys = valid_keys_list; @@ -215,6 +163,68 @@ test_basic_token_count(void) return 0; } +static int +test_parse_without_valid_keys(void) +{ + const char *args = "foo=1234,check=value0,check=value1"; + struct rte_kvargs *kvlist; + + kvlist = rte_kvargs_parse(args, NULL); + if (kvlist == NULL) { + printf("rte_kvargs_parse() error\n"); + return -1; + } + + /* call check_handler() for all entries with key="check" */ + count = 0; + if (rte_kvargs_process(kvlist, "check", check_handler, NULL) < 0) { + printf("rte_kvargs_process(check) error\n"); + rte_kvargs_free(kvlist); + return -1; + } + if (count != 2) { + printf("invalid count value %u after rte_kvargs_process(check)\n", + count); + rte_kvargs_free(kvlist); + return -1; + } + + /* call check_handler() for all entries with key="nonexistent_key" */ + count = 0; + if (rte_kvargs_process(kvlist, "nonexistent_key", check_handler, NULL) < 0) { + printf("rte_kvargs_process(nonexistent_key) error\n"); + rte_kvargs_free(kvlist); + return -1; + } + if (count != 0) { + printf("invalid count value %d after rte_kvargs_process(nonexistent_key)\n", + count); + rte_kvargs_free(kvlist); + return -1; + } + + /* count all entries with key="foo" */ + count = rte_kvargs_count(kvlist, "foo"); + if (count != 1) { + printf("invalid count value %d after rte_kvargs_count(foo)\n", + count); + rte_kvargs_free(kvlist); + return -1; + } + + /* count all entries with key="nonexistent_key" */ + count = rte_kvargs_count(kvlist, "nonexistent_key"); + if (count != 0) { + printf("invalid count value %d after rte_kvargs_count(nonexistent_key)\n", + count); + rte_kvargs_free(kvlist); + return -1; + } + + rte_kvargs_free(kvlist); + return 0; +} + /* test several error cases */ static int test_invalid_kvargs(void) { @@ -257,6 +267,7 @@ static struct unit_test_suite kvargs_test_suite = { .unit_test_cases = { TEST_CASE(test_valid_kvargs), TEST_CASE(test_basic_token_count), + TEST_CASE(test_parse_without_valid_keys), TEST_CASE(test_invalid_kvargs), TEST_CASES_END() /**< NULL terminate unit test array */ }