projects / argpar.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Parse `-` and `--` as non-option arguments
[argpar.git] / tests / test_argpar.c
diff --git a/tests/test_argpar.c b/tests/test_argpar.c
index 5c4700aa27e8a8ac7afcb5087cb6c24d30951214..c78b6e8a6babb71c7b362ba62eb45932e84644fb 100644 (file)
--- 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) {
@@ -624,6 +624,32 @@ void succeed_tests(void)
                        "-f --yeah= -f",
                        descrs, 3);
        }
+
+       /* `-` non-option argument */
+       {
+               const struct argpar_opt_descr descrs[] = {
+                       { 0, 'f', NULL, false },
+                       ARGPAR_OPT_DESCR_SENTINEL
+               };
+
+               test_succeed(
+                       "-f - -f",
+                       "-f -<1,0> -f",
+                       descrs, 3);
+       }
+
+       /* `--` non-option argument */
+       {
+               const struct argpar_opt_descr descrs[] = {
+                       { 0, 'f', NULL, false },
+                       ARGPAR_OPT_DESCR_SENTINEL
+               };
+
+               test_succeed(
+                       "-f -- -f",
+                       "-f --<1,0> -f",
+                       descrs, 3);
+       }
 }
 
 /*
@@ -671,7 +697,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 +707,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 +721,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 +780,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 +801,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 +815,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 +829,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 +843,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,42 +859,11 @@ 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,
-                       descrs);
-       }
-
-       /* Invalid `-` */
-       {
-               const struct argpar_opt_descr descrs[] = {
-                       { 0, 'a', NULL, false },
-                       { 0, 'b', NULL, false },
-                       { 0, 'c', NULL, true },
-                       ARGPAR_OPT_DESCR_SENTINEL
-               };
-
-               test_fail(
-                       "-ab - -c",
-                       "While parsing argument #2 (`-`): Invalid argument",
-                       ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_INVALID_ARG,
-                       descrs);
-       }
-
-       /* Invalid `--` */
-       {
-               const struct argpar_opt_descr descrs[] = {
-                       { 0, 'a', NULL, false },
-                       { 0, 'b', NULL, false },
-                       { 0, 'c', NULL, true },
-                       ARGPAR_OPT_DESCR_SENTINEL
-               };
-
-               test_fail(
-                       "-ab -- -c",
-                       "While parsing argument #2 (`--`): Invalid argument",
-                       ARGPAR_ITER_PARSE_NEXT_STATUS_ERROR_INVALID_ARG,
+                       ARGPAR_ITER_NEXT_STATUS_ERROR_MISSING_OPT_ARG,
                        descrs);
        }
 
+       /* Unexpected long option argument */
        {
                const struct argpar_opt_descr descrs[] = {
                        { 0, 'c', "chevre", false },
@@ -878,14 +873,14 @@ 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);
        }
 }
 
 int main(void)
 {
-       plan_tests(419);
+       plan_tests(423);
        succeed_tests();
        fail_tests();
        return exit_status();
Argument parser
This page took 0.028965 seconds and 4 git commands to generate.