diff --git a/lib/widget/widget-common.c b/lib/widget/widget-common.c index a622556fb..45b1cd4b3 100644 --- a/lib/widget/widget-common.c +++ b/lib/widget/widget-common.c @@ -110,6 +110,24 @@ widget_reorder (GList * l, gboolean set_top) h->widgets = g_list_concat (l, h->widgets); } +/* --------------------------------------------------------------------------------------------- */ + +static gboolean +hotkey_cmp (const char *s1, const char *s2) +{ + gboolean n1, n2; + + n1 = s1 != NULL; + n2 = s2 != NULL; + + if (n1 != n2) + return FALSE; + + if (n1 && n2 && strcmp (s1, s2) != 0) + return FALSE; + + return TRUE; +} /* --------------------------------------------------------------------------------------------- */ /*** public functions ****************************************************************************/ @@ -173,6 +191,18 @@ hotkey_width (const hotkey_t hotkey) /* --------------------------------------------------------------------------------------------- */ +gboolean +hotkey_equal (const hotkey_t hotkey1, const hotkey_t hotkey2) +{ + /* *INDENT-OFF* */ + return (strcmp (hotkey1.start, hotkey2.start) == 0) && + hotkey_cmp (hotkey1.hotkey, hotkey2.hotkey) && + hotkey_cmp (hotkey1.end, hotkey2.end); + /* *INDENT-ON* */ +} + +/* --------------------------------------------------------------------------------------------- */ + void hotkey_draw (Widget * w, const hotkey_t hotkey, gboolean focused) { diff --git a/lib/widget/widget-common.h b/lib/widget/widget-common.h index 0a7af9f8e..97fb99ab8 100644 --- a/lib/widget/widget-common.h +++ b/lib/widget/widget-common.h @@ -154,9 +154,9 @@ struct Widget */ typedef struct hotkey_t { - char *start; - char *hotkey; - char *end; + char *start; /* never NULL */ + char *hotkey; /* can be NULL */ + char *end; /* can be NULL */ } hotkey_t; /*** global variables defined in .c file *********************************************************/ @@ -169,6 +169,8 @@ hotkey_t hotkey_new (const char *text); void hotkey_free (const hotkey_t hotkey); /* return width on terminal of hotkey */ int hotkey_width (const hotkey_t hotkey); +/* compare two hotkeys */ +gboolean hotkey_equal (const hotkey_t hotkey1, const hotkey_t hotkey2); /* draw hotkey of widget */ void hotkey_draw (Widget * w, const hotkey_t hotkey, gboolean focused); diff --git a/tests/lib/widget/Makefile.am b/tests/lib/widget/Makefile.am index 0d619edb5..868eb7b41 100644 --- a/tests/lib/widget/Makefile.am +++ b/tests/lib/widget/Makefile.am @@ -16,9 +16,13 @@ LIBS += $(GLIB_LIBS) endif TESTS = \ - complete_engine + complete_engine \ + hotkey_equal check_PROGRAMS = $(TESTS) complete_engine_SOURCES = \ complete_engine.c + +hotkey_equal_SOURCES = \ + hotkey_equal.c diff --git a/tests/lib/widget/hotkey_equal.c b/tests/lib/widget/hotkey_equal.c new file mode 100644 index 000000000..a9e80972e --- /dev/null +++ b/tests/lib/widget/hotkey_equal.c @@ -0,0 +1,175 @@ +/* + lib/widget - tests for hotkey comparision + + Copyright (C) 2019 + Free Software Foundation, Inc. + + Written by: + Andrew Borodin , 2019 + + This file is part of the Midnight Commander. + + The Midnight Commander is free software: you can redistribute it + and/or modify it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. + + The Midnight Commander is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + */ + +#define TEST_SUITE_NAME "/lib/widget" + +#include "tests/mctest.h" + +#include "lib/widget.h" + +#define C(x) ((char *) x) + +/* --------------------------------------------------------------------------------------------- */ + +/* @Before */ +static void +setup (void) +{ +} + +/* --------------------------------------------------------------------------------------------- */ + +/* @After */ +static void +teardown (void) +{ +} + +/* --------------------------------------------------------------------------------------------- */ + +/* @DataSource("test_hotkey_equal_ds") */ +/* *INDENT-OFF* */ +static const struct test_hotkey_equal_ds +{ + const hotkey_t hotkey1; + const hotkey_t hotkey2; + gboolean expected_result; +} test_hotkey_equal_ds[] = +{ + /* 0 */ + { + { .start = C ("abc"), .hotkey = NULL, .end = NULL }, + { .start = C ("abc"), .hotkey = NULL, .end = NULL }, + TRUE + }, + /* 1 */ + { + { .start = C (""), .hotkey = C (""), .end = C ("") }, + { .start = C (""), .hotkey = C (""), .end = C ("") }, + TRUE + }, + /* 2 */ + { + { .start = C ("abc"), .hotkey = C ("d"), .end = C ("efg") }, + { .start = C ("abc"), .hotkey = C ("d"), .end = C ("efg") }, + TRUE + }, + /* 3 */ + { + { .start = C ("abc"), .hotkey = NULL, .end = C ("efg") }, + { .start = C ("abc"), .hotkey = NULL, .end = C ("efg") }, + TRUE + }, + /* 4 */ + { + { .start = C ("abc"), .hotkey = C ("d"), .end = NULL }, + { .start = C ("abc"), .hotkey = C ("d"), .end = NULL }, + TRUE + }, + /* 5 */ + { + { .start = C ("abc"), .hotkey = C ("d"), .end = C ("efg") }, + { .start = C ("_bc"), .hotkey = C ("d"), .end = C ("efg") }, + FALSE + }, + /* 6 */ + { + { .start = C ("abc"), .hotkey = C ("d"), .end = C ("efg") }, + { .start = C ("abc"), .hotkey = C ("_"), .end = C ("efg") }, + FALSE + }, + /* 7 */ + { + { .start = C ("abc"), .hotkey = C ("d"), .end = C ("efg") }, + { .start = C ("abc"), .hotkey = C ("d"), .end = C ("_fg") }, + FALSE + }, + /* 8 */ + { + { .start = C ("abc"), .hotkey = C ("d"), .end = C ("efg") }, + { .start = C ("adc"), .hotkey = NULL, .end = C ("efg") }, + FALSE + }, + /* 9 */ + { + { .start = C ("abc"), .hotkey = C ("d"), .end = C ("efg") }, + { .start = C ("abc"), .hotkey = C ("d"), .end = NULL }, + FALSE + }, + /* 10 */ + { + { .start = C ("abc"), .hotkey = C ("d"), .end = C ("efg") }, + { .start = C ("abc"), .hotkey = NULL, .end = NULL }, + FALSE + } +}; +/* *INDENT-ON* */ + +/* @Test(dataSource = "test_hotkey_equal_ds") */ +/* *INDENT-OFF* */ +START_PARAMETRIZED_TEST (test_hotkey_equal, + test_hotkey_equal_ds) +/* *INDENT-ON* */ +{ + /* given */ + gboolean result; + + /* when */ + result = hotkey_equal (data->hotkey1, data->hotkey2); + + /* then */ + mctest_assert_int_eq (result, data->expected_result); +} +/* *INDENT-OFF* */ +END_PARAMETRIZED_TEST +/* *INDENT-ON* */ + +/* --------------------------------------------------------------------------------------------- */ + +int +main (void) +{ + int number_failed; + + Suite *s = suite_create (TEST_SUITE_NAME); + TCase *tc_core = tcase_create ("Core"); + SRunner *sr; + + tcase_add_checked_fixture (tc_core, setup, teardown); + + /* Add new tests here: *************** */ + mctest_add_parameterized_test (tc_core, test_hotkey_equal, test_hotkey_equal_ds); + /* *********************************** */ + + suite_add_tcase (s, tc_core); + sr = srunner_create (s); + srunner_set_log (sr, "hotkey_equal.log"); + srunner_run_all (sr, CK_ENV); + number_failed = srunner_ntests_failed (sr); + srunner_free (sr); + return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; +} + +/* --------------------------------------------------------------------------------------------- */