pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-29 22:36:38 +02:00
Code Activity

core, plugins: force "short_name" in buffers to non-empty value (name by default), remove buffer property "short_name_is_set"

Browse Source
This commit is contained in:
Sébastien Helleu
2024-06-18 18:26:33 +02:00
parent eb83e8d018
commit 1fcf5ac5b3
20 changed files with 92 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit/gui/test-gui-buffer.cpp
+10 -20
View File
@@ -173,11 +173,10 @@ TEST(GuiBuffer, GetPluginName)
/*
* Tests functions:
* gui_buffer_get_short_name
* gui_buffer_set_short_name
*/
TEST(GuiBuffer, GetSetShortName)
TEST(GuiBuffer, SetShortName)
{
struct t_gui_buffer *buffer;
@@ -186,22 +185,14 @@ TEST(GuiBuffer, GetSetShortName)
NULL, NULL, NULL);
CHECK(buffer);
POINTERS_EQUAL(NULL, gui_buffer_get_short_name (NULL));
POINTERS_EQUAL(NULL, buffer->short_name);
STRCMP_EQUAL(TEST_BUFFER_NAME, gui_buffer_get_short_name (buffer));
gui_buffer_set_short_name (buffer, NULL);
POINTERS_EQUAL(NULL, buffer->short_name);
STRCMP_EQUAL(TEST_BUFFER_NAME, gui_buffer_get_short_name (buffer));
gui_buffer_set_short_name (buffer, "short");
STRCMP_EQUAL("short", buffer->short_name);
STRCMP_EQUAL("short", gui_buffer_get_short_name (buffer));
STRCMP_EQUAL(TEST_BUFFER_NAME, buffer->short_name);
/* forbidden value => short_name unchanged */
gui_buffer_set_short_name (buffer, "");
POINTERS_EQUAL(NULL, buffer->short_name);
STRCMP_EQUAL(TEST_BUFFER_NAME, gui_buffer_get_short_name (buffer));
STRCMP_EQUAL(TEST_BUFFER_NAME, buffer->short_name);
gui_buffer_set_short_name (buffer, "t");
STRCMP_EQUAL("t", buffer->short_name);
gui_buffer_close (buffer);
}
@@ -468,7 +459,7 @@ TEST(GuiBuffer, ApplyConfigProperties)
NULL, NULL, NULL);
CHECK(buffer);
POINTERS_EQUAL(NULL, buffer->short_name);
STRCMP_EQUAL(TEST_BUFFER_NAME, buffer->short_name);
gui_buffer_close (buffer);
}
@@ -536,7 +527,7 @@ TEST(GuiBuffer, NewProps)
STRCMP_EQUAL(TEST_BUFFER_NAME, buffer->name);
STRCMP_EQUAL("core." TEST_BUFFER_NAME, buffer->full_name);
POINTERS_EQUAL(NULL, buffer->old_full_name);
POINTERS_EQUAL(NULL, buffer->short_name);
STRCMP_EQUAL(TEST_BUFFER_NAME, buffer->short_name);
LONGS_EQUAL(GUI_BUFFER_TYPE_FREE, buffer->type);
LONGS_EQUAL(GUI_BUFFER_NOTIFY_ALL, buffer->notify);
LONGS_EQUAL(0, buffer->num_displayed);
@@ -690,7 +681,7 @@ TEST(GuiBuffer, New)
STRCMP_EQUAL(TEST_BUFFER_NAME, buffer->name);
STRCMP_EQUAL("core." TEST_BUFFER_NAME, buffer->full_name);
POINTERS_EQUAL(NULL, buffer->old_full_name);
POINTERS_EQUAL(NULL, buffer->short_name);
STRCMP_EQUAL(TEST_BUFFER_NAME, buffer->short_name);
gui_buffer_close (buffer);
}
@@ -875,7 +866,6 @@ TEST(GuiBuffer, GetInteger)
LONGS_EQUAL(1, gui_buffer_get_integer (gui_buffers, "number"));
LONGS_EQUAL(0, gui_buffer_get_integer (gui_buffers, "layout_number"));
LONGS_EQUAL(0, gui_buffer_get_integer (gui_buffers, "layout_number_merge_order"));
LONGS_EQUAL(1, gui_buffer_get_integer (gui_buffers, "short_name_is_set"));
LONGS_EQUAL(GUI_BUFFER_TYPE_FORMATTED, gui_buffer_get_integer (gui_buffers, "type"));
LONGS_EQUAL(GUI_BUFFER_NOTIFY_ALL, gui_buffer_get_integer (gui_buffers, "notify"));
LONGS_EQUAL(1, gui_buffer_get_integer (gui_buffers, "num_displayed"));