core: use fixed-width integer for computing nick hash (issue #1394)

2019-08-19 23:27:11 +02:00 · 2019-08-19 23:27:11 +02:00 · 80f103b68a
commit 80f103b68a
parent 156d855787
9 changed files with 90 additions and 1 deletions
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@ -31,6 +31,7 @@ New features::

 Bug fixes::

+  * core: use fixed-width integer for computing nick hash (issue #1394)
  * core: create or update option weechat.notify.xxx when function buffer_set is called with "notify" property (issue #1390)
  * core: fix memory leak in case of error when building content of bar item for display (issue #1384)
  * core: send command line parameter to plugins only if the name starts with the plugin name followed by a colon
--- a/doc/en/weechat_dev.en.adoc
+++ b/doc/en/weechat_dev.en.adoc
@ -401,6 +401,7 @@ WeeChat "core" is located in following directories:
 |          test-core-util.cpp       | Tests: utility functions.
 |       gui/                        | Root of unit tests for interfaces.
 |          test-gui-line.cpp        | Tests: lines.
+|          test-gui-nick.cpp        | Tests: nicks.
 |       plugins/                    | Root of unit tests for plugins.
 |          irc/                     | Root of unit tests for IRC plugin.
 |             test-irc-color.cpp    | Tests: IRC colors.
--- a/doc/fr/weechat_dev.fr.adoc
+++ b/doc/fr/weechat_dev.fr.adoc
@ -403,6 +403,7 @@ Le cœur de WeeChat est situé dans les répertoires suivants :
 |          test-core-util.cpp       | Tests : fonctions utiles.
 |       gui/                        | Racine des tests unitaires pour les interfaces.
 |          test-gui-line.cpp        | Tests : lignes.
+|          test-gui-nick.cpp        | Tests : pseudos.
 |       plugins/                    | Racine des tests unitaires pour les extensions.
 |          irc/                     | Racine des tests unitaires pour l'extension IRC.
 |             test-irc-color.cpp    | Tests : couleurs IRC.
--- a/doc/ja/weechat_dev.ja.adoc
+++ b/doc/ja/weechat_dev.ja.adoc
@ -407,6 +407,8 @@ WeeChat "core" は以下のディレクトリに配置されています:
 |          test-core-util.cpp       | テスト: ユーティリティ関数
 |       gui/                        | インターフェースの単体テストを収める最上位ディレクトリ
 |          test-gui-line.cpp        | テスト: 行
+// TRANSLATION MISSING
+|          test-gui-nick.cpp        | テスト: nicks
 |       plugins/                    | プラグインの単体テストを収める最上位ディレクトリ
 |          irc/                     | IRC プラグインの単体テストを収める最上位ディレクトリ
 // TRANSLATION MISSING
--- a/src/gui/gui-nick.c
+++ b/src/gui/gui-nick.c
@ -24,6 +24,7 @@
 #endif

 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>

 #include "../core/weechat.h"
@ -45,7 +46,7 @@
 int
 gui_nick_hash_color (const char *nickname)
 {
-    unsigned long color;
+    uint64_t color;
    const char *ptr_nick;

    if (!nickname || !nickname[0])
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@ -38,6 +38,7 @@ set(LIB_WEECHAT_UNIT_TESTS_CORE_SRC
  unit/core/test-core-utf8.cpp
  unit/core/test-core-util.cpp
  unit/gui/test-gui-line.cpp
+  unit/gui/test-gui-nick.cpp
  scripts/test-scripts.cpp
 )
 add_library(weechat_unit_tests_core STATIC ${LIB_WEECHAT_UNIT_TESTS_CORE_SRC})
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@ -35,6 +35,7 @@ lib_weechat_unit_tests_core_a_SOURCES = unit/test-plugins.cpp \
                                        unit/core/test-core-utf8.cpp \
                                        unit/core/test-core-util.cpp \
                                        unit/gui/test-gui-line.cpp \
+                                        unit/gui/test-gui-nick.cpp \
                                        scripts/test-scripts.cpp

 noinst_PROGRAMS = tests
--- a/tests/tests.cpp
+++ b/tests/tests.cpp
@ -74,6 +74,7 @@ IMPORT_TEST_GROUP(CoreUtf8);
 IMPORT_TEST_GROUP(CoreUtil);
 /* GUI */
 IMPORT_TEST_GROUP(GuiLine);
+IMPORT_TEST_GROUP(GuiNick);
 /* scripts */
 IMPORT_TEST_GROUP(Scripts);

--- a/tests/unit/gui/test-gui-nick.cpp
+++ b/tests/unit/gui/test-gui-nick.cpp
@ -0,0 +1,80 @@
+/*
+ * test-gui-nick.cpp - test nick functions
+ *
+ * Copyright (C) 2019 Sébastien Helleu <flashcode@flashtux.org>
+ *
+ * This file is part of WeeChat, the extensible chat client.
+ *
+ * WeeChat 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.
+ *
+ * WeeChat 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 WeeChat.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "CppUTest/TestHarness.h"
+
+extern "C"
+{
+#include "src/core/wee-config.h"
+#include "src/core/wee-string.h"
+#include "src/gui/gui-nick.h"
+
+#define NICK_COLORS "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,"  \
+    "21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,"  \
+    "44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,"  \
+    "67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,"  \
+    "90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109," \
+    "110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,"   \
+    "127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,"   \
+    "144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,"   \
+    "161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,"   \
+    "178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,"   \
+    "195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,"   \
+    "212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,"   \
+    "229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,"   \
+    "246,247,248,249,250,251,252,253,254,255"
+
+extern int gui_nick_hash_color (const char *nickname);
+}
+
+TEST_GROUP(GuiNick)
+{
+};
+
+/*
+ * Tests functions:
+ *   gui_nick_hash_color
+ */
+
+TEST(GuiNick, NickHashColor)
+{
+    config_file_option_set (config_color_chat_nick_colors, NICK_COLORS, 0);
+
+    config_file_option_set (config_look_nick_color_hash, "dbj2", 0);
+
+    LONGS_EQUAL(71, gui_nick_hash_color ("a"));
+    LONGS_EQUAL(108, gui_nick_hash_color ("abc"));
+    LONGS_EQUAL(146, gui_nick_hash_color ("abcdef"));
+    LONGS_EQUAL(73, gui_nick_hash_color ("abcdefghi"));
+    LONGS_EQUAL(170, gui_nick_hash_color ("abcdefghijklmnopqrstuvwxyz"));
+    LONGS_EQUAL(94, gui_nick_hash_color ("zzzzzz"));
+
+    config_file_option_set (config_look_nick_color_hash, "sum", 0);
+
+    LONGS_EQUAL(97, gui_nick_hash_color ("a"));
+    LONGS_EQUAL(38, gui_nick_hash_color ("abc"));
+    LONGS_EQUAL(85, gui_nick_hash_color ("abcdef"));
+    LONGS_EQUAL(141, gui_nick_hash_color ("abcdefghi"));
+    LONGS_EQUAL(31, gui_nick_hash_color ("abcdefghijklmnopqrstuvwxyz"));
+    LONGS_EQUAL(220, gui_nick_hash_color ("zzzzzz"));
+
+    config_file_option_reset (config_color_chat_nick_colors, 0);
+}