mirror of
https://github.com/weechat/weechat.git
synced 2026-06-28 22:06:38 +02:00
tests: separate prefix from message in recorded messages
The record functions are moved to tests-record.cpp.
This commit is contained in:
@@ -22,6 +22,7 @@
|
||||
#include "CppUTest/TestHarness.h"
|
||||
|
||||
#include "tests/tests.h"
|
||||
#include "tests/tests-record.h"
|
||||
|
||||
extern "C"
|
||||
{
|
||||
@@ -41,21 +42,19 @@ extern "C"
|
||||
#define WEE_CMD_CORE(__command) \
|
||||
command_record ("core.weechat", __command);
|
||||
|
||||
#define WEE_CHECK_MSG_BUFFER(__buffer_name, __message) \
|
||||
if (record_search (__buffer_name, __message) < 0) \
|
||||
#define WEE_CHECK_MSG_BUFFER(__buffer_name, __prefix, __message) \
|
||||
if (record_search (__buffer_name, __prefix, __message) < 0) \
|
||||
{ \
|
||||
char **msg = command_build_error ( \
|
||||
"Message not displayed on buffer " __buffer_name ": " \
|
||||
"\"" __message "\n" \
|
||||
"All messages displayed:\n"); \
|
||||
char **msg = command_build_error (__buffer_name, __prefix, \
|
||||
__message); \
|
||||
record_dump (msg); \
|
||||
FAIL(string_dyn_free (msg, 0)); \
|
||||
}
|
||||
|
||||
#define WEE_CHECK_MSG_CORE(__message) \
|
||||
WEE_CHECK_MSG_BUFFER("core.weechat", __message);
|
||||
#define WEE_SEARCH_MSG_CORE(__message) \
|
||||
record_search ("core.weechat", __message)
|
||||
#define WEE_CHECK_MSG_CORE(__prefix, __message) \
|
||||
WEE_CHECK_MSG_BUFFER("core.weechat", __prefix, __message);
|
||||
#define WEE_SEARCH_MSG_CORE(__prefix, __message) \
|
||||
record_search ("core.weechat", __prefix, __message)
|
||||
|
||||
|
||||
TEST_GROUP(CoreCommand)
|
||||
@@ -74,12 +73,20 @@ TEST_GROUP(CoreCommand)
|
||||
record_stop ();
|
||||
}
|
||||
|
||||
char **command_build_error (const char *message)
|
||||
char **command_build_error (const char *buffer_name, const char *prefix,
|
||||
const char *message)
|
||||
{
|
||||
char **msg;
|
||||
|
||||
msg = string_dyn_alloc (1024);
|
||||
string_dyn_concat (msg, "Message not displayed on buffer ", -1);
|
||||
string_dyn_concat (msg, buffer_name, -1);
|
||||
string_dyn_concat (msg, ": prefix=\"", -1);
|
||||
string_dyn_concat (msg, prefix, -1);
|
||||
string_dyn_concat (msg, "\", message=\"", -1);
|
||||
string_dyn_concat (msg, message, -1);
|
||||
string_dyn_concat (msg, "\"\n", -1);
|
||||
string_dyn_concat (msg, "All messages displayed:\n", -1);
|
||||
return msg;
|
||||
}
|
||||
};
|
||||
@@ -216,9 +223,9 @@ TEST(CoreCommand, Debug)
|
||||
|
||||
/* test command "/debug unicode" */
|
||||
WEE_CMD_CORE(command_debug_unicode);
|
||||
WEE_CHECK_MSG_CORE(" \"\u00E9\u26C4\": 5 / 2, 2 / 3, 3, 3");
|
||||
WEE_CHECK_MSG_CORE(" \"\u00E9\" (U+00E9, 233, 0xC3 0xA9): 2 / 1, 1 / 1, 1, 1, 1");
|
||||
WEE_CHECK_MSG_CORE(" \"\u26C4\" (U+26C4, 9924, 0xE2 0x9B 0x84): 3 / 1, 1 / 2, 2, 2, 2");
|
||||
WEE_CHECK_MSG_CORE("", " \"\u00E9\u26C4\": 5 / 2, 2 / 3, 3, 3");
|
||||
WEE_CHECK_MSG_CORE("", " \"\u00E9\" (U+00E9, 233, 0xC3 0xA9): 2 / 1, 1 / 1, 1, 1, 1");
|
||||
WEE_CHECK_MSG_CORE("", " \"\u26C4\" (U+26C4, 9924, 0xE2 0x9B 0x84): 3 / 1, 1 / 2, 2, 2, 2");
|
||||
|
||||
/* test command "/debug windows" */
|
||||
/* TODO: write tests */
|
||||
@@ -373,10 +380,10 @@ TEST(CoreCommand, Reload)
|
||||
{
|
||||
WEE_CMD_CORE("/save");
|
||||
WEE_CMD_CORE("/reload");
|
||||
LONGS_EQUAL(0, WEE_SEARCH_MSG_CORE("Options reloaded from sec.conf"));
|
||||
LONGS_EQUAL(1, WEE_SEARCH_MSG_CORE("Options reloaded from weechat.conf"));
|
||||
LONGS_EQUAL(2, WEE_SEARCH_MSG_CORE("Options reloaded from plugins.conf"));
|
||||
LONGS_EQUAL(3, WEE_SEARCH_MSG_CORE("Options reloaded from charset.conf"));
|
||||
LONGS_EQUAL(0, WEE_SEARCH_MSG_CORE("", "Options reloaded from sec.conf"));
|
||||
LONGS_EQUAL(1, WEE_SEARCH_MSG_CORE("", "Options reloaded from weechat.conf"));
|
||||
LONGS_EQUAL(2, WEE_SEARCH_MSG_CORE("", "Options reloaded from plugins.conf"));
|
||||
LONGS_EQUAL(3, WEE_SEARCH_MSG_CORE("", "Options reloaded from charset.conf"));
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user