sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Replace check_text with check_common_text

This commit is contained in:
Yang Gu 2010-05-10 18:38:49 +08:00 committed by Denis Kenzior
parent 37c2bc8cf2
commit dff6deb6a3
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
unit/test-stkutil.c
View File

@ -52,6 +52,17 @@ static inline void check_common_bool(const ofono_bool_t command,
g_assert(command == test);
}
static inline void check_common_text(const char *command, const char *test)
{
if (test == NULL) {
g_assert(command == NULL);
return;
}
g_assert(command != NULL);
g_assert(g_str_equal(command, test));
}
/* Defined in TS 102.223 Section 8.8 */
static void check_duration(const struct stk_duration *command,
const struct stk_duration *test)
@ -68,18 +79,6 @@ static void check_response_length(const struct stk_response_length *command,
g_assert(command->max == test->max);
}
/* Defined in TS 102.223 Section 8.15 */
static inline void check_text(const char *command, const char *test)
{
if (test == NULL) {
g_assert(command == NULL);
return;
}
g_assert(command != NULL);
g_assert(g_str_equal(command, test));
}
/* Defined in TS 102.223 Section 8.31 */
static void check_icon_id(const struct stk_icon_id *command,
const struct stk_icon_id *test)
@ -347,7 +346,7 @@ static void test_display_text(gconstpointer data)
g_assert(command->dst == STK_DEVICE_IDENTITY_TYPE_DISPLAY);
g_assert(command->display_text.text);
check_text(command->display_text.text, test->text);
check_common_text(command->display_text.text, test->text);
check_icon_id(&command->display_text.icon_id, &test->icon_id);
check_common_bool(command->display_text.immediate_response,
test->immediate_response);
@ -1284,7 +1283,7 @@ static void test_get_inkey(gconstpointer data)
g_assert(command->dst == STK_DEVICE_IDENTITY_TYPE_TERMINAL);
g_assert(command->get_inkey.text);
check_text(command->get_inkey.text, test->text);
check_common_text(command->get_inkey.text, test->text);
check_icon_id(&command->get_inkey.icon_id, &test->icon_id);
check_duration(&command->get_inkey.duration, &test->duration);
check_text_attr(&command->get_inkey.text_attr,
@ -2590,9 +2589,9 @@ static void test_get_input(gconstpointer data)
if (test->text)
g_assert(command->get_input.text);
check_text(command->get_input.text, test->text);
check_common_text(command->get_input.text, test->text);
check_response_length(&command->get_input.resp_len, &test->resp_len);
check_text(command->get_input.default_text, test->default_text);
check_common_text(command->get_input.default_text, test->default_text);
check_icon_id(&command->get_input.icon_id, &test->icon_id);
check_text_attr(&command->get_input.text_attr,
&test->text_attr);