forked from AuroraMiddleware/gtk
testsuite: Strip newlines from g_warning and g_error
g_logv adds one for us already.
This commit is contained in:
parent
7bd1012e51
commit
9dad9a4b59
@ -248,7 +248,7 @@ check_iter (GtkTreeModelRefCount *ref_model,
|
||||
else
|
||||
{
|
||||
if (may_assert)
|
||||
g_error ("Expected ref count %d, but node has never been referenced.\n", expected_ref_count);
|
||||
g_error ("Expected ref count %d, but node has never been referenced.", expected_ref_count);
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
@ -98,7 +98,7 @@ _gtk_rbtree_test_height (GtkRBTree *tree,
|
||||
computed_offset += node->children->root->offset;
|
||||
|
||||
if (GTK_RBNODE_GET_HEIGHT (node) + computed_offset != node->offset)
|
||||
g_error ("node has broken offset\n");
|
||||
g_error ("node has broken offset");
|
||||
|
||||
if (!_gtk_rbtree_is_nil (node->left))
|
||||
_gtk_rbtree_test_height (tree, node->left);
|
||||
|
@ -220,7 +220,7 @@ check_specific_tag_in_range (GtkTextBuffer *buffer,
|
||||
}
|
||||
|
||||
if (count != buffer_count)
|
||||
g_error ("Counted %d tags iterating by char, %d iterating forward by tag toggle\n",
|
||||
g_error ("Counted %d tags iterating by char, %d iterating forward by tag toggle",
|
||||
buffer_count, count);
|
||||
|
||||
state = FALSE;
|
||||
@ -593,7 +593,7 @@ run_tests (GtkTextBuffer *buffer)
|
||||
g_hash_table_destroy (tag_states);
|
||||
|
||||
if (count != buffer_count)
|
||||
g_error ("Counted %d tags iterating by char, %d iterating by tag toggle\n",
|
||||
g_error ("Counted %d tags iterating by char, %d iterating by tag toggle",
|
||||
buffer_count, count);
|
||||
|
||||
check_specific_tag (buffer, "fg_red");
|
||||
@ -1035,7 +1035,7 @@ test_logical_motion (void)
|
||||
while (gtk_text_iter_forward_cursor_position (&iter));
|
||||
|
||||
if (!gtk_text_iter_is_end (&iter))
|
||||
g_error ("Expected to stop at the end iterator\n");
|
||||
g_error ("Expected to stop at the end iterator");
|
||||
|
||||
if (!gtk_text_iter_is_cursor_position (&iter))
|
||||
g_error ("Should be a cursor position before the end iterator");
|
||||
@ -1063,10 +1063,10 @@ test_logical_motion (void)
|
||||
while (gtk_text_iter_backward_cursor_position (&iter));
|
||||
|
||||
if (i != -1)
|
||||
g_error ("Expected %d steps, there were actually %d\n", expected_steps - i, i);
|
||||
g_error ("Expected %d steps, there were actually %d", expected_steps - i, i);
|
||||
|
||||
if (!gtk_text_iter_is_start (&iter))
|
||||
g_error ("Expected to stop at the start iterator\n");
|
||||
g_error ("Expected to stop at the start iterator");
|
||||
|
||||
|
||||
/* Check sentence boundaries */
|
||||
@ -1108,10 +1108,10 @@ test_logical_motion (void)
|
||||
while (gtk_text_iter_forward_sentence_end (&iter));
|
||||
|
||||
if (i != expected_steps)
|
||||
g_error ("Expected %d steps, there were actually %d\n", expected_steps, i);
|
||||
g_error ("Expected %d steps, there were actually %d", expected_steps, i);
|
||||
|
||||
if (!gtk_text_iter_is_end (&iter))
|
||||
g_error ("Expected to stop at the end iterator\n");
|
||||
g_error ("Expected to stop at the end iterator");
|
||||
|
||||
gtk_text_buffer_set_text (buffer, "Hi.\nHi. \nHi! Hi. Hi? Hi.", -1);
|
||||
|
||||
@ -1151,10 +1151,10 @@ test_logical_motion (void)
|
||||
while (gtk_text_iter_backward_sentence_start (&iter));
|
||||
|
||||
if (i != expected_steps)
|
||||
g_error ("Expected %d steps, there were actually %d\n", expected_steps, i);
|
||||
g_error ("Expected %d steps, there were actually %d", expected_steps, i);
|
||||
|
||||
if (gtk_text_iter_get_offset (&iter) != 0)
|
||||
g_error ("Expected to stop at the start iterator\n");
|
||||
g_error ("Expected to stop at the start iterator");
|
||||
|
||||
g_object_unref (buffer);
|
||||
}
|
||||
|
@ -138,7 +138,7 @@ signal_monitor_generic_handler (SignalMonitor *m,
|
||||
gchar *path_str;
|
||||
|
||||
path_str = gtk_tree_path_to_string (path);
|
||||
g_error ("Signal queue empty, got signal %s path %s\n",
|
||||
g_error ("Signal queue empty, got signal %s path %s",
|
||||
signal_name_to_string (signal), path_str);
|
||||
g_free (path_str);
|
||||
|
||||
@ -147,7 +147,7 @@ signal_monitor_generic_handler (SignalMonitor *m,
|
||||
|
||||
if (m->client != model)
|
||||
{
|
||||
g_error ("Model mismatch; expected %p, got %p\n",
|
||||
g_error ("Model mismatch; expected %p, got %p",
|
||||
m->client, model);
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
@ -171,7 +171,7 @@ signal_monitor_generic_handler (SignalMonitor *m,
|
||||
s_path_str = gtk_tree_path_to_string (s->path);
|
||||
path_str = gtk_tree_path_to_string (path);
|
||||
|
||||
g_error ("Signals don't match; expected signal %s path %s, got signal %s path %s\n",
|
||||
g_error ("Signals don't match; expected signal %s path %s, got signal %s path %s",
|
||||
signal_name_to_string (s->signal), s_path_str,
|
||||
signal_name_to_string (signal), path_str);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user