X-Git-Url: http://git.efficios.com/?p=argpar.git;a=blobdiff_plain;f=tests%2Ftest_argpar.c;h=458c69e5bd2d9c00cee5ff5d2ae981ff7003b7db;hp=fa915d87a81a8082e670179fcc11f54c51db8c7a;hb=1c9a6bde7e12e1978e8e47764913a91b7407e9b5;hpb=903a5b8ab5ab38d3b200b1d692ba0d29d080c92c

diff --git a/tests/test_argpar.c b/tests/test_argpar.c
index fa915d8..458c69e 100644
--- a/tests/test_argpar.c
+++ b/tests/test_argpar.c
@@ -15,13 +15,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 
 #include "tap/tap.h"
-#include "common/assert.h"
-
 #include "argpar/argpar.h"
 
 /*
@@ -40,24 +39,24 @@
 static
 void test_succeed(const char *cmdline,
 		const char *expected_cmd_line,
-		const struct bt_argpar_opt_descr *descrs,
+		const struct argpar_opt_descr *descrs,
 		unsigned int expected_ingested_orig_args)
 {
-	struct bt_argpar_parse_ret parse_ret;
+	struct argpar_parse_ret parse_ret;
 	GString *res_str = g_string_new(NULL);
 	gchar **argv = g_strsplit(cmdline, " ", 0);
 	unsigned int i;
 
-	BT_ASSERT(argv);
-	BT_ASSERT(res_str);
-	parse_ret = bt_argpar_parse(g_strv_length(argv),
+	assert(argv);
+	assert(res_str);
+	parse_ret = argpar_parse(g_strv_length(argv),
 		(const char * const *) argv, descrs, false);
 	ok(parse_ret.items,
-		"bt_argpar_parse() succeeds for command line `%s`", cmdline);
+		"argpar_parse() succeeds for command line `%s`", cmdline);
 	ok(!parse_ret.error,
-		"bt_argpar_parse() does not write an error for command line `%s`", cmdline);
+		"argpar_parse() does not write an error for command line `%s`", cmdline);
 	ok(parse_ret.ingested_orig_args == expected_ingested_orig_args,
-		"bt_argpar_parse() returns the correct number of ingested "
+		"argpar_parse() returns the correct number of ingested "
 		"original arguments for command line `%s`", cmdline);
 	if (parse_ret.ingested_orig_args != expected_ingested_orig_args) {
 		diag("Expected: %u    Got: %u", expected_ingested_orig_args,
@@ -65,18 +64,18 @@ void test_succeed(const char *cmdline,
 	}
 
 	if (!parse_ret.items) {
-		fail("bt_argpar_parse() returns the expected parsed arguments "
+		fail("argpar_parse() returns the expected parsed arguments "
 			"for command line `%s`", cmdline);
 		goto end;
 	}
 
-	for (i = 0; i < parse_ret.items->len; i++) {
-		const struct bt_argpar_item *arg = parse_ret.items->pdata[i];
+	for (i = 0; i < parse_ret.items->n_items; i++) {
+		const struct argpar_item *arg = parse_ret.items->items[i];
 
 		switch (arg->type) {
-		case BT_ARGPAR_ITEM_TYPE_OPT:
+		case ARGPAR_ITEM_TYPE_OPT:
 		{
-			const struct bt_argpar_item_opt *arg_opt =
+			const struct argpar_item_opt *arg_opt =
 				(const void *) arg;
 
 			if (arg_opt->descr->long_name) {
@@ -103,9 +102,9 @@ void test_succeed(const char *cmdline,
 
 			break;
 		}
-		case BT_ARGPAR_ITEM_TYPE_NON_OPT:
+		case ARGPAR_ITEM_TYPE_NON_OPT:
 		{
-			const struct bt_argpar_item_non_opt *arg_non_opt =
+			const struct argpar_item_non_opt *arg_non_opt =
 				(const void *) arg;
 
 			g_string_append_printf(res_str, "%s<%u,%u> ",
@@ -123,7 +122,7 @@ void test_succeed(const char *cmdline,
 	}
 
 	ok(strcmp(expected_cmd_line, res_str->str) == 0,
-		"bt_argpar_parse() returns the expected parsed arguments "
+		"argpar_parse() returns the expected parsed arguments "
 		"for command line `%s`", cmdline);
 	if (strcmp(expected_cmd_line, res_str->str) != 0) {
 		diag("Expected: `%s`", expected_cmd_line);
@@ -131,7 +130,7 @@ void test_succeed(const char *cmdline,
 	}
 
 end:
-	bt_argpar_parse_ret_fini(&parse_ret);
+	argpar_parse_ret_fini(&parse_ret);
 	g_string_free(res_str, TRUE);
 	g_strfreev(argv);
 }
@@ -141,8 +140,8 @@ void succeed_tests(void)
 {
 	/* No arguments */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+		const struct argpar_opt_descr descrs[] = {
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -153,9 +152,9 @@ void succeed_tests(void)
 
 	/* Single long option */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, '\0', "salut", false },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -166,9 +165,9 @@ void succeed_tests(void)
 
 	/* Single short option */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, 'f', NULL, false },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -179,9 +178,9 @@ void succeed_tests(void)
 
 	/* Short and long option (aliases) */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, 'f', "flaw", false },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -192,9 +191,9 @@ void succeed_tests(void)
 
 	/* Long option with argument (space form) */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, '\0', "tooth", true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -205,9 +204,9 @@ void succeed_tests(void)
 
 	/* Long option with argument (equal form) */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, '\0', "polish", true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -218,9 +217,9 @@ void succeed_tests(void)
 
 	/* Short option with argument (space form) */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, 'c', NULL, true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -231,9 +230,9 @@ void succeed_tests(void)
 
 	/* Short option with argument (glued form) */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, 'c', NULL, true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -244,9 +243,9 @@ void succeed_tests(void)
 
 	/* Short and long option (aliases) with argument (all forms) */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, 'd', "dry", true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -257,11 +256,11 @@ void succeed_tests(void)
 
 	/* Many short options, last one with argument (glued form) */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, 'd', NULL, false },
 			{ 0, 'e', NULL, false },
 			{ 0, 'f', NULL, true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -272,11 +271,11 @@ void succeed_tests(void)
 
 	/* Many options */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, 'd', NULL, false },
 			{ 0, 'e', "east", true },
 			{ 0, '\0', "mind", false },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -287,8 +286,8 @@ void succeed_tests(void)
 
 	/* Single non-option argument */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+		const struct argpar_opt_descr descrs[] = {
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -299,8 +298,8 @@ void succeed_tests(void)
 
 	/* Two non-option arguments */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+		const struct argpar_opt_descr descrs[] = {
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -311,10 +310,10 @@ void succeed_tests(void)
 
 	/* Single non-option argument mixed with options */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, 'd', NULL, false },
 			{ 0, '\0', "squeeze", true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -325,9 +324,9 @@ void succeed_tests(void)
 
 	/* Unknown short option (space form) */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, 'd', NULL, true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -338,9 +337,9 @@ void succeed_tests(void)
 
 	/* Unknown short option (glued form) */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, 'd', NULL, true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -351,9 +350,9 @@ void succeed_tests(void)
 
 	/* Unknown long option (space form) */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, '\0', "sink", true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -364,9 +363,9 @@ void succeed_tests(void)
 
 	/* Unknown long option (equal form) */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, '\0', "sink", true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -377,9 +376,9 @@ void succeed_tests(void)
 
 	/* Unknown option before non-option argument */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, '\0', "thumb", true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -390,9 +389,9 @@ void succeed_tests(void)
 
 	/* Unknown option after non-option argument */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, '\0', "thumb", true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -403,9 +402,9 @@ void succeed_tests(void)
 
 	/* Valid `---opt` */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, '\0', "-fuel", true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -416,9 +415,9 @@ void succeed_tests(void)
 
 	/* Long option containing `=` in argument (equal form) */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, '\0', "zebra", true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -429,9 +428,9 @@ void succeed_tests(void)
 
 	/* Short option's argument starting with `-` (glued form) */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, 'z', NULL, true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -442,9 +441,9 @@ void succeed_tests(void)
 
 	/* Short option's argument starting with `-` (space form) */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, 'z', NULL, true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -455,9 +454,9 @@ void succeed_tests(void)
 
 	/* Long option's argument starting with `-` (space form) */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, '\0', "janine", true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -468,9 +467,9 @@ void succeed_tests(void)
 
 	/* Long option's argument starting with `-` (equal form) */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, '\0', "janine", true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -481,10 +480,10 @@ void succeed_tests(void)
 
 	/* Long option's empty argument (equal form) */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, 'f', NULL, false },
 			{ 0, '\0', "yeah", true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_succeed(
@@ -501,33 +500,33 @@ void succeed_tests(void)
  */
 static
 void test_fail(const char *cmdline, const char *expected_error,
-		const struct bt_argpar_opt_descr *descrs)
+		const struct argpar_opt_descr *descrs)
 {
-	struct bt_argpar_parse_ret parse_ret;
+	struct argpar_parse_ret parse_ret;
 	gchar **argv = g_strsplit(cmdline, " ", 0);
 
-	parse_ret = bt_argpar_parse(g_strv_length(argv),
+	parse_ret = argpar_parse(g_strv_length(argv),
 		(const char * const *) argv, descrs, true);
 	ok(!parse_ret.items,
-		"bt_argpar_parse() fails for command line `%s`", cmdline);
+		"argpar_parse() fails for command line `%s`", cmdline);
 	ok(parse_ret.error,
-		"bt_argpar_parse() writes an error string for command line `%s`",
+		"argpar_parse() writes an error string for command line `%s`",
 		cmdline);
 	if (parse_ret.items) {
-		fail("bt_argpar_parse() writes the expected error string");
+		fail("argpar_parse() writes the expected error string");
 		goto end;
 	}
 
-	ok(strcmp(expected_error, parse_ret.error->str) == 0,
-		"bt_argpar_parse() writes the expected error string "
+	ok(strcmp(expected_error, parse_ret.error) == 0,
+		"argpar_parse() writes the expected error string "
 		"for command line `%s`", cmdline);
-	if (strcmp(expected_error, parse_ret.error->str) != 0) {
+	if (strcmp(expected_error, parse_ret.error) != 0) {
 		diag("Expected: `%s`", expected_error);
-		diag("Got:      `%s`", parse_ret.error->str);
+		diag("Got:      `%s`", parse_ret.error);
 	}
 
 end:
-	bt_argpar_parse_ret_fini(&parse_ret);
+	argpar_parse_ret_fini(&parse_ret);
 	g_strfreev(argv);
 }
 
@@ -536,9 +535,9 @@ void fail_tests(void)
 {
 	/* Unknown long option */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, '\0', "thumb", true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_fail(
@@ -549,9 +548,9 @@ void fail_tests(void)
 
 	/* Unknown short option */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, '\0', "thumb", true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_fail(
@@ -562,9 +561,9 @@ void fail_tests(void)
 
 	/* Missing long option argument */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, '\0', "thumb", true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_fail(
@@ -575,9 +574,9 @@ void fail_tests(void)
 
 	/* Missing short option argument */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, 'k', NULL, true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_fail(
@@ -588,11 +587,11 @@ void fail_tests(void)
 
 	/* Missing short option argument (multiple glued) */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, 'a', NULL, false },
 			{ 0, 'b', NULL, false },
 			{ 0, 'c', NULL, true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_fail(
@@ -603,11 +602,11 @@ void fail_tests(void)
 
 	/* Invalid `-` */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, 'a', NULL, false },
 			{ 0, 'b', NULL, false },
 			{ 0, 'c', NULL, true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_fail(
@@ -618,11 +617,11 @@ void fail_tests(void)
 
 	/* Invalid `--` */
 	{
-		const struct bt_argpar_opt_descr descrs[] = {
+		const struct argpar_opt_descr descrs[] = {
 			{ 0, 'a', NULL, false },
 			{ 0, 'b', NULL, false },
 			{ 0, 'c', NULL, true },
-			BT_ARGPAR_OPT_DESCR_SENTINEL
+			ARGPAR_OPT_DESCR_SENTINEL
 		};
 
 		test_fail(