DPDK patches and discussions
 help / color / mirror / Atom feed
From: Chengwen Feng <fengchengwen@huawei.com>
To: <thomas@monjalon.net>, <ferruh.yigit@amd.com>,
	<david.marchand@redhat.com>
Cc: <dev@dpdk.org>, <stephen@networkplumber.org>
Subject: [PATCH v4 2/7] app/test: extract basic token count testcase for kvargs
Date: Wed, 30 Oct 2024 08:54:45 +0000	[thread overview]
Message-ID: <20241030085450.56864-3-fengchengwen@huawei.com> (raw)
In-Reply-To: <20241030085450.56864-1-fengchengwen@huawei.com>

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 <fengchengwen@huawei.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
---
 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 1c46fbcaab..a9808a6f87 100644
--- a/app/test/test_kvargs.c
+++ b/app/test/test_kvargs.c
@@ -35,25 +35,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)
 {
@@ -61,29 +42,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";
@@ -127,14 +85,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) {
@@ -189,19 +139,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);
@@ -209,10 +146,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;
@@ -223,14 +156,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:
@@ -245,6 +170,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)
 {
@@ -286,6 +255,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


  parent reply	other threads:[~2024-10-30  8:54 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-03  9:53 [PATCH 0/7] refactor kvargs test Chengwen Feng
2023-11-03  9:53 ` [PATCH 1/7] app/test: introduce UT suite framework for kvargs Chengwen Feng
2024-10-11  2:08   ` Stephen Hemminger
2024-10-11  3:35     ` fengchengwen
2023-11-03  9:53 ` [PATCH 2/7] app/test: extract basic token count testcase " Chengwen Feng
2023-11-03  9:53 ` [PATCH 3/7] app/test: extract without keys " Chengwen Feng
2023-11-03  9:53 ` [PATCH 4/7] app/test: extract with " Chengwen Feng
2023-11-03  9:53 ` [PATCH 5/7] app/test: extract parse list value " Chengwen Feng
2023-11-03  9:53 ` [PATCH 6/7] app/test: extract parse empty elements " Chengwen Feng
2023-11-03  9:53 ` [PATCH 7/7] maintainers: update for kvargs library Chengwen Feng
2023-12-05  2:55 ` [PATCH 0/7] refactor kvargs test fengchengwen
2024-10-05 15:49 ` Stephen Hemminger
2024-10-11  3:34 ` [PATCH v2 " Chengwen Feng
2024-10-11  3:34   ` [PATCH v2 1/7] app/test: introduce UT suite framework for kvargs Chengwen Feng
2024-10-11  3:34   ` [PATCH v2 2/7] app/test: extract basic token count testcase " Chengwen Feng
2024-10-11  3:34   ` [PATCH v2 3/7] app/test: extract without keys " Chengwen Feng
2024-10-11  3:34   ` [PATCH v2 4/7] app/test: extract with " Chengwen Feng
2024-10-11  3:34   ` [PATCH v2 5/7] app/test: extract parse list value " Chengwen Feng
2024-10-11  3:34   ` [PATCH v2 6/7] app/test: extract parse empty elements " Chengwen Feng
2024-10-11  3:34   ` [PATCH v2 7/7] maintainers: update for kvargs library Chengwen Feng
2024-10-22  6:14 ` [PATCH v3 0/8] refactor kvargs test Chengwen Feng
2024-10-22  6:14   ` [PATCH v3 1/8] app/test: introduce UT suite framework for kvargs Chengwen Feng
2024-10-22  6:14   ` [PATCH v3 2/8] app/test: extract basic token count testcase " Chengwen Feng
2024-10-22  6:14   ` [PATCH v3 3/8] app/test: extract without keys " Chengwen Feng
2024-10-22  6:14   ` [PATCH v3 4/8] app/test: extract with " Chengwen Feng
2024-10-22  6:14   ` [PATCH v3 5/8] app/test: extract parse list value " Chengwen Feng
2024-10-22  6:14   ` [PATCH v3 6/8] app/test: extract parse empty elements " Chengwen Feng
2024-10-22  6:14   ` [PATCH v3 7/8] app/test: add process opt " Chengwen Feng
2024-10-22  6:14   ` [PATCH v3 8/8] maintainers: update for kvargs library Chengwen Feng
2024-10-30  8:54 ` [PATCH v4 0/7] refactor kvargs test Chengwen Feng
2024-10-30  8:54   ` [PATCH v4 1/7] app/test: introduce UT suite framework for kvargs Chengwen Feng
2024-10-30  8:54   ` Chengwen Feng [this message]
2024-10-30  8:54   ` [PATCH v4 3/7] app/test: extract without keys testcase " Chengwen Feng
2024-10-30  8:54   ` [PATCH v4 4/7] app/test: extract with " Chengwen Feng
2024-10-30  8:54   ` [PATCH v4 5/7] app/test: extract parse list value " Chengwen Feng
2024-10-30  8:54   ` [PATCH v4 6/7] app/test: extract parse empty elements " Chengwen Feng
2024-10-30  8:54   ` [PATCH v4 7/7] app/test: add process opt " Chengwen Feng

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=20241030085450.56864-3-fengchengwen@huawei.com \
    --to=fengchengwen@huawei.com \
    --cc=david.marchand@redhat.com \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@amd.com \
    --cc=stephen@networkplumber.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).