5 files changed, 15 insertions, 13 deletions
diff --git a/tests/unittests/test_cmd_pgp.c b/tests/unittests/test_cmd_pgp.c
index b2a1aa7e..0754773a 100644
--- a/tests/unittests/test_cmd_pgp.c
+++ b/tests/unittests/test_cmd_pgp.c
@@ -79,9 +79,9 @@ void cmd_pgp_start_shows_message_when_no_arg_in_muc(void **state)
     cmd_pgp_start_shows_message_when_no_arg_in_wintype(WIN_MUC);
 }
 
-void cmd_pgp_start_shows_message_when_no_arg_in_mucconf(void **state)
+void cmd_pgp_start_shows_message_when_no_arg_in_conf(void **state)
 {
-    cmd_pgp_start_shows_message_when_no_arg_in_wintype(WIN_MUC_CONFIG);
+    cmd_pgp_start_shows_message_when_no_arg_in_wintype(WIN_CONFIG);
 }
 
 void cmd_pgp_start_shows_message_when_no_arg_in_private(void **state)
diff --git a/tests/unittests/test_cmd_pgp.h b/tests/unittests/test_cmd_pgp.h
index 0d681a4a..d6082ecb 100644
--- a/tests/unittests/test_cmd_pgp.h
+++ b/tests/unittests/test_cmd_pgp.h
@@ -8,7 +8,7 @@ void cmd_pgp_start_shows_message_when_connecting(void **state);
 void cmd_pgp_start_shows_message_when_undefined(void **state);
 void cmd_pgp_start_shows_message_when_no_arg_in_console(void **state);
 void cmd_pgp_start_shows_message_when_no_arg_in_muc(void **state);
-void cmd_pgp_start_shows_message_when_no_arg_in_mucconf(void **state);
+void cmd_pgp_start_shows_message_when_no_arg_in_conf(void **state);
 void cmd_pgp_start_shows_message_when_no_arg_in_private(void **state);
 void cmd_pgp_start_shows_message_when_no_arg_in_xmlconsole(void **state);
 #else
diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c
index 420653e1..855dca22 100644
--- a/tests/unittests/ui/stub_ui.c
+++ b/tests/unittests/ui/stub_ui.c
@@ -250,7 +250,7 @@ void ui_handle_error(const char * const err_msg)
 
 void ui_clear_win_title(void) {}
 void ui_goodbye_title(void) {}
-void mucconfwin_handle_configuration(ProfMucConfWin *confwin, DataForm *form) {}
+void confwin_handle_configuration(ProfConfWin *confwin, DataForm *form) {}
 void ui_handle_room_configuration_form_error(const char * const roomjid, const char * const message) {}
 void ui_handle_room_config_submit_result(const char * const roomjid) {}
 void ui_handle_room_config_submit_result_error(const char * const roomjid, const char * const message) {}
@@ -263,10 +263,10 @@ void mucwin_role_set_error(ProfMucWin *mucwin, const char * const nick, const ch
 void mucwin_role_list_error(ProfMucWin *mucwin, const char * const role, const char * const error) {}
 void mucwin_handle_role_list(ProfMucWin *mucwin, const char * const role, GSList *nicks) {}
 void mucwin_kick_error(ProfMucWin *mucwin, const char * const nick, const char * const error) {}
-void mucconfwin_show_form(ProfMucConfWin *confwin) {}
-void mucconfwin_show_form_field(ProfMucConfWin *confwin, DataForm *form, char *tag) {}
-void mucconfwin_form_help(ProfMucConfWin *confwin) {}
-void mucconfwin_field_help(ProfMucConfWin *confwin, char *tag) {}
+void confwin_show_form(ProfConfWin *confwin) {}
+void confwin_show_form_field(ProfConfWin *confwin, DataForm *form, char *tag) {}
+void confwin_form_help(ProfConfWin *confwin) {}
+void confwin_field_help(ProfConfWin *confwin, char *tag) {}
 void ui_show_lines(ProfWin *window, gchar** lines) {}
 void ui_redraw_all_room_rosters(void) {}
 void ui_show_all_room_rosters(void) {}
@@ -494,7 +494,7 @@ ProfWin* win_create_muc(const char * const roomjid)
 {
     return NULL;
 }
-ProfWin* win_create_muc_config(const char * const title, DataForm *form)
+ProfWin* win_create_config(const char *const title, DataForm *form, ProfConfWinCallback submit, ProfConfWinCallback cancel, const void *userdata)
 {
     return NULL;
 }
diff --git a/tests/unittests/unittests.c b/tests/unittests/unittests.c
index 8fad2e51..90f2ffaf 100644
--- a/tests/unittests/unittests.c
+++ b/tests/unittests/unittests.c
@@ -550,7 +550,7 @@ int main(int argc, char* argv[]) {
         unit_test(cmd_pgp_start_shows_message_when_connecting),
         unit_test(cmd_pgp_start_shows_message_when_no_arg_in_console),
         unit_test(cmd_pgp_start_shows_message_when_no_arg_in_muc),
-        unit_test(cmd_pgp_start_shows_message_when_no_arg_in_mucconf),
+        unit_test(cmd_pgp_start_shows_message_when_no_arg_in_conf),
         unit_test(cmd_pgp_start_shows_message_when_no_arg_in_private),
         unit_test(cmd_pgp_start_shows_message_when_no_arg_in_xmlconsole),
 #else
diff --git a/tests/unittests/xmpp/stub_xmpp.c b/tests/unittests/xmpp/stub_xmpp.c
index 45db6649..bc2c50db 100644
--- a/tests/unittests/xmpp/stub_xmpp.c
+++ b/tests/unittests/xmpp/stub_xmpp.c
@@ -34,7 +34,7 @@ const char * connection_get_fulljid(void)
     return (char *)mock();
 }
 
-const char * session_get_domain(void)
+const char * connection_get_domain(void)
 {
     return NULL;
 }
@@ -185,8 +185,8 @@ void iq_http_upload_request(HTTPUpload *upload) {}
 void iq_confirm_instant_room(const char * const room_jid) {}
 void iq_destroy_room(const char * const room_jid) {}
 void iq_request_room_config_form(const char * const room_jid) {}
-void iq_submit_room_config(const char * const room, DataForm *form) {}
-void iq_room_config_cancel(const char * const room_jid) {}
+void iq_submit_room_config(ProfConfWin *confwin) {}
+void iq_room_config_cancel(ProfConfWin *confwin) {}
 void iq_send_ping(const char * const target) {}
 void iq_send_caps_request(const char * const to, const char * const id,
     const char * const node, const char * const ver) {}
@@ -205,6 +205,8 @@ void iq_room_role_list(const char * const room, char *role) {}
 void iq_last_activity_request(gchar *jid) {}
 void iq_autoping_check(void) {}
 void iq_rooms_cache_clear(void) {}
+void iq_command_list(const char *const target) {}
+void iq_command_exec(const char *const target, const char *const command) {}
 
 // caps functions
 void caps_add_feature(char *feature) {}