3 files changed, 29 insertions, 82 deletions
diff --git a/tests/unit/core/test-core-eval.cpp b/tests/unit/core/test-core-eval.cpp
index a74d8ee96..65f6a0c76 100644
--- a/tests/unit/core/test-core-eval.cpp
+++ b/tests/unit/core/test-core-eval.cpp
@@ -530,15 +530,15 @@ TEST(CoreEval, EvalExpression)
               "%s-test-",
               gui_color_from_option (config_color_chat_delimiters));
     WEE_CHECK_EVAL(str_value, "${color:chat_delimiters}-test-");
-    config_file_search_with_string ("irc.color.message_join", NULL, NULL,
+    config_file_search_with_string ("weechat.color.chat_host", NULL, NULL,
                                     &ptr_option, NULL);
     if (!ptr_option)
     {
-        FAIL("ERROR: option irc.color.message_join not found.");
+        FAIL("ERROR: option weechat.color.chat_host not found.");
     }
     snprintf (str_value, sizeof (str_value),
               "%s-test-", gui_color_from_option (ptr_option));
-    WEE_CHECK_EVAL(str_value, "${color:irc.color.message_join}-test-");
+    WEE_CHECK_EVAL(str_value, "${color:weechat.color.chat_host}-test-");
     WEE_CHECK_EVAL("test", "${option.not.found}test");
 
     /* test modifier (invalid values) */
diff --git a/tests/unit/plugins/test-plugins.cpp b/tests/unit/plugins/test-plugins.cpp
new file mode 100644
index 000000000..5afc2b85c
--- /dev/null
+++ b/tests/unit/plugins/test-plugins.cpp
@@ -0,0 +1,26 @@
+/*
+ * test-plugins.cpp - generic tests on plugins
+ *
+ * Copyright (C) 2003-2020 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"
+
+TEST_GROUP(Plugins)
+{
+};
diff --git a/tests/unit/test-plugins.cpp b/tests/unit/test-plugins.cpp
deleted file mode 100644
index 96151b6b1..000000000
--- a/tests/unit/test-plugins.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * test-plugins.cpp - test plugins
- *
- * Copyright (C) 2003-2020 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 <stdio.h>
-#include <string.h>
-#include <regex.h>
-#include "src/core/wee-hdata.h"
-#include "src/core/wee-hook.h"
-#include "src/plugins/plugin.h"
-}
-
-TEST_GROUP(Plugins)
-{
-};
-
-/*
- * Tests loaded plugins.
- */
-
-TEST(Plugins, Loaded)
-{
-    struct t_hdata *hdata;
-    void *plugins;
-
-    hdata = hook_hdata_get (NULL, "plugin");
-    CHECK(hdata);
-
-    plugins = hdata_get_list (hdata, "weechat_plugins");
-    CHECK(plugins);
-
-    /* check that all plugins are properly loaded */
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == alias", 1));
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == buflist", 1));
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == charset", 1));
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == exec", 1));
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == fifo", 1));
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == fset", 1));
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == guile", 1));
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == irc", 1));
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == javascript", 1));
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == logger", 1));
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == lua", 1));
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == perl", 1));
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == php", 1));
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == python", 1));
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == relay", 1));
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == ruby", 1));
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == script", 1));
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == spell", 1));
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == tcl", 1));
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == trigger", 1));
-    CHECK(hdata_search (hdata, plugins, "${plugin.name} == xfer", 1));
-
-    /* non-existing plugin */
-    POINTERS_EQUAL(NULL,
-                   hdata_search (hdata, plugins, "${plugin.name} == x", 1));
-}