3 files changed, 15 insertions, 7 deletions
diff --git a/tests/unittests/test_cmd_otr.c b/tests/unittests/test_cmd_otr.c
index c1a46fc1..088b8baa 100644
--- a/tests/unittests/test_cmd_otr.c
+++ b/tests/unittests/test_cmd_otr.c
@@ -250,7 +250,7 @@ test_cmd_otr_theirfp_from_wintype(win_type_t wintype)
 
     will_return(connection_get_status, JABBER_CONNECTED);
 
-    expect_ui_current_print_line("You must be in a regular chat window to view a recipient's fingerprint.");
+    expect_win_println("You must be in a regular chat window to view a recipient's fingerprint.");
 
     gboolean result = cmd_otr_theirfp(&window, CMD_OTR, args);
 
@@ -333,7 +333,7 @@ test_cmd_otr_start_from_wintype(win_type_t wintype)
 
     will_return(connection_get_status, JABBER_CONNECTED);
 
-    expect_ui_current_print_line("You must be in a regular chat window to start an OTR session.");
+    expect_win_println("You must be in a regular chat window to start an OTR session.");
 
     gboolean result = cmd_otr_start(&window, CMD_OTR, args);
     assert_true(result);
diff --git a/tests/unittests/ui/stub_ui.c b/tests/unittests/ui/stub_ui.c
index c93f08fd..da253774 100644
--- a/tests/unittests/ui/stub_ui.c
+++ b/tests/unittests/ui/stub_ui.c
@@ -43,9 +43,9 @@ expect_any_cons_show_error(void)
 }
 
 void
-expect_ui_current_print_line(char *message)
+expect_win_println(char *message)
 {
-    expect_string(ui_current_print_line, output, message);
+    expect_string(win_println, output, message);
 }
 
 void
@@ -517,9 +517,17 @@ void win_hide_subwin(ProfWin *window) {}
 void win_show_subwin(ProfWin *window) {}
 void win_refresh_without_subwin(ProfWin *window) {}
 void win_refresh_with_subwin(ProfWin *window) {}
-void win_printf(ProfWin *window, const char show_char, int pad_indent, GDateTime *timestamp, int flags, theme_item_t theme_item, const char * const from, const char * const message, ...) {}
+
+void win_println(ProfWin *window, theme_item_t theme, const char ch, const char *const message, ...)
+{
+    va_list args;
+    va_start(args, message);
+    vsnprintf(output, sizeof(output), message, args);
+    check_expected(output);
+    va_end(args);
+}
+
 void win_print(ProfWin *window, theme_item_t theme_item, const char ch, const char *const message, ...) {}
-void win_println(ProfWin *window, theme_item_t theme_item, const char ch, const char *const message, ...) {}
 void win_appendln(ProfWin *window, theme_item_t theme_item, const char *const message, ...) {}
 
 char* win_get_title(ProfWin *window)
diff --git a/tests/unittests/ui/stub_ui.h b/tests/unittests/ui/stub_ui.h
index d4488c4b..a1b94478 100644
--- a/tests/unittests/ui/stub_ui.h
+++ b/tests/unittests/ui/stub_ui.h
@@ -2,5 +2,5 @@ void expect_cons_show(char *expected);
 void expect_any_cons_show(void);
 void expect_cons_show_error(char *expected);
 void expect_any_cons_show_error(void);
-void expect_ui_current_print_line(char *message);
 void expect_ui_current_print_formatted_line(char show_char, int attrs, char *message);
+void expect_win_println(char *message);