From aa3941fee2eb842273ac984d588cc3026d4f7ab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Fri, 13 Mar 2020 23:12:22 +0100 Subject: [PATCH] tests: always run callback in calls to function config_file_option_set --- tests/unit/gui/test-gui-nick.cpp | 20 ++++++++++---------- tests/unit/plugins/irc/test-irc-message.cpp | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/unit/gui/test-gui-nick.cpp b/tests/unit/gui/test-gui-nick.cpp index 98b8e3c83..1595feaa1 100644 --- a/tests/unit/gui/test-gui-nick.cpp +++ b/tests/unit/gui/test-gui-nick.cpp @@ -56,12 +56,12 @@ TEST_GROUP(GuiNick) TEST(GuiNick, NickHashColor) { - config_file_option_set (config_color_chat_nick_colors, NICK_COLORS, 0); + config_file_option_set (config_color_chat_nick_colors, NICK_COLORS, 1); /* hash without salt */ /* test hash: djb2 */ - config_file_option_set (config_look_nick_color_hash, "djb2", 0); + config_file_option_set (config_look_nick_color_hash, "djb2", 1); LONGS_EQUAL(0, gui_nick_hash_color (NULL)); LONGS_EQUAL(0, gui_nick_hash_color ("")); @@ -76,7 +76,7 @@ TEST(GuiNick, NickHashColor) LONGS_EQUAL(94, gui_nick_hash_color ("zzzzzz")); /* test hash: sum */ - config_file_option_set (config_look_nick_color_hash, "sum", 0); + config_file_option_set (config_look_nick_color_hash, "sum", 1); LONGS_EQUAL(0, gui_nick_hash_color (NULL)); LONGS_EQUAL(0, gui_nick_hash_color ("")); @@ -91,7 +91,7 @@ TEST(GuiNick, NickHashColor) LONGS_EQUAL(220, gui_nick_hash_color ("zzzzzz")); /* test hash: djb2_32 */ - config_file_option_set (config_look_nick_color_hash, "djb2_32", 0); + config_file_option_set (config_look_nick_color_hash, "djb2_32", 1); LONGS_EQUAL(0, gui_nick_hash_color (NULL)); LONGS_EQUAL(0, gui_nick_hash_color ("")); @@ -106,7 +106,7 @@ TEST(GuiNick, NickHashColor) LONGS_EQUAL(94, gui_nick_hash_color ("zzzzzz")); /* test hash: sum_32 */ - config_file_option_set (config_look_nick_color_hash, "sum_32", 0); + config_file_option_set (config_look_nick_color_hash, "sum_32", 1); LONGS_EQUAL(0, gui_nick_hash_color (NULL)); LONGS_EQUAL(0, gui_nick_hash_color ("")); @@ -122,22 +122,22 @@ TEST(GuiNick, NickHashColor) /* hash with salt */ - config_file_option_set (config_look_nick_color_hash_salt, "abc", 0); + config_file_option_set (config_look_nick_color_hash_salt, "abc", 1); /* test hash: djb2 */ - config_file_option_set (config_look_nick_color_hash, "djb2", 0); + config_file_option_set (config_look_nick_color_hash, "djb2", 1); LONGS_EQUAL(146, gui_nick_hash_color ("def")); /* test hash: sum */ - config_file_option_set (config_look_nick_color_hash, "sum", 0); + config_file_option_set (config_look_nick_color_hash, "sum", 1); LONGS_EQUAL(85, gui_nick_hash_color ("def")); /* test hash: djb2_32 */ - config_file_option_set (config_look_nick_color_hash, "djb2_32", 0); + config_file_option_set (config_look_nick_color_hash, "djb2_32", 1); LONGS_EQUAL(146, gui_nick_hash_color ("def")); /* test hash: sum_32 */ - config_file_option_set (config_look_nick_color_hash, "sum_32", 0); + config_file_option_set (config_look_nick_color_hash, "sum_32", 1); LONGS_EQUAL(85, gui_nick_hash_color ("def")); config_file_option_reset (config_look_nick_color_hash_salt, 0); diff --git a/tests/unit/plugins/irc/test-irc-message.cpp b/tests/unit/plugins/irc/test-irc-message.cpp index a8f9f44ee..83aaada42 100644 --- a/tests/unit/plugins/irc/test-irc-message.cpp +++ b/tests/unit/plugins/irc/test-irc-message.cpp @@ -1214,7 +1214,7 @@ TEST(IrcMessage, Split) /* PRIVMSG with 512 bytes and split_msg_max_length == 0: no split */ config_file_option_set ( irc_config_server_default[IRC_SERVER_OPTION_SPLIT_MSG_MAX_LENGTH], - "0", 0); + "0", 1); hashtable = irc_message_split (server, "PRIVMSG #channel :" LOREM_IPSUM_512); CHECK(hashtable);