From fefeab4efeb3fe31433da8dd972556ab2bc51288 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 8 Jan 2025 15:00:20 +1000 Subject: [PATCH] test: a boolean parameter is always true/false Don't require the caller to provide the values, they're always the same. Part-of: --- test/litest-selftest.c | 2 +- test/litest.c | 72 +++++++++++++++++++++--------------------- test/test-tablet.c | 10 +++--- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/test/litest-selftest.c b/test/litest-selftest.c index 243922dc..48925139 100644 --- a/test/litest-selftest.c +++ b/test/litest-selftest.c @@ -483,7 +483,7 @@ START_TEST(parameter_permutations) }; struct litest_parameters *params = litest_parameters_new("first", 'i', 3, 1, 2, 3, "second", 's', 3, "a", "ab", "abc", - "third", 'b', 2, true, false, + "third", 'b', NULL); litest_parameters_permutations(params, permutation_func, permutations); diff --git a/test/litest.c b/test/litest.c index 9b1a270b..a3c1868c 100644 --- a/test/litest.c +++ b/test/litest.c @@ -481,44 +481,44 @@ _litest_parameters_new(const char *name, ...) { while (name) { char type = va_arg(args, int); - unsigned int nargs = va_arg(args, unsigned int); struct litest_parameter *param = litest_parameter_new(name, type); - for (unsigned int _ = 0; _ < nargs; _++) { - switch (type) { - case 'b': { - bool b = va_arg(args, int); - litest_parameter_add_bool(param, b); - break; - } - case 'c': { - char b = va_arg(args, int); - litest_parameter_add_char(param, b); - break; - } - case 'u': { - uint32_t b = va_arg(args, uint32_t); - litest_parameter_add_u32(param, b); - break; - } - case 'i': { - int32_t b = va_arg(args, int32_t); - litest_parameter_add_i32(param, b); - break; - } - case 'd': { - double b = va_arg(args, double); - litest_parameter_add_double(param, b); - break; - } - case 's': { - const char *s = va_arg(args, const char *); - litest_parameter_add_string(param, s); - break; - } - default: - abort(); - break; + if (type == 'b') { + litest_parameter_add_bool(param, true); + litest_parameter_add_bool(param, false); + } else { + unsigned int nargs = va_arg(args, unsigned int); + for (unsigned int _ = 0; _ < nargs; _++) { + switch (type) { + case 'c': { + char b = va_arg(args, int); + litest_parameter_add_char(param, b); + break; + } + case 'u': { + uint32_t b = va_arg(args, uint32_t); + litest_parameter_add_u32(param, b); + break; + } + case 'i': { + int32_t b = va_arg(args, int32_t); + litest_parameter_add_i32(param, b); + break; + } + case 'd': { + double b = va_arg(args, double); + litest_parameter_add_double(param, b); + break; + } + case 's': { + const char *s = va_arg(args, const char *); + litest_parameter_add_string(param, s); + break; + } + default: + abort(); + break; + } } } diff --git a/test/test-tablet.c b/test/test-tablet.c index 02771e8a..f803f8de 100644 --- a/test/test-tablet.c +++ b/test/test-tablet.c @@ -7201,7 +7201,7 @@ TEST_COLLECTION(tablet) litest_add_for_device(huion_static_btn_tool_pen_no_timeout_during_usage, LITEST_HUION_TABLET); { - struct litest_parameters *params = litest_parameters_new("btn_tool_pen_timeout", 'b', 2, true, false); + struct litest_parameters *params = litest_parameters_new("btn_tool_pen_timeout", 'b'); litest_add_parametrized_for_device(huion_static_btn_tool_pen_disable_quirk_on_prox_out, LITEST_HUION_TABLET, params); litest_parameters_unref(params); } @@ -7218,10 +7218,10 @@ TEST_COLLECTION(tablet_left_handed) litest_add_for_device(no_left_handed, LITEST_WACOM_CINTIQ); { - struct litest_parameters *params = litest_parameters_new("tablet_from", 'b', 2, true, false, - "touch_from", 'b', 2, true, false, - "tablet_to", 'b', 2, true, false, - "touch_to", 'b', 2, true, false); + struct litest_parameters *params = litest_parameters_new("tablet_from", 'b', + "touch_from", 'b', + "tablet_to", 'b', + "touch_to", 'b'); litest_add_parametrized(tablet_rotation_left_handed, LITEST_TABLET, LITEST_ANY, params); litest_add_parametrized(tablet_rotation_left_handed_configuration, LITEST_TABLET, LITEST_ANY, params); litest_add_parametrized(tablet_rotation_left_handed_while_in_prox, LITEST_TABLET, LITEST_ANY, params);