Added missing files, refactored ui_switch_win to check win exists

This commit is contained in:
James Booth
2014-04-01 23:54:26 +01:00
parent 7113b97952
commit b19b881b97
7 changed files with 56 additions and 35 deletions

View File

@@ -178,16 +178,10 @@ void _mock_cons_show_roster(GSList *list)
}
static
gboolean _mock_ui_win_exists(int index)
{
check_expected(index);
return (gboolean)mock();
}
static
void _mock_ui_switch_win(const int i)
gboolean _mock_ui_switch_win(const int i)
{
check_expected(i);
return (gboolean)mock();
}
// bind mocks and stubs
@@ -300,12 +294,6 @@ mock_cons_show_roster(void)
cons_show_roster = _mock_cons_show_roster;
}
void
mock_ui_win_exists(void)
{
ui_win_exists = _mock_ui_win_exists;
}
// expectations
void
@@ -458,15 +446,9 @@ cons_show_roster_expect(GSList *list)
}
void
ui_win_exists_expect_and_return(int given_index, gboolean result)
{
expect_value(_mock_ui_win_exists, index, given_index);
will_return(_mock_ui_win_exists, result);
}
void
ui_switch_win_expect(int given_i)
ui_switch_win_expect_and_return(int given_i, gboolean result)
{
ui_switch_win = _mock_ui_switch_win;
expect_value(_mock_ui_switch_win, i, given_i);
will_return(_mock_ui_switch_win, result);
}

View File

@@ -64,9 +64,6 @@ void ui_room_join_expect(char *room);
void mock_cons_show_roster(void);
void cons_show_roster_expect(GSList *list);
void mock_ui_win_exists(void);
void ui_win_exists_expect_and_return(int given_index, gboolean result);
void ui_switch_win_expect(int given_i);
void ui_switch_win_expect_and_return(int given_i, gboolean result);
#endif