Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

No reqctx test #1942

Merged
merged 3 commits into from
Nov 24, 2024
+321 −508
Merged

No reqctx test #1942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66e094e
drop legacy reqctx test - already covered in nuts tests
gdamore Nov 24, 2024
aa7f8ec
Converted options supplemental test to NUTS
gdamore Nov 24, 2024
77f85a4
options parser: Add a couple of tests for ambiguous and missing argum…
gdamore Nov 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/supplemental/util/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ nng_headers(
nng/supplemental/util/options.h
nng/supplemental/util/platform.h)
nng_test(idhash_test)
nng_test(options_test)
320 changes: 320 additions & 0 deletions src/supplemental/util/options_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,320 @@
//
// Copyright 2024 Staysail Systems, Inc. <[email protected]>
// Copyright 2018 Capitar IT Group BV <[email protected]>
//
// This software is supplied under the terms of the MIT License, a
// copy of which should be located in the distribution where this
// file was obtained (LICENSE.txt). A copy of the license may also be
// found online at https://opensource.org/licenses/MIT.
//

#include "nng/nng.h"
#include <nuts.h>

#include <nng/supplemental/util/options.h>

static nng_optspec case1[] = {
// clang-format off
{ "flag", 'f', 1, false },
{ "longflag", 0, 2, false },
{ "value", 'v', 3, true },
{ NULL, 'b', 4, false },
{ NULL, 0, 0, false },
// clang-format on
};

void
test_simple_options(void)
{
int opti = 1;
char *av[6];
int ac = 5;
int v;
char *a = NULL;

av[0] = "program";
av[1] = "-f";
av[2] = "-v";
av[3] = "123";
av[4] = "456";
NUTS_PASS(nng_opts_parse(ac, av, case1, &v, &a, &opti));
NUTS_TRUE(v == 1);
NUTS_NULL(a);
NUTS_TRUE(opti == 2);
NUTS_PASS(nng_opts_parse(ac, av, case1, &v, &a, &opti));
NUTS_TRUE(opti == 4);
NUTS_TRUE(v == 3);
NUTS_MATCH(a, "123");
NUTS_TRUE(nng_opts_parse(ac, av, case1, &v, &a, &opti) == -1);
NUTS_TRUE(opti == 4);
NUTS_MATCH(av[opti], "456");
}

void
test_long_options(void)
{
int opti = 1;
char *av[6];
int ac = 5;
int v;
char *a = NULL;

av[0] = "program";
av[1] = "--flag";
av[2] = "--value";
av[3] = "123";
av[4] = "456";
NUTS_PASS(nng_opts_parse(ac, av, case1, &v, &a, &opti));
NUTS_TRUE(v == 1);
NUTS_NULL(a);
NUTS_TRUE(opti == 2);
NUTS_PASS(nng_opts_parse(ac, av, case1, &v, &a, &opti));
NUTS_TRUE(opti == 4);
NUTS_TRUE(v == 3);
NUTS_MATCH(a, "123");
NUTS_TRUE(nng_opts_parse(ac, av, case1, &v, &a, &opti) == -1);
NUTS_TRUE(opti == 4);
NUTS_MATCH(av[opti], "456");
}

void
test_attached_short(void)
{
int opti = 1;
char *av[3];
int ac = 3;
int v;
char *a = NULL;

av[0] = "program";
av[1] = "-v123";
av[2] = "456";
NUTS_PASS(nng_opts_parse(ac, av, case1, &v, &a, &opti));
NUTS_TRUE(opti == 2);
NUTS_TRUE(v == 3);
NUTS_MATCH(a, "123");
NUTS_TRUE(nng_opts_parse(ac, av, case1, &v, &a, &opti) == -1);
NUTS_TRUE(opti == 2);
NUTS_MATCH(av[opti], "456");
}

void
test_attached_long_equals(void)
{
int opti = 1;
char *av[3];
int ac = 3;
int v;
char *a = NULL;

av[0] = "program";
av[1] = "--value=123";
av[2] = "456";
NUTS_PASS(nng_opts_parse(ac, av, case1, &v, &a, &opti));
NUTS_TRUE(opti == 2);
NUTS_TRUE(v == 3);
NUTS_MATCH(a, "123");
NUTS_TRUE(nng_opts_parse(ac, av, case1, &v, &a, &opti) == -1);
NUTS_TRUE(opti == 2);
NUTS_MATCH(av[opti], "456");
}

void
test_attached_long_colon(void)
{
int opti = 1;
char *av[3];
int ac = 3;
int v;
char *a = NULL;

av[0] = "program";
av[1] = "--value:123";
av[2] = "456";
NUTS_PASS(nng_opts_parse(ac, av, case1, &v, &a, &opti));
NUTS_TRUE(opti == 2);
NUTS_TRUE(v == 3);
NUTS_MATCH(a, "123");
NUTS_TRUE(nng_opts_parse(ac, av, case1, &v, &a, &opti) == -1);
NUTS_TRUE(opti == 2);
NUTS_MATCH(av[opti], "456");
}

void
test_negative_bad_short(void)
{
int opti = 1;
char *av[3];
int ac = 3;
int v;
char *a = NULL;

av[0] = "program";
av[1] = "-Z";
av[2] = "456";
NUTS_FAIL(nng_opts_parse(ac, av, case1, &v, &a, &opti), NNG_EINVAL);
NUTS_TRUE(opti == 1);
}

void
test_negative_bad_long(void)
{
int opti = 1;
char *av[3];
int ac = 3;
int v;
char *a = NULL;

av[0] = "program";
av[1] = "--something";
av[2] = "456";
NUTS_FAIL(nng_opts_parse(ac, av, case1, &v, &a, &opti), NNG_EINVAL);
NUTS_TRUE(opti == 1);
}

void
test_option_separator_flag(void)
{
int opti = 1;
char *av[5];
int ac = 5;
int v;
char *a = NULL;

av[0] = "program";
av[1] = "-f";
av[2] = "-";
av[3] = "-v";
av[4] = "456";
NUTS_PASS(nng_opts_parse(ac, av, case1, &v, &a, &opti));
NUTS_TRUE(v == 1);
NUTS_TRUE(opti == 2);
NUTS_TRUE(nng_opts_parse(ac, av, case1, &v, &a, &opti) == -1);
NUTS_TRUE(opti == 3);
}

void
test_no_options(void)
{
int opti = 1;
char *av[1];
int ac = 1;
int v;
char *a = NULL;

av[0] = "program";
NUTS_TRUE(nng_opts_parse(ac, av, case1, &v, &a, &opti) == -1);
}

void
test_arg_only(void)
{
int opti = 1;
char *av[2];
int ac = 2;
int v;
char *a = NULL;

av[0] = "program";
av[1] = "123";
NUTS_TRUE(nng_opts_parse(ac, av, case1, &v, &a, &opti) == -1);
NUTS_TRUE(opti == 1);
}

void
test_mixed_long_short(void)
{
int opti = 1;
char *av[7];
int ac = 7;
int v;
char *a = NULL;

av[0] = "program";
av[1] = "--value=123";
av[2] = "-f";
av[3] = "--longflag";
av[4] = "-b";
av[5] = "-vxyz";
av[6] = "456";
NUTS_PASS(nng_opts_parse(ac, av, case1, &v, &a, &opti));
NUTS_TRUE(opti == 2);
NUTS_TRUE(v == 3);
NUTS_MATCH(a, "123");
NUTS_PASS(nng_opts_parse(ac, av, case1, &v, &a, &opti));
NUTS_TRUE(opti == 3);
NUTS_TRUE(v == 1);
NUTS_PASS(nng_opts_parse(ac, av, case1, &v, &a, &opti));
NUTS_TRUE(opti == 4);
NUTS_TRUE(v == 2);
NUTS_PASS(nng_opts_parse(ac, av, case1, &v, &a, &opti));
NUTS_TRUE(opti == 5);
NUTS_TRUE(v == 4);
NUTS_PASS(nng_opts_parse(ac, av, case1, &v, &a, &opti));
NUTS_TRUE(opti == 6);
NUTS_TRUE(v == 3);
NUTS_MATCH(a, "xyz");
NUTS_MATCH(av[opti], "456");
NUTS_TRUE(nng_opts_parse(ac, av, case1, &v, &a, &opti) == -1);
NUTS_TRUE(opti == 6);
}

void
test_ambiguous(void)
{
int opti = 1;
char *av[2];
int ac = 2;
int v;
char *a = NULL;

nng_optspec spec[] = {
{ "flag", 'f', 1, false },
{ "fluid", 0, 2, false },
{ NULL, 0, 0, false },
};

av[0] = "program";
av[1] = "--fl";
NUTS_FAIL(nng_opts_parse(ac, av, spec, &v, &a, &opti), NNG_EAMBIGUOUS);
}

void
test_missing_arg(void)
{
int opti = 1;
char *av[2];
int ac = 2;
int v;
char *a = NULL;

nng_optspec spec[] = {
{ "flag", 'f', 1, true },
{ NULL, 0, 0, false },
};

av[0] = "program";
av[1] = "--fl";
NUTS_FAIL(nng_opts_parse(ac, av, spec, &v, &a, &opti), NNG_ENOARG);
av[0] = "program";
av[1] = "-f";
opti = 1;
NUTS_FAIL(nng_opts_parse(ac, av, spec, &v, &a, &opti), NNG_ENOARG);
}

NUTS_TESTS = {
{ "simple options", test_simple_options },
{ "long options", test_long_options },
{ "separator flag", test_option_separator_flag },
{ "no options", test_no_options },
{ "attached short", test_attached_long_equals },
{ "attached long equals", test_attached_long_equals },
{ "attached long colon", test_attached_long_colon },
{ "bad short", test_negative_bad_short },
{ "bad long", test_negative_bad_long },
{ "arg only", test_arg_only },
{ "options mixed long short", test_mixed_long_short },
{ "ambiguous options", test_ambiguous },
{ "missing argument", test_missing_arg },
{ NULL, NULL },
};
2 changes: 0 additions & 2 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ add_nng_test(inproc 5)
add_nng_test(ipcsupp 10)
add_nng_test(multistress 60)
add_nng_test(nonblock 60)
add_nng_test(options 5)
add_nng_test(pipe 5)
add_nng_test(scalability 20 ON)
add_nng_test(synch 5)
Expand All @@ -143,7 +142,6 @@ add_nng_test(ws 30)
add_nng_test(wss 30)
add_nng_test1(zt 60 NNG_TRANSPORT_ZEROTIER)

add_nng_test(reqctx 5)
add_nng_test(reqstress 60)

# c++ tests
Expand Down
Loading
Loading