AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the textbuffer test

Browse Source 
The test was assuming that gtk_text_buffer_paste_clipboard is
synchronous, which is no longer the case.
This commit is contained in:
Matthias Clasen 2017-12-26 23:15:30 -05:00
parent c176d0c3d8
commit 90b016ef73
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
testsuite/gtk/textbuffer.c
View File

@ -1362,6 +1362,19 @@ check_buffer_contents (GtkTextBuffer *buffer,
g_assert_cmpstr (buffer_contents, ==, contents); g_assert_cmpstr (buffer_contents, ==, contents);
} }
static void
wait_for_changed (GtkTextBuffer *buffer)
{
GMainLoop *loop;
gulong id;
loop = g_main_loop_new (NULL, FALSE);
id = g_signal_connect_swapped (buffer, "changed", G_CALLBACK (g_main_loop_quit), loop);
g_main_loop_run (loop);
g_signal_handler_disconnect (buffer, id);
g_main_loop_unref (loop);
}
static void static void
test_clipboard (void) test_clipboard (void)
{ {
@ -1386,6 +1399,8 @@ test_clipboard (void)
gtk_text_buffer_get_end_iter (buffer, &end); gtk_text_buffer_get_end_iter (buffer, &end);
gtk_text_buffer_paste_clipboard (buffer, clipboard, &end, TRUE); gtk_text_buffer_paste_clipboard (buffer, clipboard, &end, TRUE);
wait_for_changed (buffer);
check_buffer_contents (buffer, "defabc"); check_buffer_contents (buffer, "defabc");
/* Simple copy & paste */ /* Simple copy & paste */
@ -1396,6 +1411,8 @@ test_clipboard (void)
gtk_text_buffer_get_start_iter (buffer, &start); gtk_text_buffer_get_start_iter (buffer, &start);
gtk_text_buffer_paste_clipboard (buffer, clipboard, &start, TRUE); gtk_text_buffer_paste_clipboard (buffer, clipboard, &start, TRUE);
wait_for_changed (buffer);
check_buffer_contents (buffer, "abcdefabc"); check_buffer_contents (buffer, "abcdefabc");
/* Replace the selection when pasting */ /* Replace the selection when pasting */
@ -1410,6 +1427,8 @@ test_clipboard (void)
gtk_text_buffer_get_end_iter (buffer, &end); gtk_text_buffer_get_end_iter (buffer, &end);
gtk_text_buffer_select_range (buffer, &start, &end); gtk_text_buffer_select_range (buffer, &start, &end);
gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, TRUE); gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, TRUE);
wait_for_changed (buffer);
check_buffer_contents (buffer, "abcabc"); check_buffer_contents (buffer, "abcabc");
/* Copy & paste text with tags. /* Copy & paste text with tags.
@ -1428,6 +1447,8 @@ test_clipboard (void)
gtk_text_buffer_select_range (buffer, &start, &end); gtk_text_buffer_select_range (buffer, &start, &end);
gtk_text_buffer_copy_clipboard (buffer, clipboard); gtk_text_buffer_copy_clipboard (buffer, clipboard);
gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, TRUE); gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, TRUE);
wait_for_changed (buffer);
check_buffer_contents (buffer, "abcdef"); check_buffer_contents (buffer, "abcdef");
gtk_text_buffer_get_iter_at_offset (buffer, &start, 3); gtk_text_buffer_get_iter_at_offset (buffer, &start, 3);