diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-bidi.c | 18 | ||||
| -rw-r--r-- | tests/testiter.c | 32 | ||||
| -rw-r--r-- | tests/testmisc.c | 26 |
3 files changed, 38 insertions, 38 deletions
diff --git a/tests/test-bidi.c b/tests/test-bidi.c index fe74cac2..dadad5b1 100644 --- a/tests/test-bidi.c +++ b/tests/test-bidi.c @@ -362,7 +362,7 @@ test_move_cursor_para (void) PangoLine *line; PangoRectangle ext; PangoLines *lines; - PangoLayoutIter *iter; + PangoLineIter *iter; PangoLine *new_line; layout = pango_layout_new (context); @@ -389,10 +389,10 @@ test_move_cursor_para (void) break; iter = pango_lines_get_iter (lines); - while (pango_layout_iter_get_line (iter) != line) - pango_layout_iter_next_line (iter); - pango_layout_iter_get_line_extents (iter, NULL, &ext); - pango_layout_iter_free (iter); + while (pango_line_iter_get_line (iter) != line) + pango_line_iter_next_line (iter); + pango_line_iter_get_line_extents (iter, NULL, &ext); + pango_line_iter_free (iter); pango_lines_move_cursor(lines, TRUE, NULL, @@ -433,10 +433,10 @@ test_move_cursor_para (void) pango_lines_index_to_line (lines, index, &line, NULL, NULL, NULL); g_assert_nonnull (line); iter = pango_lines_get_iter (lines); - while (pango_layout_iter_get_line (iter) != line) - pango_layout_iter_next_line (iter); - pango_layout_iter_get_line_extents (iter, NULL, &ext); - pango_layout_iter_free (iter); + while (pango_line_iter_get_line (iter) != line) + pango_line_iter_next_line (iter); + pango_line_iter_get_line_extents (iter, NULL, &ext); + pango_line_iter_free (iter); pango_lines_move_cursor (lines, TRUE, NULL, diff --git a/tests/testiter.c b/tests/testiter.c index 062cd3b9..a966342e 100644 --- a/tests/testiter.c +++ b/tests/testiter.c @@ -80,7 +80,7 @@ static void iter_char_test (PangoLayout *layout) { PangoRectangle extents, run_extents; - PangoLayoutIter *iter; + PangoLineIter *iter; PangoRun *run; int num_chars; int i, index, offset; @@ -99,19 +99,19 @@ iter_char_test (PangoLayout *layout) gchar *char_str; g_assert (iter_next_ok); - index = pango_layout_iter_get_index (iter); + index = pango_line_iter_get_index (iter); ptr = text + index; char_str = g_strndup (ptr, g_utf8_next_char (ptr) - ptr); verbose ("i=%d (visual), index = %d '%s':\n", i, index, char_str); g_free (char_str); - pango_layout_iter_get_char_extents (iter, &extents); + pango_line_iter_get_char_extents (iter, &extents); verbose (" char extents: x=%d,y=%d w=%d,h=%d\n", extents.x, extents.y, extents.width, extents.height); - run = pango_layout_iter_get_run (iter); + run = pango_line_iter_get_run (iter); if (run) { @@ -124,7 +124,7 @@ iter_char_test (PangoLayout *layout) glyphs = pango_run_get_glyphs (run); /* Get needed data for the GlyphString */ - pango_layout_iter_get_run_extents (iter, NULL, &run_extents); + pango_line_iter_get_run_extents (iter, NULL, &run_extents); offset = item->offset; rtl = item->analysis.level%2; desc = pango_font_describe (item->analysis.font); @@ -158,7 +158,7 @@ iter_char_test (PangoLayout *layout) /* We're on a line terminator */ } - iter_next_ok = pango_layout_iter_next_char (iter); + iter_next_ok = pango_line_iter_next_char (iter); verbose ("more to go? %d\n", iter_next_ok); } @@ -166,14 +166,14 @@ iter_char_test (PangoLayout *layout) * input string */ g_assert (!iter_next_ok); - pango_layout_iter_free (iter); + pango_line_iter_free (iter); } static void iter_cluster_test (PangoLayout *layout) { PangoRectangle extents; - PangoLayoutIter *iter; + PangoLineIter *iter; int index; gboolean iter_next_ok; PangoLine *last_line = NULL; @@ -184,16 +184,16 @@ iter_cluster_test (PangoLayout *layout) while (iter_next_ok) { - PangoLine *line = pango_layout_iter_get_line (iter); + PangoLine *line = pango_line_iter_get_line (iter); /* Every cluster is part of a run */ - g_assert (pango_layout_iter_get_run (iter)); + g_assert (pango_line_iter_get_run (iter)); - index = pango_layout_iter_get_index (iter); + index = pango_line_iter_get_index (iter); - pango_layout_iter_get_cluster_extents (iter, NULL, &extents); + pango_line_iter_get_cluster_extents (iter, NULL, &extents); - iter_next_ok = pango_layout_iter_next_cluster (iter); + iter_next_ok = pango_line_iter_next_cluster (iter); verbose ("index = %d:\n", index); verbose (" cluster extents: x=%d,y=%d w=%d,h=%d\n", @@ -215,11 +215,11 @@ iter_cluster_test (PangoLayout *layout) g_assert (!iter_next_ok); - pango_layout_iter_free (iter); + pango_line_iter_free (iter); } static void -test_layout_iter (void) +test_line_iter (void) { const char **ptext; PangoFontMap *fontmap; @@ -320,7 +320,7 @@ main (int argc, char *argv[]) { g_test_init (&argc, &argv, NULL); - g_test_add_func ("/layout/iter", test_layout_iter); + g_test_add_func ("/layout/iter", test_line_iter); g_test_add_func ("/layout/glyphitem-iter", test_glyphitem_iter); return g_test_run (); diff --git a/tests/testmisc.c b/tests/testmisc.c index f1e892e8..a4183478 100644 --- a/tests/testmisc.c +++ b/tests/testmisc.c @@ -178,7 +178,7 @@ test_run_height (void) { PangoContext *context; PangoLayout *layout; - PangoLayoutIter *iter; + PangoLineIter *iter; PangoRectangle logical1, logical2; if (strcmp (G_OBJECT_TYPE_NAME (pango_cairo_font_map_get_default ()), "PangoCairoCoreTextFontMap") == 0) @@ -192,14 +192,14 @@ test_run_height (void) pango_layout_set_text (layout, "one", -1); iter = pango_lines_get_iter (pango_layout_get_lines (layout)); - pango_layout_iter_get_run_extents (iter, NULL, &logical1); - pango_layout_iter_free (iter); + pango_line_iter_get_run_extents (iter, NULL, &logical1); + pango_line_iter_free (iter); pango_layout_set_text (layout, "", -1); iter = pango_lines_get_iter (pango_layout_get_lines (layout)); - pango_layout_iter_get_run_extents (iter, NULL, &logical2); - pango_layout_iter_free (iter); + pango_line_iter_get_run_extents (iter, NULL, &logical2); + pango_line_iter_free (iter); g_assert_cmpint (logical1.height, ==, logical2.height); @@ -581,7 +581,7 @@ test_extents (void) { PangoLayout *layout; PangoLines *lines; - PangoLayoutIter *iter; + PangoLineIter *iter; PangoRectangle layout_extents; PangoRectangle line_extents; PangoRectangle run_extents; @@ -602,11 +602,11 @@ test_extents (void) do { - pango_layout_iter_get_line_extents (iter, NULL, &line_extents); - pango_layout_iter_get_run_extents (iter, NULL, &run_extents); - pango_layout_iter_get_cluster_extents (iter, NULL, &cluster_extents); - pango_layout_iter_get_char_extents (iter, &char_extents); - index = pango_layout_iter_get_index (iter); + pango_line_iter_get_line_extents (iter, NULL, &line_extents); + pango_line_iter_get_run_extents (iter, NULL, &run_extents); + pango_line_iter_get_cluster_extents (iter, NULL, &cluster_extents); + pango_line_iter_get_char_extents (iter, &char_extents); + index = pango_line_iter_get_index (iter); pango_lines_index_to_pos (lines, NULL, index, &pos); if (pos.width < 0) { @@ -624,9 +624,9 @@ test_extents (void) g_assert_true (pango_rectangle_contains (&line_extents, &strong)); g_assert_true (pango_rectangle_contains (&line_extents, &weak)); } - while (pango_layout_iter_next_char (iter)); + while (pango_line_iter_next_char (iter)); - pango_layout_iter_free (iter); + pango_line_iter_free (iter); g_object_unref (layout); } |