X-Git-Url: http://git.efficios.com/?p=argpar.git;a=blobdiff_plain;f=tests%2Ftest_argpar.c;h=4882d45c1c0bade6ca1ef0b0ac7ee9ac755f55b0;hp=5c4700aa27e8a8ac7afcb5087cb6c24d30951214;hb=f3ab5ca1c03d5ae622ac53b7c1da30ebd21db199;hpb=d4d05805c9634c2ca9ae92950d01196917b6b260

diff --git a/tests/test_argpar.c b/tests/test_argpar.c
index 5c4700a..4882d45 100644
--- a/tests/test_argpar.c
+++ b/tests/test_argpar.c
@@ -184,39 +184,39 @@ void test_succeed_argpar_iter(const char * const cmdline,
 	assert(iter);
 
 	for (i = 0; ; i++) {
-		enum argpar_iter_parse_next_status status;
+		enum argpar_iter_next_status status;
 
 		ARGPAR_ITEM_DESTROY_AND_RESET(item);
-		status = argpar_iter_parse_next(iter, &item, &error);
+		status = argpar_iter_next(iter, &item, &error);
 
-		ok(status == ARGPAR_ITER_PARSE_NEXT_STATUS_OK ||
-			status == ARGPAR_ITER_PARSE_NEXT_STATUS_END ||
-			status == ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_UNKNOWN_OPT,
-			"argpar_iter_parse_next() returns the expected status "
+		ok(status == ARGPAR_ITER_NEXT_STATUS_OK ||
+			status == ARGPAR_ITER_NEXT_STATUS_END ||
+			status == ARGPAR_ITER_NEXT_STATUS_ERROR_UNKNOWN_OPT,
+			"argpar_iter_next() returns the expected status "
 			"(%d) for command line `%s` (call %u)",
 			status, cmdline, i + 1);
 
-		if (status == ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_UNKNOWN_OPT) {
+		if (status == ARGPAR_ITER_NEXT_STATUS_ERROR_UNKNOWN_OPT) {
 			ok(error,
-				"argpar_iter_parse_next() sets an error for "
-				"status `ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_UNKNOWN_OPT` "
+				"argpar_iter_next() sets an error for "
+				"status `ARGPAR_ITER_NEXT_STATUS_ERROR_UNKNOWN_OPT` "
 				"and command line `%s` (call %u)",
 				cmdline, i + 1);
 		} else {
 			ok(!error,
-				"argpar_iter_parse_next() doesn't set an error "
+				"argpar_iter_next() doesn't set an error "
 				"for other status than "
-				"`ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_UNKNOWN_OPT` "
+				"`ARGPAR_ITER_NEXT_STATUS_ERROR_UNKNOWN_OPT` "
 				"and command line `%s` (call %u)",
 				cmdline, i + 1);
 		}
 
-		if (status == ARGPAR_ITER_PARSE_NEXT_STATUS_END ||
-				status == ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_UNKNOWN_OPT) {
+		if (status == ARGPAR_ITER_NEXT_STATUS_END ||
+				status == ARGPAR_ITER_NEXT_STATUS_ERROR_UNKNOWN_OPT) {
 			ok(!item,
-				"argpar_iter_parse_next() doesn't set an item "
-				"for status `ARGPAR_ITER_PARSE_NEXT_STATUS_END` "
-				"or `ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_UNKNOWN_OPT` "
+				"argpar_iter_next() doesn't set an item "
+				"for status `ARGPAR_ITER_NEXT_STATUS_END` "
+				"or `ARGPAR_ITER_NEXT_STATUS_ERROR_UNKNOWN_OPT` "
 				"and command line `%s` (call %u)",
 				cmdline, i + 1);
 			break;
@@ -225,9 +225,9 @@ void test_succeed_argpar_iter(const char * const cmdline,
 		append_to_res_str(res_str, item);
 	}
 
-	actual_ingested_orig_args = argpar_iter_get_ingested_orig_args(iter);
+	actual_ingested_orig_args = argpar_iter_ingested_orig_args(iter);
 	ok(actual_ingested_orig_args == expected_ingested_orig_args,
-		"argpar_iter_get_ingested_orig_args() returns the expected "
+		"argpar_iter_ingested_orig_args() returns the expected "
 		"number of ingested original arguments for command line `%s`",
 		cmdline);
 
@@ -237,7 +237,7 @@ void test_succeed_argpar_iter(const char * const cmdline,
 	}
 
 	ok(strcmp(expected_cmd_line, res_str->str) == 0,
-		"argpar_iter_parse_next() returns the expected parsing items "
+		"argpar_iter_next() returns the expected parsing items "
 		"for command line `%s`", cmdline);
 
 	if (strcmp(expected_cmd_line, res_str->str) != 0) {
@@ -671,7 +671,7 @@ end:
 
 /*
  * Parses `cmdline` with the iterator API using the option descriptors
- * `descrs`, and ensures that argpar_iter_parse_next() fails with status
+ * `descrs`, and ensures that argpar_iter_next() fails with status
  * `expected_status` and that it sets an error which is equal to
  * `expected_error`.
  *
@@ -681,7 +681,7 @@ end:
 static
 void test_fail_argpar_iter(const char * const cmdline,
 		const char * const expected_error,
-		const enum argpar_iter_parse_next_status expected_status,
+		const enum argpar_iter_next_status expected_status,
 		const struct argpar_opt_descr * const descrs)
 {
 	struct argpar_iter *iter = NULL;
@@ -695,46 +695,46 @@ void test_fail_argpar_iter(const char * const cmdline,
 	assert(iter);
 
 	for (i = 0; ; i++) {
-		enum argpar_iter_parse_next_status status;
+		enum argpar_iter_next_status status;
 
 		ARGPAR_ITEM_DESTROY_AND_RESET(item);
-		status = argpar_iter_parse_next(iter, &item, &error);
-		ok(status == ARGPAR_ITER_PARSE_NEXT_STATUS_OK ||
+		status = argpar_iter_next(iter, &item, &error);
+		ok(status == ARGPAR_ITER_NEXT_STATUS_OK ||
 			status == expected_status,
-			"argpar_iter_parse_next() returns the expected status "
+			"argpar_iter_next() returns the expected status "
 			"(%d) for command line `%s` (call %u)",
 			status, cmdline, i + 1);
 
-		if (status != ARGPAR_ITER_PARSE_NEXT_STATUS_OK) {
+		if (status != ARGPAR_ITER_NEXT_STATUS_OK) {
 			ok(!item,
-				"argpar_iter_parse_next() doesn't set an item "
+				"argpar_iter_next() doesn't set an item "
 				"for other status than "
-				"`ARGPAR_ITER_PARSE_NEXT_STATUS_OK` "
+				"`ARGPAR_ITER_NEXT_STATUS_OK` "
 				"and command line `%s` (call %u)",
 				cmdline, i + 1);
 			ok(error,
-				"argpar_iter_parse_next() sets an error for "
+				"argpar_iter_next() sets an error for "
 				"other status than "
-				" `ARGPAR_ITER_PARSE_NEXT_STATUS_OK` "
+				" `ARGPAR_ITER_NEXT_STATUS_OK` "
 				"and command line `%s` (call %u)",
 				cmdline, i + 1);
 			break;
 		}
 
 		ok(item,
-			"argpar_iter_parse_next() sets an item for status "
-			"`ARGPAR_ITER_PARSE_NEXT_STATUS_OK` "
+			"argpar_iter_next() sets an item for status "
+			"`ARGPAR_ITER_NEXT_STATUS_OK` "
 			"and command line `%s` (call %u)",
 			cmdline, i + 1);
 		ok(!error,
-			"argpar_iter_parse_next() doesn't set an error for status "
-			"`ARGPAR_ITER_PARSE_NEXT_STATUS_OK` "
+			"argpar_iter_next() doesn't set an error for status "
+			"`ARGPAR_ITER_NEXT_STATUS_OK` "
 			"and command line `%s` (call %u)",
 			cmdline, i + 1);
 	}
 
 	ok(strcmp(expected_error, error) == 0,
-		"argpar_iter_parse_next() sets the expected error string "
+		"argpar_iter_next() sets the expected error string "
 		"for command line `%s`", cmdline);
 
 	if (strcmp(expected_error, error) != 0) {
@@ -754,7 +754,7 @@ void test_fail_argpar_iter(const char * const cmdline,
  */
 static
 void test_fail(const char * const cmdline, const char * const expected_error,
-		const enum argpar_iter_parse_next_status expected_iter_next_status,
+		const enum argpar_iter_next_status expected_iter_next_status,
 		const struct argpar_opt_descr * const descrs)
 {
 	test_fail_argpar_parse(cmdline, expected_error, descrs);
@@ -775,7 +775,7 @@ void fail_tests(void)
 		test_fail(
 			"--thumb=party --meow",
 			"While parsing argument #2 (`--meow`): Unknown option `--meow`",
-			ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_UNKNOWN_OPT,
+			ARGPAR_ITER_NEXT_STATUS_ERROR_UNKNOWN_OPT,
 			descrs);
 	}
 
@@ -789,7 +789,7 @@ void fail_tests(void)
 		test_fail(
 			"--thumb=party -x",
 			"While parsing argument #2 (`-x`): Unknown option `-x`",
-			ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_UNKNOWN_OPT,
+			ARGPAR_ITER_NEXT_STATUS_ERROR_UNKNOWN_OPT,
 			descrs);
 	}
 
@@ -803,7 +803,7 @@ void fail_tests(void)
 		test_fail(
 			"--thumb",
 			"While parsing argument #1 (`--thumb`): Missing required argument for option `--thumb`",
-			ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_MISSING_OPT_ARG,
+			ARGPAR_ITER_NEXT_STATUS_ERROR_MISSING_OPT_ARG,
 			descrs);
 	}
 
@@ -817,7 +817,7 @@ void fail_tests(void)
 		test_fail(
 			"-k",
 			"While parsing argument #1 (`-k`): Missing required argument for option `-k`",
-			ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_MISSING_OPT_ARG,
+			ARGPAR_ITER_NEXT_STATUS_ERROR_MISSING_OPT_ARG,
 			descrs);
 	}
 
@@ -833,7 +833,7 @@ void fail_tests(void)
 		test_fail(
 			"-abc",
 			"While parsing argument #1 (`-abc`): Missing required argument for option `-c`",
-			ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_MISSING_OPT_ARG,
+			ARGPAR_ITER_NEXT_STATUS_ERROR_MISSING_OPT_ARG,
 			descrs);
 	}
 
@@ -849,7 +849,7 @@ void fail_tests(void)
 		test_fail(
 			"-ab - -c",
 			"While parsing argument #2 (`-`): Invalid argument",
-			ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_INVALID_ARG,
+			ARGPAR_ITER_NEXT_STATUS_ERROR_INVALID_ARG,
 			descrs);
 	}
 
@@ -865,7 +865,7 @@ void fail_tests(void)
 		test_fail(
 			"-ab -- -c",
 			"While parsing argument #2 (`--`): Invalid argument",
-			ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_INVALID_ARG,
+			ARGPAR_ITER_NEXT_STATUS_ERROR_INVALID_ARG,
 			descrs);
 	}
 
@@ -878,7 +878,7 @@ void fail_tests(void)
 		test_fail(
 			"--chevre=fromage",
 			"While parsing argument #1 (`--chevre=fromage`): Unexpected argument for option `--chevre`",
-			ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_UNEXPECTED_OPT_ARG,
+			ARGPAR_ITER_NEXT_STATUS_ERROR_UNEXPECTED_OPT_ARG,
 			descrs);
 	}
 }